diff --git a/.github/workflows/eslint.yml b/.github/workflows/eslint.yml
index f2bd4b3464..b05c9807c9 100644
--- a/.github/workflows/eslint.yml
+++ b/.github/workflows/eslint.yml
@@ -8,9 +8,19 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+    # Checkout the repo
     - uses: actions/checkout@v2
 
-    # Will run ES Lint checks on javascript files
+    # Install Node
+    - uses: actions/setup-node@v2
+      with:
+        cache: 'yarn'
+
+    # Run yarn install for JS dependencies
+    - name: 'Yarn Install'
+      run: yarn install
+
+    # Run the ES Lint checks on javascript files
     #   https://github.com/marketplace/actions/run-eslint
     - name: 'ES Lint checks'
       uses: stefanoeb/eslint-action@1.0.0
diff --git a/.github/workflows/mysql.yml b/.github/workflows/mysql.yml
index 740bd53d1f..6c6a4395fb 100644
--- a/.github/workflows/mysql.yml
+++ b/.github/workflows/mysql.yml
@@ -6,6 +6,7 @@ jobs:
   mysql:
     runs-on: ubuntu-latest
 
+    # Define environment variables for MySQL and Rails
     env:
       DB_ADAPTER: mysql2
       MYSQL_PWD: root
@@ -14,94 +15,59 @@ jobs:
     steps:
     # Checkout the repo
     - uses: actions/checkout@v2
-      with:
-        fetch-depth: 1
-
-    - name: 'Install MySQL Packages'
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y mysql-client libmysqlclient-dev
 
-    - name: 'Determine Ruby and Bundler Versions from Gemfile.lock'
-      run: |
-        echo "RUBY_VERSION=`cat ./Gemfile.lock | grep -A 1 'RUBY VERSION' | grep 'ruby' | grep -oE '[0-9]\.[0-9]'`" >> $GITHUB_ENV
-        echo "BUNDLER_VERSION=`cat ./Gemfile.lock | grep -A 1 'BUNDLED WITH' | grep -oE '[0-9]\.[0-9]'`" >> $GITHUB_ENV
+    # Install Ruby and run bundler
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.6.3
+        bundler-cache: true
 
-    - name: 'Install Ruby'
-      uses: actions/setup-ruby@v1
+    # Install Node
+    - uses: actions/setup-node@v2
       with:
-        ruby-version: ${{ env.RUBY_VERSION }}
+        cache: 'yarn'
 
     # Copy all of the example configs over
     - name: 'Setup Default Configuration'
       run: |
-        # Make copies of all the example config files
         cp config/database.yml.sample config/database.yml
         cp config/initializers/contact_us.rb.example config/initializers/contact_us.rb
         cp config/initializers/wicked_pdf.rb.example config/initializers/wicked_pdf.rb
 
-    # Try to retrieve the gems from the cache
-    - name: 'Cache Gems'
-      uses: actions/cache@v2.1.5
-      with:
-        path: vendor/bundle
-        key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }}
-        restore-keys: |
-          ${{ runner.os }}-gem-
-
-    - name: 'Bundle Install'
-      run: |
-        gem install bundler -v ${{ env.BUNDLER_VERSION }}
-        bundle config path vendor/bundle
-        bundle install --jobs 4 --retry 3 --without pgsql rollbar aws
-
+    # Stub out the Rails credentials file so that we can start the Rails app
     - name: 'Setup Credentials'
-      run: |
-        # generate a default credential file and key
-        EDITOR='echo "$(cat config/credentials.yml.example)" >' bundle exec rails credentials:edit
-
-    # Try to retrieve the yarn JS dependencies from the cache
-    - name: 'Cache Yarn Packages'
-      uses: actions/cache@v2.1.5
-      with:
-        path: node_modules/
-        key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-        restore-keys: |
-          ${{ runner.os }}-build-${{ env.cache-name }}-
-          ${{ runner.os }}-build-
-          ${{ runner.os }}-yarn-
-          ${{ runner.os }}-
+      run: EDITOR='echo "$(cat config/credentials.yml.example)" >' bundle exec rails credentials:edit
 
+    # Set the path to the wkhtmltopdf executable
     - name: 'Determine wkhtmltopdf location'
       run: echo "WICKED_PDF_PATH=`bundle exec which wkhtmltopdf`" >> $GITHUB_ENV
 
+    # Run yarn install for JS dependencies
     - name: 'Yarn Install'
-      run: |
-        yarn install
+      run: yarn install
 
+    # Start the DB server and initialize the DB
     - name: 'Start MySQL'
-      run: sudo systemctl start mysql
-
-    - name: 'Setup Test DB'
-      run: bin/rails db:setup RAILS_ENV=test
-
-    - name: 'Migrate DB'
-      run: bin/rails db:migrate RAILS_ENV=test
-
-    - name: 'Compile Assets'
       run: |
-        bin/rails webpacker:compile
-        bin/rails assets:precompile
+        sudo systemctl start mysql
+        bin/rails db:setup RAILS_ENV=test
+        bin/rails db:migrate RAILS_ENV=test
+
+    # Prebuild the CSS, JS and image assets
+    - name: 'Precompile all of the Assets'
+      run: bin/rails assets:precompile
 
+    # Run the JS tests
     - name: 'Run Karma Tests'
       run: yarn test
 
+    # Run  the unit and functional tests
     - name: 'Run Rspec Unit and Functional Tests'
       run: |
         bin/bundle exec rspec spec/models/ spec/policies/ spec/services/ spec/helpers/
         bin/bundle exec rspec spec/controllers/ spec/presenters/ spec/requests/ spec/views
         bin/bundle exec rspec spec/mixins/
 
-    # Only run Integration tests if the PR or Push is to master or development branches
+    # Run the time consuming integration tests (using Chrome headless browser)
     - name: 'Run Rspec Integration Tests'
       run: bin/bundle exec rspec spec/features/
diff --git a/.github/workflows/postgres.yml b/.github/workflows/postgres.yml
index 5681a97364..504983a12a 100644
--- a/.github/workflows/postgres.yml
+++ b/.github/workflows/postgres.yml
@@ -23,6 +23,7 @@ jobs:
           --health-timeout 5s
           --health-retries 5
 
+    # Define environment variables for Postgres and Rails
     env:
       RAILS_ENV: test
       DATABASE_URL: postgres://postgres:@localhost:5432/roadmap_test
@@ -30,92 +31,67 @@ jobs:
     steps:
     # Checkout the repo
     - uses: actions/checkout@v2
+
+    # Install Ruby and run bundler
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.6.3
+        bundler-cache: true
+
+    # Install Node
+    - uses: actions/setup-node@v2
       with:
-        fetch-depth: 1
+        cache: 'yarn'
 
+    # Install the Postgres developer packages
     - name: 'Install Postgresql Packages'
       run: |
         sudo apt-get update
         sudo apt-get install libpq-dev
 
-    - name: 'Determine Ruby and Bundler Versions from Gemfile.lock'
-      run: |
-        echo "RUBY_VERSION=`cat ./Gemfile.lock | grep -A 1 'RUBY VERSION' | grep 'ruby' | grep -oE '[0-9]\.[0-9]'`" >> $GITHUB_ENV
-        echo "BUNDLER_VERSION=`cat ./Gemfile.lock | grep -A 1 'BUNDLED WITH' | grep -oE '[0-9]\.[0-9]'`" >> $GITHUB_ENV
-
-    # Install Ruby - using the version found in the Gemfile.lock
-    - name: 'Install Ruby'
-      uses: actions/setup-ruby@v1
-      with:
-        ruby-version: ${{ env.RUBY_VERSION }}
-
     # Copy all of the example configs over
     - name: 'Setup Default Configuration'
       run: |
-        # Make copies of all the example config files
         cp config/database.yml.sample config/database.yml
         cp config/initializers/contact_us.rb.example config/initializers/contact_us.rb
         cp config/initializers/wicked_pdf.rb.example config/initializers/wicked_pdf.rb
 
-    # Try to retrieve the gems from the cache
-    - name: 'Cache Gems'
-      uses: actions/cache@v2.1.5
-      with:
-        path: vendor/bundle
-        key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }}
-        restore-keys: |
-          ${{ runner.os }}-gem-
-
-    - name: 'Bundle Install'
-      run: |
-        gem install bundler -v ${{ env.BUNDLER_VERSION }}
-        bundle config path vendor/bundle
-        bundle install --jobs 4 --retry 3 --without mysql rollbar aws
-
+    # Stub out the Rails credentials file so that we can start the Rails app
     - name: 'Setup Credentials'
       run: |
         # generate a default credential file and key
         EDITOR='echo "$(cat config/credentials.yml.example)" >' bundle exec rails credentials:edit
 
-    # Try to retrieve the yarn JS dependencies from the cache
-    - name: 'Cache Yarn Packages'
-      uses: actions/cache@v2.1.5
-      with:
-        path: node_modules/
-        key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-        restore-keys: |
-          ${{ runner.os }}-build-${{ env.cache-name }}-
-          ${{ runner.os }}-build-
-          ${{ runner.os }}-yarn-
-          ${{ runner.os }}-
-
+    # Set the path to the wkhtmltopdf executable
     - name: 'Determine wkhtmltopdf location'
       run: echo "WICKED_PDF_PATH=`bundle exec which wkhtmltopdf`" >> $GITHUB_ENV
 
+    # Run yarn install for JS dependencies
     - name: 'Yarn Install'
       run: |
         yarn install
 
+    # Initialize the DB
     - name: 'Setup Test DB'
-      run: bin/rails db:setup RAILS_ENV=test
-
-    - name: 'Migrate DB'
-      run: bin/rails db:migrate RAILS_ENV=test
+      run: |
+        bin/rails db:setup RAILS_ENV=test
+        bin/rails db:migrate RAILS_ENV=test
 
+    # Prebuild the CSS, JS and image assets
     - name: 'Compile Assets'
-      run: |
-        bin/rails webpacker:compile
-        bin/rails assets:precompile
+      run: bin/rails assets:precompile
 
+    # Run the JS tests
     - name: 'Run Karma Tests'
       run: yarn test
 
+    # Run  the unit and functional tests
     - name: 'Run Rspec Unit and Functional Tests'
       run: |
         bin/rspec spec/models/ spec/policies/ spec/services/ spec/helpers/
         bin/rspec spec/controllers/ spec/presenters/ spec/requests/ spec/views
         bin/rspec spec/mixins/
 
-    # Integration Tests are only run if PR or Push is to master or development branches
+    # Run the time consuming integration tests (using Chrome headless browser)
     - name: 'Run Integration Tests'
       run: bin/rspec spec/features/
diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml
index 085bbb0183..0fd54b1cc4 100644
--- a/.github/workflows/rubocop.yml
+++ b/.github/workflows/rubocop.yml
@@ -7,24 +7,15 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+    # Checkout the repo
     - uses: actions/checkout@v2
 
-    - name: 'Determine Ruby and Bundler Versions from Gemfile.lock'
-      run: |
-        echo "RUBY_VERSION=`cat ./Gemfile.lock | grep -A 1 'RUBY VERSION' | grep 'ruby' | grep -oE '[0-9]\.[0-9]'`" >> $GITHUB_ENV
-        echo "BUNDLER_VERSION=`cat ./Gemfile.lock | grep -A 1 'BUNDLED WITH' | grep -oE '[0-9]\.[0-9]'`" >> $GITHUB_ENV
-
-    # Install Ruby - using the version found in the Gemfile.lock
-    - name: 'Install Ruby'
-      uses: actions/setup-ruby@v1
+    # Install Ruby and run bundler
+    - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: ${{ env.RUBY_VERSION }}
-
-    - name: 'Bundle Install'
-      run: |
-        gem install bundler -v ${{ env.BUNDLER_VERSION }}
-        bundle config path vendor/bundle
-        bundle install --jobs 4 --retry 3 --without pgsql rollbar aws
+        ruby-version: 2.6.3
+        bundler-cache: true
 
+    # Run the Rubocop linter checks
     - name: 'Run Rubocop'
       run: bin/rubocop
diff --git a/.rubocop.yml b/.rubocop.yml
index af6bbac1ba..5a9465c8f2 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,179 +1,186 @@
+# ----------------
+# - INSTRUCTIONS -
+# ----------------
+# The DMPRoadmap codebase tries to follow the latest Ruby/Rails style guidelines as defined
+# by the community via the Rubocop gem.
+#
+# Before submitting a PR, please run `bin/rubocop` from the project root.
+#     Note that you can specify individual files or folders e.g.: `bin/rubocop app/mailers`
+#     Note you can let Rubocop auto-correct many issues with the `-a` flag
+#
+# New versions of Rubocop typically include new Cops (Cops are inidivual Rubocop rules).
+# If you see a message like the following when you run `bin/rubocop`:
+#
+#    "The following cops were added to RuboCop, but are not configured. Please set Enabled
+#     to either `true` or `false` in your `.rubocop.yml` file."
+#
+# You should copy and paste the specified Cops into this file. You can review what the
+# Cop will do by Googling the name of the rule e.g.: "rubocop Layout/SpaceBeforeBrackets"
+#
+# After you review the rule, you can either Enable it or Disable it in this file. The
+# Rubocop documentation for the Cop may also give you additional options that can be
+# configured.
+#
+# Try to place any new Cops under their relevant section and in alphabetical order
+
 AllCops:
-  # Cache the results for faster processing
-  UseCache: true
   # Show the name of the cops being voilated in the feedback
   DisplayCopNames: true
   DisplayStyleGuide: true
+
+  # Rubocop will skip checking the following directories
   Exclude:
     - 'bin/**/*'
     - 'db/**/*'
     - 'vendor/**/*'
     - 'node_modules/**/*'
-    - 'test/**/*'
-    - 'lib/tasks/*'
+    - 'scripts/**/*'
 
-# Force no empty lines at the start or end of a block's body. Ignore specs, since this
-# improves readability within the RSpec blocks.
-Layout/EmptyLinesAroundBlockBody:
-  Exclude:
-    - 'spec/**/*'
+  # Automatically add any new Cops to this file and enable them
+  NewCops: enable
 
-# Force a single blank line around a class's body. Adding this whitespace makes code
-# a bit easier to read.
-Layout/EmptyLinesAroundClassBody:
-  Enabled: true
-  EnforcedStyle: empty_lines
-
-# Force a single blank line around a module's body. Adding this whitespace makes code
-# a bit easier to read.
-Layout/EmptyLinesAroundModuleBody:
-  Enabled: true
-  EnforcedStyle: empty_lines
+  # Cache the results for faster processing
+  UseCache: true
 
-# Ignore this cop. The Rubocop default is sensible, but the rubocop-rails gem modifies
-# this to position end keywords awkwardly.
-Layout/EndAlignment:
+# -----------
+# - GEMSPEC -
+# -----------
+Gemspec/DateAssignment: # new in 1.10
   Enabled: true
-  EnforcedStyleAlignWith: keyword
-
-# The difference between `rails` and `normal` is that the `rails` style
-# prescribes that in classes and modules the `protected` and `private`
-# modifier keywords shall be indented the same as public methods and that
-# protected and private members shall be indented one step more than the
-# modifiers. Other than that, both styles mean that entities on the same
-# logical depth shall have the same indentation.
-Layout/IndentationConsistency:
-  Description: 'Keep indentation straight.'
-  StyleGuide: '#spaces-indentation'
-  Enabled: true
-  EnforcedStyle: normal
 
-Layout/IndentationWidth:
-  Description: 'Use 2 spaces for indentation.'
-  StyleGuide: '#spaces-indentation'
+# ----------
+# - LAYOUT -
+# ----------
+Layout/LineEndStringConcatenationIndentation: # new in 1.18
   Enabled: true
-
-# Restrict the length of each line of code to 90 characters. Enforcing this is important
-# as many developers are working on smaller screens, or split screens. Having to scroll
-# to read a full line of code makes code harder to read and more frustrating to work with.
-Layout/LineLength:
-  # I've found that 90 is a suitable limit. Many developers balk at the 80 character
-  # default.
-  Max: 100
-
-Layout/EmptyLinesAroundAttributeAccessor:
+Layout/SpaceBeforeBrackets: # new in 1.7
   Enabled: true
 
-Layout/SpaceAroundMethodCallOperator:
+# --------
+# - LINT -
+# --------
+Lint/AmbiguousAssignment: # new in 1.7
   Enabled: true
-
-# Enforce this in the main code but ignore it in specs since the Rspec core methods
-# are defined as potentially ambiguous blocks
 Lint/AmbiguousBlockAssociation:
   Exclude:
     - 'spec/**/*'
-
-Lint/DeprecatedOpenSSLConstant:
+Lint/AmbiguousOperatorPrecedence: # new in 1.21
   Enabled: true
-
-Lint/MixedRegexpCaptureTypes:
+Lint/AmbiguousRange: # new in 1.19
   Enabled: true
-
-Lint/RaiseException:
+Lint/DeprecatedConstants: # new in 1.8
   Enabled: true
-
-Lint/StructNewOverride:
+Lint/DuplicateBranch: # new in 1.3
+  Enabled: true
+Lint/DuplicateRegexpCharacterClassElement: # new in 1.1
+  Enabled: true
+Lint/EmptyBlock: # new in 1.1
+  Enabled: true
+Lint/EmptyClass: # new in 1.3
+  Enabled: true
+Lint/EmptyInPattern: # new in 1.16
+  Enabled: true
+Lint/IncompatibleIoSelectWithFiberScheduler: # new in 1.21
+  Enabled: true
+Lint/LambdaWithoutLiteralBlock: # new in 1.8
+  Enabled: true
+Lint/NoReturnInBeginEndBlocks: # new in 1.2
+  Enabled: true
+Lint/NumberedParameterAssignment: # new in 1.9
+  Enabled: true
+Lint/OrAssignmentToConstant: # new in 1.9
+  Enabled: true
+Lint/RedundantDirGlobSort: # new in 1.8
+  Enabled: true
+Lint/RequireRelativeSelfPath: # new in 1.22
+  Enabled: true
+Lint/SymbolConversion: # new in 1.9
+  Enabled: true
+Lint/ToEnumArguments: # new in 1.1
+  Enabled: true
+Lint/TripleQuotes: # new in 1.9
+  Enabled: true
+Lint/UnexpectedBlockArity: # new in 1.5
+  Enabled: true
+Lint/UnmodifiedReduceAccumulator: # new in 1.1
   Enabled: true
 
-# Bumping the default AbcSize so we don't need to refactor everything
-Metrics/AbcSize:
-  Max: 25
-
-# Restrict the number of lines of code that may be within a block of code. This should
-# force developers to break their code into smaller discrete methods or objects.
-Metrics/BlockLength:
-  # Exclude specs, since those are defined as large blocks of code
-  Exclude:
-    - 'spec/**/*'
-
-# Bumping the default ClassLength so we don't need to refactor everything
+# -----------
+# - METRICS -
+# -----------
+# briley Oct. 4th 2021
+# Default is 100 lines. Most of our controllers, models, etc. violate this
+# Cop, so setting it to 300 since we do not have time to refactor everything
 Metrics/ClassLength:
   Max: 300
-
-# Bumping the default CyclomaticComplexity so we don't need to refactor everything
-Metrics/CyclomaticComplexity:
-  Max: 25
-
-# Bumping the default MethodLength so we don't need to refactor everything
+# briley Oct. 4th 2021
+# Default is 10 lines which feels very restrictive but would also require us to do
+# too much refactoring at this point.
 Metrics/MethodLength:
-  Max: 25
-
-# Bumping the default PerceivedComplexity so we don't need to refactor everything
-Metrics/PerceivedComplexity:
-  Max: 25
+  Max: 20
 
-# This cop enforces the use of boolean and/or "&&" and "||" over "and" "or".
-# Sometimes using "and"/"or" is preferrable, when these are used as control flow.
-#
-# For example:
-#
-#   render text: "Hello world" and return
-#
-Style/AndOr:
-  Enabled: false
-
-# This cop enforces how modules and classes are nested within another module or class.
-# In Rails code (e.g. models and controllers) nesting with a colon is preferrable (e.g.
-# User::Session).
-Style/ClassAndModuleChildren:
+# mnicholson Oct. 6th 2021
+# Default lenght for block is 25 lines, which it would be very restrictive for
+# the Rspec views methods. So I'll just exclude some files.
+Metrics/BlockLength:
   Exclude:
-    - 'app/**/*'
+     - 'lib/tasks/*.rake'
+     - 'lib/tasks/utils/*.rake'
+     - 'spec/**/*'
 
-# This cop enforces each class to have documentation at the top. That's not always
-# practical or necessary in Rails apps (e.g. the purpose of helpers is self evident).
-Style/Documentation:
-  Enabled: false
+  IgnoredMethods: ['describe', 'context', 'task', 'namespace']
 
-# Enforce empty methods to be written across two lines, like any normal method would be.
-# This allows for easy modification of the method in future.
-Style/EmptyMethod:
+# ------------
+# - SECURITY -
+# ------------
+Security/IoMethods: # new in 1.22
   Enabled: true
-  EnforcedStyle: expanded
 
-# Leave the string formatting style as `"some text %{value}" % { value: "text" }`
-# since we're uncertain what effect `format` and `sprintf` may have on the Fastgetext
-# markup `_("text")`
-Style/FormatString:
-  EnforcedStyle: percent
-
-# Prefer the use of `"some %{token} text"` instead of `some %<token> text` or
-# `some %token text` since it would invalidate many of our translation strings
-Style/FormatStringToken:
-  EnforcedStyle: template
-
-# Enforce double quotes. Don't allow single quotes. This is preferred since double
-# quotes are more useful (they support escaping characters, and interpolation).
-Style/StringLiterals:
+# ---------
+# - STYLE -
+# ---------
+Style/ArgumentsForwarding: # new in 1.1
   Enabled: true
-  EnforcedStyle: double_quotes
-
-Style/ExponentialNotation:
+Style/CollectionCompact: # new in 1.2
   Enabled: true
-
-Style/HashEachMethods:
+Style/DocumentDynamicEvalDefinition: # new in 1.1
   Enabled: true
-
-Style/HashTransformKeys:
+Style/EndlessMethod: # new in 1.8
   Enabled: true
-
-Style/HashTransformValues:
+Style/HashConversion: # new in 1.10
   Enabled: true
-
-Style/RedundantRegexpCharacterClass:
+Style/HashExcept: # new in 1.7
   Enabled: true
-
-Style/RedundantRegexpEscape:
+Style/IfWithBooleanLiteralBranches: # new in 1.9
   Enabled: true
-
-Style/SlicingWithRange:
+Style/InPatternThen: # new in 1.16
+  Enabled: true
+Style/MultilineInPatternThen: # new in 1.16
+  Enabled: true
+Style/NegatedIfElseCondition: # new in 1.2
+  Enabled: true
+Style/NilLambda: # new in 1.3
+  Enabled: true
+Style/NumberedParameters: # new in 1.22
+  Enabled: true
+Style/NumberedParametersLimit: # new in 1.22
+  Enabled: true
+Style/OpenStructUse:
+  Enabled: false # used heavily in API so needs a lot of work to refactor
+Style/QuotedSymbols: # new in 1.16
+  Enabled: true
+Style/RedundantArgument: # new in 1.4
+  Enabled: true
+Style/RedundantSelfAssignmentBranch: # new in 1.19
+  Enabled: true
+Style/SelectByRegexp: # new in 1.22
+  Enabled: true
+Style/StringChars: # new in 1.12
+  Enabled: true
+Style/StringLiterals:
+  Enabled: true
+  Exclude:
+    - 'app/views/**/*'
+    - 'config/**/*'
+Style/SwapValues: # new in 1.1
   Enabled: true
diff --git a/Gemfile b/Gemfile
index 63820fd17c..ce079fdbaa 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,39 +1,39 @@
 # frozen_string_literal: true
 
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-ruby ">= 2.6.3"
+ruby '>= 2.6.3'
 
 # ===========#
 # CORE RAILS #
 # ===========#
 
 # Full-stack web application framework. (http://rubyonrails.org)
-gem "rails", "~> 5.2"
+gem 'rails', '~> 5.2'
 
 # TODO: Remove this once Rails addresses the issue with its dependency on mimemagic. Mimemagic had
 #       an MIT license but was using some incompatible GPL license code.
 #       Versions of mimemagic that were yanked: https://rubygems.org/gems/mimemagic/versions
 #       Analysis of the issue: https://www.theregister.com/2021/03/25/ruby_rails_code/
-gem "mimemagic", "~> 0.3.7"
+gem 'mimemagic', '~> 0.3.7'
 
 # Use sqlite3 as the database for Active Record
 # gem 'sqlite3', '~> 1.4'
 
 # Use Puma as the app server
-gem "puma", group: :puma, require: false
+gem 'puma', group: :puma, require: false
 
 # Use SCSS for stylesheets
-gem "sass-rails"
+gem 'sass-rails'
 
 # Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker
-gem "webpacker"
+gem 'webpacker'
 
 # Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
-gem "turbolinks"
+gem 'turbolinks'
 
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
-gem "jbuilder"
+gem 'jbuilder'
 
 # Use Redis adapter to run Action Cable in production
 # gem "redis", "~> 4.0"
@@ -44,7 +44,7 @@ gem "jbuilder"
 # gem "image_processing", "~> 1.2"
 
 # Reduces boot times through caching; required in config/boot.rb
-gem "bootsnap", require: false
+gem 'bootsnap', require: false
 
 # GEMS ADDED TO HELP HANDLE RAILS MIGRATION FROM 3.x to 4.2
 # THESE GEMS HELP SUPPORT DEPRACATED FUNCTIONALITY AND WILL LOSE SUPPORT IN
@@ -60,7 +60,7 @@ gem "bootsnap", require: false
 
 # Rollbar-gem is the SDK for Ruby apps and includes support for apps using
 # Rails, Sinatra, Rack, plain Ruby, and other frameworks.
-gem "rollbar", group: :rollbar, require: false
+gem 'rollbar', group: :rollbar, require: false
 
 # ======== #
 # DATABASE #
@@ -68,14 +68,14 @@ gem "rollbar", group: :rollbar, require: false
 
 # A simple, fast Mysql library for Ruby, binding to libmysql
 # (http://github.com/brianmario/mysql2)
-gem "mysql2", group: :mysql, require: false
+gem 'mysql2', group: :mysql, require: false
 
 # Pg is the Ruby interface to the {PostgreSQL
 # RDBMS}[http://www.postgresql.org/](https://bitbucket.org/ged/ruby-pg)
-gem "pg", group: :pgsql, require: false
+gem 'pg', group: :pgsql, require: false
 
 # Bit fields for ActiveRecord (https://github.com/pboling/flag_shih_tzu)
-gem "flag_shih_tzu" # , "~> 0.3.23"
+gem 'flag_shih_tzu' # , "~> 0.3.23"
 
 # ======== #
 # SECURITY #
@@ -83,35 +83,35 @@ gem "flag_shih_tzu" # , "~> 0.3.23"
 
 # Flexible authentication solution for Rails with Warden
 # (https://github.com/plataformatec/devise)
-gem "devise"
+gem 'devise'
 
 # An invitation strategy for Devise (https://github.com/scambra/devise_invitable)
-gem "devise_invitable"
+gem 'devise_invitable'
 
 # A generalized Rack framework for multiple-provider authentication.
 # (https://github.com/omniauth/omniauth)
-gem "omniauth"
+gem 'omniauth'
 
 # OmniAuth Shibboleth strategies for OmniAuth 1.x
-gem "omniauth-shibboleth"
+gem 'omniauth-shibboleth'
 
 # ORCID OAuth 2.0 Strategy for OmniAuth 1.0
 # (https://github.com/datacite/omniauth-orcid)
-gem "omniauth-orcid"
+gem 'omniauth-orcid'
 
 # This gem provides a mitigation against CVE-2015-9284 (Cross-Site Request
 # Forgery on the request phase when using OmniAuth gem with a Ruby on Rails
 # application) by implementing a CSRF token verifier that directly uses
 # ActionController::RequestForgeryProtection code from Rails.
 #   https://nvd.nist.gov/vuln/detail/CVE-2015-9284
-gem "omniauth-rails_csrf_protection"
+gem 'omniauth-rails_csrf_protection'
 
 # A ruby implementation of the RFC 7519 OAuth JSON Web Token (JWT) standard.
-gem "jwt"
+gem 'jwt'
 
 # Gems for repository integration
 # OO authorization for Rails (https://github.com/elabs/pundit)
-gem "pundit"
+gem 'pundit'
 
 # ========== #
 # UI / VIEWS #
@@ -120,22 +120,22 @@ gem "pundit"
 # Ruby gem to handle settings for ActiveRecord instances by storing them as
 # serialized Hash in a separate database table. Namespaces and defaults
 # included. (https://github.com/ledermann/rails-settings)
-gem "ledermann-rails-settings"
+gem 'ledermann-rails-settings'
 
 # Gem providing simple Contact Us functionality with a Rails 3+ Engine.
 # (https://github.com/jdutil/contact_us)
-gem "contact_us" # COULD BE EASILY REPLACED WITH OUR OWN CODE
+gem 'contact_us' # COULD BE EASILY REPLACED WITH OUR OWN CODE
 
 # Helpers for the reCAPTCHA API (http://github.com/ambethia/recaptcha)
-gem "recaptcha"
+gem 'recaptcha'
 
 # Ideal gem for handling attachments in Rails, Sinatra and Rack applications.
 # (http://github.com/markevans/dragonfly)
-gem "dragonfly"
+gem 'dragonfly'
 
 group :aws do
   # Amazon AWS S3 data store for use with the Dragonfly gem.
-  gem "dragonfly-s3_data_store"
+  gem 'dragonfly-s3_data_store'
 end
 
 # ========== #
@@ -144,21 +144,21 @@ end
 
 # A pagination engine plugin for Rails 4+ and other modern frameworks
 # (https://github.com/kaminari/kaminari)
-gem "kaminari"
+gem 'kaminari'
 
 # Paginate in your headers, not in your response body. This follows the
 # proposed RFC-8288 standard for Web linking.
-gem "api-pagination"
+gem 'api-pagination'
 
 # =========== #
 # STYLESHEETS #
 # =========== #
 
 # Integrate SassC-Ruby into Rails. (https://github.com/sass/sassc-rails)
-gem "sassc-rails"
+gem 'sassc-rails'
 
 # Font-Awesome SASS (https://github.com/FortAwesome/font-awesome-sass)
-gem "font-awesome-sass", "~> 5.13.0"
+gem 'font-awesome-sass', '~> 5.13.0'
 
 # Use webpack to manage app-like JavaScript modules in Rails
 # (https://github.com/rails/webpacker)
@@ -166,7 +166,7 @@ gem "font-awesome-sass", "~> 5.13.0"
 
 # Parse CSS and add vendor prefixes to CSS rules using values from the Can
 # I Use website. (https://github.com/ai/autoprefixer-rails)
-gem "autoprefixer-rails"
+gem 'autoprefixer-rails'
 
 # Minimal embedded v8 for Ruby (https://github.com/discourse/mini_racer)
 # gem "mini_racer"
@@ -176,27 +176,27 @@ gem "autoprefixer-rails"
 # ========= #
 
 # Provides binaries for WKHTMLTOPDF project in an easily accessible package.
-gem "wkhtmltopdf-binary"
+gem 'wkhtmltopdf-binary'
 
 # PDF generator (from HTML) gem for Ruby on Rails
 # (https://github.com/mileszs/wicked_pdf)
-gem "wicked_pdf"
+gem 'wicked_pdf'
 
 # This simple gem allows you to create MS Word docx documents from simple
 # html documents. This makes it easy to create dynamic reports and forms
 # that can be downloaded by your users as simple MS Word docx files.
 # (http://github.com/karnov/htmltoword)
-gem "htmltoword"
+gem 'htmltoword'
 
 # Filename sanitization for Ruby. This is useful when you generate filenames for
 # downloads from user input
-gem "zaru"
+gem 'zaru'
 
 # ==================== #
 # INTERNATIONALIZATION #
 # ==================== #
 
-gem "translation"
+gem 'translation'
 
 # ========= #
 # UTILITIES #
@@ -205,13 +205,13 @@ gem "translation"
 # Run any code in parallel Processes(> use all CPUs) or Threads(> speedup
 # blocking operations). Best suited for map-reduce or e.g. parallel downloads/uploads.
 # TODO: Replace use of this with ActiveJob where possible
-gem "parallel"
+gem 'parallel'
 
 # Makes http fun again! Wrapper to simplify the native Net::HTTP libraries
-gem "httparty"
+gem 'httparty'
 
 # Autoload dotenv in Rails. (https://github.com/bkeepers/dotenv)
-gem "dotenv-rails"
+gem 'dotenv-rails'
 
 # ================================= #
 # ENVIRONMENT SPECIFIC DEPENDENCIES #
@@ -219,139 +219,159 @@ gem "dotenv-rails"
 
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
-  gem "byebug", platforms: %i[mri mingw x64_mingw]
+  gem 'byebug', platforms: %i[mri mingw x64_mingw]
 end
 
 group :test do
   # RSpec for Rails (https://github.com/rspec/rspec-rails)
-  gem "rspec-rails"
+  gem 'rspec-rails'
 
   # factory_bot_rails provides integration between factory_bot and rails 3
   # or newer (http://github.com/thoughtbot/factory_bot_rails)
-  gem "factory_bot_rails"
+  gem 'factory_bot_rails'
 
   # Easily generate fake data (https://github.com/stympy/faker)
-  gem "faker"
+  gem 'faker'
 
   # the instafailing RSpec progress bar formatter
   # (https://github.com/thekompanee/fuubar)
-  gem "fuubar"
+  gem 'fuubar'
 
   # Guard keeps an eye on your file modifications (http://guardgem.org)
-  gem "guard"
+  gem 'guard'
 
   # Guard gem for RSpec (https://github.com/guard/guard-rspec)
-  gem "guard-rspec"
+  gem 'guard-rspec'
 
   # Library for stubbing HTTP requests in Ruby.
   # (http://github.com/bblimke/webmock)
-  gem "webmock"
+  gem 'webmock'
 
   # Code coverage for Ruby 1.9+ with a powerful configuration library and
   # automatic merging of coverage across test suites
   # (http://github.com/colszowka/simplecov)
-  gem "simplecov", require: false
+  # gem 'simplecov', require: false
 
   # Strategies for cleaning databases.  Can be used to ensure a clean state
   # for testing. (http://github.com/DatabaseCleaner/database_cleaner)
-  gem "database_cleaner", require: false
+  gem 'database_cleaner', require: false
 
   # Making tests easy on the fingers and eyes
   # (https://github.com/thoughtbot/shoulda)
-  gem "shoulda", require: false
+  gem 'shoulda', require: false
 
   # Mocking and stubbing library (http://gofreerange.com/mocha/docs)
-  gem "mocha", require: false
+  gem 'mocha', require: false
 
   # Adds support for Capybara system testing and selenium driver
-  gem "capybara"
-  gem "selenium-webdriver"
+  gem 'capybara'
+  gem 'selenium-webdriver'
   # Easy installation and use of web drivers to run system tests with browsers
-  gem "webdrivers"
+  gem 'webdrivers'
 
   # Automatically create snapshots when Cucumber steps fail with Capybara
   # and Rails (http://github.com/mattheworiordan/capybara-screenshot)
-  gem "capybara-screenshot"
+  gem 'capybara-screenshot'
 
   # Browser integration tests are expensive. We can mock external requests
   # in our tests, but once a browser is involved, we lose control.
-  gem "capybara-webmock"
+  gem 'capybara-webmock'
 
   # RSpec::CollectionMatchers lets you express expected outcomes on
   # collections of an object in an example.
-  gem "rspec-collection_matchers"
+  gem 'rspec-collection_matchers'
 
   # A set of RSpec matchers for testing Pundit authorisation policies.
-  gem "pundit-matchers"
+  gem 'pundit-matchers'
 
   # This gem brings back assigns to your controller tests as well as assert_template
   # to both controller and integration tests.
-  gem "rails-controller-testing"
+  gem 'rails-controller-testing'
 end
 
 group :ci, :development do
   # Security vulnerability scanner for Ruby on Rails.
   # (http://brakemanscanner.org)
-  gem "brakeman"
-
-  # Automatic Ruby code style checking tool.
-  # (https://github.com/rubocop-hq/rubocop)
-  # Rubocop style checks for DMP Roadmap projects.
-  # (https://github.com/DMPRoadmap/rubocop-DMP_Roadmap)
-  gem "rubocop-dmp_roadmap"
+  gem 'brakeman'
 
   # Helper gem to require bundler-audit
   # (http://github.com/stewartmckee/bundle-audit)
-  gem "bundle-audit"
+  gem 'bundle-audit'
+
+  # RuboCop is a Ruby code style checking and code formatting tool. It aims to enforce
+  # the community-driven Ruby Style Guide.
+  gem 'rubocop'
+
+  # RuboCop rules for detecting and autocorrecting undecorated strings for i18n
+  # (gettext and rails-i18n)
+  gem 'rubocop-i18n'
+
+  # A collection of RuboCop cops to check for performance optimizations in Ruby code.
+  gem 'rubocop-performance'
+
+  # Automatic Rails code style checking tool. A RuboCop extension focused on enforcing
+  # Rails best practices and coding conventions.
+  gem 'rubocop-rails'
+
+  # A RuboCop plugin for Rake tasks
+  gem 'rubocop-rake'
+
+  # Code style checking for RSpec files. A plugin for the RuboCop code style enforcing
+  # & linting tool.
+  gem 'rubocop-rspec'
+
+  # Thread-safety checks via static analysis. A plugin for the RuboCop code style
+  # enforcing & linting tool.
+  gem 'rubocop-thread_safety'
 end
 
 group :development do
   # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
-  gem "listen"
-  gem "web-console"
+  gem 'listen'
+  gem 'web-console'
   # Spring speeds up development by keeping your application running in the background.
   # Read more: https://github.com/rails/spring
-  gem "spring"
-  gem "spring-watcher-listen"
+  gem 'spring'
+  gem 'spring-watcher-listen'
 
   # Simple Progress Bar for output to a terminal
   # (http://github.com/paul/progress_bar)
-  gem "progress_bar", require: false
+  gem 'progress_bar', require: false
 
   # A collection of text algorithms (http://github.com/threedaymonk/text)
-  gem "text", require: false
+  gem 'text', require: false
 
   # Better error page for Rails and other Rack apps
   # (https://github.com/charliesome/better_errors)
-  gem "better_errors"
+  gem 'better_errors'
 
   # Retrieve the binding of a method's caller. Can also retrieve bindings
   # even further up the stack. (http://github.com/banister/binding_of_caller)
-  gem "binding_of_caller"
+  gem 'binding_of_caller'
 
   # rspec command for spring
   # (https://github.com/jonleighton/spring-commands-rspec)
-  gem "spring-commands-rspec"
+  gem 'spring-commands-rspec'
 
   # Profiles loading speed for rack applications. (http://miniprofiler.com)
-  gem "rack-mini-profiler"
+  gem 'rack-mini-profiler'
 
   # Annotates Rails Models, routes, fixtures, and others based on the
   # database schema. (http://github.com/ctran/annotate_models)
-  gem "annotate"
+  gem 'annotate'
 
   # Add comments to your Gemfile with each dependency's description.
   # (https://github.com/ivantsepp/annotate_gem)
-  gem "annotate_gem"
+  gem 'annotate_gem'
 
   # help to kill N+1 queries and unused eager loading.
   # (https://github.com/flyerhzm/bullet)
-  gem "bullet"
+  gem 'bullet'
 
   # Documentation tool for consistent and usable documentation in Ruby.
   # (http://yardoc.org)
-  gem "yard"
+  gem 'yard'
 
   # TomDoc for YARD (http://rubyworks.github.com/yard-tomdoc)
-  gem "yard-tomdoc"
+  gem 'yard-tomdoc'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index b9d51ac32d..81eca25817 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -52,7 +52,7 @@ GEM
     api-pagination (4.8.2)
     arel (9.0.0)
     ast (2.4.2)
-    autoprefixer-rails (10.3.3.0)
+    autoprefixer-rails (10.4.2.0)
       execjs (~> 2)
     bcrypt (3.1.16)
     better_errors (2.9.1)
@@ -62,11 +62,11 @@ GEM
     bindex (0.8.1)
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
-    bootsnap (1.9.1)
-      msgpack (~> 1.0)
-    brakeman (5.1.1)
+    bootsnap (1.10.2)
+      msgpack (~> 1.2)
+    brakeman (5.2.1)
     builder (3.2.4)
-    bullet (6.1.5)
+    bullet (7.0.1)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     bundle-audit (0.1.0)
@@ -75,15 +75,16 @@ GEM
       bundler (>= 1.2.0, < 3)
       thor (~> 1.0)
     byebug (11.1.3)
-    capybara (3.35.3)
+    capybara (3.36.0)
       addressable
+      matrix
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    capybara-screenshot (1.0.25)
+    capybara-screenshot (1.0.26)
       capybara (>= 1.0, < 4)
       launchy
     capybara-webmock (0.6.0)
@@ -108,17 +109,16 @@ GEM
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
     debug_inspector (1.1.0)
-    devise (4.8.0)
+    devise (4.8.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    devise_invitable (2.0.5)
+    devise_invitable (2.0.6)
       actionmailer (>= 5.0)
       devise (>= 4.6)
-    diff-lcs (1.4.4)
-    docile (1.4.0)
+    diff-lcs (1.5.0)
     dotenv (2.7.6)
     dotenv-rails (2.7.6)
       dotenv (= 2.7.6)
@@ -131,7 +131,7 @@ GEM
       dragonfly (~> 1.0)
       fog-aws
     erubi (1.10.0)
-    excon (0.86.0)
+    excon (0.90.0)
     execjs (2.8.1)
     factory_bot (6.2.0)
       activesupport (>= 5.0.0)
@@ -140,26 +140,30 @@ GEM
       railties (>= 5.0.0)
     faker (2.19.0)
       i18n (>= 1.6, < 2)
-    faraday (1.8.0)
+    faraday (1.9.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
       faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
+      faraday-net_http_persistent (~> 1.0)
       faraday-patron (~> 1.0)
       faraday-rack (~> 1.0)
-      multipart-post (>= 1.2, < 3)
+      faraday-retry (~> 1.0)
       ruby2_keywords (>= 0.0.4)
     faraday-em_http (1.0.0)
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.3)
+      multipart-post (>= 1.2, < 3)
     faraday-net_http (1.0.1)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
-    ffi (1.15.4)
+    faraday-retry (1.0.3)
+    ffi (1.15.5)
     flag_shih_tzu (0.3.23)
     fog-aws (3.12.0)
       fog-core (~> 2.1)
@@ -180,13 +184,15 @@ GEM
     font-awesome-sass (5.13.1)
       sassc (>= 1.11)
     formatador (0.3.0)
+    forwardable (1.3.2)
     fuubar (2.5.1)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
-    gettext (3.3.7)
+    gettext (3.4.2)
       locale (>= 2.0.5)
+      prime
       text (>= 1.3.0)
-    globalid (0.5.2)
+    globalid (1.0.0)
       activesupport (>= 5.0)
     guard (2.18.0)
       formatador (>= 0.2.4)
@@ -203,7 +209,7 @@ GEM
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
     hashdiff (1.0.1)
-    hashie (4.1.0)
+    hashie (5.0.0)
     highline (2.0.3)
     htmltoword (1.1.1)
       actionpack
@@ -212,60 +218,64 @@ GEM
     httparty (0.20.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.8.10)
+    i18n (1.9.1)
       concurrent-ruby (~> 1.0)
     ipaddress (0.8.3)
-    jbuilder (2.11.2)
+    jbuilder (2.11.5)
+      actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
-    json (2.5.1)
-    jwt (2.2.3)
-    kaminari (1.2.1)
+    json (2.6.1)
+    jwt (2.3.0)
+    kaminari (1.2.2)
       activesupport (>= 4.1.0)
-      kaminari-actionview (= 1.2.1)
-      kaminari-activerecord (= 1.2.1)
-      kaminari-core (= 1.2.1)
-    kaminari-actionview (1.2.1)
+      kaminari-actionview (= 1.2.2)
+      kaminari-activerecord (= 1.2.2)
+      kaminari-core (= 1.2.2)
+    kaminari-actionview (1.2.2)
       actionview
-      kaminari-core (= 1.2.1)
-    kaminari-activerecord (1.2.1)
+      kaminari-core (= 1.2.2)
+    kaminari-activerecord (1.2.2)
       activerecord
-      kaminari-core (= 1.2.1)
-    kaminari-core (1.2.1)
+      kaminari-core (= 1.2.2)
+    kaminari-core (1.2.2)
     launchy (2.5.0)
       addressable (~> 2.7)
     ledermann-rails-settings (2.5.0)
       activerecord (>= 4.2)
-    listen (3.7.0)
+    listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     locale (2.1.3)
-    loofah (2.12.0)
+    loofah (2.13.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     lumberjack (1.2.8)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
     marcel (1.0.2)
+    matrix (0.4.2)
     method_source (1.0.0)
-    mime-types (3.3.1)
+    mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0901)
+    mime-types-data (3.2022.0105)
     mimemagic (0.3.10)
       nokogiri (~> 1)
       rake
-    mini_mime (1.1.1)
-    mini_portile2 (2.6.1)
-    minitest (5.14.4)
+    mini_mime (1.1.2)
+    mini_portile2 (2.7.1)
+    minitest (5.15.0)
     mocha (1.13.0)
-    msgpack (1.4.2)
+    msgpack (1.4.4)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     mysql2 (0.5.3)
     nenv (0.3.0)
     nio4r (2.5.8)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
+    nokogiri (1.13.1)
+      mini_portile2 (~> 2.7.0)
+      racc (~> 1.4)
+    nokogiri (1.13.1-x86_64-linux)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -280,7 +290,7 @@ GEM
       hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)
       rack-protection
-    omniauth-oauth2 (1.7.1)
+    omniauth-oauth2 (1.7.2)
       oauth2 (~> 1.4)
       omniauth (>= 1.9, < 3)
     omniauth-orcid (2.1.1)
@@ -294,9 +304,12 @@ GEM
     options (2.3.2)
     orm_adapter (0.5.0)
     parallel (1.21.0)
-    parser (3.0.2.0)
+    parser (3.1.0.0)
       ast (~> 2.4.1)
-    pg (1.2.3)
+    pg (1.3.0)
+    prime (0.1.2)
+      forwardable
+      singleton
     progress_bar (1.3.3)
       highline (>= 1.6, < 3)
       options (~> 2.3.0)
@@ -304,19 +317,19 @@ GEM
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (4.0.6)
-    puma (5.5.0)
+    puma (5.6.1)
       nio4r (~> 2.0)
     pundit (2.1.1)
       activesupport (>= 3.0.0)
     pundit-matchers (1.7.0)
       rspec-rails (>= 3.0.0)
-    racc (1.5.2)
+    racc (1.6.0)
     rack (2.2.3)
     rack-mini-profiler (2.3.3)
       rack (>= 1.2.0)
     rack-protection (2.1.0)
       rack
-    rack-proxy (0.7.0)
+    rack-proxy (0.7.2)
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
@@ -348,34 +361,34 @@ GEM
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
-    rainbow (3.0.0)
+    rainbow (3.1.1)
     rake (13.0.6)
     rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     recaptcha (5.8.1)
       json
-    regexp_parser (2.1.1)
+    regexp_parser (2.2.0)
     responders (3.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
     rexml (3.2.5)
-    rollbar (3.2.0)
+    rollbar (3.3.0)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
       rspec-mocks (~> 3.10.0)
     rspec-collection_matchers (1.2.0)
       rspec-expectations (>= 2.99.0.beta1)
-    rspec-core (3.10.1)
+    rspec-core (3.10.2)
       rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec-expectations (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+    rspec-mocks (3.10.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-rails (5.0.2)
+    rspec-rails (5.1.0)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       railties (>= 5.2)
@@ -383,43 +396,33 @@ GEM
       rspec-expectations (~> 3.10)
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
-    rspec-support (3.10.2)
-    rubocop (1.22.0)
+    rspec-support (3.10.3)
+    rubocop (1.25.0)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.12.0, < 2.0)
+      rubocop-ast (>= 1.15.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.12.0)
+    rubocop-ast (1.15.1)
       parser (>= 3.0.1.1)
-    rubocop-dmp_roadmap (1.1.2)
-      rubocop (>= 0.58.2)
-      rubocop-rails_config (>= 0.2.2)
-      rubocop-rspec (>= 1.27.0)
-    rubocop-minitest (0.15.1)
-      rubocop (>= 0.90, < 2.0)
-    rubocop-packaging (0.5.1)
-      rubocop (>= 0.89, < 2.0)
-    rubocop-performance (1.11.5)
+    rubocop-i18n (3.0.0)
+      rubocop (~> 1.0)
+    rubocop-performance (1.13.2)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.12.2)
+    rubocop-rails (2.13.2)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.7.0, < 2.0)
-    rubocop-rails_config (1.7.3)
-      railties (>= 5.0)
-      rubocop (>= 1.19)
-      rubocop-ast (>= 1.0.1)
-      rubocop-minitest (~> 0.15)
-      rubocop-packaging (~> 0.5)
-      rubocop-performance (~> 1.11)
-      rubocop-rails (~> 2.0)
-    rubocop-rspec (2.5.0)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
+    rubocop-rspec (2.8.0)
       rubocop (~> 1.19)
+    rubocop-thread_safety (0.4.4)
+      rubocop (>= 0.53.0)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
     ruby_dig (0.0.2)
@@ -445,12 +448,7 @@ GEM
     shoulda-context (2.0.0)
     shoulda-matchers (4.5.1)
       activesupport (>= 4.2.0)
-    simplecov (0.21.2)
-      docile (~> 1.1)
-      simplecov-html (~> 0.11)
-      simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.3)
+    singleton (0.1.1)
     spring (2.1.1)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
@@ -460,17 +458,17 @@ GEM
     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.2)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
+    sprockets-rails (3.4.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     text (1.3.1)
-    thor (1.1.0)
+    thor (1.2.1)
     thread_safe (0.3.6)
     tilt (2.0.10)
     tomparse (0.4.2)
-    translation (1.26)
-      gettext (~> 3.2, >= 3.2.5, <= 3.3.7)
+    translation (1.28)
+      gettext (~> 3.2, >= 3.2.5, <= 3.4.2)
     turbolinks (5.2.1)
       turbolinks-source (~> 5.2)
     turbolinks-source (5.2.0)
@@ -485,10 +483,10 @@ GEM
       activemodel (>= 5.0)
       bindex (>= 0.4.0)
       railties (>= 5.0)
-    webdrivers (4.6.1)
+    webdrivers (4.7.0)
       nokogiri (~> 1.6)
       rubyzip (>= 1.3.0)
-      selenium-webdriver (>= 3.0, < 4.0)
+      selenium-webdriver (> 3.141, < 5.0)
     webmock (3.14.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
@@ -507,7 +505,8 @@ GEM
     wkhtmltopdf-binary (0.12.6.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    yard (0.9.26)
+    yard (0.9.27)
+      webrick (~> 1.7.0)
     yard-tomdoc (0.7.1)
       tomparse (>= 0.4.0)
       yard
@@ -515,6 +514,7 @@ GEM
 
 PLATFORMS
   ruby
+  x86_64-linux
 
 DEPENDENCIES
   annotate
@@ -572,12 +572,17 @@ DEPENDENCIES
   rollbar
   rspec-collection_matchers
   rspec-rails
-  rubocop-dmp_roadmap
+  rubocop
+  rubocop-i18n
+  rubocop-performance
+  rubocop-rails
+  rubocop-rake
+  rubocop-rspec
+  rubocop-thread_safety
   sass-rails
   sassc-rails
   selenium-webdriver
   shoulda
-  simplecov
   spring
   spring-commands-rspec
   spring-watcher-listen
@@ -598,4 +603,4 @@ RUBY VERSION
    ruby 2.6.3p62
 
 BUNDLED WITH
-   2.1.4
+   2.2.33
diff --git a/Rakefile b/Rakefile
index 700a8a33cf..42f9525d64 100755
--- a/Rakefile
+++ b/Rakefile
@@ -10,7 +10,7 @@
 
 # task default: :test
 
-require_relative "config/application"
+require_relative 'config/application'
 
 DMPRoadmap::Application.load_tasks
 
diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb
index fa6ee697da..9aec230539 100644
--- a/app/channels/application_cable/channel.rb
+++ b/app/channels/application_cable/channel.rb
@@ -1,9 +1,6 @@
 # frozen_string_literal: true
 
 module ApplicationCable
-
   class Channel < ActionCable::Channel::Base
-
   end
-
 end
diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb
index b08f85080a..8d6c2a1bf4 100644
--- a/app/channels/application_cable/connection.rb
+++ b/app/channels/application_cable/connection.rb
@@ -1,9 +1,6 @@
 # frozen_string_literal: true
 
 module ApplicationCable
-
   class Connection < ActionCable::Connection::Base
-
   end
-
 end
diff --git a/app/controllers/answers_controller.rb b/app/controllers/answers_controller.rb
index 48980290bf..9e089bd5d4 100644
--- a/app/controllers/answers_controller.rb
+++ b/app/controllers/answers_controller.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
+# Controller that handles Answers to DMP questions
 class AnswersController < ApplicationController
-
   respond_to :html
   include ConditionsHelper
 
@@ -12,6 +12,7 @@ class AnswersController < ApplicationController
   #       `remote: true` in the <form> tag and just send back the ERB.
   #       Consider using ActionCable for the progress bar(s)
   # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+  # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
   def create_or_update
     p_params = permitted_params
 
@@ -21,21 +22,17 @@ def create_or_update
       unless p.question_exists?(p_params[:question_id])
         # rubocop:disable Layout/LineLength
         render(status: :not_found, json: {
-                 msg: _("There is no question with id %{question_id} associated to plan id %{plan_id} for which to create or update an answer") % {
-                   question_id: p_params[:question_id],
-                   plan_id: p_params[:plan_id]
-                 }
+                 msg: format(_('There is no question with id %<question_id>s associated to plan id %<plan_id>s for which to create or update an answer'), question_id: p_params[:question_id], plan_id: p_params[:plan_id])
                })
         # rubocop:enable Layout/LineLength
         return
       end
     rescue ActiveRecord::RecordNotFound
+      # rubocop:disable Layout/LineLength
       render(status: :not_found, json: {
-               msg: _("There is no plan with id %{id} for which to create or update an answer") % {
-                 id: p_params[:plan_id]
-               }
+               msg: format(_('There is no plan with id %<id>s for which to create or update an answer'), id: p_params[:plan_id])
              })
-
+      # rubocop:enable Layout/LineLength
       return
     end
     q = Question.find(p_params[:question_id])
@@ -127,19 +124,19 @@ def create_or_update
 
       send_webhooks(current_user, @answer)
       render json: {
-        "qn_data": qn_data,
-        "section_data": section_data,
-        "question" => {
-          "id" => @question.id,
-          "answer_lock_version" => @answer.lock_version,
-          "locking" => if @stale_answer
-                         render_to_string(partial: "answers/locking", locals: {
+        qn_data: qn_data,
+        section_data: section_data,
+        'question' => {
+          'id' => @question.id,
+          'answer_lock_version' => @answer.lock_version,
+          'locking' => if @stale_answer
+                         render_to_string(partial: 'answers/locking', locals: {
                                             question: @question,
                                             answer: @stale_answer,
                                             user: @answer.user
                                           }, formats: [:html])
                        end,
-          "form" => render_to_string(partial: "answers/new_edit", locals: {
+          'form' => render_to_string(partial: 'answers/new_edit', locals: {
                                        template: template,
                                        question: @question,
                                        answer: @answer,
@@ -147,13 +144,13 @@ def create_or_update
                                        locking: false,
                                        base_template_org: template.base_org
                                      }, formats: [:html]),
-          "answer_status" => render_to_string(partial: "answers/status", locals: {
+          'answer_status' => render_to_string(partial: 'answers/status', locals: {
                                                 answer: @answer
                                               }, formats: [:html])
         },
-        "plan" => {
-          "id" => @plan.id,
-          "progress" => render_to_string(partial: "plans/progress", locals: {
+        'plan' => {
+          'id' => @plan.id,
+          'progress' => render_to_string(partial: 'plans/progress', locals: {
                                            plan: @plan,
                                            current_phase: @section.phase
                                          }, formats: [:html])
@@ -164,10 +161,11 @@ def create_or_update
     # rubocop:enable Style/GuardClause
   end
   # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
-  # rubocop:enable
+  # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
   private
 
+  # rubocop:disable Metrics/AbcSize
   def permitted_params
     permitted = params.require(:answer)
                       .permit(:id, :text, :plan_id, :user_id, :question_id,
@@ -184,11 +182,11 @@ def permitted_params
     permitted[:question_option_ids] = [] if params[:answer][:question_option_ids].nil?
     permitted
   end
+  # rubocop:enable Metrics/AbcSize
 
   def check_answered(section, q_array, all_answers)
     n_qs = section.questions.select { |question| q_array.include?(question.id) }.length
     n_ans = all_answers.select { |ans| q_array.include?(ans.question.id) and ans.answered? }.length
     [n_qs, n_ans]
   end
-
 end
diff --git a/app/controllers/api/v0/base_controller.rb b/app/controllers/api/v0/base_controller.rb
index f90f9c7320..c955adfdab 100644
--- a/app/controllers/api/v0/base_controller.rb
+++ b/app/controllers/api/v0/base_controller.rb
@@ -1,127 +1,130 @@
 # frozen_string_literal: true
 
-class Api::V0::BaseController < ApplicationController
-
-  protect_from_forgery with: :null_session
-  before_action :define_resource, only: %i[destroy show update]
-  respond_to :json
-
-  # POST /api/{plural_resource_name}
-  def create
-    define_resource(resource_class.new(resource_params))
+module Api
+  module V0
+    # Generic controller for API V0
+    class BaseController < ApplicationController
+      protect_from_forgery with: :null_session
+      before_action :define_resource, only: %i[destroy show update]
+      respond_to :json
+
+      # POST /api/{plural_resource_name}
+      def create
+        define_resource(resource_class.new(resource_params))
+
+        if retrieve_resource.save
+          render :show, status: :created
+        else
+          render json: retrieve_resource.errors, status: :unprocessable_entity
+        end
+      end
 
-    if retrieve_resource.save
-      render :show, status: :created
-    else
-      render json: retrieve_resource.errors, status: :unprocessable_entity
-    end
-  end
+      # DELETE /api/{plural_resource_name}/1
+      def destroy
+        retrieve_resource.destroy
+        head :no_content
+      end
 
-  # DELETE /api/{plural_resource_name}/1
-  def destroy
-    retrieve_resource.destroy
-    head :no_content
-  end
+      # GET /api/{plural_resource_name}
+      def index
+        plural_resource_name = "@#{resource_name.pluralize}"
+        resources = resource_class.where(query_params)
+                                  .page(page_params[:page])
+                                  .per(page_params[:page_size])
 
-  # GET /api/{plural_resource_name}
-  def index
-    plural_resource_name = "@#{resource_name.pluralize}"
-    resources = resource_class.where(query_params)
-                              .page(page_params[:page])
-                              .per(page_params[:page_size])
+        instance_variable_set(plural_resource_name, resources)
+        respond_with instance_variable_get(plural_resource_name)
+      end
 
-    instance_variable_set(plural_resource_name, resources)
-    respond_with instance_variable_get(plural_resource_name)
-  end
+      # GET /api/{plural_resource_name}/1
+      def show
+        respond_with retrieve_resource
+      end
 
-  # GET /api/{plural_resource_name}/1
-  def show
-    respond_with retrieve_resource
-  end
+      # PATCH/PUT /api/{plural_resource_name}/1
+      def update
+        if retrieve_resource.update(resource_params)
+          render :show
+        else
+          render json: retrieve_resource.errors, status: :unprocessable_entity
+        end
+      end
 
-  # PATCH/PUT /api/{plural_resource_name}/1
-  def update
-    if retrieve_resource.update(resource_params)
-      render :show
-    else
-      render json: retrieve_resource.errors, status: :unprocessable_entity
-    end
-  end
+      private
 
-  private
+      # The resource from the created instance variable
+      #
+      # Returns Object
+      def retrieve_resource
+        instance_variable_get("@#{resource_name}")
+      end
 
-  # The resource from the created instance variable
-  #
-  # Returns Object
-  def retrieve_resource
-    instance_variable_get("@#{resource_name}")
-  end
+      # The allowed parameters for searching. Override this method in each API
+      # controller to permit additional parameters to search on
+      #
+      # Returns Hash
+      def query_params
+        {}
+      end
 
-  # The allowed parameters for searching. Override this method in each API
-  # controller to permit additional parameters to search on
-  #
-  # Returns Hash
-  def query_params
-    {}
-  end
+      # The allowed parameters for pagination
+      #
+      # Returns Hash
+      def page_params
+        params.permit(:page, :page_size)
+      end
 
-  # The allowed parameters for pagination
-  #
-  # Returns Hash
-  def page_params
-    params.permit(:page, :page_size)
-  end
+      # The resource class based on the controller
+      #
+      # Returns Object
+      def resource_class
+        @resource_class ||= resource_name.classify.constantize
+      end
 
-  # The resource class based on the controller
-  #
-  # Returns Object
-  def resource_class
-    @resource_class ||= resource_name.classify.constantize
-  end
+      # The singular name for the resource class based on the controller
+      #
+      # Returns String
+      def resource_name
+        @resource_name ||= controller_name.singularize
+      end
 
-  # The singular name for the resource class based on the controller
-  #
-  # Returns String
-  def resource_name
-    @resource_name ||= controller_name.singularize
-  end
+      # Only allow a trusted parameter "white list" through.
+      # If a single resource is loaded for #create or #update,
+      # then the controller for the resource must implement
+      # the method "#{resource_name}_params" to limit permitted
+      # parameters for the individual model.
+      def resource_params
+        @resource_params ||= send("#{resource_name}_params")
+      end
 
-  # Only allow a trusted parameter "white list" through.
-  # If a single resource is loaded for #create or #update,
-  # then the controller for the resource must implement
-  # the method "#{resource_name}_params" to limit permitted
-  # parameters for the individual model.
-  def resource_params
-    @resource_params ||= send("#{resource_name}_params")
-  end
+      # Use callbacks to share common setup or constraints between actions.
+      def define_resource(resource = nil)
+        resource ||= resource_class.find(params[:id])
+        instance_variable_set("@#{resource_name}", resource)
+      end
 
-  # Use callbacks to share common setup or constraints between actions.
-  def define_resource(resource = nil)
-    resource ||= resource_class.find(params[:id])
-    instance_variable_set("@#{resource_name}", resource)
-  end
+      def authenticate
+        authenticate_token || render_bad_credentials
+      end
 
-  def authenticate
-    authenticate_token || render_bad_credentials
-  end
+      def authenticate_token
+        authenticate_with_http_token do |token, _options|
+          # reject the empty string as it is our base empty token
+          if token == ''
+            false
+          else
+            @token = token
+            @user = User.find_by(api_token: token)
+            # if no user found, return false, otherwise true
+            !@user.nil? && @user.can_use_api?
+          end
+        end
+      end
 
-  def authenticate_token
-    authenticate_with_http_token do |token, _options|
-      # reject the empty string as it is our base empty token
-      if token != ""
-        @token = token
-        @user = User.find_by(api_token: token)
-        # if no user found, return false, otherwise true
-        !@user.nil? && @user.can_use_api?
-      else
-        false
+      def render_bad_credentials
+        headers['WWW-Authenticate'] = 'Token realm=""'
+        render json: _('Bad Credentials'), status: 401
       end
     end
   end
-
-  def render_bad_credentials
-    headers["WWW-Authenticate"] = "Token realm=\"\""
-    render json: _("Bad Credentials"), status: 401
-  end
-
 end
diff --git a/app/controllers/api/v0/departments_controller.rb b/app/controllers/api/v0/departments_controller.rb
index 5bd31d6f18..83e483cce7 100644
--- a/app/controllers/api/v0/departments_controller.rb
+++ b/app/controllers/api/v0/departments_controller.rb
@@ -1,80 +1,79 @@
 # frozen_string_literal: true
 
-class Api::V0::DepartmentsController < Api::V0::BaseController
-
-  before_action :authenticate
-
-  ##
-  # Create a new department based on the information passed in JSON to the API
-  def create
-    raise Pundit::NotAuthorizedError unless Api::V0::DepartmentsPolicy.new(@user, nil).index?
+module Api
+  module V0
+    # Handles CRUD operations for Departments in API V0
+    class DepartmentsController < Api::V0::BaseController
+      before_action :authenticate
+
+      ##
+      # Create a new department based on the information passed in JSON to the API
+      def create
+        raise Pundit::NotAuthorizedError unless Api::V0::DepartmentsPolicy.new(@user, nil).index?
+
+        @department = Department.new(org: @user.org,
+                                     code: params[:code],
+                                     name: params[:name])
+        if @department.save
+          redirect_to api_v0_departments_path
+        else
+          # the department did not save
+          headers['WWW-Authenticate'] = 'Token realm=""'
+          render json: _('Departments code and name must be unique'), status: 400
+        end
+      end
 
-    @department = Department.new(org: @user.org,
-                                 code: params[:code],
-                                 name: params[:name])
-    if @department.save
-      redirect_to api_v0_departments_path
-    else
-      # the department did not save
-      headers["WWW-Authenticate"] = "Token realm=\"\""
-      render json: _("Departments code and name must be unique"), status: 400
-    end
-  end
+      ##
+      # Lists the departments for the API user's organisation
+      def index
+        raise Pundit::NotAuthorizedError unless Api::V0::DepartmentsPolicy.new(@user, nil).index?
 
-  ##
-  # Lists the departments for the API user's organisation
-  def index
-    raise Pundit::NotAuthorizedError unless Api::V0::DepartmentsPolicy.new(@user, nil).index?
+        @departments = @user.org.departments
+      end
 
-    @departments = @user.org.departments
-  end
+      ##
+      # List the users for each department on the organisation
+      def users
+        raise Pundit::NotAuthorizedError unless Api::V0::DepartmentsPolicy.new(@user, nil).users?
 
-  ##
-  # List the users for each department on the organisation
-  def users
-    raise Pundit::NotAuthorizedError unless Api::V0::DepartmentsPolicy.new(@user, nil).users?
+        @users = @user.org.users.includes(:department)
+      end
 
-    @users = @user.org.users.includes(:department)
-  end
+      ##
+      # Assign the list of users to the passed department id
+      def assign_users
+        @department = Department.find(params[:id])
 
-  ##
-  # Assign the list of users to the passed department id
-  def assign_users
-    @department = Department.find(params[:id])
+        raise Pundit::NotAuthorizedError unless Api::V0::DepartmentsPolicy.new(@user, @department).assign_users?
 
-    unless Api::V0::DepartmentsPolicy.new(@user, @department).assign_users?
-      raise Pundit::NotAuthorizedError
-    end
+        assign_users_to(@department.id)
+        redirect_to users_api_v0_departments_path
+      end
 
-    assign_users_to(@department.id)
-    redirect_to users_api_v0_departments_path
-  end
+      ##
+      # Remove departments from the list of users
+      def unassign_users
+        raise Pudndit::NotAuthorizedError unless Api::V0::DepartmentsPolicy.new(@user, @department).assign_users?
 
-  ##
-  # Remove departments from the list of users
-  def unassign_users
-    unless Api::V0::DepartmentsPolicy.new(@user, @department).assign_users?
-      raise Pudndit::NotAuthorizedError
-    end
+        assign_users_to(nil)
+        redirect_to users_api_v0_departments_path
+      end
 
-    assign_users_to(nil)
-    redirect_to users_api_v0_departments_path
-  end
+      private
 
-  private
+      def assign_users_to(department_id)
+        params[:users].each do |email|
+          reassign = User.find_by(email: email)
+          # Currently the validation is that the user's org matches the API user's
+          # Not sure if this is possible to capture in pundit
+          unless @user.present? && @user.org == reassign&.org
+            raise Pundit::NotAuthorizedError, _("user #{email} was not found on your organisation")
+          end
 
-  def assign_users_to(department_id)
-    params[:users].each do |email|
-      reassign = User.find_by(email: email)
-      # Currently the validation is that the user's org matches the API user's
-      # Not sure if this is possible to capture in pundit
-      unless @user.present? && @user.org == reassign&.org
-        raise Pundit::NotAuthorizedError, _("user #{email} was not found on your organisation")
+          reassign.department_id = department_id
+          reassign.save!
+        end
       end
-
-      reassign.department_id = department_id
-      reassign.save!
     end
   end
-
 end
diff --git a/app/controllers/api/v0/guidance_groups_controller.rb b/app/controllers/api/v0/guidance_groups_controller.rb
index 17beae33d4..7c828f1f69 100644
--- a/app/controllers/api/v0/guidance_groups_controller.rb
+++ b/app/controllers/api/v0/guidance_groups_controller.rb
@@ -1,26 +1,27 @@
 # frozen_string_literal: true
 
-class Api::V0::GuidanceGroupsController < Api::V0::BaseController
+module Api
+  module V0
+    # Handles GuidanceGroup queries for API V0
+    class GuidanceGroupsController < Api::V0::BaseController
+      before_action :authenticate
 
-  before_action :authenticate
+      def index
+        raise Pundit::NotAuthorizedError unless Api::V0::GuidanceGroupPolicy.new(@user, :guidance_group).index?
 
-  def index
-    unless Api::V0::GuidanceGroupPolicy.new(@user, :guidance_group).index?
-      raise Pundit::NotAuthorizedError
-    end
-
-    @all_viewable_groups = GuidanceGroup.all_viewable(@user)
-    respond_with @all_viewable_groups
-  end
+        @all_viewable_groups = GuidanceGroup.all_viewable(@user)
+        respond_with @all_viewable_groups
+      end
 
-  def pundit_user
-    @user
-  end
+      def pundit_user
+        @user
+      end
 
-  private
+      private
 
-  def query_params
-    params.permit(:id)
+      def query_params
+        params.permit(:id)
+      end
+    end
   end
-
 end
diff --git a/app/controllers/api/v0/plans_controller.rb b/app/controllers/api/v0/plans_controller.rb
index 5e30069bda..8fa848bffd 100644
--- a/app/controllers/api/v0/plans_controller.rb
+++ b/app/controllers/api/v0/plans_controller.rb
@@ -1,123 +1,123 @@
 # frozen_string_literal: true
 
-class Api::V0::PlansController < Api::V0::BaseController
-
-  include Paginable
-
-  before_action :authenticate
-
-  ##
-  # Creates a new plan based on the information passed in JSON to the API
-  # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-  def create
-    @template = Template.live(params[:template_id])
-    raise Pundit::NotAuthorizedError unless Api::V0::PlansPolicy.new(@user, @template).create?
-
-    plan_user = User.find_by(email: params[:plan][:email])
-    # ensure user exists
-    if plan_user.blank?
-      User.invite!({ email: params[:plan][:email] }, @user)
-      plan_user = User.find_by(email: params[:plan][:email])
-      plan_user.org = @user.org
-      plan_user.save
-    end
-    # ensure user's organisation is the same as api user's
-    unless plan_user.org == @user.org
-      raise Pundit::NotAuthorizedError, _("user must be in your organisation")
-    end
-
-    # initialize the plan
-    @plan = Plan.new
-
-    # Attach the user as the PI and Data Contact
-    @plan.contributors << Contributor.new(
-      name: [plan_user.firstname, plan_user.surname].join(" "),
-      email: plan_user.email,
-      investigation: true,
-      data_curation: true
-    )
-
-    # set funder name to template's org, or original template's org
-    @plan.funder_id = if @template.customization_of.nil?
-                        @template.org.id
-                      else
-                        Template.where(
-                          family_id: @template.customization_of
-                        ).first.org.id
-                      end
-    @plan.template = @template
-    @plan.title = params[:plan][:title]
-    if @plan.save
-      @plan.assign_creator(plan_user)
-      respond_with @plan
-    else
-      # the plan did not save
-      headers["WWW-Authenticate"] = "Token realm=\"\""
-      render json: _("Bad Parameters"), status: 400
+module Api
+  module V0
+    # Primary controller for API V0 that handles CRUD operations for Plans
+    class PlansController < Api::V0::BaseController
+      include Paginable
+
+      before_action :authenticate
+
+      ##
+      # Creates a new plan based on the information passed in JSON to the API
+      # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+      def create
+        @template = Template.live(params[:template_id])
+        raise Pundit::NotAuthorizedError unless Api::V0::PlansPolicy.new(@user, @template).create?
+
+        plan_user = User.find_by(email: params[:plan][:email])
+        # ensure user exists
+        if plan_user.blank?
+          User.invite!({ email: params[:plan][:email] }, @user)
+          plan_user = User.find_by(email: params[:plan][:email])
+          plan_user.org = @user.org
+          plan_user.save
+        end
+        # ensure user's organisation is the same as api user's
+        raise Pundit::NotAuthorizedError, _('user must be in your organisation') unless plan_user.org == @user.org
+
+        # initialize the plan
+        @plan = Plan.new
+
+        # Attach the user as the PI and Data Contact
+        @plan.contributors << Contributor.new(
+          name: [plan_user.firstname, plan_user.surname].join(' '),
+          email: plan_user.email,
+          investigation: true,
+          data_curation: true
+        )
+
+        # set funder name to template's org, or original template's org
+        @plan.funder_id = if @template.customization_of.nil?
+                            @template.org.id
+                          else
+                            Template.where(
+                              family_id: @template.customization_of
+                            ).first.org.id
+                          end
+        @plan.template = @template
+        @plan.title = params[:plan][:title]
+        if @plan.save
+          @plan.assign_creator(plan_user)
+          respond_with @plan
+        else
+          # the plan did not save
+          headers['WWW-Authenticate'] = 'Token realm=""'
+          render json: _('Bad Parameters'), status: 400
+        end
+      end
+      # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+
+      # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+      # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+      def index
+        raise Pundit::NotAuthorizedError unless Api::V0::PlansPolicy.new(@user, nil).index?
+
+        if params[:per_page].present?
+          max_pages = Rails.configuration.x.application.api_max_page_size
+          params[:per_page] = max_pages if params[:per_page].to_i > max_pages
+        end
+
+        # Get all the Org Admin plans
+        org_admin_plans = @user.org.org_admin_plans
+        @plans = org_admin_plans.includes([{ roles: :user }, { answers: :question_options },
+                                           template: [{ phases: {
+                                             sections: { questions: %i[question_format themes] }
+                                           } }, :org]])
+
+        # Filter on list of users
+        user_ids = extract_param_list(params, 'user')
+        @plans = @plans.where(roles: { user_id: user_ids, access: Role.bit_values(:editor) }) if user_ids.present?
+        # filter on dates
+        if params['created_after'].present? || params['created_before'].present?
+          @plans = @plans.where(created_at: dates_to_range(params, 'created_after', 'created_before'))
+        end
+        if params['updated_after'].present? || params['updated_before'].present?
+          @plans = @plans.where(updated_at: dates_to_range(params, 'updated_after', 'updated_before'))
+        end
+        if params['remove_tests'].present? && params['remove_tests'].downcase == 'true'
+          @plans = @plans.where.not(visibility: Plan.visibilities[:is_test])
+        end
+        # filter on funder (dmptemplate_id)
+        template_ids = extract_param_list(params, 'template')
+        @plans = @plans.where(templates: { family_id: template_ids }) if template_ids.present?
+        # filter on id(s)
+        plan_ids = extract_param_list(params, 'plan')
+        @plans = @plans.where(id: plan_ids) if plan_ids.present?
+        # apply pagination after filtering
+        @args = { per_page: params[:per_page], page: params[:page] }
+        @plans = refine_query(@plans)
+        respond_with @plans
+      end
+      # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+      # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+
+      private
+
+      def extract_param_list(params, attribute)
+        list = params.fetch("#{attribute}[]", [])
+        val = params.fetch(attribute, [])
+        list << val if val.present?
+        list
+      end
+
+      # takes in the params hash and converts to a date-range
+      def dates_to_range(hash, start, stop)
+        today = Date.today
+        start_date = Date.parse(hash.fetch(start, today.prev_month.to_date.to_s))
+        end_date = Date.parse(hash.fetch(stop, today.to_date.to_s)) + 1.day
+        start_date..end_date
+      end
     end
   end
-  # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
-
-  # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-  def index
-    raise Pundit::NotAuthorizedError unless Api::V0::PlansPolicy.new(@user, nil).index?
-
-    if params[:per_page].present?
-      max_pages = Rails.configuration.x.application.api_max_page_size
-      params[:per_page] = max_pages if params[:per_page].to_i > max_pages
-    end
-
-    # Get all the Org Admin plans
-    org_admin_plans = @user.org.org_admin_plans
-    @plans = org_admin_plans.includes([{ roles: :user }, { answers: :question_options },
-                                       template: [{ phases: {
-                                         sections: { questions: %i[question_format themes] }
-                                       } }, :org]])
-
-    # Filter on list of users
-    user_ids = extract_param_list(params, "user")
-    if user_ids.present?
-      @plans = @plans.where(roles: { user_id: user_ids, access: Role.bit_values(:editor) })
-    end
-    # filter on dates
-    if params["created_after"].present? || params["created_before"].present?
-      @plans = @plans.where(created_at: dates_to_range(params, "created_after", "created_before"))
-    end
-    if params["updated_after"].present? || params["updated_before"].present?
-      @plans = @plans.where(updated_at: dates_to_range(params, "updated_after", "updated_before"))
-    end
-    if params["remove_tests"].present? && params["remove_tests"].downcase == "true"
-      @plans = @plans.where.not(visibility: Plan.visibilities[:is_test])
-    end
-    # filter on funder (dmptemplate_id)
-    template_ids = extract_param_list(params, "template")
-    @plans = @plans.where(templates: { family_id: template_ids }) if template_ids.present?
-    # filter on id(s)
-    plan_ids = extract_param_list(params, "plan")
-    @plans = @plans.where(id: plan_ids) if plan_ids.present?
-    # apply pagination after filtering
-    @args = { per_page: params[:per_page], page: params[:page] }
-    @plans = refine_query(@plans)
-    respond_with @plans
-  end
-  # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
-  # rubocop:enable
-
-  private
-
-  def extract_param_list(params, attribute)
-    list = params.fetch(attribute + "[]", [])
-    val = params.fetch(attribute, [])
-    list << val if val.present?
-    list
-  end
-
-  # takes in the params hash and converts to a date-range
-  def dates_to_range(hash, start, stop)
-    today = Date.today
-    start_date = Date.parse(hash.fetch(start, today.prev_month.to_date.to_s))
-    end_date = Date.parse(hash.fetch(stop, today.to_date.to_s)) + 1.day
-    start_date..end_date
-  end
-
 end
diff --git a/app/controllers/api/v0/statistics_controller.rb b/app/controllers/api/v0/statistics_controller.rb
index b74f1a241d..2af50dfcb2 100644
--- a/app/controllers/api/v0/statistics_controller.rb
+++ b/app/controllers/api/v0/statistics_controller.rb
@@ -1,244 +1,243 @@
 # frozen_string_literal: true
 
-class Api::V0::StatisticsController < Api::V0::BaseController
-
-  before_action :authenticate
-
-  # GET /api/v0/statistics/users_joined?start_date=&end_date=&org_id=
-  #
-  # Returns the number of users joined for the user's org.
-  # If start_date is passed, only counts those with created_at is >= than start_date
-  # If end_date is passed, only counts those with created_at is <= than end_date are
-  # If org_id is passed and user has super_admin privileges that counter is performed
-  # against org_id param instead of user's org
-
-  # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-  def users_joined
-    unless Api::V0::StatisticsPolicy.new(@user, :statistics).users_joined?
-      raise Pundit::NotAuthorizedError
-    end
-
-    scoped = if @user.can_super_admin? && params[:org_id].present?
-               User.unscoped.where(org_id: params[:org_id])
-             else
-               User.unscoped.where(org_id: @user.org_id)
-             end
-
-    if params[:range_dates].present?
-      r = {}
-      params[:range_dates].each_pair do |k, v|
-        r[k] = scoped.where(created_at: dates_to_range(v)).count
-      end
-
-      # Reverse hash r, so dates in ascending order
-      r = Hash[r.to_a.reverse]
-
-      respond_to do |format|
-        format.json { render(json: r.to_json) }
-        format.csv do
-          send_data(CSV.generate do |csv|
-            csv << [_("Month"), _("No. Users joined")]
-            total = 0
-            r.each_pair do |k, v|
-              csv << [k, v]
-              total += v
+module Api
+  module V0
+    # Provides statistical info for API V0
+    class StatisticsController < Api::V0::BaseController
+      before_action :authenticate
+
+      # GET /api/v0/statistics/users_joined?start_date=&end_date=&org_id=
+      #
+      # Returns the number of users joined for the user's org.
+      # If start_date is passed, only counts those with created_at is >= than start_date
+      # If end_date is passed, only counts those with created_at is <= than end_date are
+      # If org_id is passed and user has super_admin privileges that counter is performed
+      # against org_id param instead of user's org
+
+      # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+      # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+      def users_joined
+        raise Pundit::NotAuthorizedError unless Api::V0::StatisticsPolicy.new(@user, :statistics).users_joined?
+
+        scoped = if @user.can_super_admin? && params[:org_id].present?
+                   User.unscoped.where(org_id: params[:org_id])
+                 else
+                   User.unscoped.where(org_id: @user.org_id)
+                 end
+
+        if params[:range_dates].present?
+          r = {}
+          params[:range_dates].each_pair do |k, v|
+            r[k] = scoped.where(created_at: dates_to_range(v)).count
+          end
+
+          # Reverse hash r, so dates in ascending order
+          r = r.to_a.reverse.to_h
+
+          respond_to do |format|
+            format.json { render(json: r.to_json) }
+            format.csv do
+              send_data(CSV.generate do |csv|
+                csv << [_('Month'), _('No. Users joined')]
+                total = 0
+                r.each_pair do |k, v|
+                  csv << [k, v]
+                  total += v
+                end
+                csv << [_('Total'), total]
+              end, filename: "#{_('users_joined')}.csv")
             end
-            csv << [_("Total"), total]
-          end, filename: "#{_('users_joined')}.csv")
+          end
+        else
+          if params['start_date'].present? || params['end_date'].present?
+            scoped = scoped.where(created_at: dates_to_range(params))
+          end
+          @users_count = scoped.count
+          respond_with @users_count
         end
       end
-    else
-      if params["start_date"].present? || params["end_date"].present?
-        scoped = scoped.where(created_at: dates_to_range(params))
-      end
-      @users_count = scoped.count
-      respond_with @users_count
-    end
-  end
-  # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
-  # rubocop:enable
-
-  # GET
-  # Returns the number of completed plans within the user's org for the data
-  # start_date and end_date specified
-  # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-  def completed_plans
-    unless Api::V0::StatisticsPolicy.new(@user, :statistics).completed_plans?
-      raise Pundit::NotAuthorizedError
-    end
-
-    scoped = if @user.can_super_admin? && params[:org_id].present?
-               Org.find(params[:org_id]).plans.where(complete: true)
-             else
-               @user.org.plans.where(complete: true)
-             end
-
-    if params[:range_dates].present?
-      r = {}
-      params[:range_dates].each_pair do |k, v|
-        r[k] = scoped.where(created_at: dates_to_range(v)).count
-      end
-
-      # Reverse hash r, so dates in ascending order
-      r = Hash[r.to_a.reverse]
-
-      respond_to do |format|
-        format.json { render(json: r.to_json) }
-        format.csv do
-          send_data(CSV.generate do |csv|
-            csv << [_("Month"), _("No. Completed Plans")]
-            total = 0
-            r.each_pair do |k, v|
-              csv << [k, v]
-              total += v
+      # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+      # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+
+      # GET
+      # Returns the number of completed plans within the user's org for the data
+      # start_date and end_date specified
+      # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+      # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+      def completed_plans
+        raise Pundit::NotAuthorizedError unless Api::V0::StatisticsPolicy.new(@user, :statistics).completed_plans?
+
+        scoped = if @user.can_super_admin? && params[:org_id].present?
+                   Org.find(params[:org_id]).plans.where(complete: true)
+                 else
+                   @user.org.plans.where(complete: true)
+                 end
+
+        if params[:range_dates].present?
+          r = {}
+          params[:range_dates].each_pair do |k, v|
+            r[k] = scoped.where(created_at: dates_to_range(v)).count
+          end
+
+          # Reverse hash r, so dates in ascending order
+          r = r.to_a.reverse.to_h
+
+          respond_to do |format|
+            format.json { render(json: r.to_json) }
+            format.csv do
+              send_data(CSV.generate do |csv|
+                csv << [_('Month'), _('No. Completed Plans')]
+                total = 0
+                r.each_pair do |k, v|
+                  csv << [k, v]
+                  total += v
+                end
+                csv << [_('Total'), total]
+              end, filename: "#{_('completed_plans')}.csv")
             end
-            csv << [_("Total"), total]
-          end, filename: "#{_('completed_plans')}.csv")
+          end
+        else
+          if params['start_date'].present? || params['end_date'].present?
+            scoped = scoped.where(created_at: dates_to_range(params))
+          end
+          render(json: { completed_plans: scoped.count })
         end
       end
-    else
-      if params["start_date"].present? || params["end_date"].present?
-        scoped = scoped.where(created_at: dates_to_range(params))
-      end
-      render(json: { completed_plans: scoped.count })
-    end
-  end
-  # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
-  # rubocop:enable
-
-  # /api/v0/statistics/created_plans
-  # Returns the number of created plans within the user's org for the data
-  # start_date and end_date specified
-  # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-  def created_plans
-    raise Pundit::NotAuthorizedError unless Api::V0::StatisticsPolicy.new(@user, :statistics).plans?
-
-    scoped = if @user.can_super_admin? && params[:org_id].present?
-               Org.find(params[:org_id]).plans
-             else
-               @user.org.plans
-             end
-
-    if params[:range_dates].present?
-      r = {}
-      params[:range_dates].each_pair do |k, v|
-        r[k] = scoped.where(created_at: dates_to_range(v)).count
-      end
-
-      # Reverse hash r, so dates in ascending order
-      r = Hash[r.to_a.reverse]
-
-      respond_to do |format|
-        format.json { render(json: r.to_json) }
-        format.csv do
-          send_data(CSV.generate do |csv|
-            csv << [_("Month"), _("No. Plans")]
-            total = 0
-            r.each_pair do |k, v|
-              csv << [k, v]
-              total += v
+      # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+      # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+
+      # /api/v0/statistics/created_plans
+      # Returns the number of created plans within the user's org for the data
+      # start_date and end_date specified
+      # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+      # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+      def created_plans
+        raise Pundit::NotAuthorizedError unless Api::V0::StatisticsPolicy.new(@user, :statistics).plans?
+
+        scoped = if @user.can_super_admin? && params[:org_id].present?
+                   Org.find(params[:org_id]).plans
+                 else
+                   @user.org.plans
+                 end
+
+        if params[:range_dates].present?
+          r = {}
+          params[:range_dates].each_pair do |k, v|
+            r[k] = scoped.where(created_at: dates_to_range(v)).count
+          end
+
+          # Reverse hash r, so dates in ascending order
+          r = r.to_a.reverse.to_h
+
+          respond_to do |format|
+            format.json { render(json: r.to_json) }
+            format.csv do
+              send_data(CSV.generate do |csv|
+                csv << [_('Month'), _('No. Plans')]
+                total = 0
+                r.each_pair do |k, v|
+                  csv << [k, v]
+                  total += v
+                end
+                csv << [_('Total'), total]
+              end, filename: "#{_('plans')}.csv")
             end
-            csv << [_("Total"), total]
-          end, filename: "#{_('plans')}.csv")
+          end
+        else
+          if params['start_date'].present? || params['end_date'].present?
+            scoped = scoped.where(created_at: dates_to_range(params))
+          end
+          render(json: { completed_plans: scoped.count })
         end
       end
-    else
-      if params["start_date"].present? || params["end_date"].present?
-        scoped = scoped.where(created_at: dates_to_range(params))
+      # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+      # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+
+      ##
+      # Displays the number of DMPs using templates owned/create by the caller's Org
+      # between the optional specified dates
+      # rubocop:disable Metrics/AbcSize
+      def using_template
+        org_templates = @user.org.templates.where(customization_of: nil)
+        raise Pundit::NotAuthorizedError unless Api::V0::StatisticsPolicy.new(@user,
+                                                                              org_templates.first).using_template?
+
+        @templates = {}
+        org_templates.each do |template|
+          if @templates[template.title].blank?
+            @templates[template.title]          = {}
+            @templates[template.title][:title]  = template.title
+            @templates[template.title][:id]     = template.family_id
+            @templates[template.title][:uses]   = 0
+          end
+          scoped = template.plans
+          if params['start_date'].present? || params['end_date'].present?
+            scoped = scoped.where(created_at: dates_to_range(params))
+          end
+          @templates[template.title][:uses] += scoped.length
+        end
+        respond_with @templates
       end
-      render(json: { completed_plans: scoped.count })
-    end
-  end
-  # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
-  # rubocop:enable
-
-  ##
-  # Displays the number of DMPs using templates owned/create by the caller's Org
-  # between the optional specified dates
-  # rubocop:disable Metrics/AbcSize
-  def using_template
-    org_templates = @user.org.templates.where(customization_of: nil)
-    unless Api::V0::StatisticsPolicy.new(@user, org_templates.first).using_template?
-      raise Pundit::NotAuthorizedError
-    end
-
-    @templates = {}
-    org_templates.each do |template|
-      if @templates[template.title].blank?
-        @templates[template.title]          = {}
-        @templates[template.title][:title]  = template.title
-        @templates[template.title][:id]     = template.family_id
-        @templates[template.title][:uses]   = 0
+      # rubocop:enable Metrics/AbcSize
+
+      ##
+      # GET
+      # Renders a list of templates with their titles, ids, and uses between the optional
+      # specified dates the uses are restricted to DMPs created by users of the same
+      # organisation as the user who ititiated the call.
+      # rubocop:disable Metrics/AbcSize
+      def plans_by_template
+        raise Pundit::NotAuthorizedError unless Api::V0::StatisticsPolicy.new(@user, :statistics).plans_by_template?
+
+        @templates = {}
+        scoped = @user.org.plans
+        if params['start_date'].present? || params['end_date'].present?
+          scoped = scoped.where(created_at: dates_to_range(params))
+        end
+        scoped.each do |plan|
+          # if hash exists
+          if @templates[plan.template.title].blank?
+            @templates[plan.template.title] = {}
+            @templates[plan.template.title][:title] = plan.template.title
+            @templates[plan.template.title][:id] = plan.template.family_id
+            @templates[plan.template.title][:uses] = 1
+          else
+            @templates[plan.template.title][:uses] += 1
+          end
+        end
+        respond_with @templates
       end
-      scoped = template.plans
-      if params["start_date"].present? || params["end_date"].present?
-        scoped = scoped.where(created_at: dates_to_range(params))
+      # rubocop:enable Metrics/AbcSize
+
+      # GET
+      #
+      # Renders a list of DMPs metadata, provided the DMPs were created between the
+      # optional specified dates DMPs must be owned by a user who's organisation is the
+      # same as the user who generates the call.
+      # rubocop:disable Metrics/AbcSize
+      def plans
+        raise Pundit::NotAuthorizedError unless Api::V0::StatisticsPolicy.new(@user, :statistics).plans?
+
+        @org_plans = @user.org.plans
+        if params['remove_tests'].present? && params['remove_tests'].downcase == 'true'
+          @org_plans = @org_plans.where.not(visibility: Plan.visibilities[:is_test])
+        end
+        if params['start_date'].present? || params['end_date'].present?
+          @org_plans = @org_plans.where(created_at: dates_to_range(params))
+        end
+        respond_with @org_plans
       end
-      @templates[template.title][:uses] += scoped.length
-    end
-    respond_with @templates
-  end
-  # rubocop:enable Metrics/AbcSize
-
-  ##
-  # GET
-  # Renders a list of templates with their titles, ids, and uses between the optional
-  # specified dates the uses are restricted to DMPs created by users of the same
-  # organisation as the user who ititiated the call.
-  # rubocop:disable Metrics/AbcSize
-  def plans_by_template
-    unless Api::V0::StatisticsPolicy.new(@user, :statistics).plans_by_template?
-      raise Pundit::NotAuthorizedError
-    end
+      # rubocop:enable Metrics/AbcSize
 
-    @templates = {}
-    scoped = @user.org.plans
-    if params["start_date"].present? || params["end_date"].present?
-      scoped = scoped.where(created_at: dates_to_range(params))
-    end
-    scoped.each do |plan|
-      # if hash exists
-      if @templates[plan.template.title].blank?
-        @templates[plan.template.title] = {}
-        @templates[plan.template.title][:title] = plan.template.title
-        @templates[plan.template.title][:id] = plan.template.family_id
-        @templates[plan.template.title][:uses] = 1
-      else
-        @templates[plan.template.title][:uses] += 1
+      private
+
+      # Convert start/end dates in hash to a range of Dates
+      def dates_to_range(hash)
+        today = Date.today
+        start_date = Date.parse(hash.fetch('start_date', today.prev_month.to_date.to_s))
+        end_date = Date.parse(hash.fetch('end_date', today.to_date.to_s)) + 1.day
+        start_date..end_date
       end
     end
-    respond_with @templates
-  end
-  # rubocop:enable Metrics/AbcSize
-
-  # GET
-  #
-  # Renders a list of DMPs metadata, provided the DMPs were created between the
-  # optional specified dates DMPs must be owned by a user who's organisation is the
-  # same as the user who generates the call.
-  # rubocop:disable Metrics/AbcSize
-  def plans
-    raise Pundit::NotAuthorizedError unless Api::V0::StatisticsPolicy.new(@user, :statistics).plans?
-
-    @org_plans = @user.org.plans
-    if params["remove_tests"].present? && params["remove_tests"].downcase == "true"
-      @org_plans = @org_plans.where.not(visibility: Plan.visibilities[:is_test])
-    end
-    if params["start_date"].present? || params["end_date"].present?
-      @org_plans = @org_plans.where(created_at: dates_to_range(params))
-    end
-    respond_with @org_plans
   end
-  # rubocop:enable Metrics/AbcSize
-
-  private
-
-  # Convert start/end dates in hash to a range of Dates
-  def dates_to_range(hash)
-    today = Date.today
-    start_date = Date.parse(hash.fetch("start_date", today.prev_month.to_date.to_s))
-    end_date = Date.parse(hash.fetch("end_date", today.to_date.to_s)) + 1.day
-    start_date..end_date
-  end
-
 end
diff --git a/app/controllers/api/v0/templates_controller.rb b/app/controllers/api/v0/templates_controller.rb
index b4f8e1e243..f1156593f5 100644
--- a/app/controllers/api/v0/templates_controller.rb
+++ b/app/controllers/api/v0/templates_controller.rb
@@ -1,58 +1,59 @@
 # frozen_string_literal: true
 
-class Api::V0::TemplatesController < Api::V0::BaseController
-
-  before_action :authenticate
-
-  # GET
-  #
-  # Renders a list of templates ordered by organisation
-  # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-  def index
-    # check if the user has permissions to use the templates API
-    unless Api::V0::TemplatePolicy.new(@user, :guidance_group).index?
-      raise Pundit::NotAuthorizedError
-    end
-
-    @org_templates = {}
-
-    published_templates = Template.includes(:org)
-                                  .unarchived
-                                  .where(customization_of: nil, published: true)
-                                  .order(:org_id, :version)
-
-    customized_templates = Template.includes(:org)
-                                   .unarchived
-                                   .where(org_id: @user.org_id, published: true)
-                                   .where.not(customization_of: nil)
-
-    published_templates.order(:org_id, :version).each do |temp|
-      if @org_templates[temp.org].present?
-        if @org_templates[temp.org][:own][temp.family_id].nil?
-          @org_templates[temp.org][:own][temp.family_id] = temp
+module Api
+  module V0
+    # Handles queries for templates for API V0
+    class TemplatesController < Api::V0::BaseController
+      before_action :authenticate
+
+      # GET
+      #
+      # Renders a list of templates ordered by organisation
+      # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+      # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+      def index
+        # check if the user has permissions to use the templates API
+        raise Pundit::NotAuthorizedError unless Api::V0::TemplatePolicy.new(@user, :guidance_group).index?
+
+        @org_templates = {}
+
+        published_templates = Template.includes(:org)
+                                      .unarchived
+                                      .where(customization_of: nil, published: true)
+                                      .order(:org_id, :version)
+
+        customized_templates = Template.includes(:org)
+                                       .unarchived
+                                       .where(org_id: @user.org_id, published: true)
+                                       .where.not(customization_of: nil)
+
+        published_templates.order(:org_id, :version).each do |temp|
+          if @org_templates[temp.org].present?
+            @org_templates[temp.org][:own][temp.family_id] = temp if @org_templates[temp.org][:own][temp.family_id].nil?
+          else
+            @org_templates[temp.org] = {}
+            @org_templates[temp.org][:own] = {}
+            @org_templates[temp.org][:cust] = {}
+            @org_templates[temp.org][:own][temp.family_id] = temp
+          end
         end
-      else
-        @org_templates[temp.org] = {}
-        @org_templates[temp.org][:own] = {}
-        @org_templates[temp.org][:cust] = {}
-        @org_templates[temp.org][:own][temp.family_id] = temp
-      end
-    end
-    customized_templates.each do |temp|
-      if @org_templates[temp.org].present?
-        if @org_templates[temp.org][:cust][temp.family_id].nil?
-          @org_templates[temp.org][:cust][temp.family_id] = temp
+        customized_templates.each do |temp|
+          if @org_templates[temp.org].present?
+            if @org_templates[temp.org][:cust][temp.family_id].nil?
+              @org_templates[temp.org][:cust][temp.family_id] =
+                temp
+            end
+          else
+            @org_templates[temp.org] = {}
+            @org_templates[temp.org][:own] = {}
+            @org_templates[temp.org][:cust] = {}
+            @org_templates[temp.org][:cust][temp.family_id] = temp
+          end
         end
-      else
-        @org_templates[temp.org] = {}
-        @org_templates[temp.org][:own] = {}
-        @org_templates[temp.org][:cust] = {}
-        @org_templates[temp.org][:cust][temp.family_id] = temp
+        respond_with @org_templates
       end
+      # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+      # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
     end
-    respond_with @org_templates
   end
-  # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
-  # rubocop:enable
-
 end
diff --git a/app/controllers/api/v1/authentication_controller.rb b/app/controllers/api/v1/authentication_controller.rb
index 752bfbb117..c74dd39c5d 100644
--- a/app/controllers/api/v1/authentication_controller.rb
+++ b/app/controllers/api/v1/authentication_controller.rb
@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
 module Api
-
   module V1
-
     # Accepts 2 types of authentication:
     #
     # Client Credentials:
@@ -24,12 +22,12 @@ module V1
     #    code: "[users.api_token]"
     #  }
     class AuthenticationController < BaseApiController
-
       respond_to :json
 
       skip_before_action :authorize_request, only: %i[authenticate]
 
       # POST /api/v1/authenticate
+      # rubocop:disable Metrics/AbcSize
       def authenticate
         body = request.body.read
         json = JSON.parse(body)
@@ -38,20 +36,17 @@ def authenticate
 
         if @token.present?
           @expiration = auth_svc.expiration
-          @token_type = "Bearer"
-          render "/api/v1/token", status: :ok
+          @token_type = 'Bearer'
+          render '/api/v1/token', status: :ok
         else
           render_error errors: auth_svc.errors, status: :unauthorized
         end
       rescue JSON::ParserError => e
         Rails.logger.error "API V1 - authenticate: #{e.message}"
         Rails.logger.error request.body.read
-        render_error errors: _("Missing or invalid JSON"), status: :bad_request
+        render_error errors: _('Missing or invalid JSON'), status: :bad_request
       end
-      # rubocop:enable
-
+      # rubocop:enable Metrics/AbcSize
     end
-
   end
-
 end
diff --git a/app/controllers/api/v1/base_api_controller.rb b/app/controllers/api/v1/base_api_controller.rb
index 77da394d82..e25a6740a7 100644
--- a/app/controllers/api/v1/base_api_controller.rb
+++ b/app/controllers/api/v1/base_api_controller.rb
@@ -1,12 +1,9 @@
 # frozen_string_literal: true
 
 module Api
-
   module V1
-
     # Base API Controller
     class BaseApiController < ApplicationController
-
       # Skipping the standard Rails authenticity tokens passed in UI
       skip_before_action :verify_authenticity_token
 
@@ -26,14 +23,14 @@ class BaseApiController < ApplicationController
 
       # GET /api/v1/heartbeat
       def heartbeat
-        render "/api/v1/heartbeat", status: :ok
+        render '/api/v1/heartbeat', status: :ok
       end
 
       protected
 
       def render_error(errors:, status:)
         @payload = { errors: [errors] }
-        render "/api/v1/error", status: status
+        render '/api/v1/error', status: status
       end
 
       private
@@ -63,12 +60,13 @@ def base_response_content
       # Retrieve the requested pagination params or use defaults
       # only allow 100 per page as the max
       def pagination_params
-        @page = params.fetch("page", 1).to_i
-        @per_page = params.fetch("per_page", 20).to_i
+        @page = params.fetch('page', 1).to_i
+        @per_page = params.fetch('per_page', 20).to_i
         @per_page = 100 if @per_page > 100
       end
 
       # Parse the body of the incoming request
+      # rubocop:disable Metrics/AbcSize
       def parse_request
         return false unless request.present? && request.body.present?
 
@@ -78,10 +76,11 @@ def parse_request
         rescue JSON::ParserError => e
           Rails.logger.error "JSON Parser: #{e.message}"
           Rails.logger.error request.body
-          render_error(errors: _("Invalid JSON format"), status: :bad_request)
+          render_error(errors: _('Invalid JSON format'), status: :bad_request)
           false
         end
       end
+      # rubocop:enable Metrics/AbcSize
 
       # ==========================
 
@@ -189,9 +188,6 @@ def host_permitted_params
            storage_type availability geo_location certified_with pid_system] +
           [host_ids: identifier_permitted_params]
       end
-
     end
-
   end
-
 end
diff --git a/app/controllers/api/v1/plans_controller.rb b/app/controllers/api/v1/plans_controller.rb
index 649f987d97..b1480437bd 100644
--- a/app/controllers/api/v1/plans_controller.rb
+++ b/app/controllers/api/v1/plans_controller.rb
@@ -1,11 +1,9 @@
 # frozen_string_literal: true
 
 module Api
-
   module V1
-
+    # Handles CRUD operations for plans in API V1
     class PlansController < BaseApiController
-
       respond_to :json
 
       # GET /api/v1/plans/:id
@@ -15,14 +13,15 @@ def show
 
         if plans.present? && plans.any?
           @items = paginate_response(results: plans)
-          render "/api/v1/plans/index", status: :ok
+          render '/api/v1/plans/index', status: :ok
         else
-          render_error(errors: [_("Plan not found")], status: :not_found)
+          render_error(errors: [_('Plan not found')], status: :not_found)
         end
       end
 
       # POST /api/v1/plans
       # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+      # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       def create
         dmp = @json.with_indifferent_access.fetch(:items, []).first.fetch(:dmp, {})
 
@@ -34,8 +33,8 @@ def create
         # Convert the JSON into a Plan and it's associations
         plan = Api::V1::Deserialization::Plan.deserialize(json: dmp)
         if plan.present?
-          save_err = _("Unable to create your DMP")
-          exists_err = _("Plan already exists. Send an update instead.")
+          save_err = _('Unable to create your DMP')
+          exists_err = _('Plan already exists. Send an update instead.')
           no_org_err = _("Could not determine ownership of the DMP. Please add an
                           :affiliation to the :contact")
 
@@ -55,11 +54,8 @@ def create
 
           # If we cannot save for some reason then return an error
           plan = Api::V1::PersistenceService.safe_save(plan: plan)
-          # rubocop:disable Layout/LineLength
           render_error(errors: save_err, status: :internal_server_error) and return if plan.new_record?
 
-          # rubocop:enable Layout/LineLength
-
           # If the plan was generated by an ApiClient then associate them
           plan.update(api_client_id: client.id) if client.is_a?(ApiClient)
 
@@ -69,14 +65,15 @@ def create
 
           # Kaminari Pagination requires an ActiveRecord result set :/
           @items = paginate_response(results: Plan.where(id: plan.id))
-          render "/api/v1/plans/index", status: :created
+          render '/api/v1/plans/index', status: :created
         else
-          render_error(errors: [_("Invalid JSON!")], status: :bad_request)
+          render_error(errors: [_('Invalid JSON!')], status: :bad_request)
         end
       rescue JSON::ParserError
-        render_error(errors: [_("Invalid JSON")], status: :bad_request)
+        render_error(errors: [_('Invalid JSON')], status: :bad_request)
       end
       # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+      # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
       # GET /api/v1/plans
       def index
@@ -88,9 +85,9 @@ def index
         if plans.present? && plans.any?
           @items = paginate_response(results: plans)
           @minimal = true
-          render "api/v1/plans/index", status: :ok
+          render 'api/v1/plans/index', status: :ok
         else
-          render_error(errors: [_("No Plans found")], status: :not_found)
+          render_error(errors: [_('No Plans found')], status: :not_found)
         end
       end
 
@@ -134,11 +131,12 @@ def lookup_user(contributor:)
         user
       end
 
+      # rubocop:disable Metrics/AbcSize
       def invite_contributor(contributor:)
         return nil unless contributor.present?
 
         # If the user was not found, invite them and attach any know identifiers
-        names = contributor.name&.split || [""]
+        names = contributor.name&.split || ['']
         firstname = names.length > 1 ? names.first : nil
         surname = names.length > 1 ? names.last : names.first
         user = User.invite!({ email: contributor.email,
@@ -153,9 +151,7 @@ def invite_contributor(contributor:)
         end
         user
       end
-
+      # rubocop:enable Metrics/AbcSize
     end
-
   end
-
 end
diff --git a/app/controllers/api/v1/templates_controller.rb b/app/controllers/api/v1/templates_controller.rb
index 57383c825c..729b3edbbd 100644
--- a/app/controllers/api/v1/templates_controller.rb
+++ b/app/controllers/api/v1/templates_controller.rb
@@ -1,14 +1,13 @@
 # frozen_string_literal: true
 
 module Api
-
   module V1
-
+    # Provides a list of templates for API V1
     class TemplatesController < BaseApiController
-
       respond_to :json
 
       # GET /api/v1/templates
+      # rubocop:disable Metrics/AbcSize
       def index
         # If this is a User and not an ApiClient include the Org's
         # templates and customizations as well as the public ones
@@ -35,12 +34,10 @@ def index
 
         templates = templates.order(:title)
         @items = paginate_response(results: templates)
-        render "/api/v1/templates/index", status: :ok
+        render '/api/v1/templates/index', status: :ok
       end
       # rubocop:enable
-
     end
-
+    # rubocop:enable Metrics/AbcSize
   end
-
 end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 53dad81fb4..0253b5cef6 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
+# Base controller logic
 class ApplicationController < ActionController::Base
-
   protect_from_forgery with: :exception
 
   before_action :configure_permitted_parameters, if: :devise_controller?
@@ -22,8 +22,6 @@ class ApplicationController < ActionController::Base
   # When we are in production reroute Record Not Found errors to the branded 404 page
   rescue_from ActiveRecord::RecordNotFound, with: :render_not_found
 
-  rescue_from StandardError, with: :handle_server_error
-
   rescue_from Pundit::NotAuthorizedError, with: :user_not_authorized
 
   private
@@ -35,11 +33,11 @@ def current_org
   def user_not_authorized
     if user_signed_in?
       # redirect_to plans_url, alert: _("You are not authorized to perform this action.")
-      msg = _("You are not authorized to perform this action.")
+      msg = _('You are not authorized to perform this action.')
       render_respond_to_format_with_error_message(msg, plans_url, 403, nil)
     else
       # redirect_to root_url, alert: _("You need to sign in or sign up before continuing.")
-      msg = _("You need to sign in or sign up before continuing.")
+      msg = _('You need to sign in or sign up before continuing.')
       render_respond_to_format_with_error_message(msg, root_url, 401, nil)
     end
   end
@@ -56,15 +54,16 @@ def current_locale
   def store_location
     # store last url - this is needed for post-login redirect to whatever the user last
     # visited.
-    unless ["/users/sign_in",
-            "/users/sign_up",
-            "/users/password",
-            "/users/invitation/accept"].any? { |ur| request.fullpath.include?(ur) } \
-    or request.xhr? # don't store ajax calls
+    unless ['/users/sign_in',
+            '/users/sign_up',
+            '/users/password',
+            '/users/invitation/accept'].any? { |ur| request.fullpath.include?(ur) } \
+    || request.xhr? # don't store ajax calls
       session[:previous_url] = request.fullpath
     end
   end
 
+  # rubocop:disable Metrics/AbcSize
   def after_sign_in_path_for(_resource)
     referer_path = URI(request.referer).path unless request.referer.nil?
     if from_external_domain? || referer_path.eql?(new_user_session_path) ||
@@ -75,6 +74,7 @@ def after_sign_in_path_for(_resource)
       request.referer
     end
   end
+  # rubocop:enable Metrics/AbcSize
 
   def after_sign_up_path_for(_resource)
     referer_path = URI(request.referer).path unless request.referer.nil?
@@ -104,45 +104,42 @@ def authenticate_admin!
     end
   end
 
-  def failure_message(obj, action = "save")
-    _("Unable to %{action} the %{object}.%{errors}") % {
-      object: obj_name_for_display(obj),
-      action: action || "save",
-      errors: errors_for_display(obj)
-    }
+  def failure_message(obj, action = 'save')
+    format(_('Unable to %<action>s the %<object>s.%<errors>s'),
+           object: obj_name_for_display(obj),
+           action: action || 'save', errors: errors_for_display(obj))
   end
 
-  def success_message(obj, action = "saved")
-    _("Successfully %{action} the %{object}.") % {
-      object: obj_name_for_display(obj),
-      action: action || "save"
-    }
+  def success_message(obj, action = 'saved')
+    format(_('Successfully %<action>s the %<object>s.'), object: obj_name_for_display(obj), action: action || 'save')
   end
 
   def errors_for_display(obj)
-    return "" unless obj.present? && obj.errors.any?
+    return '' unless obj.present? && obj.errors.any?
 
     msgs = obj.errors.full_messages.uniq.collect { |msg| "<li>#{msg}</li>" }
-    "<ul>#{msgs.join('')}</li></ul>"
+    "<ul>#{msgs.join}</li></ul>"
   end
 
+  # rubocop:disable Metrics/AbcSize
   def obj_name_for_display(obj)
     display_name = {
-      ApiClient: _("API client"),
-      ExportedPlan: _("plan"),
-      GuidanceGroup: _("guidance group"),
-      Note: _("comment"),
-      Org: _("organisation"),
-      Perm: _("permission"),
-      Pref: _("preferences"),
-      User: obj == current_user ? _("profile") : _("user"),
-      QuestionOption: _("question option")
+      ApiClient: _('API client'),
+      ExportedPlan: _('plan'),
+      GuidanceGroup: _('guidance group'),
+      Note: _('comment'),
+      Org: _('organisation'),
+      Perm: _('permission'),
+      Pref: _('preferences'),
+      User: obj == current_user ? _('profile') : _('user'),
+      QuestionOption: _('question option')
     }
     if obj.respond_to?(:customization_of) && obj.send(:customization_of).present?
-      display_name[:Template] = "customization"
+      display_name[:Template] = 'customization'
     end
-    display_name[obj.class.name.to_sym] || obj.class.name.downcase || "record"
+    display_name[obj.class.name.to_sym] || obj.class.name.downcase || 'record'
   end
+  # rubocop:enable Metrics/AbcSize
 
   # Override rails default render action to look for a branded version of a
   # template instead of using the default one. If no override exists, the
@@ -152,7 +149,7 @@ def obj_name_for_display(obj)
   # replacing. For example:
   #  app/views/branded/layouts/_header.html.erb -> app/views/layouts/_header.html.erb
   def prepend_view_paths
-    prepend_view_path Rails.root.join("app", "views", "branded")
+    prepend_view_path Rails.root.join('app', 'views', 'branded')
   end
 
   ##
@@ -181,15 +178,10 @@ def configure_permitted_parameters
   end
 
   def render_not_found(exception)
-    msg = _("Record Not Found") + ": #{exception.message}"
+    msg = _('Record Not Found') + ": #{exception.message}"
     render_respond_to_format_with_error_message(msg, root_url, 404, exception)
   end
 
-  def handle_server_error(exception)
-    msg = exception.message.to_s if exception.present?
-    render_respond_to_format_with_error_message(msg, root_url, 500, exception)
-  end
-
   def render_respond_to_format_with_error_message(msg, url_or_path, http_status, exception)
     Rails.logger.error msg
     Rails.logger.error exception&.backtrace if exception.present?
@@ -200,9 +192,8 @@ def render_respond_to_format_with_error_message(msg, url_or_path, http_status, e
       # Render the JSON error message (using API V1)
       format.json do
         @payload = { errors: [msg] }
-        render "/api/v1/error", status: http_status
+        render '/api/v1/error', status: http_status
       end
     end
   end
-
 end
diff --git a/app/controllers/concerns/allowed_question_formats.rb b/app/controllers/concerns/allowed_question_formats.rb
index 0dc68f3af7..3e8d4bd995 100644
--- a/app/controllers/concerns/allowed_question_formats.rb
+++ b/app/controllers/concerns/allowed_question_formats.rb
@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
+# Controller that gets Questions types that allow multiple selections
+# TODO: this could likely just live on the model!
 module AllowedQuestionFormats
-
   private
 
   # The QuestionFormat "Multi select box" is no longer being used for new templates
   def allowed_question_formats
-    QuestionFormat.where.not(title: "Multi select box").order(:title)
+    QuestionFormat.where.not(title: 'Multi select box').order(:title)
   end
-
 end
diff --git a/app/controllers/concerns/conditional_user_mailer.rb b/app/controllers/concerns/conditional_user_mailer.rb
index c9f5ce42e1..c83338347d 100644
--- a/app/controllers/concerns/conditional_user_mailer.rb
+++ b/app/controllers/concerns/conditional_user_mailer.rb
@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
+# Determines whether or not the user has enabled/disabled the email notification
+# before sending it out
 module ConditionalUserMailer
-
   # Executes a given block passed if the recipient user has the preference
   # email key enabled
   #
@@ -10,18 +11,17 @@ module ConditionalUserMailer
   #              prefences.email (see dmproadmap.rb initializer)
   #
   # Returns Boolean
-  def deliver_if(recipients: [], key:, &block)
+  def deliver_if(key:, recipients: [], &block)
     return false unless block_given?
 
     Array(recipients).each do |recipient|
-      email_hash = recipient.get_preferences("email").with_indifferent_access
+      email_hash = recipient.get_preferences('email').with_indifferent_access
       # Violation of rubocop's DoubleNegation check
       # preference_value = !!email_hash.dig(*key.to_s.split("."))
-      preference_value = email_hash.dig(*key.to_s.split("."))
+      preference_value = email_hash.dig(*key.to_s.split('.'))
       block.call(recipient) if preference_value
     end
 
     true
   end
-
 end
diff --git a/app/controllers/concerns/org_selectable.rb b/app/controllers/concerns/org_selectable.rb
index 5aac93cc48..84f3d270a4 100644
--- a/app/controllers/concerns/org_selectable.rb
+++ b/app/controllers/concerns/org_selectable.rb
@@ -54,7 +54,6 @@
 #
 # See the comments on OrgsController#search for more info on how the typeaheads work
 module OrgSelectable
-
   extend ActiveSupport::Concern
 
   # rubocop:disable Metrics/BlockLength
@@ -65,7 +64,9 @@ module OrgSelectable
 
     # Converts the incoming params_into an Org by either locating it
     # via its id, identifier and/or name, or initializing a new one
-    def org_from_params(params_in:, allow_create: true)
+    # the default allow_create is based off restrict_orgs
+    def org_from_params(params_in:,
+                        allow_create: !Rails.configuration.x.application.restrict_orgs)
       # params_in = params_in.with_indifferent_access
       return nil unless params_in[:org_id].present? &&
                         params_in[:org_id].is_a?(String)
@@ -125,11 +126,10 @@ def create_org(org:, params_in:)
     end
 
     def prep_org_partial
-      name = Rails.configuration.x.application.restrict_orgs ? "local_only" : "combined"
+      name = Rails.configuration.x.application.restrict_orgs ? 'local_only' : 'combined'
       @org_partial = "shared/org_selectors/#{name}"
       @all_orgs = Org.includes(identifiers: [:identifier_scheme]).all
     end
   end
   # rubocop:enable Metrics/BlockLength
-
 end
diff --git a/app/controllers/concerns/paginable.rb b/app/controllers/concerns/paginable.rb
index aea376ed12..0a81985b49 100644
--- a/app/controllers/concerns/paginable.rb
+++ b/app/controllers/concerns/paginable.rb
@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
+# Provides support for pagination/searching/sorting of table data
 # rubocop:disable Metrics/ModuleLength
 module Paginable
-
   extend ActiveSupport::Concern
-  require "sort_direction"
+  require 'sort_direction'
 
   ##
   # Regex to validate sort_field param is safe
-  SORT_COLUMN_FORMAT = /[\w_]+\.[\w_]/.freeze
+  SORT_COLUMN_FORMAT = /[\w_]+\.[\w_]+$/.freeze
 
   PAGINATION_QUERY_PARAMS = %i[page sort_field sort_direction
                                search controller action].freeze
@@ -37,15 +37,16 @@ module Paginable
   # one approach to just include everything in the double splat `**options` param
 
   # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/ParameterLists
+  # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
   def paginable_renderise(partial: nil, template: nil, controller: nil, action: nil,
                           path_params: {}, query_params: {}, scope: nil,
                           locals: {}, **options)
     unless scope.is_a?(ActiveRecord::Relation)
-      raise ArgumentError, _("scope should be an ActiveRecord::Relation object")
+      raise ArgumentError, _('scope should be an ActiveRecord::Relation object')
     end
-    raise ArgumentError, _("path_params should be a Hash object") unless path_params.is_a?(Hash)
-    raise ArgumentError, _("query_params should be a Hash object") unless query_params.is_a?(Hash)
-    raise ArgumentError, _("locals should be a Hash object") unless locals.is_a?(Hash)
+    raise ArgumentError, _('path_params should be a Hash object') unless path_params.is_a?(Hash)
+    raise ArgumentError, _('query_params should be a Hash object') unless query_params.is_a?(Hash)
+    raise ArgumentError, _('locals should be a Hash object') unless locals.is_a?(Hash)
 
     # Default options
     @paginable_options = {}.merge(options)
@@ -61,12 +62,12 @@ def paginable_renderise(partial: nil, template: nil, controller: nil, action: ni
     # Additional path_params passed to this function got special treatment
     # (e.g. it is taking into account when building base_url)
     @paginable_path_params = path_params.symbolize_keys
-    if @args[:page] == "ALL" &&
+    if @args[:page] == 'ALL' &&
        @args[:search].blank? &&
        @paginable_options[:view_all] == false
       render(
         status: :forbidden,
-        html: _("Restricted access to View All the records")
+        html: _('Restricted access to View All the records')
       )
     else
       @refined_scope = refine_query(scope)
@@ -78,17 +79,17 @@ def paginable_renderise(partial: nil, template: nil, controller: nil, action: ni
       )
       # If this was an ajax call then render as JSON
       if options[:format] == :json
-        render json: { html: render_to_string(layout: "/layouts/paginable",
+        render json: { html: render_to_string(layout: '/layouts/paginable',
                                               partial: partial, locals: locals) }
       elsif partial.present?
-        render(layout: "/layouts/paginable", partial: partial, locals: locals)
+        render(layout: '/layouts/paginable', partial: partial, locals: locals)
       else
         render(template: template, locals: locals)
       end
     end
   end
   # rubocop:enable Metrics/AbcSize, Metrics/MethodLength, Metrics/ParameterLists
-  # rubocop:enable
+  # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
   # Returns the base url of the paginable route for a given page passed
   def paginable_base_url(page = 1)
@@ -107,7 +108,7 @@ def paginable_sort_link(sort_field)
     link_to(
       sort_link_name(sort_field),
       sort_link_url(sort_field),
-      class: "paginable-action",
+      class: 'paginable-action',
       data: { remote: @paginable_options[:remote] },
       aria: { label: sort_field }
     )
@@ -125,21 +126,21 @@ def paginable?
 
   # Refine a scope passed to this concern if any of the params (search,
   # sort_field or page) are present
-  # rubocop:disable Metrics/AbcSize
+  # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
   def refine_query(scope)
     @args = @args.with_indifferent_access
-    scope = scope.search(@args[:search]) if @args[:search].present?
+    scope = scope.search(@args[:search]).distinct if @args[:search].present?
     # Can raise NoMethodError if the scope does not define a search method
     if @args[:sort_field].present?
       frmt = @args[:sort_field][SORT_COLUMN_FORMAT]
-      raise ArgumentError, "sort_field param looks unsafe" unless frmt
+      raise ArgumentError, 'sort_field param looks unsafe' unless frmt
 
       # Can raise ActiveRecord::StatementInvalid (e.g. column does not
       # exist, ambiguity on column, etc)
       # how we contruct scope depends on whether sort field is in the
       # main table or in a related table
       scope_table = scope.klass.name.underscore
-      parts = @args[:sort_field].partition(".")
+      parts = @args[:sort_field].partition('.')
       table_part = parts.first
       column_part = parts.last
       if scope_table == table_part.singularize
@@ -147,17 +148,18 @@ def refine_query(scope)
         scope = scope.order(order_field.to_sym => sort_direction.to_s)
       else
         order_field = ActiveRecord::Base.sanitize_sql(@args[:sort_field])
+        sd = ActiveRecord::Base.sanitize_sql(sort_direction)
         scope = scope.includes(table_part.singularize.to_sym)
-                     .order(order_field + " " + sort_direction.to_s)
+                     .order("#{order_field} #{sd}")
       end
     end
-    if @args[:page] != "ALL"
+    if @args[:page] != 'ALL'
       # Can raise error if page is not a number
       scope = scope.page(@args[:page])
     end
     scope
   end
-  # rubocop:enable Metrics/AbcSize
+  # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
   def sort_direction
     @sort_direction ||= SortDirection.new(@args[:sort_direction])
@@ -167,9 +169,9 @@ def sort_direction
   # html prevented of being escaped
   def sort_link_name(sort_field)
     @args = @args.with_indifferent_access
-    class_name = "fas fa-sort"
-    dir = "up"
-    dir = "down" if sort_direction.to_s == "DESC"
+    class_name = 'fas fa-sort'
+    dir = 'up'
+    dir = 'down' if sort_direction.to_s == 'DESC'
     class_name = "fas fa-sort-#{dir}" if @args[:sort_field] == sort_field
     <<~HTML.html_safe
       <i class="fas #{class_name}"
@@ -177,17 +179,18 @@ def sort_link_name(sort_field)
          style="float: right; font-size: 1.2em;">
 
         <span class="screen-reader-text">
-          #{_('Sort by %{sort_field}') % { sort_field: sort_field.split('.').first }}
+          #{format(_('Sort by %<sort_field>s'), sort_field: sort_field.split('.').first)}
         </span>
       </i>
     HTML
   end
 
   # Returns the sort url for a given sort_field.
+  # rubocop:disable Metrics/AbcSize
   def sort_link_url(sort_field)
     @args = @args.with_indifferent_access
     query_params = {}
-    query_params[:page] = @args[:page] == "ALL" ? "ALL" : 1
+    query_params[:page] = @args[:page] == 'ALL' ? 'ALL' : 1
     query_params[:sort_field] = sort_field
     query_params[:sort_direction] = if @args[:sort_field] == sort_field
                                       sort_direction.opposite
@@ -200,6 +203,7 @@ def sort_link_url(sort_field)
     sort_url.to_s
     "#{sort_url}&#{stringify_nonpagination_query_params}"
   end
+  # rubocop:enable Metrics/AbcSize
 
   # Retrieve any query params that are not a part of the paginable concern
   def stringify_nonpagination_query_params
@@ -211,10 +215,10 @@ def stringify_query_params(page: 1, search: @args[:search],
                              sort_direction: nil)
 
     query_string = { page: page }
-    query_string["search"] = search if search.present?
+    query_string['search'] = search if search.present?
     if sort_field.present?
-      query_string["sort_field"] = sort_field
-      query_string["sort_direction"] = SortDirection.new(sort_direction)
+      query_string['sort_field'] = sort_field
+      query_string['sort_direction'] = SortDirection.new(sort_direction)
     end
     query_string.to_param
   end
@@ -222,6 +226,5 @@ def stringify_query_params(page: 1, search: @args[:search],
   def paginable_params
     params.permit(PAGINATION_QUERY_PARAMS)
   end
-
 end
 # rubocop:enable Metrics/ModuleLength
diff --git a/app/controllers/concerns/template_methods.rb b/app/controllers/concerns/template_methods.rb
index bebd8249a2..f1ebf5d862 100644
--- a/app/controllers/concerns/template_methods.rb
+++ b/app/controllers/concerns/template_methods.rb
@@ -1,13 +1,10 @@
 # frozen_string_literal: true
 
 # This module holds helper controller methods for controllers that deal with Templates
-#
 module TemplateMethods
-
   private
 
   def template_type(template)
-    template.customization_of.present? ? _("customisation") : _("template")
+    template.customization_of.present? ? _('customisation') : _('template')
   end
-
 end
diff --git a/app/controllers/concerns/versionable.rb b/app/controllers/concerns/versionable.rb
index 24233e4ef9..e242f16e78 100644
--- a/app/controllers/concerns/versionable.rb
+++ b/app/controllers/concerns/versionable.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
+# Helpers that allow us to version Template-Phase-Section-Question
 module Versionable
-
   private
 
   # Takes in a Template, phase, Section, Question, or Annotaion
@@ -18,7 +18,7 @@ def get_modifiable(obj)
       template = obj
     else
       raise ArgumentError,
-            _("obj should be a Template, Phase, Section, Question, or Annotation")
+            _('obj should be a Template, Phase, Section, Question, or Annotation')
     end
 
     # raises RuntimeError if template is not latest
@@ -39,11 +39,12 @@ def get_modifiable(obj)
   # generated and returns a modifiable version of that object
   # NOTE: the obj passed is still not saved however it should belongs to a
   # parent already
-  # rubocop:disable Metrics/MethodLength
+  # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+  # rubocop:disable Metrics/CyclomaticComplexity
   def get_new(obj)
     unless obj.respond_to?(:template)
       raise ArgumentError,
-            _("obj should be a Phase, Section, Question, or Annotation")
+            _('obj should be a Phase, Section, Question, or Annotation')
     end
 
     template = obj.template
@@ -62,7 +63,7 @@ def get_new(obj)
         belongs = :question
       else
         raise ArgumentError,
-              _("obj should be a Phase, Section, Question, or Annotation")
+              _('obj should be a Phase, Section, Question, or Annotation')
       end
 
       if belongs == :template
@@ -76,21 +77,21 @@ def get_new(obj)
     end
     obj
   end
-  # rubocop:enable Metrics/MethodLength
+  # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+  # rubocop:enable Metrics/CyclomaticComplexity
 
   # Locates an object (e.g. phase, section, question, annotation) in a
   # search_space
   # (e.g. phases/sections/questions/annotations) by comparing either the number
   # method or the org_id and text for annotations
   # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+  # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
   def find_in_space(obj, search_space)
-    unless search_space.respond_to?(:each)
-      raise ArgumentError, _("The search_space does not respond to each")
-    end
+    raise ArgumentError, _('The search_space does not respond to each') unless search_space.respond_to?(:each)
 
     if search_space.empty?
       raise ArgumentError,
-            _("The search space does not have elements associated")
+            _('The search space does not have elements associated')
     end
 
     if obj.is_a?(search_space.first.class)
@@ -131,6 +132,5 @@ def find_in_space(obj, search_space)
     nil
   end
   # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
-  # rubocop:enable
-
+  # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 end
diff --git a/app/controllers/contacts_controller.rb b/app/controllers/contacts_controller.rb
index 9857fb6c1b..ca95d2fa3d 100644
--- a/app/controllers/contacts_controller.rb
+++ b/app/controllers/contacts_controller.rb
@@ -1,39 +1,43 @@
 # frozen_string_literal: true
 
-class ContactUs::ContactsController < ApplicationController
+module ContactUs
+  # Controller for the Contact Us gem
+  class ContactsController < ApplicationController
+    # rubocop:disable Metrics/AbcSize
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+    def create
+      @contact = ContactUs::Contact.new(params[:contact_us_contact])
 
-  def create
-    @contact = ContactUs::Contact.new(params[:contact_us_contact])
-
-    if !user_signed_in? && Rails.configuration.x.recaptcha.enabled
-      unless verify_recaptcha(model: @contact) && @contact.save
-        flash[:alert] = _("Captcha verification failed, please retry.")
+      if !user_signed_in? && Rails.configuration.x.recaptcha.enabled &&
+         !(verify_recaptcha(model: @contact) && @contact.save)
+        flash[:alert] = _('Captcha verification failed, please retry.')
         render_new_page and return
       end
+      if @contact.save
+        redirect_to(ContactUs.success_redirect || '/',
+                    notice: _('Contact email was successfully sent.'))
+      else
+        flash[:alert] = _('Unable to submit your request')
+        render_new_page
+      end
     end
-    if @contact.save
-      redirect_to(ContactUs.success_redirect || "/",
-                  notice: _("Contact email was successfully sent."))
-    else
-      flash[:alert] = _("Unable to submit your request")
+    # rubocop:enable Metrics/AbcSize
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+
+    def new
+      @contact = ContactUs::Contact.new
       render_new_page
     end
-  end
 
-  def new
-    @contact = ContactUs::Contact.new
-    render_new_page
-  end
-
-  protected
+    protected
 
-  def render_new_page
-    case ContactUs.form_gem
-    when "formtastic"  then render "new_formtastic"
-    when "simple_form" then render "new_simple_form"
-    else
-      render "new"
+    def render_new_page
+      case ContactUs.form_gem
+      when 'formtastic'  then render 'new_formtastic'
+      when 'simple_form' then render 'new_simple_form'
+      else
+        render 'new'
+      end
     end
   end
-
 end
diff --git a/app/controllers/contributors_controller.rb b/app/controllers/contributors_controller.rb
index 9dd63fca83..3c210b63d4 100644
--- a/app/controllers/contributors_controller.rb
+++ b/app/controllers/contributors_controller.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
+# Controller for the Contributors page
 class ContributorsController < ApplicationController
-
   include OrgSelectable
   helper PaginableHelper
 
@@ -27,17 +27,17 @@ def edit
     authorize @plan
   end
 
-  # rubocop:disable Metrics/AbcSize
+  # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
   # POST /plans/:plan_id/contributors
   def create
-    authorize @plan
+    authorize @plan, :edit?
 
     args = translate_roles(hash: contributor_params)
     args = process_org(hash: args)
     if args.blank?
       @contributor = Contributor.new(args)
-      @contributor.errors.add(:affiliation, "invalid")
-      flash[:alert] = failure_message(@contributor, _("add"))
+      @contributor.errors.add(:affiliation, 'invalid')
+      flash[:alert] = failure_message(@contributor, _('add'))
       render :new
     else
       args = process_orcid_for_create(hash: args)
@@ -51,14 +51,14 @@ def create
         save_orcid
 
         redirect_to plan_contributors_path(@plan),
-                    notice: success_message(@contributor, _("added"))
+                    notice: success_message(@contributor, _('added'))
       else
-        flash[:alert] = failure_message(@contributor, _("add"))
+        flash[:alert] = failure_message(@contributor, _('add'))
         render :new
       end
     end
   end
-  # rubocop:enable Metrics/AbcSize
+  # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
   # PUT /plans/:plan_id/contributors/:id
   def update
@@ -69,9 +69,9 @@ def update
 
     if @contributor.update(args)
       redirect_to edit_plan_contributor_path(@plan, @contributor),
-                  notice: success_message(@contributor, _("saved"))
+                  notice: success_message(@contributor, _('saved'))
     else
-      flash.now[:alert] = failure_message(@contributor, _("save"))
+      flash.now[:alert] = failure_message(@contributor, _('save'))
       render :edit
     end
   end
@@ -81,10 +81,10 @@ def update
   def destroy
     authorize @plan
     if @contributor.destroy
-      msg = success_message(@contributor, _("removed"))
+      msg = success_message(@contributor, _('removed'))
       redirect_to plan_contributors_path(@plan), notice: msg
     else
-      flash.now[:alert] = failure_message(@contributor, _("remove"))
+      flash.now[:alert] = failure_message(@contributor, _('remove'))
       render :edit
     end
   end
@@ -105,7 +105,7 @@ def contributor_params
   # Translate the check boxes values of "1" and "0" to true/false
   def translate_roles(hash:)
     roles = Contributor.new.all_roles
-    roles.each { |role| hash[role.to_sym] = hash[role.to_sym] == "1" }
+    roles.each { |role| hash[role.to_sym] = hash[role.to_sym] == '1' }
     hash
   end
 
@@ -131,7 +131,7 @@ def process_org(hash:)
   def process_orcid_for_create(hash:)
     return hash unless hash[:identifiers_attributes].present?
 
-    id_hash = hash[:identifiers_attributes][:"0"]
+    id_hash = hash[:identifiers_attributes][:'0']
     return hash unless id_hash[:value].blank?
 
     hash.delete(:identifiers_attributes)
@@ -142,10 +142,10 @@ def process_orcid_for_create(hash:)
   def process_orcid_for_update(hash:)
     return hash unless hash[:identifiers_attributes].present?
 
-    id_hash = hash[:identifiers_attributes][:"0"]
+    id_hash = hash[:identifiers_attributes][:'0']
     return hash unless id_hash[:value].blank?
 
-    existing = @contributor.identifier_for_scheme(scheme: "orcid")
+    existing = @contributor.identifier_for_scheme(scheme: 'orcid')
     existing.destroy if existing.present?
     hash.delete(:identifiers_attributes)
     hash
@@ -158,7 +158,7 @@ def fetch_plan
     @plan = Plan.includes(:contributors).find_by(id: params[:plan_id])
     return true if @plan.present?
 
-    redirect_to root_path, alert: _("plan not found")
+    redirect_to root_path, alert: _('plan not found')
   end
 
   def fetch_contributor
@@ -166,7 +166,7 @@ def fetch_contributor
     return true if @contributor.present? &&
                    @plan.contributors.include?(@contributor)
 
-    redirect_to plan_contributors_path, alert: _("contributor not found")
+    redirect_to plan_contributors_path, alert: _('contributor not found')
   end
 
   # The following 2 methods address an issue with using Rails normal
@@ -196,5 +196,4 @@ def save_orcid
     @cached_orcid.save
     @contributor.reload
   end
-
 end
diff --git a/app/controllers/feedback_requests_controller.rb b/app/controllers/feedback_requests_controller.rb
index 21ad271218..a8d91c4976 100644
--- a/app/controllers/feedback_requests_controller.rb
+++ b/app/controllers/feedback_requests_controller.rb
@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
+# Controller that handles requests for Admin Feedback
 class FeedbackRequestsController < ApplicationController
-
   include FeedbacksHelper
 
   after_action :verify_authorized
 
-  ALERT = _("Unable to submit your request for feedback at this time.")
-  ERROR = _("An error occurred when requesting feedback for this plan.")
+  ALERT = _('Unable to submit your request for feedback at this time.')
+  ERROR = _('An error occurred when requesting feedback for this plan.')
 
   def create
     @plan = Plan.find(params[:plan_id])
@@ -34,5 +34,4 @@ def request_feedback_flash_notice
     text = current_user.org.feedback_msg || feedback_confirmation_default_message
     feedback_constant_to_text(text, current_user, @plan, current_user.org)
   end
-
 end
diff --git a/app/controllers/guidance_groups_controller.rb b/app/controllers/guidance_groups_controller.rb
index a20b2dd233..611d5ef4d4 100644
--- a/app/controllers/guidance_groups_controller.rb
+++ b/app/controllers/guidance_groups_controller.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
+# Controller for the Guidances page that handles Group info
 class GuidanceGroupsController < ApplicationController
-
   after_action :verify_authorized
   respond_to :html
 
@@ -18,6 +18,7 @@ def admin_new
   end
 
   # POST /org/admin/guidancegroup/:id/admin_create
+  # rubocop:disable Metrics/AbcSize
   def admin_create
     # Ensure that the user can only create GuidanceGroups for their Org
     args = guidance_group_params.to_h.merge({ org_id: current_user.org.id })
@@ -25,13 +26,14 @@ def admin_create
     authorize @guidance_group
 
     if @guidance_group.save
-      flash.now[:notice] = success_message(@guidance_group, _("created"))
+      flash.now[:notice] = success_message(@guidance_group, _('created'))
       render :admin_edit
     else
-      flash.now[:alert] = failure_message(@guidance_group, _("create"))
+      flash.now[:alert] = failure_message(@guidance_group, _('create'))
       render :admin_new
     end
   end
+  # rubocop:enable Metrics/AbcSize
 
   # GET /org/admin/guidancegroup/:id/admin_edit
   def admin_edit
@@ -40,17 +42,19 @@ def admin_edit
   end
 
   # PUT /org/admin/guidancegroup/:id/admin_update
+  # rubocop:disable Metrics/AbcSize
   def admin_update
     @guidance_group = GuidanceGroup.find(params[:id])
     authorize @guidance_group
 
     if @guidance_group.update(guidance_group_params)
-      flash.now[:notice] = success_message(@guidance_group, _("saved"))
+      flash.now[:notice] = success_message(@guidance_group, _('saved'))
     else
-      flash.now[:alert] = failure_message(@guidance_group, _("save"))
+      flash.now[:alert] = failure_message(@guidance_group, _('save'))
     end
     render :admin_edit
   end
+  # rubocop:enable Metrics/AbcSize
 
   # PUT /org/admin/guidancegroup/:id/admin_update_publish
   def admin_update_publish
@@ -58,10 +62,10 @@ def admin_update_publish
     authorize @guidance_group
 
     if @guidance_group.update(published: true)
-      flash[:notice] = _("Your guidance group has been published and is now available to users.")
+      flash[:notice] = _('Your guidance group has been published and is now available to users.')
 
     else
-      flash[:alert] = failure_message(@guidance_group, _("publish"))
+      flash[:alert] = failure_message(@guidance_group, _('publish'))
     end
     redirect_to admin_index_guidance_path
   end
@@ -72,11 +76,9 @@ def admin_update_unpublish
     authorize @guidance_group
 
     if @guidance_group.update(published: false)
-      # rubocop:disable Layout/LineLength
-      flash[:notice] = _("Your guidance group is no longer published and will not be available to users.")
-      # rubocop:enable Layout/LineLength
+      flash[:notice] = _('Your guidance group is no longer published and will not be available to users.')
     else
-      flash[:alert] = failure_message(@guidance_group, _("unpublish"))
+      flash[:alert] = failure_message(@guidance_group, _('unpublish'))
     end
     redirect_to admin_index_guidance_path
   end
@@ -86,9 +88,9 @@ def admin_destroy
     @guidance_group = GuidanceGroup.find(params[:id])
     authorize @guidance_group
     if @guidance_group.destroy
-      flash[:notice] = success_message(@guidance_group, _("deleted"))
+      flash[:notice] = success_message(@guidance_group, _('deleted'))
     else
-      flash[:alert] = failure_message(@guidance_group, _("delete"))
+      flash[:alert] = failure_message(@guidance_group, _('delete'))
     end
     redirect_to admin_index_guidance_path
   end
@@ -98,5 +100,4 @@ def admin_destroy
   def guidance_group_params
     params.require(:guidance_group).permit(:org_id, :name, :published, :optional_subset)
   end
-
 end
diff --git a/app/controllers/guidances_controller.rb b/app/controllers/guidances_controller.rb
index 74835bd073..d3a193a12e 100644
--- a/app/controllers/guidances_controller.rb
+++ b/app/controllers/guidances_controller.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
+# Controller for the Guidances page that handles Guidance operations
 class GuidancesController < ApplicationController
-
   after_action :verify_authorized
   respond_to :html
 
@@ -36,6 +36,7 @@ def admin_edit
   end
 
   # POST /org/admin/guidance/:id/admin_create
+  # rubocop:disable Metrics/AbcSize
   def admin_create
     @guidance = Guidance.new(guidance_params)
     authorize @guidance
@@ -48,14 +49,16 @@ def admin_create
           guidance_group.save
         end
       end
-      flash.now[:notice] = success_message(@guidance, _("created"))
+      flash.now[:notice] = success_message(@guidance, _('created'))
     else
-      flash.now[:alert] = failure_message(@guidance, _("create"))
+      flash.now[:alert] = failure_message(@guidance, _('create'))
     end
     render :new_edit
   end
+  # rubocop:enable Metrics/AbcSize
 
   # PUT /org/admin/guidance/:id/admin_update
+  # rubocop:disable Metrics/AbcSize
   def admin_update
     @guidance = Guidance.find(params[:id])
     authorize @guidance
@@ -68,14 +71,16 @@ def admin_update
           guidance_group.save
         end
       end
-      flash.now[:notice] = success_message(@guidance, _("saved"))
+      flash.now[:notice] = success_message(@guidance, _('saved'))
     else
-      flash.now[:alert] = failure_message(@guidance, _("save"))
+      flash.now[:alert] = failure_message(@guidance, _('save'))
     end
     render :new_edit
   end
+  # rubocop:enable Metrics/AbcSize
 
   # DELETE /org/admin/guidance/:id/admin_destroy
+  # rubocop:disable Metrics/AbcSize
   def admin_destroy
     @guidance = Guidance.find(params[:id])
     authorize @guidance
@@ -85,46 +90,47 @@ def admin_destroy
         guidance_group.published = false
         guidance_group.save
       end
-      flash[:notice] = success_message(@guidance, _("deleted"))
+      flash[:notice] = success_message(@guidance, _('deleted'))
     else
-      flash[:alert] = failure_message(@guidance, _("delete"))
+      flash[:alert] = failure_message(@guidance, _('delete'))
     end
     redirect_to(action: :admin_index)
   end
+  # rubocop:enable Metrics/AbcSize
 
   # PUT /org/admin/guidance/:id/admin_publish
+  # rubocop:disable Metrics/AbcSize
   def admin_publish
     @guidance = Guidance.find(params[:id])
     authorize @guidance
     if @guidance.update_attributes(published: true)
       guidance_group = GuidanceGroup.find(@guidance.guidance_group_id)
-      if !guidance_group.published? || guidance_group.published.nil?
-        guidance_group.update(published: true)
-      end
-      flash[:notice] = _("Your guidance has been published and is now available to users.")
+      guidance_group.update(published: true) if !guidance_group.published? || guidance_group.published.nil?
+      flash[:notice] = _('Your guidance has been published and is now available to users.')
 
     else
-      flash[:alert] = failure_message(@guidance, _("publish"))
+      flash[:alert] = failure_message(@guidance, _('publish'))
     end
     redirect_to(action: :admin_index)
   end
+  # rubocop:enable Metrics/AbcSize
 
   # PUT /org/admin/guidance/:id/admin_unpublish
+  # rubocop:disable Metrics/AbcSize
   def admin_unpublish
     @guidance = Guidance.find(params[:id])
     authorize @guidance
     if @guidance.update_attributes(published: false)
       guidance_group = GuidanceGroup.find(@guidance.guidance_group_id)
-      unless guidance_group.guidances.where(published: true).exists?
-        guidance_group.update(published: false)
-      end
-      flash[:notice] = _("Your guidance is no longer published and will not be available to users.")
+      guidance_group.update(published: false) unless guidance_group.guidances.where(published: true).exists?
+      flash[:notice] = _('Your guidance is no longer published and will not be available to users.')
 
     else
-      flash[:alert] = failure_message(@guidance, _("unpublish"))
+      flash[:alert] = failure_message(@guidance, _('unpublish'))
     end
     redirect_to(action: :admin_index)
   end
+  # rubocop:enable Metrics/AbcSize
 
   private
 
@@ -138,5 +144,4 @@ def ensure_default_group(org)
 
     GuidanceGroup.create_org_default(org)
   end
-
 end
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index e4ec75806a..e7409d75b3 100644
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
+# Controller for the home page that users see when not logged in
 class HomeController < ApplicationController
-
   include OrgSelectable
 
   respond_to :html
@@ -18,15 +18,14 @@ def index
       name = current_user.name(false)
       # The RolesController defaults the firstname and surname (both required fields)
       # to 'FirstName' and 'Surname' when a plan is shared with an unknown user
-      if name == "First Name Surname"
+      if name == 'First Name Surname'
         redirect_to edit_user_registration_path
       else
         redirect_to plans_url
       end
-    elsif session["devise.shibboleth_data"].present?
+    elsif session['devise.shibboleth_data'].present?
       # NOTE: Update this to handle ORCiD as well when we enable it as a login method
       redirect_to new_user_registration_url
     end
   end
-
 end
diff --git a/app/controllers/identifiers_controller.rb b/app/controllers/identifiers_controller.rb
index 9b90f2c8a3..07f3530b80 100644
--- a/app/controllers/identifiers_controller.rb
+++ b/app/controllers/identifiers_controller.rb
@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
+# Controller that handles a user disassociating their Shib or ORCID on the profile page
 class IdentifiersController < ApplicationController
-
   respond_to :html
   after_action :verify_authorized
 
   # DELETE /users/identifiers
-  # ---------------------------------------------------------------------
+  # rubocop:disable Metrics/AbcSize
   def destroy
     authorize Identifier
     user = User.find(current_user.id)
@@ -15,16 +15,14 @@ def destroy
     # If the requested identifier belongs to the current user remove it
     if user.identifiers.include?(identifier)
       identifier.destroy!
-      flash[:notice] = _("Successfully unlinked your account from %{is}.") % {
-        is: identifier.identifier_scheme&.description
-      }
+      flash[:notice] =
+        format(_('Successfully unlinked your account from %<is>s.'), is: identifier.identifier_scheme&.description)
     else
-      flash[:alert] = _("Unable to unlink your account from %{is}.") % {
-        is: identifier.identifier_scheme&.description
-      }
+      flash[:alert] =
+        format(_('Unable to unlink your account from %<is>s.'), is: identifier.identifier_scheme&.description)
     end
 
     redirect_to edit_user_registration_path
   end
-
+  # rubocop:enable Metrics/AbcSize
 end
diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb
index a623a64fce..ae863c5eff 100644
--- a/app/controllers/notes_controller.rb
+++ b/app/controllers/notes_controller.rb
@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
+# Controller for the Comments section of the Write Plan page
 class NotesController < ApplicationController
-
   include ConditionalUserMailer
-  require "pp"
+  require 'pp'
   after_action :verify_authorized
   respond_to :html
 
@@ -11,11 +11,10 @@ class NotesController < ApplicationController
   # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
   def create
     @note = Note.new
-    @note.user_id = note_params[:user_id]
+    # take user id from current user rather than form as form can be spoofed
+    @note.user_id = current_user.id
     # ensure user has access to plan BEFORE creating/finding answer
-    unless Plan.find_by(id: note_params[:plan_id]).readable_by?(@note.user_id)
-      raise Pundit::NotAuthorizedError
-    end
+    raise Pundit::NotAuthorizedError unless Plan.find_by(id: note_params[:plan_id]).readable_by?(@note.user_id)
 
     Answer.transaction do
       @answer = Answer.find_by(
@@ -33,11 +32,9 @@ def create
 
     @note.answer = @answer
     @note.text = note_params[:text]
-
     authorize @note
 
     @plan = @answer.plan
-
     @question = Question.find(note_params[:question_id])
 
     if @note.save
@@ -45,31 +42,31 @@ def create
       answer = @note.answer
       plan = answer.plan
       owner = plan.owner
-      deliver_if(recipients: owner, key: "users.new_comment") do |_r|
+      deliver_if(recipients: owner, key: 'users.new_comment') do |_r|
         UserMailer.new_comment(current_user, plan, answer).deliver_now
       end
-      @notice = success_message(@note, _("created"))
+      @notice = success_message(@note, _('created'))
       render(json: {
-        "notes" => {
-          "id" => note_params[:question_id],
-          "html" => render_to_string(partial: "layout", locals: {
+        'notes' => {
+          'id' => note_params[:question_id],
+          'html' => render_to_string(partial: 'layout', locals: {
                                        plan: @plan,
                                        question: @question,
                                        answer: @answer
                                      }, formats: [:html])
         },
-        "title" => {
-          "id" => note_params[:question_id],
-          "html" => render_to_string(partial: "title", locals: {
+        'title' => {
+          'id' => note_params[:question_id],
+          'html' => render_to_string(partial: 'title', locals: {
                                        answer: @answer
                                      }, formats: [:html])
         }
       }.to_json, status: :created)
     else
       @status = false
-      @notice = failure_message(@note, _("create"))
+      @notice = failure_message(@note, _('create'))
       render json: {
-        "msg" => @notice
+        'msg' => @notice
       }.to_json, status: :bad_request
     end
   end
@@ -89,27 +86,27 @@ def update
     question_id = @note.answer.question_id.to_s
 
     if @note.update(note_params)
-      @notice = success_message(@note, _("saved"))
+      @notice = success_message(@note, _('saved'))
       render(json: {
-        "notes" => {
-          "id" => question_id,
-          "html" => render_to_string(partial: "layout", locals: {
+        'notes' => {
+          'id' => question_id,
+          'html' => render_to_string(partial: 'layout', locals: {
                                        plan: @plan,
                                        question: @question,
                                        answer: @answer
                                      }, formats: [:html])
         },
-        "title" => {
-          "id" => question_id,
-          "html" => render_to_string(partial: "title", locals: {
+        'title' => {
+          'id' => question_id,
+          'html' => render_to_string(partial: 'title', locals: {
                                        answer: @answer
                                      }, formats: [:html])
         }
       }.to_json, status: :ok)
     else
-      @notice = failure_message(@note, _("save"))
+      @notice = failure_message(@note, _('save'))
       render json: {
-        "msg" => @notice
+        'msg' => @notice
       }.to_json, status: :bad_request
     end
   end
@@ -131,27 +128,27 @@ def archive
     question_id = @note.answer.question_id.to_s
 
     if @note.update(note_params)
-      @notice = success_message(@note, _("removed"))
+      @notice = success_message(@note, _('removed'))
       render(json: {
-        "notes" => {
-          "id" => question_id,
-          "html" => render_to_string(partial: "layout", locals: {
+        'notes' => {
+          'id' => question_id,
+          'html' => render_to_string(partial: 'layout', locals: {
                                        plan: @plan,
                                        question: @question,
                                        answer: @answer
                                      }, formats: [:html])
         },
-        "title" => {
-          "id" => question_id,
-          "html" => render_to_string(partial: "title", locals: {
+        'title' => {
+          'id' => question_id,
+          'html' => render_to_string(partial: 'title', locals: {
                                        answer: @answer
                                      }, formats: [:html])
         }
       }.to_json, status: :ok)
     else
-      @notice = failure_message(@note, _("remove"))
+      @notice = failure_message(@note, _('remove'))
       render json: {
-        "msg" => @notice
+        'msg' => @notice
       }.to_json, status: :bad_request
     end
   end
@@ -164,5 +161,4 @@ def note_params
           .permit(:text, :archived_by, :user_id, :answer_id, :plan_id,
                   :question_id)
   end
-
 end
diff --git a/app/controllers/org_admin/conditions_controller.rb b/app/controllers/org_admin/conditions_controller.rb
index 8c2c59376d..552ade2114 100644
--- a/app/controllers/org_admin/conditions_controller.rb
+++ b/app/controllers/org_admin/conditions_controller.rb
@@ -1,35 +1,36 @@
 # frozen_string_literal: true
 
-class OrgAdmin::ConditionsController < ApplicationController
+module OrgAdmin
+  # Controller that handles conditional questions
+  class ConditionsController < ApplicationController
+    # /org_admin/questions/:question_id/conditions/new
+    def new
+      question = Question.find(params[:question_id])
+      condition_no = new_condition_params[:condition_no]
+      next_condition_no = condition_no.to_i + 1
+      render json: { add_link: render_to_string(partial: 'add',
+                                                formats: :html,
+                                                layout: false,
+                                                locals: { question: question,
+                                                          condition_no: next_condition_no }),
+                     attachment_partial: render_to_string(partial: 'form',
+                                                          formats: :html,
+                                                          layout: false,
+                                                          locals: {
+                                                            question: question,
+                                                            cond: Condition.new(question: question),
+                                                            condition_no: condition_no
+                                                          }) }
+    end
 
-  # /org_admin/questions/:question_id/conditions/new
-  def new
-    question = Question.find(params[:question_id])
-    condition_no = new_condition_params[:condition_no]
-    next_condition_no = condition_no.to_i + 1
-    render json: { add_link: render_to_string(partial: "add",
-                                              formats: :html,
-                                              layout: false,
-                                              locals: { question: question,
-                                                        condition_no: next_condition_no }),
-                   attachment_partial: render_to_string(partial: "form",
-                                                        formats: :html,
-                                                        layout: false,
-                                                        locals: {
-                                                          question: question,
-                                                          cond: Condition.new(question: question),
-                                                          condition_no: condition_no
-                                                        }) }
-  end
-
-  private
+    private
 
-  def new_condition_params
-    params.permit(:condition_no)
-  end
+    def new_condition_params
+      params.permit(:condition_no)
+    end
 
-  def condition_params
-    params.require(:question_option_id, :action_type).permit(:remove_question_id, :condition_no)
+    def condition_params
+      params.require(:question_option_id, :action_type).permit(:remove_question_id, :condition_no)
+    end
   end
-
 end
diff --git a/app/controllers/org_admin/departments_controller.rb b/app/controllers/org_admin/departments_controller.rb
index 8d52cf9293..8613a484c6 100644
--- a/app/controllers/org_admin/departments_controller.rb
+++ b/app/controllers/org_admin/departments_controller.rb
@@ -1,80 +1,83 @@
 # frozen_string_literal: true
 
-class OrgAdmin::DepartmentsController < ApplicationController
+module OrgAdmin
+  # Controller that handles department operations
+  class DepartmentsController < ApplicationController
+    after_action :verify_authorized
+    respond_to :html
 
-  after_action :verify_authorized
-  respond_to :html
-
-  # GET add new department
-  def new
-    @department = Department.new
-    @org_id = org_id
-    @department.org_id = @org_id
-    authorize @department
-  end
+    # GET add new department
+    def new
+      @department = Department.new
+      @org_id = org_id
+      @department.org_id = @org_id
+      authorize @department
+    end
 
-  # POST /departments
-  # POST /departments.json
-  def create
-    @department = Department.new(department_params)
-    @org_id = org_id
+    # POST /departments
+    # POST /departments.json
+    def create
+      @department = Department.new(department_params)
+      @org_id = org_id
 
-    authorize @department
+      authorize @department
 
-    if @department.save
-      flash.now[:notice] = success_message(@department, _("created"))
-      # reset value
-      @department = nil
-    else
-      flash.now[:alert] = failure_message(@department, _("create"))
+      if @department.save
+        flash.now[:notice] = success_message(@department, _('created'))
+        # reset value
+        @department = nil
+      else
+        flash.now[:alert] = failure_message(@department, _('create'))
+      end
+      render :new
     end
-    render :new
-  end
 
-  # GET /departments/1/edit
-  def edit
-    @department = Department.find(params[:id])
-    @org_id = org_id
-    authorize @department
-  end
+    # GET /departments/1/edit
+    def edit
+      @department = Department.find(params[:id])
+      @org_id = org_id
+      authorize @department
+    end
 
-  # PUT /departments/1
-  def update
-    @department = Department.find(params[:id])
-    @org_id = org_id
-    authorize @department
+    # PUT /departments/1
+    # rubocop:disable Metrics/AbcSize
+    def update
+      @department = Department.find(params[:id])
+      @org_id = org_id
+      authorize @department
 
-    if @department.update(department_params)
-      flash.now[:notice] = success_message(@department, _("saved"))
-    else
-      flash.now[:alert] = failure_message(@department, _("save"))
+      if @department.update(department_params)
+        flash.now[:notice] = success_message(@department, _('saved'))
+      else
+        flash.now[:alert] = failure_message(@department, _('save'))
+      end
+      render :edit
     end
-    render :edit
-  end
+    # rubocop:enable Metrics/AbcSize
 
-  # DELETE /departments/1
-  def destroy
-    @department = Department.find(params[:id])
-    @org_id = org_id
-    authorize @department
-    url = "#{admin_edit_org_path(@org_id)}\#departments"
+    # DELETE /departments/1
+    def destroy
+      @department = Department.find(params[:id])
+      @org_id = org_id
+      authorize @department
+      url = "#{admin_edit_org_path(@org_id)}\#departments"
 
-    if @department.destroy
-      flash[:notice] = success_message(@department, _("deleted"))
-    else
-      flash[:alert] = failure_message(@department, _("delete"))
+      if @department.destroy
+        flash[:notice] = success_message(@department, _('deleted'))
+      else
+        flash[:alert] = failure_message(@department, _('delete'))
+      end
+      redirect_to url
     end
-    redirect_to url
-  end
 
-  private
+    private
 
-  def department_params
-    params.require(:department).permit(:id, :name, :code, :org_id)
-  end
+    def department_params
+      params.require(:department).permit(:id, :name, :code, :org_id)
+    end
 
-  def org_id
-    current_user.can_super_admin? ? params[:org_id] : current_user.org_id
+    def org_id
+      current_user.can_super_admin? ? params[:org_id] : current_user.org_id
+    end
   end
-
 end
diff --git a/app/controllers/org_admin/phase_versions_controller.rb b/app/controllers/org_admin/phase_versions_controller.rb
index c132c6c294..096acd4867 100644
--- a/app/controllers/org_admin/phase_versions_controller.rb
+++ b/app/controllers/org_admin/phase_versions_controller.rb
@@ -1,20 +1,21 @@
 # frozen_string_literal: true
 
-class OrgAdmin::PhaseVersionsController < ApplicationController
+module OrgAdmin
+  # Controller that handles creating new versions of Phases
+  class PhaseVersionsController < ApplicationController
+    include Versionable
 
-  include Versionable
-
-  # POST /org_admin/templates/:template_id/phases/:phase_id/versions
-  def create
-    @phase = Phase.find(params[:phase_id])
-    authorize @phase, :create?
-    @new_phase = get_modifiable(@phase)
-    flash[:notice] = if @new_phase == @phase
-                       "This template is already a draft"
-                     else
-                       "New version of Template created"
-                     end
-    redirect_to org_admin_template_phase_url(@new_phase.template, @new_phase)
+    # POST /org_admin/templates/:template_id/phases/:phase_id/versions
+    def create
+      @phase = Phase.find(params[:phase_id])
+      authorize @phase
+      @new_phase = get_modifiable(@phase)
+      flash[:notice] = if @new_phase == @phase
+                         'This template is already a draft'
+                       else
+                         'New version of Template created'
+                       end
+      redirect_to org_admin_template_phase_url(@new_phase.template, @new_phase)
+    end
   end
-
 end
diff --git a/app/controllers/org_admin/phases_controller.rb b/app/controllers/org_admin/phases_controller.rb
index 3ef617119a..f27a3e7380 100644
--- a/app/controllers/org_admin/phases_controller.rb
+++ b/app/controllers/org_admin/phases_controller.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
 module OrgAdmin
-
+  # Controller that handles phases
   class PhasesController < ApplicationController
-
     include Versionable
 
     after_action :verify_authorized
@@ -15,7 +14,7 @@ def show
       authorize phase
       unless phase.template.latest?
         # rubocop:disable Layout/LineLength
-        flash[:notice] = _("You are viewing a historical version of this template. You will not be able to make changes.")
+        flash[:notice] = _('You are viewing a historical version of this template. You will not be able to make changes.')
         # rubocop:enable Layout/LineLength
       end
       sections = if phase.template.customization_of? && phase.template.latest?
@@ -26,9 +25,9 @@ def show
                    # will be readonly
                    phase.sections.order(:number)
                  end
-      render("container",
+      render('container',
              locals: {
-               partial_path: "show",
+               partial_path: 'show',
                template: phase.template,
                phase: phase,
                prefix_section: phase.prefix_section,
@@ -40,7 +39,7 @@ def show
     # rubocop:enable Metrics/AbcSize
 
     # GET /org_admin/templates/:template_id/phases/:id/edit
-    # rubocop:disable Metrics/AbcSize
+    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
     def edit
       phase = Phase.includes(:template).find(params[:id])
       authorize phase
@@ -52,9 +51,9 @@ def edit
           section: params[:section]
         )
       else
-        render("container",
+        render('container',
                locals: {
-                 partial_path: "edit",
+                 partial_path: 'edit',
                  template: phase.template,
                  phase: phase,
                  prefix_section: phase.prefix_section,
@@ -65,7 +64,7 @@ def edit
                })
       end
     end
-    # rubocop:enable Metrics/AbcSize
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
     # preview a phase
     # GET /org_admin/templates/:template_id/phases/:id/preview
@@ -78,6 +77,7 @@ def preview
 
     # add a new phase to a passed template
     # GET /org_admin/templates/:template_id/phases/new
+    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
     def new
       template = Template.includes(:phases).find(params[:template_id])
       if template.latest?
@@ -93,22 +93,23 @@ def new
                          else
                            org_admin_templates_path
                          end
-        render("/org_admin/templates/container",
+        render('/org_admin/templates/container',
                locals: {
-                 partial_path: "new",
+                 partial_path: 'new',
                  template: template,
                  phase: phase,
                  referrer: local_referrer
                })
       else
         render org_admin_templates_path,
-               alert: _("You cannot add a phase to a historical version of a template.")
+               alert: _('You cannot add a phase to a historical version of a template.')
       end
     end
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
     # create a phase
     # POST /org_admin/templates/:template_id/phases
-    # rubocop:disable Metrics/AbcSize
+    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
     def create
       phase = Phase.new(phase_params)
       phase.template = Template.find(params[:template_id])
@@ -117,12 +118,13 @@ def create
         phase = get_new(phase)
         phase.modifiable = true
         if phase.save
-          flash[:notice] = success_message(phase, _("created"))
+          flash[:notice] = success_message(phase, _('created'))
         else
-          flash[:alert] = failure_message(phase, _("create"))
+          flash[:alert] = failure_message(phase, _('create'))
         end
       rescue StandardError => e
-        flash[:alert] = _("Unable to create a new version of this template.") + "<br>" + e.message
+        msg = _('Unable to create a new version of this template.<br>')
+        flash[:alert] = "#{msg}<br>#{e.message}"
       end
       if flash[:alert].present?
         redirect_to new_org_admin_template_phase_path(template_id: phase.template.id)
@@ -131,26 +133,29 @@ def create
                                                        id: phase.id)
       end
     end
-    # rubocop:enable Metrics/AbcSize
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
     # update a phase of a template
     # PUT /org_admin/templates/:template_id/phases/:id
+    # rubocop:disable Metrics/AbcSize
     def update
       phase = Phase.find(params[:id])
       authorize phase
       begin
         phase = get_modifiable(phase)
         if phase.update(phase_params)
-          flash[:notice] = success_message(phase, _("updated"))
+          flash[:notice] = success_message(phase, _('updated'))
         else
-          flash[:alert] = failure_message(phase, _("update"))
+          flash[:alert] = failure_message(phase, _('update'))
         end
       rescue StandardError => e
-        flash[:alert] = _("Unable to create a new version of this template.") + "<br>" + e.message
+        msg = _('Unable to create a new version of this template.')
+        flash[:alert] = "#{msg}<br>#{e.message}"
       end
       redirect_to edit_org_admin_template_phase_path(template_id: phase.template.id,
                                                      id: phase.id)
     end
+    # rubocop:enable Metrics/AbcSize
 
     # POST /org_admin/templates/:template_id/phases/:id/sort
     def sort
@@ -171,12 +176,13 @@ def destroy
         phase = get_modifiable(phase)
         template = phase.template
         if phase.destroy!
-          flash[:notice] = success_message(phase, _("deleted"))
+          flash[:notice] = success_message(phase, _('deleted'))
         else
-          flash[:alert] = failure_message(phase, _("delete"))
+          flash[:alert] = failure_message(phase, _('delete'))
         end
       rescue StandardError => e
-        flash[:alert] = _("Unable to create a new version of this template.") + "<br>" + e.message
+        msg = _('Unable to create a new version of this template.')
+        flash[:alert] = "#{msg}<br>#{e.message}"
       end
 
       if flash[:alert].present?
@@ -192,7 +198,5 @@ def destroy
     def phase_params
       params.require(:phase).permit(:title, :description, :number, sort_order: [])
     end
-
   end
-
 end
diff --git a/app/controllers/org_admin/plans_controller.rb b/app/controllers/org_admin/plans_controller.rb
index d04739b5fc..2c7ec2a396 100644
--- a/app/controllers/org_admin/plans_controller.rb
+++ b/app/controllers/org_admin/plans_controller.rb
@@ -1,83 +1,86 @@
 # frozen_string_literal: true
 
-class OrgAdmin::PlansController < ApplicationController
+module OrgAdmin
+  # Controller that handles admin operations for plans
+  class PlansController < ApplicationController
+    # GET org_admin/plans
+    # rubocop:disable Metrics/AbcSize
+    def index
+      # Test auth directly and throw Pundit error sincePundit
+      # is unaware of namespacing
+      raise Pundit::NotAuthorizedError unless current_user.present? && current_user.can_org_admin?
 
-  # GET org_admin/plans
-  def index
-    # Test auth directly and throw Pundit error sincePundit
-    # is unaware of namespacing
-    raise Pundit::NotAuthorizedError unless current_user.present? && current_user.can_org_admin?
+      sql = 'users.org_id = ? AND plans.feedback_requested is TRUE AND roles.active is TRUE'
+      feedback_ids = Role.creator.joins(:user, :plan)
+                         .where(sql, current_user.org_id).pluck(:plan_id)
+      @feedback_plans = Plan.where(id: feedback_ids).compact
 
-    sql = "users.org_id = ? AND plans.feedback_requested is TRUE AND roles.active is TRUE"
-    feedback_ids = Role.creator.joins(:user, :plan)
-                       .where(sql, current_user.org_id).pluck(:plan_id)
-    @feedback_plans = Plan.where(id: feedback_ids).reject(&:nil?)
-
-    @super_admin = current_user.can_super_admin?
-    @clicked_through = params[:click_through].present?
-    @plans = @super_admin ? Plan.all.page(1) : current_user.org.org_admin_plans.page(1)
-  end
+      @super_admin = current_user.can_super_admin?
+      @clicked_through = params[:click_through].present?
+      @plans = @super_admin ? Plan.all.page(1) : current_user.org.org_admin_plans.page(1)
+    end
+    # rubocop:enable Metrics/AbcSize
 
-  # GET org_admin/plans/:id/feedback_complete
-  def feedback_complete
-    plan = Plan.find(params[:id])
-    # Test auth directly and throw Pundit error sincePundit is
-    # unaware of namespacing
-    raise Pundit::NotAuthorizedError unless current_user.present? && current_user.can_org_admin?
-    raise Pundit::NotAuthorizedError unless plan.reviewable_by?(current_user.id)
+    # GET org_admin/plans/:id/feedback_complete
+    # rubocop:disable Metrics/AbcSize
+    def feedback_complete
+      plan = Plan.find(params[:id])
+      # Test auth directly and throw Pundit error sincePundit is
+      # unaware of namespacing
+      raise Pundit::NotAuthorizedError unless current_user.present? && current_user.can_org_admin?
+      raise Pundit::NotAuthorizedError unless plan.reviewable_by?(current_user.id)
 
-    if plan.complete_feedback(current_user)
-      # rubocop:disable Layout/LineLength
-      redirect_to(org_admin_plans_path,
-                  notice: _("%{plan_owner} has been notified that you have finished providing feedback") % {
-                    plan_owner: plan.owner.name(false)
-                  })
-      # rubocop:enable Layout/LineLength
-    else
-      redirect_to org_admin_plans_path,
-                  alert: _("Unable to notify user that you have finished providing feedback.")
+      if plan.complete_feedback(current_user)
+        # rubocop:disable Layout/LineLength
+        redirect_to(org_admin_plans_path,
+                    notice: format(_('%<plan_owner>s has been notified that you have finished providing feedback'), plan_owner: plan.owner.name(false)))
+        # rubocop:enable Layout/LineLength
+      else
+        redirect_to org_admin_plans_path,
+                    alert: _('Unable to notify user that you have finished providing feedback.')
+      end
     end
-  end
+    # rubocop:enable Metrics/AbcSize
 
-  # GET /org_admin/download_plans
-  # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-  def download_plans
-    # Test auth directly and throw Pundit error sincePundit
-    # is unaware of namespacing
-    raise Pundit::NotAuthorizedError unless current_user.present? && current_user.can_org_admin?
+    # GET /org_admin/download_plans
+    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+    def download_plans
+      # Test auth directly and throw Pundit error sincePundit
+      # is unaware of namespacing
+      raise Pundit::NotAuthorizedError unless current_user.present? && current_user.can_org_admin?
 
-    org = current_user.org
-    file_name = org.name.gsub(/ /, "_")
-                   .gsub(/[.;,]/, "")
-    header_cols = [
-      _("Project title").to_s,
-      _("Template").to_s,
-      _("Organisation").to_s,
-      _("Owner name").to_s,
-      _("Owner email").to_s,
-      _("Updated").to_s,
-      _("Visibility").to_s
-    ]
+      org = current_user.org
+      file_name = org.name.gsub(/ /, '_')
+                     .gsub(/[.;,]/, '')
+      header_cols = [
+        _('Project title').to_s,
+        _('Template').to_s,
+        _('Organisation').to_s,
+        _('Owner name').to_s,
+        _('Owner email').to_s,
+        _('Updated').to_s,
+        _('Visibility').to_s
+      ]
 
-    plans = CSV.generate do |csv|
-      csv << header_cols
-      org.org_admin_plans.includes(template: :org).order(updated_at: :desc).each do |plan|
-        csv << [
-          plan.title.to_s,
-          plan.template.title.to_s,
-          (plan.owner.org.present? ? plan.owner.org.name : "").to_s,
-          plan.owner.name(false).to_s,
-          plan.owner.email.to_s,
-          l(plan.latest_update.to_date, format: :csv).to_s,
-          Plan::VISIBILITY_MESSAGE[plan.visibility.to_sym].capitalize.to_s
-        ]
+      plans = CSV.generate do |csv|
+        csv << header_cols
+        org.org_admin_plans.includes(template: :org).order(updated_at: :desc).each do |plan|
+          csv << [
+            plan.title.to_s,
+            plan.template.title.to_s,
+            (plan.owner&.org&.present? ? plan.owner.org.name : '').to_s,
+            plan.owner&.name(false)&.to_s,
+            plan.owner&.email&.to_s,
+            l(plan.latest_update.to_date, format: :csv).to_s,
+            Plan::VISIBILITY_MESSAGE[plan.visibility.to_sym].capitalize.to_s
+          ]
+        end
       end
-    end
 
-    respond_to do |format|
-      format.csv  { send_data plans, filename: "#{file_name}.csv" }
+      respond_to do |format|
+        format.csv  { send_data plans, filename: "#{file_name}.csv" }
+      end
     end
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
   end
-  # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
-
 end
diff --git a/app/controllers/org_admin/question_options_controller.rb b/app/controllers/org_admin/question_options_controller.rb
index 1a5e1948ae..0bdfc7e8d2 100644
--- a/app/controllers/org_admin/question_options_controller.rb
+++ b/app/controllers/org_admin/question_options_controller.rb
@@ -1,14 +1,13 @@
 # frozen_string_literal: true
 
 module OrgAdmin
-
+  # Controller that handles question options
   class QuestionOptionsController < ApplicationController
-
     include Versionable
 
     after_action :verify_authorized
 
-    # rubocop:disable Metrics/AbcSize
+    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
     def destroy
       question_option = QuestionOption.find(params[:id])
       option_id_to_remove = question_option.id.to_s
@@ -22,12 +21,12 @@ def destroy
           question.conditions.each do |cond|
             cond.destroy if cond.option_list.include?(option_id_to_remove)
           end
-          flash[:notice] = success_message(question_option, _("deleted"))
+          flash[:notice] = success_message(question_option, _('deleted'))
         else
-          flash[:alert] = flash[:alert] = failure_message(question_option, _("delete"))
+          flash[:alert] = flash[:alert] = failure_message(question_option, _('delete'))
         end
       rescue StandardError
-        flash[:alert] = _("Unable to create a new version of this template.")
+        flash[:alert] = _('Unable to create a new version of this template.')
       end
       redirect_to edit_org_admin_template_phase_path(
         template_id: section.phase.template.id,
@@ -35,8 +34,6 @@ def destroy
         section: section.id
       )
     end
-    # rubocop:enable Metrics/AbcSize
-
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
   end
-
 end
diff --git a/app/controllers/org_admin/questions_controller.rb b/app/controllers/org_admin/questions_controller.rb
index f3061c764e..1b19d53074 100644
--- a/app/controllers/org_admin/questions_controller.rb
+++ b/app/controllers/org_admin/questions_controller.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
 module OrgAdmin
-
+  # Controller that handles questions
   class QuestionsController < ApplicationController
-
     include AllowedQuestionFormats
     include Versionable
     include ConditionsHelper
@@ -18,7 +17,7 @@ def show
                                    section: { phase: :template })
                          .find(params[:id])
       authorize question
-      render json: { html: render_to_string(partial: "show", locals: {
+      render json: { html: render_to_string(partial: 'show', locals: {
                                               template: question.section.phase.template,
                                               section: question.section,
                                               question: question,
@@ -31,7 +30,7 @@ def show
     def open_conditions
       question = Question.find(params[:question_id])
       authorize question
-      render json: { container: render_to_string(partial: "org_admin/conditions/container",
+      render json: { container: render_to_string(partial: 'org_admin/conditions/container',
                                                  formats: :html,
                                                  layout: false,
                                                  locals: {
@@ -41,16 +40,14 @@ def open_conditions
                      webhooks: webhook_hash(question.conditions) }
     end
 
-    # rubocop:disable Layout/LineLength
     # GET /org_admin/templates/[:template_id]/phases/[:phase_id]/sections/[:id]/questions/[:question_id]/edit
-    # rubocop:enable Layout/LineLength
     def edit
       question = Question.includes(:annotations,
                                    :question_options,
                                    section: { phase: :template })
                          .find(params[:id])
       authorize question
-      render json: { html: render_to_string(partial: "edit", locals: {
+      render json: { html: render_to_string(partial: 'edit', locals: {
                                               template: question.section.phase.template,
                                               section: question.section,
                                               question: question,
@@ -60,20 +57,21 @@ def edit
     end
 
     # GET /org_admin/templates/:template_id/phases/:phase_id/sections/:section_id/questions/new
+    # rubocop:disable Metrics/AbcSize
     def new
       section = Section.includes(:questions, phase: :template).find(params[:section_id])
       nbr = section.questions.maximum(:number)
-      question_format = QuestionFormat.find_by(title: "Text area")
+      question_format = QuestionFormat.find_by(title: 'Text area')
       question = Question.new(section_id: section.id,
                               question_format: question_format,
                               number: nbr.present? ? nbr + 1 : 1)
       question_formats = allowed_question_formats
       authorize question
-      render json: { html: render_to_string(partial: "form", locals: {
+      render json: { html: render_to_string(partial: 'form', locals: {
                                               template: section.phase.template,
                                               section: section,
                                               question: question,
-                                              method: "post",
+                                              method: 'post',
                                               url: org_admin_template_phase_section_questions_path(
                                                 template_id: section.phase.template.id,
                                                 phase_id: section.phase.id,
@@ -82,6 +80,7 @@ def new
                                               question_formats: question_formats
                                             }) }
     end
+    # rubocop:enable Metrics/AbcSize
 
     # POST /org_admin/templates/:template_id/phases/:phase_id/sections/:section_id/questions
     # rubocop:disable Metrics/AbcSize
@@ -92,12 +91,12 @@ def create
         question = get_new(question)
         section = question.section
         if question.save
-          flash[:notice] = success_message(question, _("created"))
+          flash[:notice] = success_message(question, _('created'))
         else
-          flash[:alert] = failure_message(question, _("create"))
+          flash[:alert] = failure_message(question, _('create'))
         end
       rescue StandardError
-        flash[:alert] = _("Unable to create a new version of this template.")
+        flash[:alert] = _('Unable to create a new version of this template.')
       end
       redirect_to edit_org_admin_template_phase_path(
         template_id: section.phase.template.id,
@@ -109,6 +108,7 @@ def create
 
     # PUT /org_admin/templates/:template_id/phases/:phase_id/sections/:section_id/questions/:id
     # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
     def update
       question = Question.find(params[:id])
       authorize question
@@ -161,12 +161,12 @@ def update
       # add check for number present to ensure this is not just an annotation
       attrs[:theme_ids] = [] if attrs[:theme_ids].blank? && attrs[:number].present?
       if question.update(attrs)
-        if question.update_conditions(sanitize_hash(params["conditions"]),
+        if question.update_conditions(sanitize_hash(params['conditions']),
                                       old_to_new_opts, question_id_map)
-          flash[:notice] = success_message(question, _("updated"))
+          flash[:notice] = success_message(question, _('updated'))
         end
       else
-        flash[:alert] = flash[:alert] = failure_message(question, _("update"))
+        flash[:alert] = flash[:alert] = failure_message(question, _('update'))
       end
       if question.section.phase.template.customization_of.present?
         redirect_to org_admin_template_phase_path(
@@ -183,7 +183,7 @@ def update
       end
     end
     # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
-    # rubocop:enable
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
     # DELETE /org_admin/templates/:template_id/phases/:phase_id/sections/:section_id/questions/:id
     # rubocop:disable Metrics/AbcSize
@@ -194,12 +194,12 @@ def destroy
         question = get_modifiable(question)
         section = question.section
         if question.destroy!
-          flash[:notice] = success_message(question, _("deleted"))
+          flash[:notice] = success_message(question, _('deleted'))
         else
-          flash[:alert] = flash[:alert] = failure_message(question, _("delete"))
+          flash[:alert] = flash[:alert] = failure_message(question, _('delete'))
         end
       rescue StandardError
-        flash[:alert] = _("Unable to create a new version of this template.")
+        flash[:alert] = _('Unable to create a new version of this template.')
       end
       redirect_to edit_org_admin_template_phase_path(
         template_id: section.phase.template.id,
@@ -231,7 +231,7 @@ def sanitize_hash(param_conditions)
       hash_of_hashes.each do |cond_name, cond_hash|
         sanitized_hash = {}
         cond_hash.each do |k, v|
-          v = ActionController::Base.helpers.sanitize(v) if k.start_with?("webhook")
+          v = ActionController::Base.helpers.sanitize(v) if k.start_with?('webhook')
           sanitized_hash[k] = v
         end
         res[cond_name] = sanitized_hash
@@ -256,11 +256,11 @@ def question_params
     # options are now out of sync with the params.
     # This sorts that out.
     def update_option_ids(attrs_in, opt_map)
-      qopts = attrs_in["question_options_attributes"]
+      qopts = attrs_in['question_options_attributes']
       qopts.each_pair do |_, attr_hash|
-        old_id = attr_hash["id"]
+        old_id = attr_hash['id']
         new_id = opt_map[old_id]
-        attr_hash["id"] = new_id
+        attr_hash['id'] = new_id
       end
       attrs_in
     end
@@ -268,6 +268,7 @@ def update_option_ids(attrs_in, opt_map)
     # When a template gets versioned by changes to one of its questions we need to loop
     # through the incoming params and ensure that the annotations and question_options
     # get attached to the new question
+    # rubocop:disable Metrics/AbcSize
     def transfer_associations(attrs, question)
       if attrs[:annotations_attributes].present?
         attrs[:annotations_attributes].each_pair do |_, value|
@@ -280,7 +281,6 @@ def transfer_associations(attrs, question)
       end
       attrs
     end
-
+    # rubocop:enable Metrics/AbcSize
   end
-
 end
diff --git a/app/controllers/org_admin/sections_controller.rb b/app/controllers/org_admin/sections_controller.rb
index 0d5b9b2b2f..2b8c74a698 100644
--- a/app/controllers/org_admin/sections_controller.rb
+++ b/app/controllers/org_admin/sections_controller.rb
@@ -1,22 +1,22 @@
 # frozen_string_literal: true
 
 module OrgAdmin
-
+  # Controller that handles sections
   class SectionsController < ApplicationController
-
     include Versionable
 
     respond_to :html
     after_action :verify_authorized
 
     # GET /org_admin/templates/[:template_id]/phases/[:phase_id]/sections
+    # rubocop:disable Metrics/AbcSize
     def index
       authorize Section.new
       phase = Phase.includes(:template, :sections).find(params[:phase_id])
       edit = phase.template.latest? &&
              (current_user.can_modify_templates? &&
              (phase.template.org_id == current_user.org_id))
-      render partial: "index",
+      render partial: 'index',
              locals: {
                template: phase.template,
                phase: phase,
@@ -28,6 +28,7 @@ def index
                edit: edit
              }
     end
+    # rubocop:enable Metrics/AbcSize
 
     # GET /org_admin/templates/[:template_id]/phases/[:phase_id]/sections/[:id]
     def show
@@ -36,7 +37,7 @@ def show
       @section = Section.includes(questions: %i[annotations question_options])
                         .find(params[:id])
       @template = Template.find(params[:template_id])
-      render json: { html: render_to_string(partial: "show",
+      render json: { html: render_to_string(partial: 'show',
                                             locals: { template: @template, section: @section }) }
     end
 
@@ -49,9 +50,9 @@ def edit
       # User cannot edit a section if its not modifiable or the template is not the
       # latest redirect to show
       partial_name = if section.modifiable? && section.phase.template.latest?
-                       "edit"
+                       'edit'
                      else
-                       "show"
+                       'show'
                      end
       render json: { html: render_to_string(partial: partial_name,
                                             locals: {
@@ -62,12 +63,12 @@ def edit
     end
 
     # POST /org_admin/templates/[:template_id]/phases/[:phase_id]/sections
-    # rubocop:disable Metrics/AbcSize
+    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
     def create
       @phase = Phase.find_by(id: params[:phase_id])
       if @phase.nil?
         flash[:alert] =
-          _("Unable to create a new section. The phase you specified does not exist.")
+          _('Unable to create a new section. The phase you specified does not exist.')
         redirect_to edit_org_admin_template_path(template_id: params[:template_id])
         return
       end
@@ -75,21 +76,21 @@ def create
       authorize @section
       @section = get_new(@section)
       if @section.save
-        flash[:notice] = success_message(@section, _("created"))
+        flash[:notice] = success_message(@section, _('created'))
         redirect_to edit_org_admin_template_phase_path(
           id: @section.phase_id,
           template_id: @phase.template_id,
           section: @section.id
         )
       else
-        flash[:alert] = failure_message(@section, _("create"))
+        flash[:alert] = failure_message(@section, _('create'))
         redirect_to edit_org_admin_template_phase_path(
           template_id: @phase.template_id,
           id: @section.phase_id
         )
       end
     end
-    # rubocop:enable Metrics/AbcSize
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
     # PUT /org_admin/templates/[:template_id]/phases/[:phase_id]/sections/[:id]
     # rubocop:disable Metrics/AbcSize
@@ -99,12 +100,13 @@ def update
       begin
         section = get_modifiable(section)
         if section.update(section_params)
-          flash[:notice] = success_message(section, _("saved"))
+          flash[:notice] = success_message(section, _('saved'))
         else
-          flash[:alert] = failure_message(section, _("save"))
+          flash[:alert] = failure_message(section, _('save'))
         end
       rescue StandardError => e
-        flash[:alert] = _("Unable to create a new version of this template.") + "<br/>" + e.message
+        msg = _('Unable to create a new version of this template.')
+        flash[:alert] = "#{msg}<br/>#{e.message}"
       end
 
       redirect_to edit_org_admin_template_phase_path(
@@ -123,12 +125,13 @@ def destroy
         section = get_modifiable(section)
         phase = section.phase
         if section.destroy!
-          flash[:notice] = success_message(section, _("deleted"))
+          flash[:notice] = success_message(section, _('deleted'))
         else
-          flash[:alert] = failure_message(section, _("delete"))
+          flash[:alert] = failure_message(section, _('delete'))
         end
       rescue StandardError => e
-        flash[:alert] = _("Unable to create a new version of this template.") + "<br/>" + e.message
+        msg = _('Unable to delete this version of the template.')
+        flash[:alert] = "#{msg}<br/>#{e.message}"
       end
 
       redirect_to(edit_org_admin_template_phase_path(
@@ -143,7 +146,5 @@ def destroy
     def section_params
       params.require(:section).permit(:title, :description)
     end
-
   end
-
 end
diff --git a/app/controllers/org_admin/template_copies_controller.rb b/app/controllers/org_admin/template_copies_controller.rb
index db65f414bb..6e3c99af85 100644
--- a/app/controllers/org_admin/template_copies_controller.rb
+++ b/app/controllers/org_admin/template_copies_controller.rb
@@ -1,27 +1,30 @@
 # frozen_string_literal: true
 
-class OrgAdmin::TemplateCopiesController < ApplicationController
+module OrgAdmin
+  # Controller that handles copying templates
+  class TemplateCopiesController < ApplicationController
+    include TemplateMethods
 
-  include TemplateMethods
+    after_action :verify_authorized
 
-  after_action :verify_authorized
-
-  # POST /org_admin/templates/:id/copy (AJAX)
-  def create
-    @template = Template.find(params[:template_id])
-    authorize @template, :copy?
-    begin
-      new_copy = @template.generate_copy!(current_user.org)
-      flash[:notice] = "#{template_type(@template).capitalize} was successfully copied."
-      redirect_to edit_org_admin_template_path(new_copy)
-    rescue StandardError
-      flash[:alert] = failure_message(_("copy"), template_type(@template))
-      if request.referrer.present?
-        redirect_back(fallback_location: org_admin_templates_path)
-      else
-        redirect_to org_admin_templates_path
+    # POST /org_admin/templates/:id/copy (AJAX)
+    # rubocop:disable Metrics/AbcSize
+    def create
+      @template = Template.find(params[:template_id])
+      authorize @template, :copy?
+      begin
+        new_copy = @template.generate_copy!(current_user.org)
+        flash[:notice] = "#{template_type(@template).capitalize} was successfully copied."
+        redirect_to edit_org_admin_template_path(new_copy)
+      rescue StandardError
+        flash[:alert] = failure_message(_('copy'), template_type(@template))
+        if request.referrer.present?
+          redirect_back(fallback_location: org_admin_templates_path)
+        else
+          redirect_to org_admin_templates_path
+        end
       end
     end
+    # rubocop:enable Metrics/AbcSize
   end
-
 end
diff --git a/app/controllers/org_admin/template_customization_transfers_controller.rb b/app/controllers/org_admin/template_customization_transfers_controller.rb
index 5268b2bcf0..f0b98e28b7 100644
--- a/app/controllers/org_admin/template_customization_transfers_controller.rb
+++ b/app/controllers/org_admin/template_customization_transfers_controller.rb
@@ -1,32 +1,33 @@
 # frozen_string_literal: true
 
-class OrgAdmin::TemplateCustomizationTransfersController < ApplicationController
-
-  include Versionable
-
-  after_action :verify_authorized
-
-  # POST /org_admin/templates/:id/transfer_customization
-  #
-  # The funder template's id is passed through here
-  def create
-    @template = Template.find(params[:template_id])
-    authorize @template, :transfer_customization?
-    if @template.upgrade_customization?
-      # If the customized template is not published it will not version, so publish it!
-      previously_published = @template.published?
-      @template.publish unless previously_published
-
-      @new_customization = @template.upgrade_customization!
-
-      # Reset the published flag if the customized template was not previously published
-      @template.update(published: false) unless previously_published
-
-      redirect_to org_admin_template_path(@new_customization)
-    else
-      flash[:alert] = _("That template is no longer customizable.")
-      redirect_back(fallback_location: org_admin_templates_path)
+module OrgAdmin
+  # Controller that handles transfering parent template changes to a customized template
+  class TemplateCustomizationTransfersController < ApplicationController
+    include Versionable
+
+    after_action :verify_authorized
+
+    # POST /org_admin/templates/:id/transfer_customization
+    #
+    # The funder template's id is passed through here
+    def create
+      @template = Template.find(params[:template_id])
+      authorize @template, :transfer_customization?
+      if @template.upgrade_customization?
+        # If the customized template is not published it will not version, so publish it!
+        previously_published = @template.published?
+        @template.publish unless previously_published
+
+        @new_customization = @template.upgrade_customization!
+
+        # Reset the published flag if the customized template was not previously published
+        @template.update(published: false) unless previously_published
+
+        redirect_to org_admin_template_path(@new_customization)
+      else
+        flash[:alert] = _('That template is no longer customizable.')
+        redirect_back(fallback_location: org_admin_templates_path)
+      end
     end
   end
-
 end
diff --git a/app/controllers/org_admin/template_customizations_controller.rb b/app/controllers/org_admin/template_customizations_controller.rb
index 91094a5ead..15c37f533b 100644
--- a/app/controllers/org_admin/template_customizations_controller.rb
+++ b/app/controllers/org_admin/template_customizations_controller.rb
@@ -1,27 +1,30 @@
 # frozen_string_literal: true
 
-class OrgAdmin::TemplateCustomizationsController < ApplicationController
+module OrgAdmin
+  # Controller that handles customizing a template
+  class TemplateCustomizationsController < ApplicationController
+    include Paginable
+    include Versionable
+    after_action :verify_authorized
 
-  include Paginable
-  include Versionable
-  after_action :verify_authorized
-
-  # POST /org_admin/templates/:id/customize
-  def create
-    @template = Template.find(params[:template_id])
-    authorize(@template, :customize?)
-    if @template.customize?(current_user.org)
-      begin
-        @customisation = @template.customize!(current_user.org)
-        redirect_to org_admin_template_path(@customisation)
-        return
-      rescue ArgumentError
-        flash[:alert] = _("Unable to customize that template.")
+    # POST /org_admin/templates/:id/customize
+    # rubocop:disable Metrics/AbcSize
+    def create
+      @template = Template.find(params[:template_id])
+      authorize(@template, :customize?)
+      if @template.customize?(current_user.org)
+        begin
+          @customisation = @template.customize!(current_user.org)
+          redirect_to org_admin_template_path(@customisation)
+          return
+        rescue ArgumentError
+          flash[:alert] = _('Unable to customize that template.')
+        end
+      else
+        flash[:notice] = _('That template is not customizable.')
       end
-    else
-      flash[:notice] = _("That template is not customizable.")
+      redirect_back(fallback_location: org_admin_templates_path)
     end
-    redirect_back(fallback_location: org_admin_templates_path)
+    # rubocop:enable Metrics/AbcSize
   end
-
 end
diff --git a/app/controllers/org_admin/templates_controller.rb b/app/controllers/org_admin/templates_controller.rb
index 3f26367365..1cc4c48d58 100644
--- a/app/controllers/org_admin/templates_controller.rb
+++ b/app/controllers/org_admin/templates_controller.rb
@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
 module OrgAdmin
-
-  # rubocop:disable Metrics/ClassLength
+  # Controller that handles templates
   class TemplatesController < ApplicationController
-
     include Paginable
     include Versionable
     include TemplateMethods
@@ -13,16 +11,16 @@ class TemplatesController < ApplicationController
 
     # The root version of index which returns all templates
     # GET /org_admin/templates
-    # -----------------------------------------------------
+    # rubocop:disable Metrics/AbcSize
     def index
       authorize Template
       templates = Template.latest_version.where(customization_of: nil)
       published = templates.select { |t| t.published? || t.draft? }.length
 
       @orgs              = Org.managed
-      @title             = _("All Templates")
+      @title             = _('All Templates')
       @templates         = templates.includes(:org).page(1)
-      @query_params      = { sort_field: "templates.title", sort_direction: "asc" }
+      @query_params      = { sort_field: 'templates.title', sort_direction: 'asc' }
       @all_count         = templates.length
       @published_count   = published.present? ? published : 0
       @unpublished_count = if published.present?
@@ -32,11 +30,12 @@ def index
                            end
       render :index
     end
+    # rubocop:enable Metrics/AbcSize
 
     # A version of index that displays only templates that belong to the user's org
     # GET /org_admin/templates/organisational
     # -----------------------------------------------------
-    # rubocop:disable Metrics/AbcSize
+    # rubocop:disable Metrics/AbcSize, Metrics/PerceivedComplexity
     def organisational
       authorize Template
       templates = Template.latest_version_per_org(current_user.org.id)
@@ -45,12 +44,12 @@ def organisational
 
       @orgs  = current_user.can_super_admin? ? Org.all : nil
       @title = if current_user.can_super_admin?
-                 _("%{org_name} Templates") % { org_name: current_user.org.name }
+                 format(_('%<org_name>s Templates'), org_name: current_user.org.name)
                else
-                 _("Own Templates")
+                 _('Own Templates')
                end
       @templates = templates.page(1)
-      @query_params = { sort_field: "templates.title", sort_direction: "asc" }
+      @query_params = { sort_field: 'templates.title', sort_direction: 'asc' }
       @all_count = templates.length
       @published_count = published.present? ? published : 0
       @unpublished_count = if published.present?
@@ -60,12 +59,13 @@ def organisational
                            end
       render :index
     end
-    # rubocop:enable Metrics/AbcSize
+    # rubocop:enable Metrics/AbcSize, Metrics/PerceivedComplexity
 
     # A version of index that displays only templates that are customizable
     # GET /org_admin/templates/customisable
     # -----------------------------------------------------
-    # rubocop:disable Metrics/AbcSize
+    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
     def customisable
       authorize Template
       customizations = Template.latest_customized_version_per_org(current_user.org.id)
@@ -81,10 +81,10 @@ def customisable
       published = customizations.select { |t| t.published? || t.draft? }.length
 
       @orgs = current_user.can_super_admin? ? Org.all : []
-      @title = _("Customizable Templates")
+      @title = _('Customizable Templates')
       @templates = funder_templates
       @customizations = customizations
-      @query_params = { sort_field: "templates.title", sort_direction: "asc" }
+      @query_params = { sort_field: 'templates.title', sort_direction: 'asc' }
       @all_count = funder_templates.length
       @published_count = published.present? ? published : 0
       @unpublished_count = if published.present?
@@ -96,7 +96,8 @@ def customisable
 
       render :index
     end
-    # rubocop:enable Metrics/AbcSize
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
     # GET /org_admin/templates/[:id]
     def show
@@ -105,17 +106,17 @@ def show
       # Load the info needed for the overview section if the authorization check passes!
       phases = template.phases
                        .includes(sections: { questions: :question_options })
-                       .order("phases.number", "sections.number", "questions.number",
-                              "question_options.number")
-                       .select("phases.title", "phases.description", "sections.title",
-                               "questions.text", "question_options.text")
+                       .order('phases.number', 'sections.number', 'questions.number',
+                              'question_options.number')
+                       .select('phases.title', 'phases.description', 'sections.title',
+                               'questions.text', 'question_options.text')
       unless template.latest?
         # rubocop:disable Layout/LineLength
-        flash[:notice] = _("You are viewing a historical version of this template. You will not be able to make changes.")
+        flash[:notice] = _('You are viewing a historical version of this template. You will not be able to make changes.')
         # rubocop:enable Layout/LineLength
       end
-      render "container", locals: {
-        partial_path: "show",
+      render 'container', locals: {
+        partial_path: 'show',
         template: template,
         phases: phases,
         referrer: get_referrer(template, request.referrer)
@@ -123,31 +124,33 @@ def show
     end
 
     # GET /org_admin/templates/:id/edit
+    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
     def edit
       template = Template.includes(:org, :phases).find(params[:id])
       authorize template
       # Load the info needed for the overview section if the authorization check passes!
       phases = template.phases.includes(sections: { questions: :question_options })
-                       .order("phases.number",
-                              "sections.number",
-                              "questions.number",
-                              "question_options.number")
-                       .select("phases.title",
-                               "phases.description",
-                               "sections.title",
-                               "questions.text",
-                               "question_options.text")
-      if !template.latest?
-        redirect_to org_admin_template_path(id: template.id)
-      else
-        render "container", locals: {
-          partial_path: "edit",
+                       .order('phases.number',
+                              'sections.number',
+                              'questions.number',
+                              'question_options.number')
+                       .select('phases.title',
+                               'phases.description',
+                               'sections.title',
+                               'questions.text',
+                               'question_options.text')
+      if template.latest?
+        render 'container', locals: {
+          partial_path: 'edit',
           template: template,
           phases: phases,
           referrer: get_referrer(template, request.referrer)
         }
+      else
+        redirect_to org_admin_template_path(id: template.id)
       end
     end
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
     # GET /org_admin/templates/new
     def new
@@ -167,16 +170,16 @@ def create
       @template = Template.new(args)
       @template.org_id = current_user.org.id
       @template.locale = current_org.language.abbreviation
-      @template.links = if params["template-links"].present?
-                          ActiveSupport::JSON.decode(params["template-links"])
+      @template.links = if params['template-links'].present?
+                          ActiveSupport::JSON.decode(params['template-links'])
                         else
-                          { "funder": [], "sample_plan": [] }
+                          { funder: [], sample_plan: [] }
                         end
       if @template.save
         redirect_to edit_org_admin_template_path(@template),
-                    notice: success_message(@template, _("created"))
+                    notice: success_message(@template, _('created'))
       else
-        flash[:alert] = flash[:alert] = failure_message(@template, _("create"))
+        flash[:alert] = flash[:alert] = failure_message(@template, _('create'))
         render :new
       end
     end
@@ -194,25 +197,23 @@ def update
         args[:visibility] = parse_visibility(args, current_user.org)
 
         template.assign_attributes(args)
-        if params["template-links"].present?
-          template.links = ActiveSupport::JSON.decode(params["template-links"])
-        end
+        template.links = ActiveSupport::JSON.decode(params['template-links']) if params['template-links'].present?
         if template.save
           render(json: {
                    status: 200,
-                   msg: success_message(template, _("saved"))
+                   msg: success_message(template, _('saved'))
                  })
         else
           render(json: {
                    status: :bad_request,
-                   msg: failure_message(template, _("save"))
+                   msg: failure_message(template, _('save'))
                  })
         end
       rescue ActiveSupport::JSON.parse_error
         render(json: {
                  status: :bad_request,
-                 msg: _("Error parsing links for a %{template}") %
-               { template: template_type(template) }
+                 msg: format(_('Error parsing links for a %<template>s'),
+                             template: template_type(template))
                })
         nil
       rescue StandardError => e
@@ -225,7 +226,7 @@ def update
     # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
     # DELETE /org_admin/templates/:id
-    # rubocop:disable Metrics/AbcSize
+    # rubocop:disable Metrics/AbcSize, Metrics/PerceivedComplexity
     def destroy
       template = Template.find(params[:id])
       authorize template
@@ -233,15 +234,13 @@ def destroy
       if versions.reject { |t| t.plans.empty? }.empty?
         versions.each do |version|
           if version.destroy!
-            flash[:notice] = success_message(template, _("removed"))
+            flash[:notice] = success_message(template, _('removed'))
           else
-            flash[:alert] = failure_message(template, _("remove"))
+            flash[:alert] = failure_message(template, _('remove'))
           end
         end
       else
-        # rubocop:disable Layout/LineLength
         flash[:alert] = _("You cannot delete a #{template_type(template)} that has been used to create plans.")
-        # rubocop:enable Layout/LineLength
       end
       if request.referrer.present?
         redirect_to request.referrer
@@ -249,7 +248,7 @@ def destroy
         redirect_to org_admin_templates_path
       end
     end
-    # rubocop:enable Metrics/AbcSize
+    # rubocop:enable Metrics/AbcSize, Metrics/PerceivedComplexity
 
     # GET /org_admin/templates/:id/history
     def history
@@ -261,19 +260,19 @@ def history
                        else
                          organisational_org_admin_templates_path
                        end
-      render "history", locals: {
+      render 'history', locals: {
         templates: templates,
-        query_params: { sort_field: "templates.version", sort_direction: "desc" },
+        query_params: { sort_field: 'templates.version', sort_direction: 'desc' },
         referrer: local_referrer,
         current: templates.maximum(:version)
       }
     end
 
     # PATCH /org_admin/templates/:id/publish  (AJAX)
+    # rubocop:disable Metrics/AbcSize
     def publish
       template = Template.find(params[:id])
       authorize template
-      # rubocop:disable Layout/LineLength
       publishable, errors = template.publishability
       if publishable
         if template.publish!
@@ -284,11 +283,12 @@ def publish
       else
         flash[:alert] = errors
       end
-      # rubocop:enable Layout/LineLength
       redirect_to request.referrer.present? ? request.referrer : org_admin_templates_path
     end
+    # rubocop:enable Metrics/AbcSize
 
     # PATCH /org_admin/templates/:id/unpublish  (AJAX)
+    # rubocop:disable Metrics/AbcSize
     def unpublish
       template = Template.find(params[:id])
       authorize template
@@ -298,11 +298,10 @@ def unpublish
           flash[:alert] = _("Unable to unpublish your #{template_type(template)}.")
         end
       end
-      unless flash[:alert].present?
-        flash[:notice] = _("Successfully unpublished your #{template_type(template)}")
-      end
+      flash[:notice] = _("Successfully unpublished your #{template_type(template)}") unless flash[:alert].present?
       redirect_to request.referrer.present? ? request.referrer : org_admin_templates_path
     end
+    # rubocop:enable Metrics/AbcSize
 
     # GET template_export/:id
     # -----------------------------------------------------
@@ -328,28 +327,24 @@ def template_export
       @formatting = Settings::Template::DEFAULT_SETTINGS[:formatting]
 
       begin
-        # rubocop:disable Layout/LineLength
-        file_name = @template.title.gsub(/[^a-zA-Z\d\s]/, "").gsub(/ /, "_") + "_v" + @template.version.to_s
-        # rubocop:enable Layout/LineLength
+        safe_title = @template.title.gsub(/[^a-zA-Z\d\s]/, '').gsub(/ /, '_')
+        file_name = "#{safe_title}_v#{@template.version}"
         respond_to do |format|
           format.docx do
-            render docx: "template_exports/template_export", filename: "#{file_name}.docx"
+            render docx: 'template_exports/template_export', filename: "#{file_name}.docx"
           end
 
           format.pdf do
             # rubocop:disable Layout/LineLength
             render pdf: file_name,
-                   template: "template_exports/template_export",
+                   template: 'template_exports/template_export',
                    margin: @formatting[:margin],
                    footer: {
-                     center: _("Template created using the %{application_name} service. Last modified %{date}") % {
-                       application_name: ApplicationService.application_name,
-                       date: l(@template.updated_at.to_date, formats: :short)
-                     },
+                     center: format(_('Template created using the %<application_name>s service. Last modified %<date>s'), application_name: ApplicationService.application_name, date: l(@template.updated_at.to_date, formats: :short)),
                      font_size: 8,
                      spacing: (@formatting[:margin][:bottom] / 2) - 4,
-                     right: "[page] of [topage]",
-                     encoding: "utf8"
+                     right: '[page] of [topage]',
+                     encoding: 'utf8'
                    }
             # rubocop:enable Layout/LineLength
           end
@@ -357,7 +352,7 @@ def template_export
       rescue ActiveRecord::RecordInvalid
         # What scenario is this triggered in? it's common to our export pages
         redirect_to public_templates_path,
-                    alert: _("Unable to download the DMP Template at this time.")
+                    alert: _('Unable to download the DMP Template at this time.')
       end
     end
     # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
@@ -389,9 +384,9 @@ def parse_visibility(args, org)
       # If nil and the org is not a funder, we default to organisational
       # If present, we parse to retrieve the value
       if args[:visibility].nil?
-        org.funder? ? "publicly_visible" : "organisationally_visible"
+        org.funder? ? 'publicly_visible' : 'organisationally_visible'
       else
-        args.fetch(:visibility, "0") == "1" ? "organisationally_visible" : "publicly_visible"
+        args.fetch(:visibility, '0') == '1' ? 'organisationally_visible' : 'publicly_visible'
       end
     end
 
@@ -411,8 +406,5 @@ def get_referrer(template, referrer)
         request.referrer
       end
     end
-
   end
-  # rubocop:enable Metrics/ClassLength
-
 end
diff --git a/app/controllers/org_admin/users_controller.rb b/app/controllers/org_admin/users_controller.rb
index 8b096f55f8..6138ddb18b 100644
--- a/app/controllers/org_admin/users_controller.rb
+++ b/app/controllers/org_admin/users_controller.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
 module OrgAdmin
-
+  # Controller that handles admin operations on users
   class UsersController < ApplicationController
-
     after_action :verify_authorized
 
     def edit
@@ -11,7 +10,7 @@ def edit
       authorize @user
       @departments = @user.org.departments.order(:name)
       @plans = Plan.active(@user).page(1)
-      render "org_admin/users/edit",
+      render 'org_admin/users/edit',
              locals: { user: @user,
                        departments: @departments,
                        plans: @plans,
@@ -21,24 +20,26 @@ def edit
                        default_org: @user.org }
     end
 
+    # rubocop:disable Metrics/AbcSize
     def update
       @user = User.find(params[:id])
       authorize @user
       @departments = @user.org.departments.order(:name)
       @plans = Plan.active(@user).page(1)
       if @user.update_attributes(user_params)
-        flash.now[:notice] = success_message(@user, _("updated"))
+        flash.now[:notice] = success_message(@user, _('updated'))
       else
-        flash.now[:alert] = failure_message(@user, _("update"))
+        flash.now[:alert] = failure_message(@user, _('update'))
       end
       render :edit
     end
+    # rubocop:enable Metrics/AbcSize
 
     def user_plans
       @user = User.find(params[:id])
       authorize @user
       @plans = Plan.active(@user).page(1)
-      render "org_admin/users/plans"
+      render 'org_admin/users/plans'
     end
 
     private
@@ -46,7 +47,5 @@ def user_plans
     def user_params
       params.require(:user).permit(:department_id)
     end
-
   end
-
 end
diff --git a/app/controllers/orgs_controller.rb b/app/controllers/orgs_controller.rb
index f302afd450..78ad6f1777 100644
--- a/app/controllers/orgs_controller.rb
+++ b/app/controllers/orgs_controller.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
+# Controller for Org pages for Admins
 class OrgsController < ApplicationController
-
   include OrgSelectable
 
   after_action :verify_authorized, except: %w[
@@ -19,30 +19,32 @@ class OrgsController < ApplicationController
   def admin_edit
     org = Org.find(params[:id])
     authorize org
-    languages = Language.all.order("name")
-    org.links = { "org": [] } unless org.links.present?
-    render "admin_edit", locals: { org: org, languages: languages, method: "PUT",
+    languages = Language.all.order('name')
+    org.links = { org: [] } unless org.links.present?
+    render 'admin_edit', locals: { org: org, languages: languages, method: 'PUT',
                                    url: admin_update_org_path(org) }
   end
 
   # PUT /org/admin/:id/admin_update
   # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+  # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
   def admin_update
     attrs = org_params
     @org = Org.find(params[:id])
     authorize @org
+
     @org.logo = attrs[:logo] if attrs[:logo]
-    tab = (attrs[:feedback_enabled].present? ? "feedback" : "profile")
+    tab = (attrs[:feedback_enabled].present? ? 'feedback' : 'profile')
     @org.links = ActiveSupport::JSON.decode(params[:org_links]) if params[:org_links].present?
 
     # Only allow super admins to change the org types and shib info
     if current_user.can_super_admin?
       identifiers = []
-      attrs[:managed] = attrs[:managed] == "1"
+      attrs[:managed] = attrs[:managed] == '1'
 
       # Handle Shibboleth identifier if that is enabled
       if Rails.configuration.x.shibboleth.use_filtered_discovery_service
-        shib = IdentifierScheme.by_name("shibboleth").first
+        shib = IdentifierScheme.by_name('shibboleth').first
 
         if shib.present? && attrs[:identifiers_attributes].present?
           key = attrs[:identifiers_attributes].keys.first
@@ -82,19 +84,19 @@ def admin_update
         end
         @org.save
       end
-
       redirect_to "#{admin_edit_org_path(@org)}\##{tab}",
-                  notice: success_message(@org, _("saved"))
+                  notice: success_message(@org, _('saved'))
     else
-      failure = failure_message(@org, _("save")) if failure.blank?
+      failure = failure_message(@org, _('save')) if failure.blank?
       redirect_to "#{admin_edit_org_path(@org)}\##{tab}", alert: failure
     end
   end
   # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
-  # rubocop:enable
+  # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
   # This action is used by installations that have the following config enabled:
   #   Rails.configuration.x.shibboleth.use_filtered_discovery_service
+  # rubocop:disable Metrics/AbcSize
   def shibboleth_ds
     unless current_user.nil?
       redirect_to root_path
@@ -103,7 +105,7 @@ def shibboleth_ds
 
     @user = User.new
     # Display the custom Shibboleth discovery service page.
-    @orgs = Identifier.by_scheme_name("shibboleth", "Org")
+    @orgs = Identifier.by_scheme_name('shibboleth', 'Org')
                       .sort { |a, b| a.identifiable.name <=> b.identifiable.name }
                       .map(&:identifiable)
 
@@ -111,7 +113,7 @@ def shibboleth_ds
     # if the ``@orgs` array has items ... it renders the shibboleth_ds view
     # rubocop:disable Style/GuardClause, Style/RedundantReturn
     if @orgs.empty?
-      flash.now[:alert] = _("No organisations are currently registered.")
+      flash.now[:alert] = _('No organisations are currently registered.')
       redirect_to user_shibboleth_omniauth_authorize_path
       return
     end
@@ -120,41 +122,41 @@ def shibboleth_ds
 
   # This action is used to redirect a user to the Shibboleth IdP
   # POST /orgs/shibboleth_ds
-  # rubocop:disable Metrics/AbcSize
   def shibboleth_ds_passthru
-    if !shib_params[:org_id].blank?
-      session["org_id"] = shib_params[:org_id]
+    if shib_params[:org_id].blank?
+      redirect_to shibboleth_ds_path, notice: _('Please choose an organisation')
+    else
+      session['org_id'] = shib_params[:org_id]
 
       org = Org.where(id: shib_params[:org_id])
-      shib_entity = Identifier.by_scheme_name("shibboleth", "Org")
+      shib_entity = Identifier.by_scheme_name('shibboleth', 'Org')
                               .where(identifiable: org)
 
-      if !shib_entity.empty?
+      if shib_entity.empty?
+        failure = _('Your organisation does not seem to be properly configured.')
+        redirect_to shibboleth_ds_path, alert: failure
+      else
         # initiate shibboleth login sequence
         entity_param = "entityID=#{shib_entity.first.value}"
         redirect_to "#{shib_login_url}?#{shib_callback_url}&#{entity_param}"
-      else
-        failure = _("Your organisation does not seem to be properly configured.")
-        redirect_to shibboleth_ds_path, alert: failure
       end
 
-    else
-      redirect_to shibboleth_ds_path, notice: _("Please choose an organisation")
     end
   end
   # rubocop:enable Metrics/AbcSize
 
   # POST /orgs  (via AJAX from Org Typeaheads ... see below for specific pages)
-  # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+  # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+  # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
   def search
     args = search_params
     # If the search term is greater than 2 characters
-    if args.present? && args.fetch(:name, "").length > 2
-      type = params.fetch(:type, "local")
+    if args.present? && args.fetch(:name, '').length > 2
+      type = params.fetch(:type, 'local')
 
       # If we are including external API results
       orgs = case type
-             when "combined"
+             when 'combined'
                # This type will search both ROR and the local DB giving the local
                # DB results preference. It is triggered from the following pages:
                #   Create Account
@@ -167,7 +169,7 @@ def search
                OrgSelection::SearchService.search_combined(
                  search_term: args[:name]
                )
-             when "external"
+             when 'external'
                # This type will ONLY check ROR for the specified search term. It
                # is triggered from the following page:
                #  SuperAdmin - New Org
@@ -194,7 +196,7 @@ def search
 
       # If we need to restrict the results to funding orgs then
       # only return the ones with a valid fundref
-      if orgs.present? && params.fetch(:funder_only, "false") == "true"
+      if orgs.present? && params.fetch(:funder_only, 'false') == 'true'
         orgs = orgs.select do |org|
           org[:fundref].present? && !org[:fundref].blank?
         end
@@ -206,7 +208,8 @@ def search
       render json: []
     end
   end
-  # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
+  # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+  # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
   private
 
@@ -221,7 +224,7 @@ def org_params
   end
 
   def shib_params
-    params.permit("org_id")
+    params.permit('org_id')
   end
 
   def search_params
@@ -240,6 +243,7 @@ def shib_callback_url
   # Destroy the identifier if it exists and was blanked out, replace the
   # identifier if it was updated, create the identifier if its new, or
   # ignore it
+  # rubocop:disable Metrics/AbcSize
   def process_identifier_change(org:, identifier:)
     return org unless identifier.is_a?(Identifier)
 
@@ -257,5 +261,5 @@ def process_identifier_change(org:, identifier:)
 
     org
   end
-
+  # rubocop:enable Metrics/AbcSize
 end
diff --git a/app/controllers/paginable/contributors_controller.rb b/app/controllers/paginable/contributors_controller.rb
index b0a153f6f4..3e50ef5b65 100644
--- a/app/controllers/paginable/contributors_controller.rb
+++ b/app/controllers/paginable/contributors_controller.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
 module Paginable
-
+  # Controller for paginating/sorting/searching the contributors table
   class ContributorsController < ApplicationController
-
     after_action :verify_authorized
     respond_to :html
 
@@ -13,15 +12,13 @@ class ContributorsController < ApplicationController
     # GET /paginable/plans/:plan_id/contributors/index/:page
     def index
       @plan = Plan.find_by(id: params[:plan_id])
-      authorize @plan
+      authorize @plan, :show?
       paginable_renderise(
-        partial: "index",
+        partial: 'index',
         scope: Contributor.where(plan_id: @plan.id),
-        query_params: { sort_field: "contributors.name", sort_direction: :asc },
+        query_params: { sort_field: 'contributors.name', sort_direction: :asc },
         format: :json
       )
     end
-
   end
-
 end
diff --git a/app/controllers/paginable/departments_controller.rb b/app/controllers/paginable/departments_controller.rb
index 0fd997d636..77affdcb12 100644
--- a/app/controllers/paginable/departments_controller.rb
+++ b/app/controllers/paginable/departments_controller.rb
@@ -1,31 +1,32 @@
 # frozen_string_literal: true
 
-class Paginable::DepartmentsController < ApplicationController
+module Paginable
+  # Controller for paginating/sorting/searching the departments table
+  class DepartmentsController < ApplicationController
+    after_action :verify_authorized
+    respond_to :html
 
-  after_action :verify_authorized
-  respond_to :html
+    include Paginable
 
-  include Paginable
-
-  # /paginable/departments/index/:page
-  def index
-    authorize Department
-    paginable_renderise(
-      partial: "index",
-      scope: departments,
-      query_params: { sort_field: "departments.name", sort_direction: :asc },
-      format: :json
-    )
-  end
+    # /paginable/departments/index/:page
+    def index
+      authorize Department
+      paginable_renderise(
+        partial: 'index',
+        scope: departments,
+        query_params: { sort_field: 'departments.name', sort_direction: :asc },
+        format: :json
+      )
+    end
 
-  private
+    private
 
-  def departments
-    if current_user.can_super_admin?
-      Department.by_org(Org.find(params[:id]))
-    else
-      Department.by_org(Org.find(current_user.org_id))
+    def departments
+      if current_user.can_super_admin?
+        Department.by_org(Org.find(params[:id]))
+      else
+        Department.by_org(Org.find(current_user.org_id))
+      end
     end
   end
-
 end
diff --git a/app/controllers/paginable/guidance_groups_controller.rb b/app/controllers/paginable/guidance_groups_controller.rb
index 761d6d9af7..d001ecc68a 100644
--- a/app/controllers/paginable/guidance_groups_controller.rb
+++ b/app/controllers/paginable/guidance_groups_controller.rb
@@ -1,18 +1,19 @@
 # frozen_string_literal: true
 
-class Paginable::GuidanceGroupsController < ApplicationController
+module Paginable
+  # Controller for paginating/sorting/searching the guidance groups table
+  class GuidanceGroupsController < ApplicationController
+    include Paginable
 
-  include Paginable
-
-  # /paginable/guidance_groups/index/:page
-  def index
-    authorize(Guidance)
-    paginable_renderise(
-      partial: "index",
-      scope: GuidanceGroup.by_org(current_user.org),
-      query_params: { sort_field: "guidance_groups.name", sort_direction: :asc },
-      format: :json
-    )
+    # /paginable/guidance_groups/index/:page
+    def index
+      authorize(Guidance)
+      paginable_renderise(
+        partial: 'index',
+        scope: GuidanceGroup.by_org(current_user.org),
+        query_params: { sort_field: 'guidance_groups.name', sort_direction: :asc },
+        format: :json
+      )
+    end
   end
-
 end
diff --git a/app/controllers/paginable/guidances_controller.rb b/app/controllers/paginable/guidances_controller.rb
index 6d4d9bfb57..d97e00826a 100644
--- a/app/controllers/paginable/guidances_controller.rb
+++ b/app/controllers/paginable/guidances_controller.rb
@@ -1,19 +1,20 @@
 # frozen_string_literal: true
 
-class Paginable::GuidancesController < ApplicationController
+module Paginable
+  # Controller for paginating/sorting/searching the guidance table
+  class GuidancesController < ApplicationController
+    include Paginable
 
-  include Paginable
-
-  # /paginable/guidances/index/:page
-  def index
-    authorize(Guidance)
-    paginable_renderise(
-      partial: "index",
-      scope: Guidance.by_org(current_user.org)
-                     .includes(:guidance_group, :themes),
-      query_params: { sort_field: "guidances.text", sort_direction: :asc },
-      format: :json
-    )
+    # /paginable/guidances/index/:page
+    def index
+      authorize(Guidance)
+      paginable_renderise(
+        partial: 'index',
+        scope: Guidance.by_org(current_user.org)
+                      .includes(:guidance_group, :themes),
+        query_params: { sort_field: 'guidances.text', sort_direction: :asc },
+        format: :json
+      )
+    end
   end
-
 end
diff --git a/app/controllers/paginable/notifications_controller.rb b/app/controllers/paginable/notifications_controller.rb
index 3aa7b088a8..5b64066edd 100644
--- a/app/controllers/paginable/notifications_controller.rb
+++ b/app/controllers/paginable/notifications_controller.rb
@@ -1,13 +1,14 @@
 # frozen_string_literal: true
 
-class Paginable::NotificationsController < ApplicationController
-
-  include Paginable
-
-  # /paginable/notifications/index/:page
-  def index
-    authorize(Notification)
-    paginable_renderise(partial: "index", scope: Notification.all, format: :json)
+module Paginable
+  # Controller for paginating/sorting/searching the notifications table
+  class NotificationsController < ApplicationController
+    include Paginable
+
+    # /paginable/notifications/index/:page
+    def index
+      authorize(Notification)
+      paginable_renderise(partial: 'index', scope: Notification.all, format: :json)
+    end
   end
-
 end
diff --git a/app/controllers/paginable/orgs_controller.rb b/app/controllers/paginable/orgs_controller.rb
index e35944a54b..252f352d54 100644
--- a/app/controllers/paginable/orgs_controller.rb
+++ b/app/controllers/paginable/orgs_controller.rb
@@ -1,18 +1,19 @@
 # frozen_string_literal: true
 
-class Paginable::OrgsController < ApplicationController
+module Paginable
+  # Controller for paginating/sorting/searching the orgs table
+  class OrgsController < ApplicationController
+    include Paginable
 
-  include Paginable
-
-  # /paginable/guidances/index/:page
-  def index
-    authorize(Org)
-    paginable_renderise(
-      partial: "index",
-      scope: Org.with_template_and_user_counts,
-      query_params: { sort_field: "orgs.name", sort_direction: :asc },
-      format: :json
-    )
+    # /paginable/guidances/index/:page
+    def index
+      authorize(Org)
+      paginable_renderise(
+        partial: 'index',
+        scope: Org.with_template_and_user_counts,
+        query_params: { sort_field: 'orgs.name', sort_direction: :asc },
+        format: :json
+      )
+    end
   end
-
 end
diff --git a/app/controllers/paginable/plans_controller.rb b/app/controllers/paginable/plans_controller.rb
index e29d26bdf9..c0c5667f63 100644
--- a/app/controllers/paginable/plans_controller.rb
+++ b/app/controllers/paginable/plans_controller.rb
@@ -1,77 +1,74 @@
 # frozen_string_literal: true
 
-class Paginable::PlansController < ApplicationController
+module Paginable
+  # Controller for paginating/sorting/searching the plans tables
+  class PlansController < ApplicationController
+    include Paginable
 
-  include Paginable
+    # /paginable/plans/privately_visible/:page
+    def privately_visible
+      authorize Plan
 
-  # /paginable/plans/privately_visible/:page
-  def privately_visible
-    unless Paginable::PlanPolicy.new(current_user).privately_visible?
-      raise Pundit::NotAuthorizedError
+      paginable_renderise(
+        partial: 'privately_visible',
+        scope: Plan.active(current_user),
+        query_params: { sort_field: 'plans.updated_at', sort_direction: :desc },
+        format: :json
+      )
     end
 
-    paginable_renderise(
-      partial: "privately_visible",
-      scope: Plan.active(current_user),
-      query_params: { sort_field: "plans.updated_at", sort_direction: :desc },
-      format: :json
-    )
-  end
+    # GET /paginable/plans/organisationally_or_publicly_visible/:page
+    def organisationally_or_publicly_visible
+      authorize Plan
 
-  # GET /paginable/plans/organisationally_or_publicly_visible/:page
-  def organisationally_or_publicly_visible
-    unless Paginable::PlanPolicy.new(current_user).organisationally_or_publicly_visible?
-      raise Pundit::NotAuthorizedError
+      paginable_renderise(
+        partial: 'organisationally_or_publicly_visible',
+        scope: Plan.organisationally_or_publicly_visible(current_user),
+        query_params: { sort_field: 'plans.updated_at', sort_direction: :desc },
+        format: :json
+      )
     end
 
-    paginable_renderise(
-      partial: "organisationally_or_publicly_visible",
-      scope: Plan.organisationally_or_publicly_visible(current_user),
-      query_params: { sort_field: "plans.updated_at", sort_direction: :desc },
-      format: :json
-    )
-  end
+    # GET /paginable/plans/publicly_visible/:page
+    def publicly_visible
+      # We want the pagination/sort/search to be retained in the URL so redirect instead
+      # of processing this as a JSON
+      paginable_params = params.permit(:page, :search, :sort_field, :sort_direction)
+      redirect_to public_plans_path(paginable_params.to_h)
+    end
 
-  # GET /paginable/plans/publicly_visible/:page
-  def publicly_visible
-    # We want the pagination/sort/search to be retained in the URL so redirect instead
-    # of processing this as a JSON
-    paginable_params = params.permit(:page, :search, :sort_field, :sort_direction)
-    redirect_to public_plans_path(paginable_params.to_h)
-  end
+    # GET /paginable/plans/org_admin/:page
+    # rubocop:disable Metrics/AbcSize
+    def org_admin
+      raise Pundit::NotAuthorizedError unless current_user.present? && current_user.can_org_admin?
 
-  # GET /paginable/plans/org_admin/:page
-  def org_admin
-    raise Pundit::NotAuthorizedError unless current_user.present? && current_user.can_org_admin?
+      # check if current user if super_admin
+      @super_admin = current_user.can_super_admin?
+      @clicked_through = params[:click_through].present?
+      plans = @super_admin ? Plan.all : current_user.org.org_admin_plans
+      plans = plans.joins(:template, roles: [user: :org]).where(Role.creator_condition)
 
-    # check if current user if super_admin
-    @super_admin = current_user.can_super_admin?
-    @clicked_through = params[:click_through].present?
-    plans = @super_admin ? Plan.all : current_user.org.org_admin_plans
-    plans = plans.joins(:template, roles: [user: :org]).where(Role.creator_condition)
+      paginable_renderise(
+        partial: 'org_admin',
+        scope: plans,
+        view_all: !current_user.can_super_admin?,
+        query_params: { sort_field: 'plans.updated_at', sort_direction: :desc },
+        format: :json
+      )
+    end
+    # rubocop:enable Metrics/AbcSize
 
-    paginable_renderise(
-      partial: "org_admin",
-      scope: plans,
-      view_all: !current_user.can_super_admin?,
-      query_params: { sort_field: "plans.updated_at", sort_direction: :desc },
-      format: :json
-    )
-  end
+    # GET /paginable/plans/org_admin/:page
+    def org_admin_other_user
+      @user = User.find(params[:id])
+      authorize @user
+      raise Pundit::NotAuthorizedError unless current_user.present? && current_user.can_org_admin? && @user.present?
 
-  # GET /paginable/plans/org_admin/:page
-  def org_admin_other_user
-    @user = User.find(params[:id])
-    authorize @user
-    unless current_user.present? && current_user.can_org_admin? && @user.present?
-      raise Pundit::NotAuthorizedError
+      paginable_renderise(
+        partial: 'org_admin_other_user',
+        scope: Plan.active(@user),
+        query_params: { sort_field: 'plans.updated_at', sort_direction: :desc }
+      )
     end
-
-    paginable_renderise(
-      partial: "org_admin_other_user",
-      scope: Plan.active(@user),
-      query_params: { sort_field: "plans.updated_at", sort_direction: :desc }
-    )
   end
-
 end
diff --git a/app/controllers/paginable/templates_controller.rb b/app/controllers/paginable/templates_controller.rb
index 680e7eb8ca..5ea6b552e8 100644
--- a/app/controllers/paginable/templates_controller.rb
+++ b/app/controllers/paginable/templates_controller.rb
@@ -1,109 +1,113 @@
 # frozen_string_literal: true
 
-class Paginable::TemplatesController < ApplicationController
+module Paginable
+  # Controller for paginating/sorting/searching the templates tables
+  class TemplatesController < ApplicationController
+    include CustomizableTemplateLinkHelper
+    include Paginable
 
-  include CustomizableTemplateLinkHelper
-  include Paginable
+    # TODO: Clean up this code for Rubocop
 
-  # TODO: Clean up this code for Rubocop
-  # rubocop:disable Layout/LineLength
-
-  # GET /paginable/templates/:page  (AJAX)
-  # -----------------------------------------------------
-  def index
-    authorize Template
-    templates = Template.latest_version.where(customization_of: nil)
-    case params[:f]
-    when "published"
-      template_ids = templates.select { |t| t.published? || t.draft? }.collect(&:family_id)
-      templates = Template.latest_version(template_ids).where(customization_of: nil)
-    when "unpublished"
-      template_ids = templates.select { |t| !t.published? && !t.draft? }.collect(&:family_id)
-      templates = Template.latest_version(template_ids).where(customization_of: nil)
+    # GET /paginable/templates/:page  (AJAX)
+    # -----------------------------------------------------
+    # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
+    def index
+      authorize Template
+      templates = Template.latest_version.where(customization_of: nil)
+      case params[:f]
+      when 'published'
+        template_ids = templates.select { |t| t.published? || t.draft? }.collect(&:family_id)
+        templates = Template.latest_version(template_ids).where(customization_of: nil)
+      when 'unpublished'
+        template_ids = templates.select { |t| !t.published? && !t.draft? }.collect(&:family_id)
+        templates = Template.latest_version(template_ids).where(customization_of: nil)
+      end
+      paginable_renderise(
+        partial: 'index',
+        scope: templates.includes(:org),
+        query_params: { sort_field: 'templates.title', sort_direction: :asc },
+        locals: { action: 'index' },
+        format: :json
+      )
     end
-    paginable_renderise(
-      partial: "index",
-      scope: templates.includes(:org),
-      query_params: { sort_field: "templates.title", sort_direction: :asc },
-      locals: { action: "index" },
-      format: :json
-    )
-  end
+    # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity
 
-  # GET /paginable/templates/organisational/:page  (AJAX)
-  # -----------------------------------------------------
-  def organisational
-    authorize Template
-    templates = Template.latest_version_per_org(current_user.org.id)
-                        .where(customization_of: nil, org_id: current_user.org.id)
-    case params[:f]
-    when "published"
-      template_ids = templates.select { |t| t.published? || t.draft? }.collect(&:family_id)
-      templates = Template.latest_version(template_ids)
-    when "unpublished"
-      template_ids = templates.select { |t| !t.published? && !t.draft? }.collect(&:family_id)
-      templates = Template.latest_version(template_ids)
+    # GET /paginable/templates/organisational/:page  (AJAX)
+    # -----------------------------------------------------
+    # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
+    def organisational
+      authorize Template
+      templates = Template.latest_version_per_org(current_user.org.id)
+                          .where(customization_of: nil, org_id: current_user.org.id)
+      case params[:f]
+      when 'published'
+        template_ids = templates.select { |t| t.published? || t.draft? }.collect(&:family_id)
+        templates = Template.latest_version(template_ids)
+      when 'unpublished'
+        template_ids = templates.select { |t| !t.published? && !t.draft? }.collect(&:family_id)
+        templates = Template.latest_version(template_ids)
+      end
+      paginable_renderise(
+        partial: 'organisational',
+        scope: templates,
+        query_params: { sort_field: 'templates.title', sort_direction: :asc },
+        locals: { action: 'organisational' },
+        format: :json
+      )
     end
-    paginable_renderise(
-      partial: "organisational",
-      scope: templates,
-      query_params: { sort_field: "templates.title", sort_direction: :asc },
-      locals: { action: "organisational" },
-      format: :json
-    )
-  end
+    # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity
 
-  # GET /paginable/templates/customisable/:page  (AJAX)
-  # -----------------------------------------------------
-  # rubocop:disable Metrics/AbcSize
-  def customisable
-    authorize Template
-    customizations = Template.latest_customized_version_per_org(current_user.org.id)
-    templates = Template.latest_customizable
-    case params[:f]
-    when "published"
-      customization_ids = customizations.select { |t| t.published? || t.draft? }.collect(&:customization_of)
-      templates = Template.latest_customizable.where(family_id: customization_ids)
-    when "unpublished"
-      customization_ids = customizations.select { |t| !t.published? && !t.draft? }.collect(&:customization_of)
-      templates = Template.latest_customizable.where(family_id: customization_ids)
-    when "not-customised"
-      templates = Template.latest_customizable.where.not(family_id: customizations.collect(&:customization_of))
+    # GET /paginable/templates/customisable/:page  (AJAX)
+    # -----------------------------------------------------
+    # rubocop:disable Metrics/AbcSize
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+    def customisable
+      authorize Template
+      customizations = Template.latest_customized_version_per_org(current_user.org.id)
+      templates = Template.latest_customizable
+      case params[:f]
+      when 'published'
+        customization_ids = customizations.select { |t| t.published? || t.draft? }.collect(&:customization_of)
+        templates = Template.latest_customizable.where(family_id: customization_ids)
+      when 'unpublished'
+        customization_ids = customizations.select { |t| !t.published? && !t.draft? }.collect(&:customization_of)
+        templates = Template.latest_customizable.where(family_id: customization_ids)
+      when 'not-customised'
+        templates = Template.latest_customizable.where.not(family_id: customizations.collect(&:customization_of))
+      end
+      paginable_renderise(
+        partial: 'customisable',
+        scope: templates.joins(:org).includes(:org),
+        query_params: { sort_field: 'templates.title', sort_direction: :asc },
+        locals: { action: 'customisable', customizations: customizations },
+        format: :json
+      )
     end
-    paginable_renderise(
-      partial: "customisable",
-      scope: templates.joins(:org).includes(:org),
-      query_params: { sort_field: "templates.title", sort_direction: :asc },
-      locals: { action: "customisable", customizations: customizations },
-      format: :json
-    )
-  end
-  # rubocop:enable Metrics/AbcSize
-
-  # rubocop:enable Layout/LineLength
+    # rubocop:enable Metrics/AbcSize
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
-  # GET /paginable/templates/publicly_visible/:page  (AJAX)
-  # -----------------------------------------------------
-  def publicly_visible
-    # We want the pagination/sort/search to be retained in the URL so redirect instead
-    # of processing this as a JSON
-    paginable_params = params.permit(:page, :search, :sort_field, :sort_direction)
-    redirect_to public_templates_path(paginable_params.to_h)
-  end
+    # GET /paginable/templates/publicly_visible/:page  (AJAX)
+    # -----------------------------------------------------
+    def publicly_visible
+      # We want the pagination/sort/search to be retained in the URL so redirect instead
+      # of processing this as a JSON
+      paginable_params = params.permit(:page, :search, :sort_field, :sort_direction)
+      redirect_to public_templates_path(paginable_params.to_h)
+    end
 
-  # GET /paginable/templates/:id/history/:page  (AJAX)
-  # -----------------------------------------------------
-  def history
-    @template = Template.find(params[:id])
-    authorize @template
-    @templates = Template.where(family_id: @template.family_id)
-    @current = Template.current(@template.family_id)
-    paginable_renderise(
-      partial: "history",
-      scope: @templates,
-      query_params: { sort_field: "templates.title", sort_direction: :asc },
-      locals: { current: @templates.maximum(:version) }
-    )
+    # GET /paginable/templates/:id/history/:page  (AJAX)
+    # -----------------------------------------------------
+    def history
+      @template = Template.find(params[:id])
+      authorize @template
+      @templates = Template.where(family_id: @template.family_id)
+      @current = Template.current(@template.family_id)
+      paginable_renderise(
+        partial: 'history',
+        scope: @templates,
+        query_params: { sort_field: 'templates.title', sort_direction: :asc },
+        locals: { current: @templates.maximum(:version) }
+      )
+    end
   end
-
 end
diff --git a/app/controllers/paginable/themes_controller.rb b/app/controllers/paginable/themes_controller.rb
index 06cfab2b6c..19dbe3356e 100644
--- a/app/controllers/paginable/themes_controller.rb
+++ b/app/controllers/paginable/themes_controller.rb
@@ -1,13 +1,14 @@
 # frozen_string_literal: true
 
-class Paginable::ThemesController < ApplicationController
-
-  include Paginable
-
-  # /paginable/themes/index/:page
-  def index
-    authorize(Theme)
-    paginable_renderise(partial: "index", scope: Theme.all, format: :json)
+module Paginable
+  # Controller for paginating/sorting/searching the themes table
+  class ThemesController < ApplicationController
+    include Paginable
+
+    # /paginable/themes/index/:page
+    def index
+      authorize(Theme)
+      paginable_renderise(partial: 'index', scope: Theme.all, format: :json)
+    end
   end
-
 end
diff --git a/app/controllers/paginable/users_controller.rb b/app/controllers/paginable/users_controller.rb
index 9c9dfee77c..3da69b12cc 100644
--- a/app/controllers/paginable/users_controller.rb
+++ b/app/controllers/paginable/users_controller.rb
@@ -1,32 +1,35 @@
 # frozen_string_literal: true
 
-class Paginable::UsersController < ApplicationController
-
-  include Paginable
-
-  # /paginable/users/index/:page
-  def index
-    authorize User
-    @clicked_through = params[:click_through].present?
-
-    # variable containing the check box value
-    @filter_admin = params[:filter_admin] == "1"
-
-    scope = if current_user.can_super_admin?
-              User.includes(:roles)
-            else
-              current_user.org.users.includes(:roles)
-            end
-
-    scope = scope.joins(:perms).distinct if @filter_admin
-
-    paginable_renderise(
-      partial: "index",
-      scope: scope,
-      query_params: { sort_field: "users.surname", sort_direction: :asc },
-      format: :json,
-      view_all: !current_user.can_super_admin?
-    )
+module Paginable
+  # Controller for paginating/sorting/searching the users table
+  class UsersController < ApplicationController
+    include Paginable
+
+    # /paginable/users/index/:page
+    # rubocop:disable Metrics/AbcSize
+    def index
+      authorize User
+      @clicked_through = params[:click_through].present?
+
+      # variable containing the check box value
+      @filter_admin = params[:filter_admin] == '1'
+
+      scope = if current_user.can_super_admin?
+                User.includes(:roles)
+              else
+                current_user.org.users.includes(:roles)
+              end
+
+      scope = scope.joins(:perms).distinct if @filter_admin
+
+      paginable_renderise(
+        partial: 'index',
+        scope: scope,
+        query_params: { sort_field: 'users.surname', sort_direction: :asc },
+        format: :json,
+        view_all: !current_user.can_super_admin?
+      )
+    end
+    # rubocop:enable Metrics/AbcSize
   end
-
 end
diff --git a/app/controllers/passwords_controller.rb b/app/controllers/passwords_controller.rb
index 616b438722..c1c4c715cc 100644
--- a/app/controllers/passwords_controller.rb
+++ b/app/controllers/passwords_controller.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
+# Controller for password resets that is built on the Devise gem
 class PasswordsController < Devise::PasswordsController
-
   protected
 
   def after_resetting_password_path_for(_resource)
@@ -18,5 +18,4 @@ def after_resetting_password_path_for(_resource)
   def after_sending_reset_password_instructions_path_for(_resource_name)
     root_path
   end
-
 end
diff --git a/app/controllers/plan_exports_controller.rb b/app/controllers/plan_exports_controller.rb
index 27b98c24c1..e754b91c41 100644
--- a/app/controllers/plan_exports_controller.rb
+++ b/app/controllers/plan_exports_controller.rb
@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
+# Controller for the Plan Download page
 class PlanExportsController < ApplicationController
-
   after_action :verify_authorized
 
   include ConditionsHelper
 
-  # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+  # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/PerceivedComplexity
   def show
     @plan = Plan.includes(:answers, { template: { phases: { sections: :questions } } })
                 .find(params[:plan_id])
@@ -36,7 +36,7 @@ def show
     @selected_phase = if params.key?(:phase_id)
                         @plan.phases.find(params[:phase_id])
                       else
-                        @plan.phases.order("phases.updated_at DESC")
+                        @plan.phases.order('phases.updated_at DESC')
                              .detect { |p| p.visibility_allowed?(@plan) }
                       end
 
@@ -49,7 +49,7 @@ def show
       format.json { show_json }
     end
   end
-  # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+  # rubocop:enable Metrics/AbcSize, Metrics/MethodLength, Metrics/PerceivedComplexity
 
   private
 
@@ -67,34 +67,33 @@ def show_csv
   end
 
   def show_text
-    send_data render_to_string(partial: "shared/export/plan_txt"),
+    send_data render_to_string(partial: 'shared/export/plan_txt'),
               filename: "#{file_name}.txt"
   end
 
   def show_docx
     # Using and optional locals_assign export_format
     render docx: "#{file_name}.docx",
-           content: render_to_string(partial: "shared/export/plan",
-                                     locals: { export_format: "docx" })
+           content: render_to_string(partial: 'shared/export/plan',
+                                     locals: { export_format: 'docx' })
   end
 
   def show_pdf
     render pdf: file_name,
            margin: @formatting[:margin],
            footer: {
-             center: _("Created using %{application_name}. Last modified %{date}") % {
-               application_name: ApplicationService.application_name,
-               date: l(@plan.updated_at.to_date, format: :readable)
-             },
+             center: format(_('Created using %<application_name>s. Last modified %<date>s'),
+                            application_name: ApplicationService.application_name,
+                            date: l(@plan.updated_at.to_date, format: :readable)),
              font_size: 8,
              spacing: (Integer(@formatting[:margin][:bottom]) / 2) - 4,
-             right: "[page] of [topage]",
-             encoding: "utf8"
+             right: '[page] of [topage]',
+             encoding: 'utf8'
            }
   end
 
   def show_json
-    json = render_to_string(partial: "/api/v1/plans/show", locals: { plan: @plan })
+    json = render_to_string(partial: '/api/v1/plans/show', locals: { plan: @plan })
     render json: "{\"dmp\":#{json}}"
   end
 
@@ -102,8 +101,8 @@ def file_name
     # Sanitize bad characters and replace spaces with underscores
     ret = @plan.title
     Zaru.sanitize! ret
-    ret = ret.strip.gsub(/\s+/, "_")
-    ret = ret.gsub(/"/, "")
+    ret = ret.strip.gsub(/\s+/, '_')
+    ret = ret.gsub(/"/, '')
     # limit the filename length to 100 chars. Windows systems have a MAX_PATH allowance
     # of 255 characters, so this should provide enough of the title to allow the user
     # to understand which DMP it is and still allow for the file to be saved to a deeply
@@ -112,8 +111,8 @@ def file_name
   end
 
   def publicly_authorized?
-    PublicPagePolicy.new(@plan, current_user).plan_organisationally_exportable? ||
-      PublicPagePolicy.new(@plan).plan_export?
+    PublicPagePolicy.new(current_user, @plan).plan_organisationally_exportable? ||
+      PublicPagePolicy.new(current_user, @plan).plan_export?
   end
 
   def privately_authorized?
@@ -129,5 +128,4 @@ def export_params
                                    :unanswered_questions, :custom_sections,
                                    :formatting)
   end
-
 end
diff --git a/app/controllers/plans_controller.rb b/app/controllers/plans_controller.rb
index 437a5093ae..5460855633 100644
--- a/app/controllers/plans_controller.rb
+++ b/app/controllers/plans_controller.rb
@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
+# Controller for the Write plan and create plan pages
 # rubocop:disable Metrics/ClassLength
 class PlansController < ApplicationController
-
   include ConditionalUserMailer
   include OrgSelectable
 
@@ -12,20 +12,21 @@ class PlansController < ApplicationController
   after_action :verify_authorized, except: [:overview]
 
   # GET /plans
+  # rubocop:disable Metrics/AbcSize
   def index
     authorize Plan
     @plans = Plan.includes(:roles, :org).active(current_user).page(1)
-    if current_user.org.is_other?
-      @organisationally_or_publicly_visible = []
-    else
-      @organisationally_or_publicly_visible =
-        Plan.organisationally_or_publicly_visible(current_user).page(1)
-    end
+    @organisationally_or_publicly_visible = if current_user.org.is_other?
+                                              []
+                                            else
+                                              Plan.organisationally_or_publicly_visible(current_user).page(1)
+                                            end
     # TODO: Is this still used? We cannot switch this to use the :plan_params
     #       strong params because any calls that do not include `plan` in the
     #       query string will fail
     @template = Template.find(params[:plan][:template_id]) if params[:plan].present?
   end
+  # rubocop:enable Metrics/AbcSize
 
   # GET /plans/new
   # rubocop:disable Metrics/AbcSize
@@ -56,6 +57,7 @@ def new
 
   # POST /plans
   # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+  # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
   def create
     @plan = Plan.new
     authorize @plan
@@ -65,11 +67,11 @@ def create
     if plan_params[:template_id].blank?
       # Something went wrong there should always be a template id
       respond_to do |format|
-        flash[:alert] = _("Unable to identify a suitable template for your plan.")
+        flash[:alert] = _('Unable to identify a suitable template for your plan.')
         format.html { redirect_to new_plan_path }
       end
     else
-      @plan.visibility = if plan_params["visibility"].blank?
+      @plan.visibility = if plan_params['visibility'].blank?
                            Rails.configuration.x.plans.default_visibility
                          else
                            plan_params[:visibility]
@@ -79,9 +81,9 @@ def create
 
       @plan.title = if plan_params[:title].blank?
                       if current_user.firstname.blank?
-                        _("My Plan") + "(" + @plan.template.title + ")"
+                        format(_('My Plan (%<title>s)'), title: @plan.template.title)
                       else
-                        current_user.firstname + "'s" + _(" Plan")
+                        format(_('%<user_name>s Plan'), user_name: "#{current_user.firstname}'s")
                       end
                     else
                       plan_params[:title]
@@ -128,9 +130,7 @@ def create
           # rubocop:enable Layout/LineLength
         else
           # We used the specified org's or funder's template
-          # rubocop:disable Layout/LineLength
           msg += " #{_('This plan is based on the')} #{@plan.template.org.name}: '#{@plan.template.title}' template."
-          # rubocop:enable Layout/LineLength
         end
 
         @plan.add_user!(current_user.id, :creator)
@@ -148,17 +148,18 @@ def create
       else
         # Something went wrong so report the issue to the user
         respond_to do |format|
-          flash[:alert] = failure_message(@plan, _("create"))
+          flash[:alert] = failure_message(@plan, _('create'))
           format.html { redirect_to new_plan_path }
         end
       end
     end
   end
   # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
-  # rubocop:enable
+  # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
   # GET /plans/show
   # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+  # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
   def show
     @plan = Plan.includes(
       template: { phases: { sections: { questions: :answers } } },
@@ -195,15 +196,13 @@ def show
       @important_ggs << [org, ggs] if Org.default_orgs.include?(org)
 
       # If this is one of the already selected guidance groups its important!
-      unless (ggs & @selected_guidance_groups).empty?
-        @important_ggs << [org, ggs] unless @important_ggs.include?([org, ggs])
-      end
+      @important_ggs << [org, ggs] if !(ggs & @selected_guidance_groups).empty? && !@important_ggs.include?([org, ggs])
     end
 
     # Sort the rest by org name for the accordion
-    @important_ggs = @important_ggs.sort_by { |org, _gg| (org.nil? ? "" : org.name) }
+    @important_ggs = @important_ggs.sort_by { |org, _gg| (org.nil? ? '' : org.name) }
     @all_ggs_grouped_by_org = @all_ggs_grouped_by_org.sort_by do |org, _gg|
-      (org.nil? ? "" : org.name)
+      (org.nil? ? '' : org.name)
     end
     @selected_guidance_groups = @selected_guidance_groups.ids
 
@@ -218,12 +217,13 @@ def show
     respond_to :html
   end
   # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
-  # rubocop:enable
+  # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
   # TODO: This feels like it belongs on a phases controller, perhaps introducing
   #       a non-namespaces phases_controller woulld make sense here. Consider
   #       doing this when we refactor the Plan editing UI
   # GET /plans/:plan_id/phases/:id/edit
+  # rubocop:disable Metrics/AbcSize
   def edit
     plan = Plan.includes(
       { template: {
@@ -244,9 +244,10 @@ def edit
     guidance_groups = GuidanceGroup.where(published: true, id: plan.guidance_group_ids)
     render_phases_edit(plan, phase, guidance_groups)
   end
+  # rubcocop:enable Metrics/AbcSize
 
   # PUT /plans/1
-  # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+  # rubocop:disable Metrics/MethodLength, Metrics/PerceivedComplexity
   def update
     @plan = Plan.find(params[:id])
     authorize @plan
@@ -267,7 +268,7 @@ def update
       #       appropriate namespace, so org_id represents our funder
       funder_attrs = plan_params[:funder]
       funder_attrs[:org_id] = plan_params[:funder][:id]
-      funder = org_from_params(params_in: funder_attrs, allow_create: true)
+      funder = org_from_params(params_in: funder_attrs)
       @plan.funder_id = funder&.id
       attrs.delete(:funder)
 
@@ -278,26 +279,26 @@ def update
       if @plan.update(attrs) # _attributes(attrs)
         format.html do
           redirect_to plan_path(@plan),
-                      notice: success_message(@plan, _("saved"))
+                      notice: success_message(@plan, _('saved'))
         end
         format.json do
-          render json: { code: 1, msg: success_message(@plan, _("saved")) }
+          render json: { code: 1, msg: success_message(@plan, _('saved')) }
         end
       else
         format.html do
           # TODO: Should do a `render :show` here instead but show defines too many
           #       instance variables in the controller
-          redirect_to plan_path(@plan).to_s, alert: failure_message(@plan, _("save"))
+          redirect_to plan_path(@plan).to_s, alert: failure_message(@plan, _('save'))
         end
         format.json do
-          render json: { code: 0, msg: failure_message(@plan, _("save")) }
+          render json: { code: 0, msg: failure_message(@plan, _('save')) }
         end
       end
     rescue StandardError => e
-      flash[:alert] = failure_message(@plan, _("save"))
+      flash[:alert] = failure_message(@plan, _('save'))
       format.html do
         Rails.logger.error "Unable to save plan #{@plan&.id} - #{e.message}"
-        redirect_to plan_path(@plan).to_s, alert: failure_message(@plan, _("save"))
+        redirect_to plan_path(@plan).to_s, alert: failure_message(@plan, _('save'))
       end
       format.json do
         render json: { code: 0, msg: flash[:alert] }
@@ -305,7 +306,7 @@ def update
     end
     # rubocop:enable Metrics/BlockLength
   end
-  # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+  # rubocop:enable Metrics/AbcSize, Metrics/MethodLength, Metrics/PerceivedComplexity
 
   # GET /plans/:id/share
   def share
@@ -332,6 +333,7 @@ def request_feedback
   end
 
   # DELETE /plans/:id
+  # rubocop:disable Metrics/AbcSize
   def destroy
     @plan = Plan.find(params[:id])
     authorize @plan
@@ -339,34 +341,37 @@ def destroy
       respond_to do |format|
         format.html do
           redirect_to plans_url,
-                      notice: success_message(@plan, _("deleted"))
+                      notice: success_message(@plan, _('deleted'))
         end
       end
     else
       respond_to do |format|
-        flash[:alert] = failure_message(@plan, _("delete"))
-        format.html { render action: "edit" }
+        flash[:alert] = failure_message(@plan, _('delete'))
+        format.html { render action: 'edit' }
       end
     end
   end
+  # rubocop:enable Metrics/AbcSize
 
   # TODO: Is this used? It seems like it belongs on the answers controller
   # GET /plans/:id/answer
+  # rubocop:disable Metrics/AbcSize
   def answer
     @plan = Plan.find(params[:id])
     authorize @plan
-    if !params[:q_id].nil?
+    if params[:q_id].nil?
       respond_to do |format|
-        format.json do
-          render json: @plan.answer(params[:q_id], false).to_json(include: :options)
-        end
+        format.json { render json: {} }
       end
     else
       respond_to do |format|
-        format.json { render json: {} }
+        format.json do
+          render json: @plan.answer(params[:q_id], false).to_json(include: :options)
+        end
       end
     end
   end
+  # rubocop:enable Metrics/AbcSize
 
   # GET /plans/:id/download
   def download
@@ -374,10 +379,11 @@ def download
     authorize @plan
     @phase_options = @plan.phases.order(:number).pluck(:title, :id)
     @export_settings = @plan.settings(:export)
-    render "download"
+    render 'download'
   end
 
   # POST /plans/:id/duplicate
+  # rubocop:disable Metrics/AbcSize
   def duplicate
     plan = Plan.find(params[:id])
     authorize plan
@@ -385,12 +391,13 @@ def duplicate
     respond_to do |format|
       if @plan.save
         @plan.add_user!(current_user.id, :creator)
-        format.html { redirect_to @plan, notice: success_message(@plan, _("copied")) }
+        format.html { redirect_to @plan, notice: success_message(@plan, _('copied')) }
       else
-        format.html { redirect_to plans_path, alert: failure_message(@plan, _("copy")) }
+        format.html { redirect_to plans_path, alert: failure_message(@plan, _('copy')) }
       end
     end
   end
+  # rubocop:enable Metrics/AbcSize
 
   # TODO: This should probablly just be merged with the update route
   # POST /plans/:id/visibility
@@ -403,29 +410,26 @@ def visibility
         plan.visibility = plan_params[:visibility]
         if plan.save
           deliver_if(recipients: plan.owner_and_coowners,
-                     key: "owners_and_coowners.visibility_changed") do |r|
+                     key: 'owners_and_coowners.visibility_changed') do |r|
             UserMailer.plan_visibility(r, plan).deliver_now
           end
           render status: :ok,
-                 json: { msg: success_message(plan, _("updated")) }
+                 json: { msg: success_message(plan, _('updated')) }
         else
           render status: :internal_server_error,
-                 json: { msg: failure_message(plan, _("update")) }
+                 json: { msg: failure_message(plan, _('update')) }
         end
       else
         # rubocop:disable Layout/LineLength
         render status: :forbidden, json: {
-          msg: _("Unable to change the plan's status since it is needed at least %{percentage} percentage responded") % {
-            percentage: Rails.configuration.x.plans.default_percentage_answered
-          }
+          msg: format(_("Unable to change the plan's status since it is needed at least %<percentage}>s percentage responded"), percentage: Rails.configuration.x.plans.default_percentage_answered)
         }
         # rubocop:enable Layout/LineLength
       end
     else
       render status: :not_found,
-             json: { msg: _("Unable to find plan id %{plan_id}") % {
-               plan_id: params[:id]
-             } }
+             json: { msg: format(_('Unable to find plan id %{<plan_id>s'),
+                                 plan_id: params[:id]) }
     end
   end
   # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
@@ -435,19 +439,17 @@ def visibility
   def set_test
     plan = Plan.find(params[:id])
     authorize plan
-    plan.visibility = (params[:is_test] == "1" ? :is_test : :privately_visible)
-    # rubocop:disable Layout/LineLength
+    plan.visibility = (params[:is_test] == '1' ? :is_test : :privately_visible)
     if plan.save
       render json: {
         code: 1,
-        msg: (plan.is_test? ? _("Your project is now a test.") : _("Your project is no longer a test."))
+        msg: (plan.is_test? ? _('Your project is now a test.') : _('Your project is no longer a test.'))
       }
     else
       render status: :bad_request, json: {
         code: 0, msg: _("Unable to change the plan's test status")
       }
     end
-    # rubocop:enable Layout/LineLength
   end
 
   # GET /plans/:id/overview
@@ -458,9 +460,7 @@ def overview
     authorize plan
     render(:overview, locals: { plan: plan })
   rescue ActiveRecord::RecordNotFound
-    flash[:alert] = _("There is no plan associated with id %{id}") % {
-      id: params[:id]
-    }
+    flash[:alert] = format(_('There is no plan associated with id %{<id}>s'), id: params[:id])
     redirect_to(action: :index)
   end
 
@@ -491,11 +491,11 @@ def get_most_recent(templates)
     groups = {}
     templates.each do |t|
       k = t.family_id
-      if !groups.key?(k)
-        groups[k] = t
-      else
+      if groups.key?(k)
         other = groups[k]
         groups[k] = t if other.version < t.version
+      else
+        groups[k] = t
       end
     end
     groups.values
@@ -516,7 +516,7 @@ def rollup(plan, src_plan_key, super_id, obj_plan_key)
     end
 
     plan[obj_plan_key].each do |o|
-      id = o["id"]
+      id = o['id']
       o[src_plan_key] = id_to_obj[id] if id_to_obj.key?(id)
     end
     plan.delete(src_plan_key)
@@ -527,7 +527,7 @@ def render_phases_edit(plan, phase, guidance_groups)
     # Since the answers have been pre-fetched through plan (see Plan.load_for_phase)
     # we create a hash whose keys are question id and value is the answer associated
     answers = plan.answers.each_with_object({}) { |a, m| m[a.question_id] = a; }
-    render("/phases/edit", locals: {
+    render('/phases/edit', locals: {
              base_template_org: phase.template.base_org,
              plan: plan,
              phase: phase,
@@ -539,6 +539,8 @@ def render_phases_edit(plan, phase, guidance_groups)
   end
 
   # Update, destroy or add the grant
+  # rubocop:disable Metrics/AbcSize
+  # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
   def process_grant(grant_params:)
     return false unless grant_params.present?
 
@@ -557,7 +559,7 @@ def process_grant(grant_params:)
       end
     end
   end
-  # rubocop:enable
-
+  # rubocop:enable Metrics/AbcSize
+  # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 end
 # rubocop:enable Metrics/ClassLength
diff --git a/app/controllers/public_pages_controller.rb b/app/controllers/public_pages_controller.rb
index d6dd911315..0bcb8eeea8 100644
--- a/app/controllers/public_pages_controller.rb
+++ b/app/controllers/public_pages_controller.rb
@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
+# Controller for the Public DMPs and Funder Requirements pages
 class PublicPagesController < ApplicationController
-
   # GET template_index
   # -----------------------------------------------------
   # rubocop:disable Metrics/AbcSize
   def template_index
     @templates_query_params = {
       page: paginable_params.fetch(:page, 1),
-      search: paginable_params.fetch(:search, ""),
-      sort_field: paginable_params.fetch(:sort_field, "templates.title"),
-      sort_direction: paginable_params.fetch(:sort_direction, "asc")
+      search: paginable_params.fetch(:search, ''),
+      sort_field: paginable_params.fetch(:sort_field, 'templates.title'),
+      sort_direction: paginable_params.fetch(:sort_direction, 'asc')
     }
 
     templates = Template.live(Template.families(Org.funder.pluck(:id)).pluck(:family_id))
@@ -31,7 +31,7 @@ def template_export
     # covers authorization for this action.
     # Pundit dosent support passing objects into scoped policies
     unless PublicPagePolicy.new(@template).template_export?
-      msg = "You are not authorized to export that template"
+      msg = 'You are not authorized to export that template'
       redirect_to public_templates_path, notice: msg and return
       # raise Pundit::NotAuthorizedError
     end
@@ -52,35 +52,32 @@ def template_export
     @formatting = Settings::Template::DEFAULT_SETTINGS[:formatting]
 
     begin
-      file_name = @template.title.gsub(/[^a-zA-Z\d\s]/, "").gsub(/ /, "_")
+      file_name = @template.title.gsub(/[^a-zA-Z\d\s]/, '').gsub(/ /, '_')
       file_name = "#{file_name}_v#{@template.version}"
       respond_to do |format|
         format.docx do
-          render docx: "template_exports/template_export", filename: "#{file_name}.docx"
+          render docx: 'template_exports/template_export', filename: "#{file_name}.docx"
         end
 
         format.pdf do
-          # rubocop:disable Layout/LineLength
           render pdf: file_name,
-                 template: "template_exports/template_export",
+                 template: 'template_exports/template_export',
                  margin: @formatting[:margin],
                  footer: {
-                   center: _("Template created using the %{application_name} service. Last modified %{date}") % {
-                     application_name: ApplicationService.application_name,
-                     date: l(@template.updated_at.to_date, formats: :short)
-                   },
+                   center: format(_('Template created using the %<application_name>s service. Last modified %<date>s'),
+                                  application_name: ApplicationService.application_name,
+                                  date: l(@template.updated_at.to_date, formats: :short)),
                    font_size: 8,
                    spacing: (@formatting[:margin][:bottom] / 2) - 4,
-                   right: "[page] of [topage]",
-                   encoding: "utf8"
+                   right: '[page] of [topage]',
+                   encoding: 'utf8'
                  }
-          # rubocop:enable Layout/LineLength
         end
       end
     rescue ActiveRecord::RecordInvalid
       # What scenario is this triggered in? it's common to our export pages
       redirect_to public_templates_path,
-                  alert: _("Unable to download the DMP Template at this time.")
+                  alert: _('Unable to download the DMP Template at this time.')
     end
   end
   # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
@@ -89,12 +86,12 @@ def template_export
   # ------------------------------------------------------------------------------------
   def plan_index
     @plans = Plan.publicly_visible.includes(:template)
-    render "plan_index", locals: {
+    render 'plan_index', locals: {
       query_params: {
         page: paginable_params.fetch(:page, 1),
-        search: paginable_params.fetch(:search, ""),
-        sort_field: paginable_params.fetch(:sort_field, "plans.updated_at"),
-        sort_direction: paginable_params.fetch(:sort_direction, "desc")
+        search: paginable_params.fetch(:search, ''),
+        sort_field: paginable_params.fetch(:sort_field, 'plans.updated_at'),
+        sort_direction: paginable_params.fetch(:sort_direction, 'desc')
       }
     }
   end
@@ -104,5 +101,4 @@ def plan_index
   def paginable_params
     params.permit(:page, :search, :sort_field, :sort_direction)
   end
-
 end
diff --git a/app/controllers/question_formats_controller.rb b/app/controllers/question_formats_controller.rb
index 29356bf9d1..9cf5c63ded 100644
--- a/app/controllers/question_formats_controller.rb
+++ b/app/controllers/question_formats_controller.rb
@@ -1,13 +1,12 @@
 # frozen_string_literal: true
 
+# Controller that handles the RDA Metadata question type
 class QuestionFormatsController < ApplicationController
-
   # do we need authorizaton on this? it will only return the URL for the rda api
   # down the line we will add more methods for other external api's
   def rda_api_address
     render json: {
-      "url": QuestionFormat.rda_metadata.first.description
+      url: QuestionFormat.rda_metadata.first.description
     }.to_json
   end
-
 end
diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index 352fa8481b..95379ce309 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -1,69 +1,66 @@
 # frozen_string_literal: true
 
+# Controller that handles user account creation and changes from the edit profile page
 class RegistrationsController < Devise::RegistrationsController
-
   include OrgSelectable
 
   def edit
     @user = current_user
     @prefs = @user.get_preferences(:email)
     @languages = Language.sorted_by_abbreviation
-    @orgs = Org.order("name")
+    @orgs = Org.order('name')
     @other_organisations = Org.where(is_other: true).pluck(:id)
     @identifier_schemes = IdentifierScheme.for_users.order(:name)
     @default_org = current_user.org
 
-    msg = "No default preferences found (should be in dmproadmap.rb initializer)."
+    msg = 'No default preferences found (should be in dmproadmap.rb initializer).'
     flash[:alert] = msg unless @prefs
   end
 
   # GET /resource
+  # rubocop:disable Metrics/AbcSize
   def new
     oauth = { provider: nil, uid: nil }
     IdentifierScheme.for_users.each do |scheme|
-      unless session["devise.#{scheme.name.downcase}_data"].nil?
-        oauth = session["devise.#{scheme.name.downcase}_data"]
-      end
+      oauth = session["devise.#{scheme.name.downcase}_data"] unless session["devise.#{scheme.name.downcase}_data"].nil?
     end
 
     @user = User.new
 
     # no oath, no provider or no uid - bail out
-    return if oauth.nil? or oauth["provider"].nil? or oauth["uid"].nil?
+    return if oauth.nil? || oauth['provider'].nil? || oauth['uid'].nil?
 
     # Connect the new user with the identifier sent back by the OAuth provider
-    flash[:notice] = _("Please make a choice below. After linking your
-                       details to a %{application_name} account,
+    flash[:notice] = format(_("Please make a choice below. After linking your
+                       details to a %<application_name>s account,
                        you will be able to sign in directly with your
-                       institutional credentials.") % {
-                         application_name: ApplicationService.application_name
-                       }
+                       institutional credentials."), application_name: ApplicationService.application_name)
   end
+  # rubocop:enable Metrics/AbcSize
 
-  # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/PerceivedComplexity, Metrics/BlockNesting, Layout/LineLength
+  # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+  # rubocop:disable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
   # POST /resource
   def create
     oauth = { provider: nil, uid: nil }
     IdentifierScheme.for_users.each do |scheme|
-      unless session["devise.#{scheme.name.downcase}_data"].nil?
-        oauth = session["devise.#{scheme.name.downcase}_data"]
-      end
+      oauth = session["devise.#{scheme.name.downcase}_data"] unless session["devise.#{scheme.name.downcase}_data"].nil?
     end
 
     blank_org = if Rails.configuration.x.application.restrict_orgs
-                  sign_up_params[:org_id]["id"].blank?
+                  sign_up_params[:org_id]['id'].blank?
                 else
                   sign_up_params[:org_id].blank?
                 end
 
-    if sign_up_params[:accept_terms].to_s == "0"
+    if sign_up_params[:accept_terms].to_s == '0'
       redirect_to after_sign_up_error_path_for(resource),
-                  alert: _("You must accept the terms and conditions to register.")
+                  alert: _('You must accept the terms and conditions to register.')
     elsif blank_org
       redirect_to after_sign_up_error_path_for(resource),
-                  alert: _("Please select an organisation from the list, or choose Other.")
+                  alert: _('Please select an organisation from the list, or choose Other.')
     else
-      existing_user = User.where_case_insensitive("email", sign_up_params[:email]).first
+      existing_user = User.where_case_insensitive('email', sign_up_params[:email]).first
       if existing_user.present?
         if existing_user.invitation_token.present? && !existing_user.accept_terms?
           # If the user is creating an account but they have an outstanding invitation, remember
@@ -74,7 +71,7 @@ def create
           existing_user.destroy
         else
           redirect_to after_sign_up_error_path_for(resource),
-                      alert: _("That email address is already registered.")
+                      alert: _('That email address is already registered.')
           return
         end
       end
@@ -102,23 +99,22 @@ def create
       # Determine if reCAPTCHA is enabled and if so verify it
       use_recaptcha = Rails.configuration.x.recaptcha.enabled || false
       if (!use_recaptcha || verify_recaptcha(model: resource)) && resource.save
+        # rubocop:disable Metrics/BlockNesting
         if resource.active_for_authentication?
           set_flash_message :notice, :signed_up if is_navigational_format?
           sign_up(resource_name, resource)
           UserMailer.welcome_notification(current_user).deliver_now
-          unless oauth.nil?
-            # The OAuth provider could not be determined or there was no unique UID!
-            unless oauth["provider"].nil? || oauth["uid"].nil?
-              prov = IdentifierScheme.find_by(name: oauth["provider"].downcase)
-              # Until we enable ORCID signups
-              if prov.present? && prov.name == "shibboleth"
-                Identifier.create(identifier_scheme: prov,
-                                  value: oauth["uid"],
-                                  attrs: oauth,
-                                  identifiable: resource)
-                flash[:notice] = _("Welcome! You have signed up successfully with your institutional credentials. You will now be able to access your account with them.")
-                # rubocop:enable Layout/LineLength
-              end
+          if !oauth.nil? && !(oauth['provider'].nil? || oauth['uid'].nil?)
+            prov = IdentifierScheme.find_by(name: oauth['provider'].downcase)
+            # Until we enable ORCID signups
+            if prov.present? && prov.name == 'shibboleth'
+              Identifier.create(identifier_scheme: prov,
+                                value: oauth['uid'],
+                                attrs: oauth,
+                                identifiable: resource)
+              flash[:notice] = _('Welcome! You have signed up successfully with your
+                                  institutional credentials. You will now be able to access
+                                  your account with them.')
             end
           end
           respond_with resource, location: after_sign_up_path_for(resource)
@@ -126,6 +122,7 @@ def create
           set_flash_message :notice, :"signed_up_but_#{resource.inactive_message}"
           respond_with resource, location: after_inactive_sign_up_path_for(resource)
         end
+        # rubocop:enable Metrics/BlockNesting
       else
         clean_up_passwords resource
         redirect_to after_sign_up_error_path_for(resource),
@@ -134,25 +131,28 @@ def create
       end
     end
   end
-  # rubocop:enable Metrics/AbcSize, Metrics/MethodLength, Metrics/PerceivedComplexity, Metrics/BlockNesting
+  # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+  # rubocop:enable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
 
+  # rubocop:disable Metrics/AbcSize
   def update
     if user_signed_in?
       @prefs = @user.get_preferences(:email)
-      @orgs = Org.order("name")
+      @orgs = Org.order('name')
       @default_org = current_user.org
       @other_organisations = Org.where(is_other: true).pluck(:id)
       @identifier_schemes = IdentifierScheme.for_users.order(:name)
       @languages = Language.sorted_by_abbreviation
-      if params[:skip_personal_details] == "true"
+      if params[:skip_personal_details] == 'true'
         do_update_password(current_user, update_params)
       else
         do_update(needs_password?(current_user))
       end
     else
-      render(file: File.join(Rails.root, "public/403.html"), status: 403, layout: false)
+      render(file: File.join(Rails.root, 'public/403.html'), status: 403, layout: false)
     end
   end
+  # rubocop:enable Metrics/AbcSize
 
   private
 
@@ -163,27 +163,29 @@ def needs_password?(user)
     user.email != update_params[:email] || update_params[:password].present?
   end
 
-  # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Layout/LineLength, Metrics/BlockNesting
+  # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+  # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+  # rubocop:disable Style/OptionalBooleanParameter
   def do_update(require_password = true, confirm = false)
     restrict_orgs = Rails.configuration.x.application.restrict_orgs
     mandatory_params = true
     # added to by below, overwritten otherwise
-    message = _("Save Unsuccessful. ")
+    message = _('Save Unsuccessful. ')
     # ensure that the required fields are present
 
     if update_params[:email].blank?
-      message += _("Please enter an email address. ")
+      message += _('Please enter an email address. ')
       mandatory_params &&= false
     end
     if update_params[:firstname].blank?
-      message += _("Please enter a First name. ")
+      message += _('Please enter a First name. ')
       mandatory_params &&= false
     end
     if update_params[:surname].blank?
-      message += _("Please enter a Last name. ")
+      message += _('Please enter a Last name. ')
       mandatory_params &&= false
     end
-    if restrict_orgs && update_params[:org_id]["id"].blank?
+    if restrict_orgs && update_params[:org_id]['id'].blank?
       message += _("Please select an organisation from the list, or enter your organisation's name.")
       mandatory_params &&= false
     end
@@ -197,22 +199,7 @@ def do_update(require_password = true, confirm = false)
       # user is changing email or password
       if require_password
         # if user is changing email
-        if current_user.email != attrs[:email]
-          # password needs to be present
-          if attrs[:password].blank?
-            message = _("Please enter your password to change email address.")
-            successfully_updated = false
-          elsif current_user.valid_password?(attrs[:current_password])
-            successfully_updated = current_user.update_with_password(attrs)
-            unless successfully_updated
-              message = _("Save unsuccessful. \
-                That email address is already registered. \
-                You must enter a unique email address.")
-            end
-          else
-            message = _("Invalid password")
-          end
-        else
+        if current_user.email == attrs[:email]
           # remove the current_password because its not actuallyt part of the User record
           attrs.delete(:current_password)
 
@@ -220,6 +207,21 @@ def do_update(require_password = true, confirm = false)
           # require_password = true is because the email changed.
           # The case for password changed goes to do_update_password instead
           successfully_updated = current_user.update_without_password(attrs)
+        elsif attrs[:password].blank?
+          # password needs to be present
+          message = _('Please enter your password to change email address.')
+          successfully_updated = false
+        elsif current_user.valid_password?(attrs[:current_password])
+          successfully_updated = current_user.update_with_password(attrs)
+          # rubocop:disable Metrics/BlockNesting
+          unless successfully_updated
+            message = _("Save unsuccessful. \
+                That email address is already registered. \
+                You must enter a unique email address.")
+          end
+          # rubocop:enable Metrics/BlockNesting
+        else
+          message = _('Invalid password')
         end
       else
         # password not required
@@ -232,7 +234,7 @@ def do_update(require_password = true, confirm = false)
     end
 
     # unlink shibboleth from user's details
-    current_user.update_attributes(shibboleth_id: "") if params[:unlink_flag] == "true"
+    current_user.update_attributes(shibboleth_id: '') if params[:unlink_flag] == 'true'
 
     # render the correct page
     if successfully_updated
@@ -244,28 +246,30 @@ def do_update(require_password = true, confirm = false)
       session[:locale] = current_user.locale unless current_user.locale.nil?
       # Method defined at controllers/application_controller.rb
       set_locale
-      set_flash_message :notice, success_message(current_user, _("saved"))
+      set_flash_message :notice, success_message(current_user, _('saved'))
       # Sign in the user bypassing validation in case his password changed
       sign_in current_user, bypass: true
       redirect_to "#{edit_user_registration_path}\#personal-details",
-                  notice: success_message(current_user, _("saved"))
+                  notice: success_message(current_user, _('saved'))
 
     else
-      flash[:alert] = message.blank? ? failure_message(current_user, _("save")) : message
-      @orgs = Org.order("name")
-      render "edit"
+      flash[:alert] = message.blank? ? failure_message(current_user, _('save')) : message
+      @orgs = Org.order('name')
+      render 'edit'
     end
   end
-  # rubocop:enable Metrics/AbcSize, Metrics/MethodLength, Layout/LineLength, Metrics/BlockNesting
+  # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+  # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+  # rubocop:enable Style/OptionalBooleanParameter
 
-  # rubocop:disable Metrics/AbcSize
+  # rubocop:disable Metrics/AbcSize, Metrics/PerceivedComplexity
   def do_update_password(current_user, args)
     if args[:current_password].blank?
-      message = _("Please enter your current password")
+      message = _('Please enter your current password')
     elsif args[:password_confirmation].blank?
-      message = _("Please enter a password confirmation")
+      message = _('Please enter a password confirmation')
     elsif args[:password] != args[:password_confirmation]
-      message = _("Password and comfirmation must match")
+      message = _('Password and comfirmation must match')
     else
       successfully_updated = current_user.update_with_password(args)
     end
@@ -273,18 +277,18 @@ def do_update_password(current_user, args)
     if successfully_updated
       session[:locale] = current_user.locale unless current_user.locale.nil?
       # Method defined at controllers/application_controller.rb#set_locale
-      set_flash_message :notice, success_message(current_user, _("saved"))
+      set_flash_message :notice, success_message(current_user, _('saved'))
       # TODO: this method is deprecated
       sign_in current_user, bypass: true
       redirect_to "#{edit_user_registration_path}\#password-details",
-                  notice: success_message(current_user, _("saved"))
+                  notice: success_message(current_user, _('saved'))
 
     else
-      flash[:alert] = message.blank? ? failure_message(current_user, _("save")) : message
+      flash[:alert] = message.blank? ? failure_message(current_user, _('save')) : message
       redirect_to "#{edit_user_registration_path}\#password-details"
     end
   end
-  # rubocop:enable Metrics/AbcSize
+  # rubocop:enable Metrics/AbcSize, Metrics/PerceivedComplexity
 
   def sign_up_params
     params.require(:user).permit(:email, :password, :password_confirmation,
@@ -304,7 +308,7 @@ def update_params
   def handle_org(attrs:)
     return attrs unless attrs.present? && attrs[:org_id].present?
 
-    org = org_from_params(params_in: attrs, allow_create: true)
+    org = org_from_params(params_in: attrs)
 
     # Remove the extraneous Org Selector hidden fields
     attrs = remove_org_selection_params(params_in: attrs)
@@ -314,5 +318,4 @@ def handle_org(attrs:)
     attrs[:org_id] = org.id
     attrs
   end
-
 end
diff --git a/app/controllers/research_projects_controller.rb b/app/controllers/research_projects_controller.rb
index 0792cf2f36..68483b4596 100644
--- a/app/controllers/research_projects_controller.rb
+++ b/app/controllers/research_projects_controller.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
+# Controller for Grant typeahead
 class ResearchProjectsController < ApplicationController
-
   def index
     render json: research_projects
   end
@@ -19,7 +19,7 @@ def research_projects
 
     # Check the cache contents as well since the instance variable is only
     # relevant per request
-    cached = Rails.cache.fetch(["research_projects", funder_type])
+    cached = Rails.cache.fetch(['research_projects', funder_type])
     return @research_projects = cached unless cached.nil? || cached.empty?
 
     @research_projects = fetch_projects
@@ -30,7 +30,7 @@ def funder_type
   end
 
   def fetch_projects
-    Rails.cache.fetch(["research_projects", funder_type], expires_in: expiry) do
+    Rails.cache.fetch(['research_projects', funder_type], expires_in: expiry) do
       ExternalApis::OpenAireService.search(funder: funder_type)
     end
   end
@@ -40,5 +40,4 @@ def expiry
     expiration = Rails.configuration.x.cache.research_projects_expiration
     expiration.present? ? expiration : 1.day
   end
-
 end
diff --git a/app/controllers/roles_controller.rb b/app/controllers/roles_controller.rb
index 58e583eb65..3aaf716595 100644
--- a/app/controllers/roles_controller.rb
+++ b/app/controllers/roles_controller.rb
@@ -1,14 +1,15 @@
 # frozen_string_literal: true
 
+# Controller that handles adding/updating/removing collaborators from a plan
 class RolesController < ApplicationController
-
   include ConditionalUserMailer
   respond_to :html
 
   after_action :verify_authorized
 
   # POST /roles
-  # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/BlockNesting
+  # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+  # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
   def create
     registered = true
 
@@ -16,101 +17,100 @@ def create
     @role = Role.new(plan: plan, access: role_params[:access])
     authorize @role
 
-    message = ""
+    message = ''
     if role_params[:user].present? &&
        role_params[:user].key?(:email) &&
        role_params[:user][:email].present? && plan.present?
 
       if @role.plan.owner.present? && @role.plan.owner.email == role_params[:user][:email]
-        # rubocop:disable Layout/LineLength
-        flash[:notice] = _("Cannot share plan with %{email} since that email matches with the owner of the plan.") % {
-          email: role_params[:user][:email]
-        }
-        # rubocop:enable Layout/LineLength
+        flash[:notice] = format(_('Cannot share plan with %<email>s since that email matches
+                                   with the owner of the plan.'),
+                                email: role_params[:user][:email])
       else
-        user = User.where_case_insensitive("email", role_params[:user][:email]).first
+        user = User.where_case_insensitive('email', role_params[:user][:email]).first
         if user.present? &&
            Role.where(plan: @role.plan, user: user, active: true)
                .count
                .positive? # role already exists
 
-          flash[:notice] = _("Plan is already shared with %{email}.") % {
-            email: role_params[:user][:email]
-          }
+          flash[:notice] = format(_('Plan is already shared with %<email>s.'),
+                                  email: role_params[:user][:email])
         else
+          # rubocop:disable Metrics/BlockNesting
           if user.nil?
             registered = false
             User.invite!({ email: role_params[:user][:email],
-                           firstname: _("First Name"),
-                           surname: _("Surname"),
+                           firstname: _('First Name'),
+                           surname: _('Surname'),
                            org: current_user.org },
                          current_user)
-            message = _("Invitation to %{email} issued successfully.") % {
-              email: role_params[:user][:email]
-            }
-            user = User.where_case_insensitive("email", role_params[:user][:email]).first
+            message = format(_('Invitation to %<email>s issued successfully.'),
+                             email: role_params[:user][:email])
+            user = User.where_case_insensitive('email', role_params[:user][:email]).first
           end
-          message += _("Plan shared with %{email}.") % {
-            email: user.email
-          }
+
+          message += format(_('Plan shared with %<email>s.'), email: user.email)
           @role.user = user
 
           if @role.save
             if registered
-              deliver_if(recipients: user, key: "users.added_as_coowner") do |r|
+              deliver_if(recipients: user, key: 'users.added_as_coowner') do |r|
                 UserMailer.sharing_notification(@role, r, inviter: current_user)
                           .deliver_now
               end
             end
             flash[:notice] = message
           else
-            # rubocop:disable Layout/LineLength
-            flash[:alert] = _("You must provide a valid email address and select a permission level.")
-            # rubocop:enable Layout/LineLength
+            flash[:alert] = _('You must provide a valid email address and select a permission
+                               level.')
           end
+          # rubocop:enable Metrics/BlockNesting
         end
       end
     else
-      flash[:alert] = _("Please enter an email address")
+      flash[:alert] = _('Please enter an email address')
     end
-    redirect_to controller: "plans", action: "share", id: @role.plan.id
+    redirect_to controller: 'plans', action: 'share', id: @role.plan.id
   end
-  # rubocop:enable Metrics/AbcSize, Metrics/MethodLength, Metrics/BlockNesting
-  # rubocop:enable
+  # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+  # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
   # PUT /roles/:id
+  # rubocop:disable Metrics/AbcSize
   def update
     @role = Role.find(params[:id])
     authorize @role
 
     if @role.update_attributes(access: role_params[:access])
-      deliver_if(recipients: @role.user, key: "users.added_as_coowner") do |_r|
+      deliver_if(recipients: @role.user, key: 'users.added_as_coowner') do |_r|
         UserMailer.permissions_change_notification(@role, current_user).deliver_now
       end
-      # rubocop:disable Layout/LineLength
       render json: {
         code: 1,
-        msg: _("Successfully changed the permissions for %{email}. They have been notified via email.") % { email: @role.user.email }
+        msg: format(_('Successfully changed the permissions for %<email>. They have been
+                       notified via email.'), email: @role.user.email)
       }
-      # rubocop:enable Layout/LineLength
     else
       render json: { code: 0, msg: flash[:alert] }
     end
   end
+  # rubocop:enable Metrics/AbcSize
 
   # DELETE /roles/:id
+  # rubocop:disable Metrics/AbcSize
   def destroy
     @role = Role.find(params[:id])
     authorize @role
     user = @role.user
     plan = @role.plan
     @role.destroy
-    flash[:notice] = _("Access removed")
-    deliver_if(recipients: user, key: "users.added_as_coowner") do |_r|
+    flash[:notice] = _('Access removed')
+    deliver_if(recipients: user, key: 'users.added_as_coowner') do |_r|
       UserMailer.plan_access_removed(user, plan, current_user).deliver_now
     end
-    redirect_to controller: "plans", action: "share", id: @role.plan.id
+    redirect_to controller: 'plans', action: 'share', id: @role.plan.id
   end
+  # rubocop:enable Metrics/AbcSize
 
   # This function makes user's role on a plan inactive
   # i.e. "removes" this from their plans
@@ -119,9 +119,9 @@ def deactivate
     role = Role.find(params[:id])
     authorize role
     if role.deactivate!
-      flash[:notice] = _("Plan removed")
+      flash[:notice] = _('Plan removed')
     else
-      flash[:alert] = _("Unable to remove the plan")
+      flash[:alert] = _('Unable to remove the plan')
     end
     redirect_to(plans_path)
   end
@@ -131,5 +131,4 @@ def deactivate
   def role_params
     params.require(:role).permit(:plan_id, :access, user: %i[email])
   end
-
 end
diff --git a/app/controllers/session_locales_controller.rb b/app/controllers/session_locales_controller.rb
index ac5aa9a0e8..e5ef337f0c 100644
--- a/app/controllers/session_locales_controller.rb
+++ b/app/controllers/session_locales_controller.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
+# Controller that handles a language change
 class SessionLocalesController < ApplicationController
-
   def update
     session[:locale] = params[:locale] if available_locales.include?(params[:locale].intern)
     redirect_back(fallback_location: root_path)
@@ -12,5 +12,4 @@ def update
   def available_locales
     I18n.available_locales
   end
-
 end
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 5763e95917..04e15f1de2 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
+# Controller that handles user login and logout
 class SessionsController < Devise::SessionsController
-
   def new
     redirect_to(root_path)
   end
@@ -14,12 +14,12 @@ def create
     unless existing_user.nil?
 
       # Until ORCID login is supported
-      unless session["devise.shibboleth_data"].nil?
+      unless session['devise.shibboleth_data'].nil?
         args = {
-          identifier_scheme: IdentifierScheme.find_by(name: "shibboleth"),
-          value: session["devise.shibboleth_data"]["uid"],
+          identifier_scheme: IdentifierScheme.find_by(name: 'shibboleth'),
+          value: session['devise.shibboleth_data']['uid'],
           identifiable: existing_user,
-          attrs: session["devise.shibboleth_data"]
+          attrs: session['devise.shibboleth_data']
         }
         @ui = Identifier.new(args)
       end
@@ -31,7 +31,7 @@ def create
     super do
       if !@ui.nil? && @ui.save
         # rubocop:disable Layout/LineLength
-        flash[:notice] = _("Your account has been successfully linked to your institutional credentials. You will now be able to sign in with them.")
+        flash[:notice] = _('Your account has been successfully linked to your institutional credentials. You will now be able to sign in with them.')
         # rubocop:enable Layout/LineLength
       end
     end
@@ -44,5 +44,4 @@ def destroy
     # Method defined at controllers/application_controller.rb
     set_locale
   end
-
 end
diff --git a/app/controllers/settings.rb b/app/controllers/settings.rb
index de3ffd121a..c65eeb625a 100644
--- a/app/controllers/settings.rb
+++ b/app/controllers/settings.rb
@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
+# Controller for the user email preferences
 module Settings
-
   class SettingsController < ApplicationController
-
   end
-
 end
diff --git a/app/controllers/settings/plans_controller.rb b/app/controllers/settings/plans_controller.rb
index 77bdff779c..b67fc7154a 100644
--- a/app/controllers/settings/plans_controller.rb
+++ b/app/controllers/settings/plans_controller.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
 module Settings
-
+  # Controller that handles the download options (e.g. font face, size) for PDF downloads
   class PlansController < SettingsController
-
     before_action :retrieve_settings
 
     after_action :verify_authorized
@@ -17,14 +16,14 @@ def show
       end
     end
 
-    # rubocop:disable Metrics/AbcSize
+    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
     def update
       authorize @plan
       # If this is actually used we should consider switching these to strong params
       export_params = params[:export].try(:deep_symbolize_keys)
 
       settings = @plan.super_settings(:export).tap do |s|
-        if params[:commit] == "Reset"
+        if params[:commit] == 'Reset'
           s.formatting = nil
           s.fields = nil
           s.title = nil
@@ -36,9 +35,9 @@ def update
       end
 
       if settings.save
-        flash[:notice] = _("Export settings updated successfully.")
+        flash[:notice] = _('Export settings updated successfully.')
       else
-        flash[:alert] = _("An error has occurred while saving/resetting your export settings.")
+        flash[:alert] = _('An error has occurred while saving/resetting your export settings.')
 
       end
       respond_to do |format|
@@ -47,7 +46,7 @@ def update
         # format.json { render json: settings_json }
       end
     end
-    # rubocop:enable Metrics/AbcSize
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
     private
 
@@ -64,7 +63,5 @@ def settings_json
     def plan
       @plan ||= Plan.find(params[:id])
     end
-
   end
-
 end
diff --git a/app/controllers/static_pages_controller.rb b/app/controllers/static_pages_controller.rb
index 8a3a138616..f15c27d876 100644
--- a/app/controllers/static_pages_controller.rb
+++ b/app/controllers/static_pages_controller.rb
@@ -1,20 +1,14 @@
 # frozen_string_literal: true
 
+# Controller that handles requests for static pages
 class StaticPagesController < ApplicationController
+  def about_us; end
 
-  def about_us
-  end
+  def contact_us; end
 
-  def contact_us
-  end
+  def privacy; end
 
-  def privacy
-  end
-
-  def termsuse
-  end
-
-  def help
-  end
+  def termsuse; end
 
+  def help; end
 end
diff --git a/app/controllers/super_admin/api_clients_controller.rb b/app/controllers/super_admin/api_clients_controller.rb
index d483020731..5f8bdc85a0 100644
--- a/app/controllers/super_admin/api_clients_controller.rb
+++ b/app/controllers/super_admin/api_clients_controller.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
 module SuperAdmin
-
+  # Controller for managing ApiClients for API V1
   class ApiClientsController < ApplicationController
-
     respond_to :html
 
     include OrgSelectable
@@ -29,6 +28,7 @@ def edit
     end
 
     # POST /api_clients
+    # rubocop:disable Metrics/AbcSize
     def create
       authorize(ApiClient)
 
@@ -41,19 +41,20 @@ def create
 
       if @api_client.save
         UserMailer.api_credentials(@api_client).deliver_now
-        msg = success_message(@api_client, _("created"))
-        msg += _(". The API credentials have been emailed to %{email}") % {
-          email: @api_client.contact_email
-        }
+        msg = success_message(@api_client, _('created'))
+        msg += format(_('. The API credentials have been emailed to %<email>s'),
+                      email: @api_client.contact_email)
         flash.now[:notice] = msg
         render :edit
       else
-        flash.now[:alert] = failure_message(@api_client, _("create"))
+        flash.now[:alert] = failure_message(@api_client, _('create'))
         render :new
       end
     end
+    # rubocop:enable Metrics/AbcSize
 
     # PATCH/PUT /api_clients/:id
+    # rubocop:disable Metrics/AbcSize
     def update
       @api_client = ApiClient.find(params[:id])
       authorize(@api_client)
@@ -64,22 +65,23 @@ def update
       attrs = remove_org_selection_params(params_in: api_client_params)
 
       if @api_client.update(attrs)
-        flash.now[:notice] = success_message(@api_client, _("updated"))
+        flash.now[:notice] = success_message(@api_client, _('updated'))
       else
-        flash.now[:alert] = failure_message(@api_client, _("update"))
+        flash.now[:alert] = failure_message(@api_client, _('update'))
       end
       render :edit
     end
+    # rubocop:enable Metrics/AbcSize
 
     # DELETE /api_clients/:id
     def destroy
       api_client = ApiClient.find(params[:id])
       authorize(api_client)
       if api_client.destroy
-        msg = success_message(api_client, _("deleted"))
+        msg = success_message(api_client, _('deleted'))
         redirect_to super_admin_api_clients_path, notice: msg
       else
-        flash.now[:alert] = failure_message(api_client, _("delete"))
+        flash.now[:alert] = failure_message(api_client, _('delete'))
         render :edit
       end
     end
@@ -110,7 +112,5 @@ def api_client_params
                                          :client_id, :client_secret,
                                          :org_id, :org_name, :org_sources, :org_crosswalk)
     end
-
   end
-
 end
diff --git a/app/controllers/super_admin/notifications_controller.rb b/app/controllers/super_admin/notifications_controller.rb
index fba40c042c..8e086856d5 100644
--- a/app/controllers/super_admin/notifications_controller.rb
+++ b/app/controllers/super_admin/notifications_controller.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
 module SuperAdmin
-
+  # Controller for managing system wide notifications
   class NotificationsController < ApplicationController
-
     before_action :set_notification, only: %i[show edit update destroy acknowledge]
     before_action :set_notifications, only: :index
 
@@ -29,29 +28,31 @@ def edit
 
     # POST /notifications
     # POST /notifications.json
+    # rubocop:disable Metrics/AbcSize
     def create
       authorize(Notification)
       @notification = Notification.new(notification_params)
       # Will eventually need to be removed if we introduce new notification types
-      @notification.notification_type = "global"
+      @notification.notification_type = 'global'
       if @notification.save
-        flash.now[:notice] = success_message(@notification, _("created"))
+        flash.now[:notice] = success_message(@notification, _('created'))
         redirect_to edit_super_admin_notification_path(@notification)
       else
-        flash.now[:alert] = failure_message(@notification, _("create"))
+        flash.now[:alert] = failure_message(@notification, _('create'))
         render :new
       end
     end
+    # rubocop:enable Metrics/AbcSize
 
     # PATCH/PUT /notifications/1
     # PATCH/PUT /notifications/1.json
     def update
       authorize(Notification)
       if @notification.update(notification_params)
-        flash.now[:notice] = success_message(@notification, _("updated"))
+        flash.now[:notice] = success_message(@notification, _('updated'))
         return redirect_to edit_super_admin_notification_path(@notification)
       else
-        flash.now[:alert] = failure_message(@notification, _("update"))
+        flash.now[:alert] = failure_message(@notification, _('update'))
       end
       render :edit
     end
@@ -60,13 +61,13 @@ def update
     def enable
       notification = Notification.find(params[:id])
       authorize(Notification)
-      notification.enabled = (params[:enabled] == "1")
+      notification.enabled = (params[:enabled] == '1')
 
       # rubocop:disable Layout/LineLength
       if notification.save
         render json: {
           code: 1,
-          msg: (notification.enabled ? _("Your notification is now active.") : _("Your notification is no longer active."))
+          msg: (notification.enabled ? _('Your notification is now active.') : _('Your notification is no longer active.'))
         }
       else
         render status: :bad_request, json: {
@@ -81,10 +82,10 @@ def enable
     def destroy
       authorize(Notification)
       if @notification.destroy
-        msg = success_message(@notification, _("deleted"))
+        msg = success_message(@notification, _('deleted'))
         redirect_to super_admin_notifications_path, notice: msg
       else
-        flash.now[:alert] = failure_message(@notification, _("delete"))
+        flash.now[:alert] = failure_message(@notification, _('delete'))
         render :edit
       end
     end
@@ -101,8 +102,8 @@ def acknowledge
     def set_notification
       @notification = Notification.find(params[:id] || params[:notification_id])
     rescue ActiveRecord::RecordNotFound
-      flash[:alert] = _("There is no notification associated with id  %{id}") %
-                      { id: params[:id] }
+      flash[:alert] = format(_('There is no notification associated with id  %<id>s'),
+                             id: params[:id])
       redirect_to action: :index
     end
 
@@ -116,7 +117,5 @@ def notification_params
       params.require(:notification).permit(:title, :level, :body, :dismissable, :enabled,
                                            :starts_at, :expires_at)
     end
-
   end
-
 end
diff --git a/app/controllers/super_admin/org_swaps_controller.rb b/app/controllers/super_admin/org_swaps_controller.rb
index ff79822e0f..ca89d894e1 100644
--- a/app/controllers/super_admin/org_swaps_controller.rb
+++ b/app/controllers/super_admin/org_swaps_controller.rb
@@ -1,39 +1,43 @@
 # frozen_string_literal: true
 
-class SuperAdmin::OrgSwapsController < ApplicationController
-
-  include OrgSelectable
-
-  after_action :verify_authorized
-
-  def create
-    # Allows the user to swap their org affiliation on the fly
-    authorize current_user, :org_swap?
-
-    # See if the user selected a new Org via the Org Lookup and
-    # convert it into an Org
-    lookup = org_from_params(params_in: org_swap_params)
-
-    # rubocop:disable Layout/LineLength
-    if lookup.present? && !lookup.new_record?
-      current_user.org = lookup
-      if current_user.save
-        redirect_back(fallback_location: root_path,
-                      notice: _("Your organisation affiliation has been changed. You may now edit templates for %{org_name}.") % { org_name: current_user.org.name })
+module SuperAdmin
+  # Controller that handles changing a Super Admin's Org affiliation on the Templates page
+  class OrgSwapsController < ApplicationController
+    include OrgSelectable
+
+    after_action :verify_authorized
+
+    # rubocop:disable Metrics/AbcSize
+    def create
+      # Allows the user to swap their org affiliation on the fly
+      authorize(current_user, :org_swap?)
+
+      # See if the user selected a new Org via the Org Lookup and
+      # convert it into an Org
+      lookup = org_from_params(params_in: org_swap_params)
+
+      # rubocop:disable Layout/LineLength
+      if lookup.present? && !lookup.new_record?
+        current_user.org = lookup
+        if current_user.save
+          redirect_back(fallback_location: root_path,
+                        notice: format(_('Your organisation affiliation has been changed. You may now edit templates for %<org_name>s.'),
+                                       org_name: current_user.org.name))
+        else
+          redirect_back(fallback_location: root_path,
+                        alert: _('Unable to change your organisation affiliation at this time.'))
+        end
       else
-        redirect_back(fallback_location: root_path,
-                      alert: _("Unable to change your organisation affiliation at this time."))
+        redirect_back(fallback_location: root_path, alert: _('Unknown organisation.'))
       end
-    else
-      redirect_back(fallback_location: root_path, alert: _("Unknown organisation."))
+      # rubocop:enable Layout/LineLength
     end
-    # rubocop:enable Layout/LineLength
-  end
+    # rubocop:enable Metrics/AbcSize
 
-  private
+    private
 
-  def org_swap_params
-    params.require(:user).permit(:org_id, :org_name, :org_crosswalk)
+    def org_swap_params
+      params.require(:user).permit(:org_id, :org_name, :org_crosswalk)
+    end
   end
-
 end
diff --git a/app/controllers/super_admin/orgs_controller.rb b/app/controllers/super_admin/orgs_controller.rb
index 6e2c49634b..a2cd2fe183 100644
--- a/app/controllers/super_admin/orgs_controller.rb
+++ b/app/controllers/super_admin/orgs_controller.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
 module SuperAdmin
-
+  # Controller for creating and deleting Orgs
   class OrgsController < ApplicationController
-
     include OrgSelectable
 
     after_action :verify_authorized
@@ -11,7 +10,7 @@ class OrgsController < ApplicationController
     # GET /super_admin/orgs
     def index
       authorize Org
-      render "index", locals: {
+      render 'index', locals: {
         orgs: Org.includes(:contributors, :plans).with_template_and_user_counts.page(1)
       }
     end
@@ -20,11 +19,11 @@ def index
     def new
       @org = Org.new(managed: true)
       authorize @org
-      @org.links = { "org": [] }
+      @org.links = { org: [] }
     end
 
     # POST /super_admin/orgs
-    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/PerceivedComplexity
     def create
       authorize Org
       attrs = org_params
@@ -41,7 +40,7 @@ def create
       org = Org.new unless org.present?
 
       org.language = Language.default
-      org.managed = org_params[:managed] == "1"
+      org.managed = org_params[:managed] == '1'
       org.logo = params[:logo] if params[:logo]
       org.links = if params[:org_links].present?
                     JSON.parse(params[:org_links])
@@ -59,28 +58,29 @@ def create
         org.organisation = params[:organisation].present?
 
         if org.update(attrs)
-          msg = success_message(org, _("created"))
+          msg = success_message(org, _('created'))
           redirect_to admin_edit_org_path(org.id), notice: msg
         else
-          flash.now[:alert] = failure_message(org, _("create"))
+          flash.now[:alert] = failure_message(org, _('create'))
           @org = org
-          @org.links = { "org": [] } unless org.links.present?
-          render "super_admin/orgs/new"
+          @org.links = { org: [] } unless org.links.present?
+          render 'super_admin/orgs/new'
         end
       rescue Dragonfly::Job::Fetch::NotFound
-        failure = _("There seems to be a problem with your logo. Please upload it again.")
+        failure = _('There seems to be a problem with your logo. Please upload it again.')
         redirect_to admin_edit_org_path(org), alert: failure
-        render "orgs/admin_edit", locals: {
+        render 'orgs/admin_edit', locals: {
           org: org,
-          languages: Language.all.order("name"),
-          method: "POST",
+          languages: Language.all.order('name'),
+          method: 'POST',
           url: super_admin_orgs_path
         }
       end
     end
-    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength, Metrics/PerceivedComplexity
 
     # DELETE /super_admin/orgs/:id
+    # rubocop:disable Metrics/AbcSize
     def destroy
       org = Org.includes(:users, :templates, :guidance_groups).find(params[:id])
       authorize org
@@ -91,13 +91,14 @@ def destroy
       org.guidance_groups.delete_all
 
       if org.destroy!
-        msg = success_message(org, _("removed"))
+        msg = success_message(org, _('removed'))
         redirect_to super_admin_orgs_path, notice: msg
       else
-        failure = failure_message(org, _("remove"))
+        failure = failure_message(org, _('remove'))
         redirect_to super_admin_orgs_path, alert: failure
       end
     end
+    # rubocop:enable Metrics/AbcSize
 
     # POST /super_admin/:id/merge_analyze
     def merge_analyze
@@ -121,6 +122,7 @@ def merge_analyze
     end
 
     # POST /super_admin/:id/merge_commit
+    # rubocop:disable Metrics/AbcSize
     def merge_commit
       @org = Org.find(params[:id])
       authorize @org
@@ -132,17 +134,18 @@ def merge_commit
           msg = "Successfully merged '#{@org.name}' into '#{@target_org.name}'"
           redirect_to super_admin_orgs_path, notice: msg
         else
-          msg = _("An error occurred while trying to merge the Organisations.")
+          msg = _('An error occurred while trying to merge the Organisations.')
           redirect_to admin_edit_org_path(@org), alert: msg
         end
       else
-        msg = _("Unable to merge the two Organisations at this time.")
+        msg = _('Unable to merge the two Organisations at this time.')
         redirect_to admin_edit_org_path(@org), alert: msg
       end
     rescue JSON::ParserError
-      msg = _("Unable to determine what records need to be merged.")
+      msg = _('Unable to determine what records need to be merged.')
       redirect_to admin_edit_org_path(@org), alert: msg
     end
+    # rubocop:enable Metrics/AbcSize
 
     private
 
@@ -156,7 +159,5 @@ def org_params
     def merge_params
       params.require(:org).permit(:org_name, :org_sources, :org_crosswalk, :id, :target_org)
     end
-
   end
-
 end
diff --git a/app/controllers/super_admin/themes_controller.rb b/app/controllers/super_admin/themes_controller.rb
index 5738acc10a..6be6852c59 100644
--- a/app/controllers/super_admin/themes_controller.rb
+++ b/app/controllers/super_admin/themes_controller.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
 module SuperAdmin
-
+  # Controller for managing Themes
   class ThemesController < ApplicationController
-
     helper PaginableHelper
     def index
       authorize(Theme)
@@ -19,10 +18,10 @@ def create
       authorize(Theme)
       @theme = Theme.new(permitted_params)
       if @theme.save
-        flash.now[:notice] = success_message(@theme, _("created"))
+        flash.now[:notice] = success_message(@theme, _('created'))
         render :edit
       else
-        flash.now[:alert] = failure_message(@theme, _("create"))
+        flash.now[:alert] = failure_message(@theme, _('create'))
         render :new
       end
     end
@@ -32,36 +31,36 @@ def edit
       @theme = Theme.find(params[:id])
     end
 
+    # rubocop:disable Metrics/AbcSize
     def update
       authorize(Theme)
       @theme = Theme.find(params[:id])
       if @theme.update_attributes(permitted_params)
-        flash.now[:notice] = success_message(@theme, _("updated"))
+        flash.now[:notice] = success_message(@theme, _('updated'))
       else
-        flash.now[:alert] = failure_message(@theme, _("update"))
+        flash.now[:alert] = failure_message(@theme, _('update'))
       end
       render :edit
     end
+    # rubocop:enable Metrics/AbcSize
 
     def destroy
       authorize(Theme)
       @theme = Theme.find(params[:id])
       if @theme.destroy
-        msg = success_message(@theme, _("deleted"))
+        msg = success_message(@theme, _('deleted'))
         redirect_to super_admin_themes_path, notice: msg
       else
-        flash.now[:alert] = failure_message(@theme, _("delete"))
+        flash.now[:alert] = failure_message(@theme, _('delete'))
         render :edit
       end
     end
-
     # Private instance methods
+
     private
 
     def permitted_params
       params.require(:theme).permit(:title, :description)
     end
-
   end
-
 end
diff --git a/app/controllers/super_admin/users_controller.rb b/app/controllers/super_admin/users_controller.rb
index 933ac6e5c5..4c67446d60 100644
--- a/app/controllers/super_admin/users_controller.rb
+++ b/app/controllers/super_admin/users_controller.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
 module SuperAdmin
-
+  # Controller for performing CRUD operations for other users
   class UsersController < ApplicationController
-
     include OrgSelectable
 
     after_action :verify_authorized
@@ -14,7 +13,7 @@ def edit
       authorize @user
       @departments = @user.org.departments.order(:name)
       @plans = Plan.active(@user).page(1)
-      render "super_admin/users/edit",
+      render 'super_admin/users/edit',
              locals: { user: @user,
                        departments: @departments,
                        plans: @plans,
@@ -25,7 +24,7 @@ def edit
     end
 
     # PUT /super_admin/users/:id
-    # rubocop:disable Metrics/AbcSize
+    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
     def update
       @user = User.find(params[:id])
       authorize @user
@@ -52,24 +51,25 @@ def update
         end
         @user.update(org_id: lookup.id) if lookup.present?
 
-        flash.now[:notice] = success_message(@user, _("updated"))
+        flash.now[:notice] = success_message(@user, _('updated'))
       else
-        flash.now[:alert] = failure_message(@user, _("update"))
+        flash.now[:alert] = failure_message(@user, _('update'))
       end
       render :edit
     end
-    # rubocop:enable Metrics/AbcSize
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
     # PUT /super_admin/users/:id/merge
+    # rubocop:disable Metrics/AbcSize
     def merge
       @user = User.find(params[:id])
       authorize @user
 
-      if params[:id] != params[:merge_id]
-        merge_accounts
-      else
+      if params[:id] == params[:merge_id]
         flash.now[:alert] = _("You attempted to merge 2 accounts with the same email address.
            Please merge with a different email address.")
+      else
+        merge_accounts
       end
 
       # After merge attempt get departments and plans
@@ -78,38 +78,43 @@ def merge
 
       render :edit
     end
+    # rubocop:enable Metrics/AbcSize
 
     # GET /super_admin/users/:id/search
+    # rubocop:disable Metrics/AbcSize
     def search
       @user = User.find(params[:id])
-      @users = User.where("email LIKE ?", "%#{params[:email]}%")
+      @users = User.where('email LIKE ?', "%#{params[:email]}%")
       authorize @users
       @departments = @user.org.departments.order(:name)
       @plans = Plan.active(@user).page(1)
       # WHAT TO RETURN!?!?!
       if @users.present? # found a user, or Users, submit for merge
         render json: {
-          form: render_to_string(partial: "super_admin/users/confirm_merge.html.erb")
+          form: render_to_string(partial: 'super_admin/users/confirm_merge.html.erb')
         }
       else # NO USER, re-render w/error?
-        flash.now[:alert] = "Unable to find user"
+        flash.now[:alert] = 'Unable to find user'
         render :edit # re-do as responding w/ json
       end
     end
+    # rubocop:enable Metrics/AbcSize
 
     # PUT /super_admin/users/:id/archive
+    # rubocop:disable Metrics/AbcSize
     def archive
       @user = User.find(params[:id])
       authorize @user
       @departments = @user.org.departments.order(:name)
       @plans = Plan.active(@user).page(1)
       if @user.archive
-        flash.now[:notice] = success_message(@user, _("archived"))
+        flash.now[:notice] = success_message(@user, _('archived'))
       else
-        flash.now[:alert] = failure_message(@user, _("archive"))
+        flash.now[:alert] = failure_message(@user, _('archive'))
       end
       render :edit
     end
+    # rubocop:enable Metrics/AbcSize
 
     private
 
@@ -126,12 +131,10 @@ def user_params
     def merge_accounts
       remove = User.find(params[:merge_id])
       if @user.merge(remove)
-        flash.now[:notice] = success_message(@user, _("merged"))
+        flash.now[:notice] = success_message(@user, _('merged'))
       else
-        flash.now[:alert] = failure_message(@user, _("merge"))
+        flash.now[:alert] = failure_message(@user, _('merge'))
       end
     end
-
   end
-
 end
diff --git a/app/controllers/template_options_controller.rb b/app/controllers/template_options_controller.rb
index 373e48c074..4038679f6f 100644
--- a/app/controllers/template_options_controller.rb
+++ b/app/controllers/template_options_controller.rb
@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
+# Controller that determines which templates are displayed/selected for the user when
+# they are creating a new plan
 class TemplateOptionsController < ApplicationController
-
   include OrgSelectable
 
   after_action :verify_authorized
@@ -9,6 +10,7 @@ class TemplateOptionsController < ApplicationController
   # GET /template_options  (AJAX)
   # Collect all of the templates available for the org+funder combination
   # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+  # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
   def index
     org_hash = plan_params.fetch(:research_org_id, {})
     funder_hash = plan_params.fetch(:funder_id, {})
@@ -56,20 +58,18 @@ def index
     end
 
     # If no templates were available use the default template
-    if @templates.empty?
-      if Template.default.present?
-        customization = Template.published
-                                .latest_customized_version(Template.default.family_id,
-                                                           org&.id).first
+    if @templates.empty? && Template.default.present?
+      customization = Template.published
+                              .latest_customized_version(Template.default.family_id,
+                                                         org&.id).first
 
-        @templates << (customization.present? ? customization : Template.default)
-      end
+      @templates << (customization.present? ? customization : Template.default)
     end
 
     @templates = @templates.sort_by(&:title)
   end
   # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
-  # rubocop:enable
+  # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
   private
 
@@ -81,5 +81,4 @@ def plan_params
   def org_params
     %i[id name url language abbreviation ror fundref weight score]
   end
-
 end
diff --git a/app/controllers/usage_controller.rb b/app/controllers/usage_controller.rb
index 1ab8c0c29e..a406828435 100644
--- a/app/controllers/usage_controller.rb
+++ b/app/controllers/usage_controller.rb
@@ -1,14 +1,13 @@
 # frozen_string_literal: true
 
+# Controller for site usage statistics
 class UsageController < ApplicationController
-
-  require "csvable"
+  require 'csvable'
 
   after_action :verify_authorized
   # GET /usage
   def index
     authorize :usage
-
     args = default_query_args
     user_data(args: args, as_json: true)
     plan_data(args: args, as_json: true)
@@ -26,9 +25,7 @@ def plans_by_template
     authorize :usage
 
     args = default_query_args
-    if usage_params["template_plans_range"].present?
-      args[:start_date] = usage_params["template_plans_range"]
-    end
+    args[:start_date] = usage_params['template_plans_range'] if usage_params['template_plans_range'].present?
     plan_data(args: args, as_json: true)
   end
 
@@ -42,7 +39,7 @@ def global_statistics
     sep = sep_param
     data_csvified = Csvable.from_array_of_hashes(data, true, sep)
 
-    send_data(data_csvified, filename: "totals.csv")
+    send_data(data_csvified, filename: 'totals.csv')
   end
 
   # GET
@@ -53,10 +50,11 @@ def org_statistics
     sep = sep_param
     data_csvified = Csvable.from_array_of_hashes(data, true, sep)
 
-    send_data(data_csvified, filename: "totals.csv")
+    send_data(data_csvified, filename: 'totals.csv')
   end
 
   # GET /usage_yearly_users
+  # rubocop:disable Metrics/AbcSize
   def yearly_users
     # This action is triggered when a user clicks on the 'download csv' button
     # for the annual users chart
@@ -65,17 +63,19 @@ def yearly_users
     user_data(args: default_query_args)
     sep = sep_param
     send_data(CSV.generate(col_sep: sep) do |csv|
-      csv << [_("Month"), _("No. Users joined")]
+      csv << [_('Month'), _('No. Users joined')]
       total = 0
       @users_per_month.each do |data|
-        csv << [data.date.strftime("%b-%y"), data.count]
+        csv << [data.date.strftime('%b-%y'), data.count]
         total += data.count
       end
-      csv << [_("Total"), total]
-    end, filename: "users_joined.csv")
+      csv << [_('Total'), total]
+    end, filename: 'users_joined.csv')
   end
+  # rubocop:enable Metrics/AbcSize
 
   # GET /usage_yearly_plans
+  # rubocop:disable Metrics/AbcSize
   def yearly_plans
     # This action is triggered when a user clicks on the 'download csv' button
     # for the annual plans chart
@@ -84,15 +84,16 @@ def yearly_plans
     plan_data(args: default_query_args)
     sep = sep_param
     send_data(CSV.generate(col_sep: sep) do |csv|
-      csv << [_("Month"), _("No. Completed Plans")]
+      csv << [_('Month'), _('No. Completed Plans')]
       total = 0
       @plans_per_month.each do |data|
-        csv << [data.date.strftime("%b-%y"), data.count]
+        csv << [data.date.strftime('%b-%y'), data.count]
         total += data.count
       end
-      csv << [_("Total"), total]
-    end, filename: "completed_plans.csv")
+      csv << [_('Total'), total]
+    end, filename: 'completed_plans.csv')
   end
+  # rubocop:enable Metrics/AbcSize
 
   # GET /usage_all_plans_by_template
   def all_plans_by_template
@@ -105,10 +106,8 @@ def all_plans_by_template
     sep = sep_param
 
     plan_data(args: args, sort: :desc)
-    # rubocop:disable Layout/LineLength
     data_csvified = StatCreatedPlan.to_csv(@plans_per_month, details: { by_template: true, sep: sep })
-    # rubocop:enable Layout/LineLength
-    send_data(data_csvified, filename: "created_plan_by_template.csv")
+    send_data(data_csvified, filename: 'created_plan_by_template.csv')
   end
 
   private
@@ -121,17 +120,15 @@ def usage_params
   # rubocop:disable Metrics/AbcSize
   def args_from_params
     org = current_user.org
-    if current_user.can_super_admin? && usage_params[:org_id].present?
-      org = Org.find_by(id: usage_params[:org_id])
-    end
+    org = Org.find_by(id: usage_params[:org_id]) if current_user.can_super_admin? && usage_params[:org_id].present?
 
     start_date = usage_params[:start_date] if usage_params[:start_date].present?
     end_date = usage_params[:end_date] if usage_params[:end_date].present?
 
     {
       org: org,
-      start_date: start_date.present? ? start_date : first_plan_date.strftime("%Y-%m-%d"),
-      end_date: end_date.present? ? end_date : Date.today.strftime("%Y-%m-%d")
+      start_date: start_date.present? ? start_date : first_plan_date.strftime('%Y-%m-%d'),
+      end_date: end_date.present? ? end_date : Date.today.strftime('%Y-%m-%d')
     }
   end
   # rubocop:enable Metrics/AbcSize
@@ -143,24 +140,24 @@ def default_query_args
     # That means we want our date range to be 11/30/2018 to 11/30/2019
     {
       org: current_user.org,
-      start_date: Date.today.months_ago(12).end_of_month.strftime("%Y-%m-%d"),
-      end_date: Date.today.last_month.end_of_month.strftime("%Y-%m-%d"),
+      start_date: Date.today.months_ago(12).end_of_month.strftime('%Y-%m-%d'),
+      end_date: Date.today.last_month.end_of_month.strftime('%Y-%m-%d'),
       filtered: parse_filtered
     }
   end
 
   def parse_filtered
-    params[:filtered].present? && params[:filtered] == "true"
+    params[:filtered].present? && params[:filtered] == 'true'
   end
 
   # set the csv separator or default to comma
   def sep_param
-    params["sep"] || ","
+    params['sep'] || ','
   end
 
   def min_max_dates(args:)
-    args[:start_date] = first_plan_date.strftime("%Y-%m-%d")
-    args[:end_date] = Date.today.strftime("%Y-%m-%d")
+    args[:start_date] = first_plan_date.strftime('%Y-%m-%d')
+    args[:end_date] = Date.today.strftime('%Y-%m-%d')
     args
   end
 
@@ -172,7 +169,7 @@ def user_data(args:, as_json: false, sort: :asc)
 
   def plan_data(args:, as_json: false, sort: :asc)
     @plans_per_month = StatCreatedPlan.monthly_range(args)
-                                      .where.not(details: "{\"by_template\":[]}")
+                                      .where.not(details: '{"by_template":[]}')
                                       .order(date: sort)
     @plans_per_month = @plans_per_month.map(&:to_json) if as_json
   end
@@ -189,5 +186,4 @@ def first_plan_date
     StatCreatedPlan.all.order(:date).limit(1).pluck(:date).first \
     || Date.today.last_month.end_of_month
   end
-
 end
diff --git a/app/controllers/usage_downloads_controller.rb b/app/controllers/usage_downloads_controller.rb
index c297b2903b..0b2b0867e9 100644
--- a/app/controllers/usage_downloads_controller.rb
+++ b/app/controllers/usage_downloads_controller.rb
@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
+# Controller for generating CSV download of usage stats
 class UsageDownloadsController < ApplicationController
-
   def index
     check_authorized!
     data = Org::TotalCountStatService.call
     data_csvified = Csvable.from_array_of_hashes(data)
 
-    send_data(data_csvified, filename: "totals.csv")
+    send_data(data_csvified, filename: 'totals.csv')
   end
 
   private
@@ -18,5 +18,4 @@ def check_authorized!
       raise Pundit::NotAuthorizedError
     end
   end
-
 end
diff --git a/app/controllers/users/invitations_controller.rb b/app/controllers/users/invitations_controller.rb
index 4b03586e1f..0505adc2fe 100644
--- a/app/controllers/users/invitations_controller.rb
+++ b/app/controllers/users/invitations_controller.rb
@@ -1,64 +1,65 @@
 # frozen_string_literal: true
 
-class Users::InvitationsController < Devise::InvitationsController
+module Users
+  # Controller that handles user invitations
+  class InvitationsController < Devise::InvitationsController
+    include OrgSelectable
 
-  include OrgSelectable
+    # Creates the selected Org if necessary and then attaches the invited user
+    # to the Org after Devise does its thing
+    prepend_after_action :handle_org, only: [:update]
+    prepend_before_action :fix_org_params, only: [:update]
 
-  # Creates the selected Org if necessary and then attaches the invited user
-  # to the Org after Devise does its thing
-  prepend_after_action :handle_org, only: [:update]
-  prepend_before_action :fix_org_params, only: [:update]
+    protected
 
-  protected
-
-  def fix_org_params
-    hash = org_hash_from_params(params_in: params[:user])
-    org = OrgSelection::HashToOrgService.to_org(hash: hash,
-                                                allow_create: false)
-    params[:user][:org_id] = org&.id
-  end
+    def fix_org_params
+      hash = org_hash_from_params(params_in: params[:user])
+      org = OrgSelection::HashToOrgService.to_org(hash: hash,
+                                                  allow_create: false)
+      params[:user][:org_id] = org&.id
+    end
 
-  # Override require_no_authentication method defined at DeviseController
-  # (parent of Devise::InvitationsController) The following filter gets
-  # executed any time GET /users/invitation/accept?invitation_token=valid_token
-  # is requested. It replaces the default error message from devise
-  # (e.g. You are already signed in.) if the user is signed in already while
-  # trying to access to that URL
-  def require_no_authentication
-    super
-    return unless flash[:alert].present?
+    # Override require_no_authentication method defined at DeviseController
+    # (parent of Devise::InvitationsController) The following filter gets
+    # executed any time GET /users/invitation/accept?invitation_token=valid_token
+    # is requested. It replaces the default error message from devise
+    # (e.g. You are already signed in.) if the user is signed in already while
+    # trying to access to that URL
+    def require_no_authentication
+      super
+      return unless flash[:alert].present?
 
-    flash[:alert] = nil
-    # rubocop:disable Layout/LineLength
-    flash[:notice] = _("You are already signed in as another user. Please log out to activate your invitation.")
-    # rubocop:enable Layout/LineLength
-  end
+      flash[:alert] = nil
+      flash[:notice] = _('You are already signed in as another user. Please log out to activate your invitation.')
+    end
 
-  # Handle the user's Org selection
-  def handle_org
-    attrs = update_resource_params
+    # Handle the user's Org selection
+    # rubocop:disable Metrics/AbcSize
+    def handle_org
+      attrs = update_resource_params
 
-    return unless attrs[:org_id].present?
+      return unless attrs[:org_id].present?
 
-    # See if the user selected a new Org via the Org Lookup and
-    # convert it into an Org
-    lookup = org_from_params(params_in: attrs)
-    return nil unless lookup.present?
+      # See if the user selected a new Org via the Org Lookup and
+      # convert it into an Org
+      lookup = org_from_params(params_in: attrs)
+      return nil unless lookup.present?
 
-    # If this is a new Org we need to save it first before attaching
-    # it to the user
-    if lookup.new_record?
-      lookup.save
-      identifiers_from_params(params_in: attrs).each do |identifier|
-        next unless identifier.value.present?
+      # If this is a new Org we need to save it first before attaching
+      # it to the user
+      if lookup.new_record?
+        lookup.save
+        identifiers_from_params(params_in: attrs).each do |identifier|
+          next unless identifier.value.present?
 
-        identifier.identifiable = lookup
-        identifier.save
+          identifier.identifiable = lookup
+          identifier.save
+        end
+        lookup.reload
       end
-      lookup.reload
-    end
 
-    resource.update(org_id: lookup.id)
+      resource.update(org_id: lookup.id)
+    end
+    # rubocop:enable Metrics/AbcSize
   end
-
 end
diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
index 67057c1555..fb02ca2d2f 100644
--- a/app/controllers/users/omniauth_callbacks_controller.rb
+++ b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -1,85 +1,86 @@
 # frozen_string_literal: true
 
-class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
-
-  ##
-  # Dynamically build a handler for each omniauth provider
-  # -------------------------------------------------------------
-  IdentifierScheme.for_authentication.each do |scheme|
-    define_method(scheme.name.downcase) do
-      handle_omniauth(scheme)
+module Users
+  # Controller that handles callbacks from OmniAuth integrations (e.g. Shibboleth and ORCID)
+  class OmniauthCallbacksController < Devise::OmniauthCallbacksController
+    ##
+    # Dynamically build a handler for each omniauth provider
+    # -------------------------------------------------------------
+    IdentifierScheme.for_authentication.each do |scheme|
+      define_method(scheme.name.downcase) do
+        handle_omniauth(scheme)
+      end
     end
-  end
 
-  # Processes callbacks from an omniauth provider and directs the user to
-  # the appropriate page:
-  #   Not logged in and uid had no match ---> Sign Up page
-  #   Not logged in and uid had a match ---> Sign In and go to Home Page
-  #   Signed in and uid had no match --> Save the uid and go to the Profile Page
-  #   Signed in and uid had a match --> Go to the Home Page
-  #
-  # scheme - The IdentifierScheme for the provider
-  #
-  # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-  def handle_omniauth(scheme)
-    user = if request.env["omniauth.auth"].nil?
-             User.from_omniauth(request.env)
-           else
-             User.from_omniauth(request.env["omniauth.auth"])
-           end
+    # Processes callbacks from an omniauth provider and directs the user to
+    # the appropriate page:
+    #   Not logged in and uid had no match ---> Sign Up page
+    #   Not logged in and uid had a match ---> Sign In and go to Home Page
+    #   Signed in and uid had no match --> Save the uid and go to the Profile Page
+    #   Signed in and uid had a match --> Go to the Home Page
+    #
+    # scheme - The IdentifierScheme for the provider
+    #
+    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+    def handle_omniauth(scheme)
+      user = if request.env['omniauth.auth'].nil?
+               User.from_omniauth(request.env)
+             else
+               User.from_omniauth(request.env['omniauth.auth'])
+             end
 
-    # If the user isn't logged in
-    if current_user.nil?
-      # If the uid didn't have a match in the system send them to register
-      if user.nil?
-        session["devise.#{scheme.name.downcase}_data"] = request.env["omniauth.auth"]
-        redirect_to new_user_registration_url
+      # If the user isn't logged in
+      if current_user.nil?
+        # If the uid didn't have a match in the system send them to register
+        if user.nil?
+          session["devise.#{scheme.name.downcase}_data"] = request.env['omniauth.auth']
+          redirect_to new_user_registration_url
+
+        # Otherwise sign them in
+        elsif scheme.name == 'shibboleth'
+          # Until ORCID becomes supported as a login method
+          set_flash_message(:notice, :success, kind: scheme.description) if is_navigational_format?
+          sign_in_and_redirect user, event: :authentication
+        else
+          flash[:notice] = _('Successfully signed in')
+          redirect_to new_user_registration_url
+        end
 
-      # Otherwise sign them in
-      elsif scheme.name == "shibboleth"
-        # Until ORCID becomes supported as a login method
-        set_flash_message(:notice, :success, kind: scheme.description) if is_navigational_format?
-        sign_in_and_redirect user, event: :authentication
+      # The user is already logged in and just registering the uid with us
       else
-        flash[:notice] = _("Successfully signed in")
-        redirect_to new_user_registration_url
-      end
+        # If the user could not be found by that uid then attach it to their record
+        if user.nil?
+          if Identifier.create(identifier_scheme: scheme,
+                               value: request.env['omniauth.auth'].uid,
+                               attrs: request.env['omniauth.auth'],
+                               identifiable: current_user)
+            flash[:notice] =
+              format(_('Your account has been successfully linked to %<scheme>s.'),
+                     scheme: scheme.description)
 
-    # The user is already logged in and just registering the uid with us
-    else
-      # If the user could not be found by that uid then attach it to their record
-      if user.nil?
-        if Identifier.create(identifier_scheme: scheme,
-                             value: request.env["omniauth.auth"].uid,
-                             attrs: request.env["omniauth.auth"],
-                             identifiable: current_user)
-          flash[:notice] = _("Your account has been successfully linked to %{scheme}.") % {
-            scheme: scheme.description
-          }
+          else
+            flash[:alert] = format(_('Unable to link your account to %<scheme>s.'),
+                                   scheme: scheme.description)
+          end
 
-        else
-          flash[:alert] = _("Unable to link your account to %{scheme}.") % {
-            scheme: scheme.description
-          }
+        elsif user.id != current_user.id
+          # If a user was found but does NOT match the current user then the identifier has
+          # already been attached to another account (likely the user has 2 accounts)
+          # rubocop:disable Layout/LineLength
+          flash[:alert] = _("The current #{scheme.description} iD has been already linked to a user with email #{identifier.user.email}")
+          # rubocop:enable Layout/LineLength
         end
 
-      elsif user.id != current_user.id
-        # If a user was found but does NOT match the current user then the identifier has
-        # already been attached to another account (likely the user has 2 accounts)
-        # rubocop:disable Layout/LineLength
-        flash[:alert] = _("The current #{scheme.description} iD has been already linked to a user with email #{identifier.user.email}")
-        # rubocop:enable Layout/LineLength
+        # Redirect to the User Profile page
+        redirect_to edit_user_registration_path
       end
-
-      # Redirect to the User Profile page
-      redirect_to edit_user_registration_path
     end
-  end
-  # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
-  # rubocop:enable
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
-  def failure
-    redirect_to root_path
+    def failure
+      redirect_to root_path
+    end
   end
-
 end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 37a48fd3ba..c1b90e21e5 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
+# Controller that handles Admin operations for managing users
 class UsersController < ApplicationController
-
   helper PaginableHelper
   helper PermsHelper
   include ConditionalUserMailer
@@ -11,6 +11,7 @@ class UsersController < ApplicationController
   ##
   # GET - List of all users for an organisation
   # Displays number of roles[was project_group], name, email, and last sign in
+  # rubocop:disable Metrics/AbcSize
   def admin_index
     authorize User
 
@@ -32,6 +33,7 @@ def admin_index
       end
     end
   end
+  # rubocop:enable Metrics/AbcSize
 
   ##
   # GET - Displays the permissions available to the selected user
@@ -50,9 +52,9 @@ def admin_grant_permissions
             end
 
     render json: {
-      "user" => {
-        "id" => user.id,
-        "html" => render_to_string(partial: "users/admin_grant_permissions",
+      'user' => {
+        'id' => user.id,
+        'html' => render_to_string(partial: 'users/admin_grant_permissions',
                                    locals: { user: user, perms: perms },
                                    formats: [:html])
       }
@@ -64,6 +66,7 @@ def admin_grant_permissions
   # redirects to the admin_index action
   # should add validation that the perms given are current perms of the current_user
   # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+  # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
   def admin_update_permissions
     @user = User.find(params[:id])
     authorize @user
@@ -89,24 +92,25 @@ def admin_update_permissions
 
     if @user.save
       if privileges_changed
-        deliver_if(recipients: @user, key: "users.admin_privileges") do |r|
+        deliver_if(recipients: @user, key: 'users.admin_privileges') do |r|
           UserMailer.admin_privileges(r).deliver_now
         end
       end
       render(json: {
                code: 1,
-               msg: success_message(perms.first_or_initialize, _("saved")),
-               current_privileges: render_to_string(partial: "users/current_privileges",
+               msg: success_message(perms.first_or_initialize, _('saved')),
+               current_privileges: render_to_string(partial: 'users/current_privileges',
                                                     locals: { user: @user }, formats: [:html])
              })
     else
-      render(json: { code: 0, msg: failure_message(@user, _("updated")) })
+      render(json: { code: 0, msg: failure_message(@user, _('updated')) })
     end
   end
   # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
-  # rubocop:enable
+  # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
   # PUT /users/:id/update_email_preferences
+  # rubocop:disable Metrics/AbcSize
   def update_email_preferences
     prefs = preference_params
     authorize User
@@ -117,16 +121,18 @@ def update_email_preferences
       pref.settings = {}
       pref.user = current_user
     end
-    pref.settings["email"] = booleanize_hash(prefs["prefs"])
+    pref.settings['email'] = booleanize_hash(prefs['prefs'])
     pref.save
 
     # Include active tab in redirect path
     redirect_to "#{edit_user_registration_path}\#notification-preferences",
-                notice: success_message(pref, _("saved"))
+                notice: success_message(pref, _('saved'))
   end
+  # rubocop:enable Metrics/AbcSize
 
   # PUT /users/:id/activate
   # -----------------------------------------------------
+  # rubocop:disable Metrics/AbcSize
   def activate
     authorize current_user
 
@@ -138,21 +144,20 @@ def activate
       user.save!
       render json: {
         code: 1,
-        msg: _("Successfully %{action} %{username}'s account.") % {
-          action: user.active ? _("activated") : _("deactivated"),
-          username: user.name(false)
-        }
+        msg: format(_("Successfully %<action>s %<username>s's account."),
+                    action: user.active ? _('activated') : _('deactivated'),
+                    username: user.name(false))
       }
     rescue StandardError
       render json: {
         code: 0,
-        msg: _("Unable to %{action} %{username}") % {
-          action: user.active ? _("activate") : _("deactivate"),
-          username: user.name(false)
-        }
+        msg: format(_('Unable to %<action>s %<username>s'),
+                    action: user.active ? _('activate') : _('deactivate'),
+                    username: user.name(false))
       }
     end
   end
+  # rubocop:enable Metrics/AbcSize
 
   # POST /users/acknowledge_notification
   def acknowledge_notification
@@ -198,7 +203,7 @@ def preference_params
   def booleanize_hash(node)
     # leaf: convert to boolean and return
     # hash: iterate over leaves
-    return node == "true" unless node.is_a?(ActionController::Parameters)
+    return node == 'true' unless node.is_a?(ActionController::Parameters)
 
     newnode = {}
     node.each do |key, value|
@@ -206,5 +211,4 @@ def booleanize_hash(node)
     end
     newnode
   end
-
 end
diff --git a/app/helpers/annotations_helper.rb b/app/helpers/annotations_helper.rb
index 16b1c10729..3104bf0a01 100644
--- a/app/helpers/annotations_helper.rb
+++ b/app/helpers/annotations_helper.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
+# Helper methods for Annotations
 module AnnotationsHelper
-
   # rubocop:disable all
   TOOLTIPS_FOR_TEXT = {
     example_answer: _("You can add an example answer to help users respond. These will be presented above the answer box and can be copied/ pasted."),
@@ -12,5 +12,4 @@ module AnnotationsHelper
   def tooltip_for_annotation_text(annotation)
     TOOLTIPS_FOR_TEXT[annotation.type.to_sym]
   end
-
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index eb143c2b39..9d1e2f5f4b 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
+# Generic helper methods
 module ApplicationHelper
-
   def resource_name
     :user
   end
@@ -20,6 +20,7 @@ def devise_mapping
   # params) of the last URL requested. See
   # http://api.rubyonrails.org/classes/ActionDispatch/Request.html#method-i-fullpath
   # for details
+  # rubocop:disable Style/OptionalBooleanParameter
   def active_page?(path, exact_match = false)
     if exact_match
       request.fullpath == path
@@ -27,6 +28,7 @@ def active_page?(path, exact_match = false)
       request.fullpath.include?(path)
     end
   end
+  # rubocop:enable Style/OptionalBooleanParameter
 
   alias isActivePage active_page?
 
@@ -45,5 +47,4 @@ def unique_dom_id(record, prefix = nil)
     record_id = record_key_for_dom_id(record) || record.object_id
     "#{klass}_#{record_id}"
   end
-
 end
diff --git a/app/helpers/conditions_helper.rb b/app/helpers/conditions_helper.rb
index a674017fdc..87ca8e79d1 100644
--- a/app/helpers/conditions_helper.rb
+++ b/app/helpers/conditions_helper.rb
@@ -2,28 +2,23 @@
 
 DISPLAY_LENGTH = 50
 
+# Helper methods for Conditional Questions
 # rubocop:disable Metrics/ModuleLength
 module ConditionsHelper
-
   # return a list of question ids to open/hide
   def remove_list(object)
     id_list = []
-    if object.is_a?(Plan)
-      plan_answers = object.answers
-    elsif object.is_a?(Hash)
-      plan_answers = object[:answers]
-    else
-      # TODO: change this to an exception as it shouldn't happen
-      return []
-    end
-    plan_answers.each do |answer|
-      id_list += answer_remove_list(answer)
-    end
+    plan_answers = object.answers if object.is_a?(Plan)
+    plan_answers = object[:answers] if object.is_a?(Hash)
+    return [] unless plan_answers.present?
+
+    plan_answers.each { |answer| id_list += answer_remove_list(answer) }
     id_list
   end
 
   # returns an array of ids to remove based on the conditions associated with an answer
   # or trigger the email (TODO: combining these is a bit icky!)
+  # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
   def answer_remove_list(answer, user = nil)
     id_list = []
     return id_list unless answer.question.option_based?
@@ -33,23 +28,25 @@ def answer_remove_list(answer, user = nil)
       action = cond.action_type
       chosen = answer.question_option_ids.sort
       if chosen == opts
-        if action == "remove"
+        if action == 'remove'
           rems = cond.remove_data.map(&:to_i)
           id_list += rems
         elsif !user.nil?
           UserMailer.question_answered(JSON.parse(cond.webhook_data), user, answer,
-                                       chosen.join(" and ")).deliver_now
+                                       chosen.join(' and ')).deliver_now
         end
       end
     end
     # uniq because could get same remove id from diff conds
     id_list.uniq
   end
+  # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
   def send_webhooks(user, answer)
     answer_remove_list(answer, user)
   end
 
+  # rubocop:disable Metrics/AbcSize
   def email_trigger_list(answer)
     email_list = []
     return email_list unless answer.question.option_based?
@@ -60,11 +57,12 @@ def email_trigger_list(answer)
       chosen = answer.question_option_ids.sort
       next unless chosen == opts
 
-      email_list << JSON.parse(cond.webhook_data)["email"] if action == "add_webhook"
+      email_list << JSON.parse(cond.webhook_data)['email'] if action == 'add_webhook'
     end
     # uniq because could get same remove id from diff conds
-    email_list.uniq.join(",")
+    email_list.uniq.join(',')
   end
+  # rubocop:enable Metrics/AbcSize
 
   # number of answers in a section after answers updated with conditions
   def num_section_answers(plan, section)
@@ -82,6 +80,7 @@ def num_section_answers(plan, section)
   end
 
   # number of questions in a section after update with conditions
+  # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
   def num_section_questions(plan, section, phase = nil)
     # when section and phase are a hash in exports
     if section.is_a?(Hash) &&
@@ -103,6 +102,7 @@ def num_section_questions(plan, section, phase = nil)
     end
     count
   end
+  # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
   # returns an array of hashes of section_id, number of section questions, and
   # number of section answers
@@ -134,7 +134,8 @@ def section_info(plan, section)
   #    ...
   #  ]
   # }
-  # rubocop:disable Metrics/AbcSize
+  # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+  # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
   def later_question_list(question)
     collection = {}
     question.section.phase.template.phases.each do |phase|
@@ -164,70 +165,67 @@ def later_question_list(question)
     end
     collection
   end
-  # rubocop:enable Metrics/AbcSize
-  # rubocop:enable
+  # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+  # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
   def question_title(question)
-    raw "Qn. " + question.number.to_s + ": " +
-        truncate(strip_tags(question.text),
-                 length: DISPLAY_LENGTH,
-                 separator: " ",
-                 escape: false)
+    raw format('Qn. %<question_nbr>s: %<title>s',
+               question_nbr: question.number.to_s,
+               title: truncate(strip_tags(question.text), length: DISPLAY_LENGTH,
+                                                          separator: ' ', escape: false))
   end
 
   def section_title(section)
-    raw "Sec. " + section.number.to_s + ": " +
-        truncate(strip_tags(section.title),
-                 length: DISPLAY_LENGTH,
-                 separator: " ",
-                 escape: false)
+    raw format('Sec. %<section_nbr>s: %<title>s',
+               section_nbr: section.number.to_s,
+               title: truncate(strip_tags(section.title), length: DISPLAY_LENGTH,
+                                                          separator: ' ', escape: false))
   end
 
   # used when displaying a question while editing the template
   # converts condition into text
-  # rubocop:disable Metrics/AbcSize
+  # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
   def condition_to_text(conditions)
-    return_string = ""
+    return_string = ''
     conditions.each do |cond|
       opts = cond.option_list.map { |opt| QuestionOption.find(opt).text }
-      return_string += "</dd>" unless return_string.empty?
-      return_string += "<dd>" + _("Answering") + " "
-      return_string += opts.join(" and ")
-      if cond.action_type == "add_webhook"
-        subject_string = text_formatted(JSON.parse(cond.webhook_data)["subject"])
-        return_string += _(" will <b>send an email</b> with subject ") + subject_string
+      return_string += '</dd>' unless return_string.empty?
+      return_string += "<dd>#{_('Answering')} "
+      return_string += opts.join(' and ')
+      if cond.action_type == 'add_webhook'
+        subject_string = text_formatted(JSON.parse(cond.webhook_data)['subject'])
+        return_string += format(_(' will <b>send an email</b> with subject %<subject_name>s'),
+                                subject_name: subject_string)
       else
         remove_data = cond.remove_data
-        rems = remove_data.map { |rem| '"' + Question.find(rem).text + '"' }
+        rems = remove_data.map { |rem| "\"#{Question.find(rem).text}\"" }
 
-        return_string += _(" will <b>remove</b> question ") if rems.length == 1
-        return_string += _(" will <b>remove</b> questions ") if rems.length > 1
-        return_string += rems.join(" and ")
+        return_string += _(' will <b>remove</b> question ') if rems.length == 1
+        return_string += _(' will <b>remove</b> questions ') if rems.length > 1
+        return_string += rems.join(' and ')
       end
     end
-    return_string + "</dd>"
+    "#{return_string}</dd>"
   end
-  # rubocop:enable Metrics/AbcSize
+  # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
   def text_formatted(object)
-    if object.is_a?(Integer) # when remove question id
-      text = Question.find(object).text
-    elsif object.is_a?(String) # when email subject
-      text = object
-    else
-      pp "type error"
-    end
+    text = Question.find(object).text if object.is_a?(Integer)
+    text = object if object.is_a?(String)
+    return 'type error' unless text.present?
+
     cleaned_text = text
     text = ActionController::Base.helpers.truncate(cleaned_text, length: DISPLAY_LENGTH,
-                                                                 separator: " ", escape: false)
-    _('"') + text + _('"')
+                                                                 separator: ' ', escape: false)
+    "\"#{text}\""
   end
 
   # convert a set of conditions into multi-select form
+  # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
   def conditions_to_param_form(conditions)
     param_conditions = {}
     conditions.each do |condition|
-      title = "condition" + condition[:number].to_s
+      title = "condition #{condition[:number]}"
       condition_hash = { title =>
                         { question_option_id: condition.option_list,
                           action_type: condition.action_type,
@@ -248,6 +246,7 @@ def conditions_to_param_form(conditions)
     end
     param_conditions
   end
+  # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
   # returns an hash of hashes of webhook data given a condition array
   def webhook_hash(conditions)
@@ -258,6 +257,5 @@ def webhook_hash(conditions)
     end
     web_hash
   end
-
 end
 # rubocop:enable Metrics/ModuleLength
diff --git a/app/helpers/customizable_template_link_helper.rb b/app/helpers/customizable_template_link_helper.rb
index 239e1894a5..f0cb62dfd8 100644
--- a/app/helpers/customizable_template_link_helper.rb
+++ b/app/helpers/customizable_template_link_helper.rb
@@ -1,28 +1,29 @@
 # frozen_string_literal: true
 
+# Helper methods for generating links for customizing templates
 module CustomizableTemplateLinkHelper
-
   # Link to the appropriate customizable template.
   # Default link name set if name not set which can be overwritten.
+  # rubocop:disable Metrics/AbcSize, Metrics/PerceivedComplexity
   def link_to_customizable_template(name, customization, template)
     name = nil unless name.present?
 
     if customization.present?
       if customization.created_at < template.created_at
-        name = name.blank? ? _("Transfer customisation") : name
+        name = name.blank? ? _('Transfer customisation') : name
         link_to name,
                 org_admin_template_customization_transfers_path(customization.id),
-                data: { method: "post" }
+                data: { method: 'post' }
       else
-        name = name.blank? ? _("Edit customisation") : name
+        name = name.blank? ? _('Edit customisation') : name
         link_to name, org_admin_template_path(id: customization.id)
       end
     else
-      name = name.blank? ? _("Customise") : name
+      name = name.blank? ? _('Customise') : name
       link_to name,
               org_admin_template_customizations_path(template.id),
-              "data-method": "post"
+              'data-method': 'post'
     end
   end
-
+  # rubocop:enable Metrics/AbcSize, Metrics/PerceivedComplexity
 end
diff --git a/app/helpers/exports_helper.rb b/app/helpers/exports_helper.rb
index 10cdfc9405..a288457477 100644
--- a/app/helpers/exports_helper.rb
+++ b/app/helpers/exports_helper.rb
@@ -1,20 +1,20 @@
 # frozen_string_literal: true
 
+# Helper methods for Plan exports
 module ExportsHelper
-
   PAGE_MARGINS = {
-    top: "5",
-    bottom: "10",
-    left: "12",
-    right: "12"
+    top: '5',
+    bottom: '10',
+    left: '12',
+    right: '12'
   }.freeze
 
   def font_face
-    @formatting[:font_face].presence || "Arial, Helvetica, Sans-Serif"
+    @formatting[:font_face].presence || 'Arial, Helvetica, Sans-Serif'
   end
 
   def font_size
-    @formatting[:font_size].presence || "12"
+    @formatting[:font_size].presence || '12'
   end
 
   def margin_top
@@ -35,7 +35,7 @@ def margin_right
 
   def plan_attribution(attribution)
     attribution = Array(attribution)
-    prefix = attribution.many? ? _("Creators:") : _("Creator:")
+    prefix = attribution.many? ? _('Creators:') : _('Creator:')
     "<strong>#{prefix}</strong> #{attribution.join(', ')}"
   end
 
@@ -49,5 +49,4 @@ def get_margin_value_for_side(side)
       @formatting.dig(:margin, side).presence || PAGE_MARGINS[side]
     end
   end
-
 end
diff --git a/app/helpers/feedbacks_helper.rb b/app/helpers/feedbacks_helper.rb
index 94e4857c78..dc2fd15729 100644
--- a/app/helpers/feedbacks_helper.rb
+++ b/app/helpers/feedbacks_helper.rb
@@ -1,24 +1,21 @@
 # frozen_string_literal: true
 
+# Helper methods for Feedback messages
 module FeedbacksHelper
-
   def feedback_confirmation_default_subject
-    _("%{application_name}: Your plan has been submitted for feedback")
+    _('%<application_name>s: Your plan has been submitted for feedback')
   end
 
   def feedback_confirmation_default_message
-    _("<p>Hello %{user_name}.</p>"\
-      "<p>Your plan \"%{plan_name}\" has been submitted for feedback from an
+    _('<p>Hello %<user_name>s.</p>'\
+      "<p>Your plan \"%<plan_name>s\" has been submitted for feedback from an
       administrator at your organisation. "\
       "If you have questions pertaining to this action, please contact us
-      at %{organisation_email}.</p>")
+      at %<organisation_email>s.</p>")
   end
 
   def feedback_constant_to_text(text, user, plan, org)
-    _(text.to_s) % { application_name: ApplicationService.application_name,
-                     user_name: user.name(false),
-                     plan_name: plan.title,
-                     organisation_email: org.contact_email }
+    format(_(text.to_s), application_name: ApplicationService.application_name, user_name: user.name(false),
+                         plan_name: plan.title, organisation_email: org.contact_email)
   end
-
 end
diff --git a/app/helpers/identifier_helper.rb b/app/helpers/identifier_helper.rb
index 300b43a50e..fa61ee0e7c 100644
--- a/app/helpers/identifier_helper.rb
+++ b/app/helpers/identifier_helper.rb
@@ -1,15 +1,14 @@
 # frozen_string_literal: true
 
+# Helper methods for displaying Identifiers
 module IdentifierHelper
-
   def id_for_display(id:, with_scheme_name: true)
-    return _("None defined") if id.new_record? || id.value.blank?
+    return _('None defined') if id.new_record? || id.value.blank?
 
     without = id.value_without_scheme_prefix
-    prefix = with_scheme_name ? id.identifier_scheme.description + ": " : ""
-    return prefix + id.value unless without != id.value && !without.starts_with?("http")
+    prefix = with_scheme_name ? "#{id.identifier_scheme.description}: " : ''
+    return prefix + id.value unless without != id.value && !without.starts_with?('http')
 
-    link_to "#{prefix} #{without}", id.value, class: "has-new-window-popup-info"
+    link_to "#{prefix} #{without}", id.value, class: 'has-new-window-popup-info'
   end
-
 end
diff --git a/app/helpers/languages_helper.rb b/app/helpers/languages_helper.rb
index d0f3715ac5..db15cf24f5 100644
--- a/app/helpers/languages_helper.rb
+++ b/app/helpers/languages_helper.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
+# Helper methods for Languages
 module LanguagesHelper
-
   def languages
-    Rails.cache.fetch("languages", expires_in: 1.hour) { Language.sorted_by_abbreviation }
+    Rails.cache.fetch('languages', expires_in: 1.hour) { Language.sorted_by_abbreviation }
   end
-
 end
diff --git a/app/helpers/mailer_helper.rb b/app/helpers/mailer_helper.rb
index 4fa8934371..7824d66081 100644
--- a/app/helpers/mailer_helper.rb
+++ b/app/helpers/mailer_helper.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
+# Helper methods for Emails
 module MailerHelper
-
   include PermsHelper
 
   def tool_name
@@ -14,37 +14,36 @@ def helpdesk_email
 
   # Returns an unordered HTML list with the permissions associated to the user passed
   def privileges_list(user)
-    return "" unless user.respond_to?(:perms) && user.perms.respond_to?(:each)
+    return '' unless user.respond_to?(:perms) && user.perms.respond_to?(:each)
 
     names = name_and_text
-    r = "<ul>"
+    r = '<ul>'
     user.perms.each do |p|
       r += "<li>#{names[p.name.to_sym]}</li>" if names.key?(p.name.to_sym)
     end
-    r += "</ul>"
+    r += '</ul>'
   end
 
   # Returns the messaging for the specified role
   def role_text(role)
     if role.administrator?
       {
-        type: _("co-owner"),
-        placeholder1: _("write and edit the plan in a collaborative manner."),
-        placeholder2: _("You can also grant rights to other collaborators.")
+        type: _('co-owner'),
+        placeholder1: _('write and edit the plan in a collaborative manner.'),
+        placeholder2: _('You can also grant rights to other collaborators.')
       }
     elsif role.editor?
       {
-        type: _("editor"),
-        placeholder1: _("write and edit the plan in a collaborative manner."),
+        type: _('editor'),
+        placeholder1: _('write and edit the plan in a collaborative manner.'),
         placeholder2: nil
       }
     else
       {
-        type: _("read-only"),
-        placeholder1: _("read the plan and leave comments."),
+        type: _('read-only'),
+        placeholder1: _('read the plan and leave comments.'),
         placeholder2: nil
       }
     end
   end
-
 end
diff --git a/app/helpers/manifests_helper.rb b/app/helpers/manifests_helper.rb
index ba841a99cb..0e75dc90ec 100644
--- a/app/helpers/manifests_helper.rb
+++ b/app/helpers/manifests_helper.rb
@@ -39,10 +39,10 @@
 #
 #  config.action_view.stylesheet_manifest_resolver = MyCustomResolver.new
 #
+# Helper methods for JS
 module ManifestsHelper
-
   # The name of the default asset manifest files.
-  DEFAULT = "application"
+  DEFAULT = 'application'
 
   # The name of the javascript manifest file to load. Defaults to application.js
   #
@@ -65,5 +65,4 @@ def stylesheet_manifest_file
       DEFAULT
     end
   end
-
 end
diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb
index 0ccaba62af..feebd82668 100644
--- a/app/helpers/notifications_helper.rb
+++ b/app/helpers/notifications_helper.rb
@@ -1,19 +1,18 @@
 # frozen_string_literal: true
 
+# Helper methods for Global notifications and Flash messages
 module NotificationsHelper
-
   # FA html class depending on Notification level
   #
   # Returns String
   def fa_classes(notification)
     case notification.level
-    when "warning"
-      "fa-exclamation-circle"
-    when "danger"
-      "fa-times-circle"
+    when 'warning'
+      'fa-exclamation-circle'
+    when 'danger'
+      'fa-times-circle'
     else
-      "fa-info-circle"
+      'fa-info-circle'
     end
   end
-
 end
diff --git a/app/helpers/orgs_helper.rb b/app/helpers/orgs_helper.rb
index 2910e7d801..cfbc4eff61 100644
--- a/app/helpers/orgs_helper.rb
+++ b/app/helpers/orgs_helper.rb
@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
+# Helper methods for Orgs
 module OrgsHelper
-
-  EMAIL_PLACEHOLDER = "[Organisation Contact Email Placeholder]"
+  EMAIL_PLACEHOLDER = '[Organisation Contact Email Placeholder]'
 
   # Sample message for Org feedback form.
   #
@@ -11,22 +11,18 @@ module OrgsHelper
   # Returns String
   def sample_message_for_org_feedback_form(org)
     email = org.contact_email || EMAIL_PLACEHOLDER
-    _("<p>A data librarian from %{org_name} will respond to your request within 48
+    format(_("<p>A data librarian from %<org_name>s will respond to your request within 48
        hours. If you have questions pertaining to this action please contact us
-       at %{organisation_email}.</p>") % {
-         organisation_email: email,
-         org_name: org.name
-       }
+       at %<organisation_email>s.</p>"), organisation_email: email, org_name: org.name)
   end
 
   # The preferred logo url for the current configuration. If DRAGONFLY_AWS is true, return
   # the remote_url, otherwise return the url
   def logo_url_for_org(org)
-    if ENV["DRAGONFLY_AWS"] == "true"
+    if ENV['DRAGONFLY_AWS'] == 'true'
       org.logo.remote_url
     else
       org.logo.url
     end
   end
-
 end
diff --git a/app/helpers/paginable_helper.rb b/app/helpers/paginable_helper.rb
index b0c06e73d6..9939d96b3e 100644
--- a/app/helpers/paginable_helper.rb
+++ b/app/helpers/paginable_helper.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
+# Helper methods for Paginable tables
 module PaginableHelper
-
   include Paginable
-
 end
diff --git a/app/helpers/perms_helper.rb b/app/helpers/perms_helper.rb
index 2b7cf006b7..e9f38b27b0 100644
--- a/app/helpers/perms_helper.rb
+++ b/app/helpers/perms_helper.rb
@@ -1,21 +1,20 @@
 # frozen_string_literal: true
 
+# Helper methods for User permissions
 module PermsHelper
-
   # Returns a hash whose keys are the names associated to Perms and values are
   # the text to be displayed to the end user
   def name_and_text
     {
-      add_organisations: _("Add organisations"),
-      change_org_affiliation: _("Change affiliation"),
-      grant_permissions: _("Manage user privileges"),
-      modify_templates: _("Manage templates"),
-      modify_guidance: _("Manage guidance"),
-      use_api: _("API rights"),
-      change_org_details: _("Manage organisation details"),
-      grant_api_to_orgs: _("Grant API to organisations"),
-      review_org_plans: _("")
+      add_organisations: _('Add organisations'),
+      change_org_affiliation: _('Change affiliation'),
+      grant_permissions: _('Manage user privileges'),
+      modify_templates: _('Manage templates'),
+      modify_guidance: _('Manage guidance'),
+      use_api: _('API rights'),
+      change_org_details: _('Manage organisation details'),
+      grant_api_to_orgs: _('Grant API to organisations'),
+      review_org_plans: _('')
     }
   end
-
 end
diff --git a/app/helpers/plans_helper.rb b/app/helpers/plans_helper.rb
index 5e27d40dae..0b824e366d 100644
--- a/app/helpers/plans_helper.rb
+++ b/app/helpers/plans_helper.rb
@@ -1,28 +1,28 @@
 # frozen_string_literal: true
 
+# Helper methods for Plans
 module PlansHelper
-
   # display the role of the user for a given plan
   def display_role(role)
     if role.creator?
-      _("Owner")
+      _('Owner')
     elsif role.administrator?
-      _("Co-owner")
+      _('Co-owner')
     elsif role.editor?
-      _("Editor")
+      _('Editor')
     elsif role.commenter?
-      _("Read only")
+      _('Read only')
     end
   end
 
   # display the visibility of the plan
   def display_visibility(val)
     case val
-    when "organisationally_visible"
+    when 'organisationally_visible'
       "<span title=\"#{visibility_tooltip(val)}\">#{_('Organisation')}</span>"
-    when "publicly_visible"
+    when 'publicly_visible'
       "<span title=\"#{visibility_tooltip(val)}\">#{_('Public')}</span>"
-    when "privately_visible"
+    when 'privately_visible'
       "<span title=\"#{visibility_tooltip(val)}\">#{_('Private')}</span>"
     else
       "<span>#{_('Private')}</span>" # Test Plans
@@ -31,12 +31,12 @@ def display_visibility(val)
 
   def visibility_tooltip(val)
     case val
-    when "organisationally_visible"
-      _("Organisation: anyone at my organisation can view.")
-    when "publicly_visible"
-      _("Public: anyone can view.")
+    when 'organisationally_visible'
+      _('Organisation: anyone at my organisation can view.')
+    when 'publicly_visible'
+      _('Public: anyone can view.')
     else
-      _("Private: restricted to me and people I invite.")
+      _('Private: restricted to me and people I invite.')
     end
   end
 
@@ -51,5 +51,4 @@ def display_section?(customization, section, show_custom_sections)
     display ||= customization && section[:modifiable] && show_custom_sections
     display
   end
-
 end
diff --git a/app/helpers/sections_helper.rb b/app/helpers/sections_helper.rb
index e3bd8e9beb..90fe7b2d9d 100644
--- a/app/helpers/sections_helper.rb
+++ b/app/helpers/sections_helper.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
+# Helper methods for Template Sections
 module SectionsHelper
-
   # HREF attribute value for headers in the section partials. If the section
   # is modifiable, returns the section path, otherwise the edit section path.
   #
@@ -25,5 +25,4 @@ def header_path_for_section(section, phase, template)
   def draggable_for_section?(section)
     section.template.latest? && section.modifiable?
   end
-
 end
diff --git a/app/helpers/settings_template_helper.rb b/app/helpers/settings_template_helper.rb
index 0dab8e5682..f1061b0e77 100644
--- a/app/helpers/settings_template_helper.rb
+++ b/app/helpers/settings_template_helper.rb
@@ -1,22 +1,22 @@
 # frozen_string_literal: true
 
+# Helper methods for Settings
 module SettingsTemplateHelper
-
   # Retrieves an msgstr for a given admin_field
+  # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
   def admin_field_t(admin_field)
-    return _("Unknown column name.") if Settings::Template::VALID_ADMIN_FIELDS.include?(admin_field)
-    return _("Plan Name") if admin_field == "project_name"
-    return _("Plan ID") if admin_field == "project_identifier"
-    return _("Grant number") if admin_field == "grant_title"
-    return _("Principal Investigator / Researcher") if admin_field == "principal_investigator"
-    return _("Plan Data Contact") if admin_field == "project_data_contact"
-    return _("Plan Description") if admin_field == "project_description"
-    return _("Funder") if admin_field == "funder"
-    return _("Organisation") if admin_field == "institution"
-    return _("Your ORCID") if admin_field == "orcid"
+    return _('Unknown column name.') if Settings::Template::VALID_ADMIN_FIELDS.include?(admin_field)
+    return _('Plan Name') if admin_field == 'project_name'
+    return _('Plan ID') if admin_field == 'project_identifier'
+    return _('Grant number') if admin_field == 'grant_title'
+    return _('Principal Investigator / Researcher') if admin_field == 'principal_investigator'
+    return _('Plan Data Contact') if admin_field == 'project_data_contact'
+    return _('Plan Description') if admin_field == 'project_description'
+    return _('Funder') if admin_field == 'funder'
+    return _('Organisation') if admin_field == 'institution'
+    return _('Your ORCID') if admin_field == 'orcid'
 
-    _("Unknown column name.")
+    _('Unknown column name.')
   end
-  # rubocop:enable
-
+  # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 end
diff --git a/app/helpers/super_admin/orgs/merge_helper.rb b/app/helpers/super_admin/orgs/merge_helper.rb
index 1c2051fdda..35e7f737f0 100644
--- a/app/helpers/super_admin/orgs/merge_helper.rb
+++ b/app/helpers/super_admin/orgs/merge_helper.rb
@@ -1,15 +1,13 @@
 # frozen_string_literal: true
 
 module SuperAdmin
-
   module Orgs
-
+    # Helper methods for Merging Orgs
     module MergeHelper
-
       def org_column_content(attributes:)
-        return "No mergeable attributes" unless attributes.present? && attributes.keys.any?
+        return 'No mergeable attributes' unless attributes.present? && attributes.keys.any?
 
-        html = "<ul>"
+        html = '<ul>'
         attributes.each_key do |key|
           html += "<li><strong>#{key}</strong>: #{attributes[key]}</li>"
         end
@@ -17,50 +15,45 @@ def org_column_content(attributes:)
       end
 
       # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+      # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       def column_content(entries:, orcid:)
-        return _("None") unless entries.present? && entries.any?
+        return _('None') unless entries.present? && entries.any?
 
-        html = "<ul>"
+        html = '<ul>'
         entries.each do |entry|
           text = case entry.class.name
-                 when "Annotation"
-                   [entry.id, entry.text[0..20]].join(" - ")
-                 when "Department"
-                   [entry.id, entry.name].join(" - ")
-                 when "Guidance"
-                   _("Guidance for: %{themes}") % {
-                     themes: entry.themes.collect(&:title).join(", ")
-                   }
-                 when "Identifier"
-                   [entry.identifier_scheme&.name, entry.value].join(" - ")
-                 when "TokenPermissionType"
+                 when 'Annotation'
+                   [entry.id, entry.text[0..20]].join(' - ')
+                 when 'Department'
+                   [entry.id, entry.name].join(' - ')
+                 when 'Guidance'
+                   format(_('Guidance for: %<themes>s'), themes: entry.themes.collect(&:title).join(', '))
+                 when 'Identifier'
+                   [entry.identifier_scheme&.name, entry.value].join(' - ')
+                 when 'TokenPermissionType'
                    entry.token_type.capitalize
-                 when "Tracker"
+                 when 'Tracker'
                    entry.code
-                 when "User"
+                 when 'User'
                    [entry.email, entry.identifier_for_scheme(scheme: orcid)&.value].compact
-                                                                                   .join(" - ")
+                                                                                   .join(' - ')
                  else
-                   [entry.id, entry.title].join(" - ")
+                   [entry.id, entry.title].join(' - ')
                  end
           html += "<li>#{text}</li>"
         end
         "#{html}</ul>"
       end
       # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+      # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
       def merge_column_content(entries:, orcid:, to_org_name:)
-        return _("Nothing to merge") unless entries.present? && entries.any?
+        return _('Nothing to merge') unless entries.present? && entries.any?
 
-        html = _("<p>The following %{object_types} will be moved over to '%{org_name}':</p>") % {
-          object_types: entries.first.class.name.pluralize,
-          org_name: to_org_name
-        }
+        html = format(_("<p>The following %<object_types>s will be moved over to '%<org_name>s':</p>"),
+                      object_types: entries.first.class.name.pluralize, org_name: to_org_name)
         html + column_content(entries: entries, orcid: orcid)
       end
-
     end
-
   end
-
 end
diff --git a/app/helpers/template_helper.rb b/app/helpers/template_helper.rb
index b4540e0179..807e6c4559 100644
--- a/app/helpers/template_helper.rb
+++ b/app/helpers/template_helper.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
+# Helper methods for Templates
 module TemplateHelper
-
   def template_details_path(template)
     if template_modifiable?(template)
       edit_org_admin_template_path(template)
@@ -22,7 +22,7 @@ def template_modifiable?(template)
       template.org_id = current_user.org.id
   end
 
-  def links_to_a_elements(links, separator = ", ")
+  def links_to_a_elements(links, separator = ', ')
     a = links.map do |l|
       "<a href=\"#{l['link']}\">#{l['text']}</a>"
     end
@@ -34,23 +34,26 @@ def links_to_a_elements(links, separator = ", ")
   # @param hidden [Boolean] should the link be hidden?
   # @param text [String] text for the link
   # @param id [String] id for the link element
+  # rubocop:disable Style/OptionalBooleanParameter
+  # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
   def direct_link(template, hidden = false, text = nil, id = nil)
     params = {
       org: { id: "{ \"id\": #{current_user&.org&.id}, \"name\": \"#{current_user&.org&.name}\" }" },
       funder: { id: "{ \"id\": #{template.org&.id}, \"name\": \"#{template.org&.name}\" }" },
       template_id: template.id
     }
-    cls = text.nil? ? "direct-link" : "direct-link btn btn-default"
-    style = hidden ? "display: none" : ""
+    cls = text.nil? ? 'direct-link' : 'direct-link btn btn-default'
+    style = hidden ? 'display: none' : ''
 
-    link_to(plans_url(plan: params), method: :post, title: _("Create plan"),
+    link_to(plans_url(plan: params), method: :post, title: _('Create plan'),
                                      class: cls, id: id, style: style) do
       if text.nil?
-        "<span class=\"fas fa-plus-square\"></span>".html_safe
+        '<span class="fas fa-plus-square"></span>'.html_safe
       else
         text.html_safe
       end
     end
   end
-
+  # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+  # rubocop:enable Style/OptionalBooleanParameter
 end
diff --git a/app/helpers/usage_helper.rb b/app/helpers/usage_helper.rb
index 88e7aed358..6748ede7ab 100644
--- a/app/helpers/usage_helper.rb
+++ b/app/helpers/usage_helper.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
+# Helper methods for Usage dashboard
 module UsageHelper
-
   def prep_data_for_yearly_users_chart(data:)
     default_chart_prep(data: data)
   end
@@ -14,38 +14,39 @@ def prep_data_for_yearly_plans_chart(data:)
   # for each point on the Y axis (date) so we need to format the information
   # appropriately by passing along the labels for the Y axis and the datasets
   # for the X axis
-  # rubocop:disable Metrics/AbcSize
-  def prep_data_for_template_plans_chart(data:, subset: "by_template")
-    last_month = Date.today.last_month.end_of_month.strftime("%b-%y")
+  # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+  # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+  def prep_data_for_template_plans_chart(data:, subset: 'by_template')
+    last_month = Date.today.last_month.end_of_month.strftime('%b-%y')
     return { labels: [last_month], datasets: [] }.to_json if data.blank? || data.empty?
 
     datasets = {}
     # Sort this chart's date by date desacending
     data = data.map { |hash| JSON.parse(hash) }
-               .sort { |a, b| b["date"] <=> a["date"] }
+               .sort { |a, b| b['date'] <=> a['date'] }
     # Extract all of the dates as month abbreviation - year (e.g. Dec-19)
-    labels = data.map { |rec| prep_date_for_charts(date: rec["date"]) }
+    labels = data.map { |rec| prep_date_for_charts(date: rec['date']) }
 
     # Loop through the data and organize the datasets by template instead of date
     data.each do |rec|
-      date = prep_date_for_charts(date: rec["date"])
+      date = prep_date_for_charts(date: rec['date'])
       rec[subset].each do |template|
         # We need a placeholder for each month/year - template combo. The
         # default is to assume that there are zero plans for that month/year + template
         dflt = {
-          label: template["name"],
+          label: template['name'],
           backgroundColor: random_rgb,
           data: labels.map { |lbl| { x: 0, y: lbl } }
         }
 
-        template_hash = datasets.fetch(template["name"], dflt)
+        template_hash = datasets.fetch(template['name'], dflt)
 
         # Replace any of the month/year plan counts for this template IF it has
         # any plans defined
         template_hash[:data] = template_hash[:data].map do |dat|
-          dat[:y] == date ? { x: template["count"] + dat[:x], y: dat[:y] } : dat
+          dat[:y] == date ? { x: template['count'] + dat[:x], y: dat[:y] } : dat
         end
-        datasets[template["name"]] = template_hash
+        datasets[template['name']] = template_hash
       end
     end
 
@@ -55,33 +56,35 @@ def prep_data_for_template_plans_chart(data:, subset: "by_template")
       labels: labels
     }.to_json
   end
-  # rubocop:enable Metrics/AbcSize
+  # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+  # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
+  # rubocop:disable Metrics/AbcSize
   def plans_per_template_ranges
     [
-      [_("Last month"), Date.today.last_month.end_of_month],
-      [_("Last 3 months"), Date.today.months_ago(3).end_of_month],
-      [_("Last 6 months"), Date.today.months_ago(6).end_of_month],
-      [_("Last 9 months"), Date.today.months_ago(9).end_of_month],
-      [_("Last 12 months"), Date.today.months_ago(12).end_of_month]
+      [_('Last month'), Date.today.last_month.end_of_month],
+      [_('Last 3 months'), Date.today.months_ago(3).end_of_month],
+      [_('Last 6 months'), Date.today.months_ago(6).end_of_month],
+      [_('Last 9 months'), Date.today.months_ago(9).end_of_month],
+      [_('Last 12 months'), Date.today.months_ago(12).end_of_month]
     ]
   end
+  # rubocop:enable Metrics/AbcSize
 
   def default_chart_prep(data:)
     hash = {}
     data.map { |rec| JSON.parse(rec) }.each do |rec|
-      date = prep_date_for_charts(date: rec["date"])
-      hash[date] = hash.fetch(date, 0) + rec["count"].to_i
+      date = prep_date_for_charts(date: rec['date'])
+      hash[date] = hash.fetch(date, 0) + rec['count'].to_i
     end
     hash
   end
 
   def prep_date_for_charts(date:)
-    date.is_a?(Date) ? date.strftime("%b-%y") : Date.parse(date).strftime("%b-%y")
+    date.is_a?(Date) ? date.strftime('%b-%y') : Date.parse(date).strftime('%b-%y')
   end
 
   def random_rgb
     "rgb(#{rand(256)},#{rand(256)},#{rand(256)})"
   end
-
 end
diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb
index db81880938..d92ffddcb5 100644
--- a/app/jobs/application_job.rb
+++ b/app/jobs/application_job.rb
@@ -1,5 +1,4 @@
 # frozen_string_literal: true
 
 class ApplicationJob < ActiveJob::Base
-
 end
diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index 13dcf11d63..02fe2245e8 100644
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
+# Mailer methods for all emails
 class UserMailer < ActionMailer::Base
-
-  prepend_view_path "app/views/branded/"
+  prepend_view_path 'app/views/branded/'
 
   include MailerHelper
   helper MailerHelper
@@ -10,23 +10,23 @@ class UserMailer < ActionMailer::Base
 
   default from: Rails.configuration.x.organisation.email
 
+  # rubocop:disable Metrics/AbcSize
   def welcome_notification(user)
     @user           = user
     @username       = @user.name
-    @email_subject  = _("Query or feedback related to %{tool_name}") % { tool_name: tool_name }
+    @email_subject  = format(_('Query or feedback related to %<tool_name>s'), tool_name: tool_name)
     # Override the default Rails route helper for the contact_us page IF an alternate contact_us
     # url was defined in the dmproadmap.rb initializer file
     @contact_us     = Rails.application.config.x.organisation.contact_us_url || contact_us_url
 
     I18n.with_locale I18n.default_locale do
       mail(to: @user.email,
-           subject: _("Welcome to %{tool_name}") %
-           {
-             tool_name: tool_name
-           })
+           subject: format(_('Welcome to %<tool_name>s'), tool_name: tool_name))
     end
   end
+  # rubocop:enable Metrics/AbcSize
 
+  # rubocop:disable Metrics/AbcSize
   def question_answered(data, user, answer, _options_string)
     @user           = user
     @username       = @user.name
@@ -35,15 +35,16 @@ def question_answered(data, user, answer, _options_string)
     @plan_title     = @answer.plan.title.to_s
     @template_title = @answer.plan.template.title.to_s
     @data           = data
-    @recipient_name = @data["name"].to_s
-    @message        = @data["message"].to_s
+    @recipient_name = @data['name'].to_s
+    @message        = @data['message'].to_s
     @answer_text    = @options_string.to_s
 
     I18n.with_locale I18n.default_locale do
-      mail(to: data["email"],
-           subject: data["subject"])
+      mail(to: data['email'],
+           subject: data['subject'])
     end
   end
+  # rubocop:enable Metrics/AbcSize
 
   def sharing_notification(role, user, inviter:)
     @role       = role
@@ -51,14 +52,12 @@ def sharing_notification(role, user, inviter:)
     @user_email = @user.email
     @username   = @user.name
     @inviter    = inviter
-    @link       = url_for(action: "show", controller: "plans", id: @role.plan.id)
+    @link       = url_for(action: 'show', controller: 'plans', id: @role.plan.id)
 
     I18n.with_locale I18n.default_locale do
       mail(to: @role.user.email,
-           subject: _("A Data Management Plan in %{tool_name} has been shared with you") %
-           {
-             tool_name: tool_name
-           })
+           subject: format(_('A Data Management Plan in %<tool_name>s has been shared with you'),
+                           tool_name: tool_name))
     end
   end
 
@@ -68,15 +67,13 @@ def permissions_change_notification(role, user)
     @role       = role
     @plan_title = @role.plan.title
     @user       = user
-    @recepient   = @role.user
-    @messaging  = role_text(@role)
+    @recepient = @role.user
+    @messaging = role_text(@role)
 
     I18n.with_locale I18n.default_locale do
       mail(to: @recepient.email,
-           subject: _("Changed permissions on a Data Management Plan in %{tool_name}") %
-           {
-             tool_name: tool_name
-           })
+           subject: format(_('Changed permissions on a Data Management Plan in %<tool_name>s'),
+                           tool_name: tool_name))
     end
   end
 
@@ -89,10 +86,8 @@ def plan_access_removed(user, plan, current_user)
 
     I18n.with_locale I18n.default_locale do
       mail(to: @user.email,
-           subject: _("Permissions removed on a DMP in %{tool_name}") %
-           {
-             tool_name: tool_name
-           })
+           subject: format(_('Permissions removed on a DMP in %<tool_name>s'),
+                           tool_name: tool_name))
     end
   end
 
@@ -108,13 +103,12 @@ def feedback_notification(recipient, plan, requestor)
 
     I18n.with_locale I18n.default_locale do
       mail(to: @recipient.email,
-           subject: _("%{user_name} has requested feedback on a %{tool_name} plan") %
-           {
-             tool_name: tool_name, user_name: @user.name(false)
-           })
+           subject: format(_('%<user_name>s has requested feedback on a %<tool_name>s plan'),
+                           tool_name: tool_name, user_name: @user.name(false)))
     end
   end
 
+  # rubocop:disable Metrics/AbcSize
   def feedback_complete(recipient, plan, requestor)
     return unless recipient.active?
 
@@ -131,12 +125,11 @@ def feedback_complete(recipient, plan, requestor)
 
       mail(to: recipient.email,
            from: sender,
-           subject: _("%{tool_name}: Expert feedback has been provided for %{plan_title}") %
-           {
-             tool_name: tool_name, plan_title: @plan.title
-           })
+           subject: format(_('%<tool_name>s: Expert feedback has been provided for %<plan_title>s'),
+                           tool_name: tool_name, plan_title: @plan.title))
     end
   end
+  # rubocop:enable Metrics/AbcSize
 
   def plan_visibility(user, plan)
     return unless user.active?
@@ -149,10 +142,7 @@ def plan_visibility(user, plan)
 
     I18n.with_locale I18n.default_locale do
       mail(to: @user.email,
-           subject: _("DMP Visibility Changed: %{plan_title}") %
-           {
-             plan_title: @plan.title
-           })
+           subject: format(_('DMP Visibility Changed: %<plan_title>s'), plan_title: @plan.title))
     end
   end
 
@@ -176,15 +166,12 @@ def new_comment(commenter, plan, answer)
     @question_number = @question.number
     @section_title   = @question.section.title
     @phase_id        = @question.section.phase.id
-    @phase_link = url_for(action: "edit", controller: "plans", id: @plan.id, phase_id: @phase_id)
+    @phase_link = url_for(action: 'edit', controller: 'plans', id: @plan.id, phase_id: @phase_id)
 
     I18n.with_locale I18n.default_locale do
       mail(to: @plan.owner.email,
-           subject: _("%{tool_name}: A new comment was added to %{plan_title}") %
-           {
-             tool_name: tool_name,
-             plan_title: @plan.title
-           })
+           subject: format(_('%<tool_name>s: A new comment was added to %<plan_title>s'),
+                           tool_name: tool_name, plan_title: @plan.title))
     end
   end
   # rubocop:enable Metrics/AbcSize
@@ -198,13 +185,12 @@ def admin_privileges(user)
 
     I18n.with_locale I18n.default_locale do
       mail(to: user.email,
-           subject: _("Administrator privileges granted in %{tool_name}") %
-           {
-             tool_name: tool_name
-           })
+           subject: format(_('Administrator privileges granted in %<tool_name>s'),
+                           tool_name: tool_name))
     end
   end
 
+  # rubocop:disable Metrics/AbcSize
   def api_credentials(api_client)
     @api_client = api_client
     return unless @api_client.contact_email.present?
@@ -215,11 +201,8 @@ def api_credentials(api_client)
 
     I18n.with_locale I18n.default_locale do
       mail(to: @api_client.contact_email,
-           subject: _("%{tool_name} API changes") %
-           {
-             tool_name: tool_name
-           })
+           subject: format(_('%<tool_name>s API changes'), tool_name: tool_name))
     end
   end
-
+  # rubocop:enable Metrics/AbcSize
 end
diff --git a/app/models/annotation.rb b/app/models/annotation.rb
index 3552a246f5..4689352a0d 100644
--- a/app/models/annotation.rb
+++ b/app/models/annotation.rb
@@ -25,8 +25,8 @@
 #  fk_rails_...  (question_id => questions.id)
 #
 
+# Object that represents Question level guidance or example answers
 class Annotation < ApplicationRecord
-
   include VersionableModel
 
   ##
@@ -79,5 +79,4 @@ def deep_copy(**options)
     copy.question_id = options.fetch(:question_id, nil)
     copy
   end
-
 end
diff --git a/app/models/answer.rb b/app/models/answer.rb
index c994391b04..d1ff70e9b3 100644
--- a/app/models/answer.rb
+++ b/app/models/answer.rb
@@ -28,8 +28,8 @@
 #  fk_rails_...  (user_id => users.id)
 #
 
+# Object that represents an Answer to a Plan question
 class Answer < ApplicationRecord
-
   # ================
   # = Associations =
   # ================
@@ -42,7 +42,7 @@ class Answer < ApplicationRecord
 
   has_many :notes, dependent: :destroy
 
-  has_and_belongs_to_many :question_options, join_table: "answers_question_options"
+  has_and_belongs_to_many :question_options, join_table: 'answers_question_options'
 
   has_many :notes
 
@@ -96,7 +96,7 @@ def answered?
     # If the question is option based then see if any options were selected
     return question_options.any? if question.question_format.option_based?
     # Strip out any white space and see if the text is empty
-    return !text.gsub(%r{</?p>}, "").gsub(%r{<br\s?/?>}, "").chomp.blank? if text.present?
+    return !text.gsub(%r{</?p>}, '').gsub(%r{<br\s?/?>}, '').chomp.blank? if text.present?
 
     false
   end
@@ -113,7 +113,7 @@ def non_archived_notes
   #
   # Returns Hash
   def answer_hash
-    default = { "standards" => {}, "text" => "" }
+    default = { 'standards' => {}, 'text' => '' }
     begin
       h = text.nil? ? default : JSON.parse(text)
     rescue JSON::ParserError
@@ -130,10 +130,10 @@ def answer_hash
   # text      - A String with option comment text
   #
   # Returns String
-  def update_answer_hash(standards = {}, text = "")
+  def update_answer_hash(standards = {}, text = '')
     h = {}
-    h["standards"] = standards
-    h["text"] = text
+    h['standards'] = standards
+    h['text'] = text
     self.text = h.to_json
   end
 
@@ -152,5 +152,4 @@ def set_plan_complete
       plan.touch
     end
   end
-
 end
diff --git a/app/models/api_client.rb b/app/models/api_client.rb
index ad521b497c..0c20193c53 100644
--- a/app/models/api_client.rb
+++ b/app/models/api_client.rb
@@ -24,8 +24,8 @@
 #
 #  fk_rails_...  (org_id => orgs.id)
 
+# Object that represents an external system
 class ApiClient < ApplicationRecord
-
   include DeviseInvitable::Inviter
 
   extend UniqueRandom
@@ -39,9 +39,9 @@ class ApiClient < ApplicationRecord
   has_many :plans
 
   # If the Client_id or client_secret are nil generate them
-  attribute :client_id, :string, default: -> { unique_random(field_name: "client_id") }
+  attribute :client_id, :string, default: -> { unique_random(field_name: 'client_id') }
   attribute :client_secret, :string,
-            default: -> { unique_random(field_name: "client_secret") }
+            default: -> { unique_random(field_name: 'client_secret') }
 
   # ===============
   # = Validations =
@@ -83,8 +83,7 @@ def authenticate(secret:)
 
   # Generate UUIDs for the client_id and client_secret
   def generate_credentials
-    self.client_id = ApiClient.unique_random(field_name: "client_id")
-    self.client_secret = ApiClient.unique_random(field_name: "client_secret")
+    self.client_id = ApiClient.unique_random(field_name: 'client_id')
+    self.client_secret = ApiClient.unique_random(field_name: 'client_secret')
   end
-
 end
diff --git a/app/models/application_record.rb b/app/models/application_record.rb
index 0059011d4d..3fd5039392 100644
--- a/app/models/application_record.rb
+++ b/app/models/application_record.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
+# Base ActiveRecord object
 class ApplicationRecord < ActiveRecord::Base
-
   include GlobalHelpers
   include ValidationValues
   include ValidationMessages
@@ -13,5 +13,4 @@ def sanitize_fields(*attrs)
       send("#{attr}=", ActionController::Base.helpers.sanitize(send(attr)))
     end
   end
-
 end
diff --git a/app/models/concerns/acts_as_sortable.rb b/app/models/concerns/acts_as_sortable.rb
index 637e50f6df..537d24bbda 100644
--- a/app/models/concerns/acts_as_sortable.rb
+++ b/app/models/concerns/acts_as_sortable.rb
@@ -1,19 +1,19 @@
 # frozen_string_literal: true
 
+# Module that allows us to sort query results for paginated tables
+# rubocop:disable Metrics/BlockLength
 module ActsAsSortable
-
   extend ActiveSupport::Concern
 
-  module ClassMethods
-
+  class_methods do
     def update_numbers!(ids, parent:)
       # Ensure only records belonging to this parent are included.
       ids = ids.map(&:to_i) & parent.public_send("#{model_name.singular}_ids")
       return if ids.empty?
 
       case connection.adapter_name
-      when "PostgreSQL" then update_numbers_postgresql!(ids)
-      when "Mysql2"     then update_numbers_mysql2!(ids)
+      when 'PostgreSQL' then update_numbers_postgresql!(ids)
+      when 'Mysql2'     then update_numbers_mysql2!(ids)
       else
         update_numbers_sequentially!(ids)
       end
@@ -23,7 +23,7 @@ def update_numbers!(ids, parent:)
 
     def update_numbers_postgresql!(ids)
       # Build an Array with each ID and its relative position in the Array
-      values = ids.each_with_index.map { |id, i| "(#{id}, #{i + 1})" }.join(",")
+      values = ids.each_with_index.map { |id, i| "(#{id}, #{i + 1})" }.join(',')
       # Run a single UPDATE query for all records.
       query = <<~SQL
         UPDATE #{table_name} \
@@ -35,7 +35,7 @@ def update_numbers_postgresql!(ids)
     end
 
     def update_numbers_mysql2!(ids)
-      ids_string = ids.map { |id| "'#{id}'" }.join(",")
+      ids_string = ids.map { |id| "'#{id}'" }.join(',')
       update_all(%{ number = FIELD(id, #{sanitize_sql(ids_string)})
                      WHERE id IN (#{sanitize_sql(ids_string)}) })
     end
@@ -45,7 +45,6 @@ def update_numbers_sequentially!(ids)
         find(id).update_attribute(:number, number + 1)
       end
     end
-
   end
-
 end
+# rubocop:enable Metrics/BlockLength
diff --git a/app/models/concerns/date_rangeable.rb b/app/models/concerns/date_rangeable.rb
index 993aefa769..115bb94eea 100644
--- a/app/models/concerns/date_rangeable.rb
+++ b/app/models/concerns/date_rangeable.rb
@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
+# Module that allows us to interact with date ranges
 module DateRangeable
-
   extend ActiveSupport::Concern
 
-  module ClassMethods
-
+  class_methods do
     # Determines whether or not the search term is a date.
     # Expecting: '[month abbreviation] [year]' e.g.('Oct 2019')
     def date_range?(term:)
@@ -16,10 +15,8 @@ def date_range?(term:)
     def by_date_range(field, term)
       date = Date.parse(term) if term[0..1].match(/[0-9]{2}/).present?
       date = Date.parse("1st #{term}") unless date.present?
-      query = "%{table}.%{field} BETWEEN ? AND ?" % { table: table_name, field: field }
+      query = format('%<table>s.%<field>s BETWEEN ? AND ?', table: table_name, field: field)
       where(query, date, date.end_of_month)
     end
-
   end
-
 end
diff --git a/app/models/concerns/exportable_plan.rb b/app/models/concerns/exportable_plan.rb
index 5d8d66a1b8..69159c16b0 100644
--- a/app/models/concerns/exportable_plan.rb
+++ b/app/models/concerns/exportable_plan.rb
@@ -3,16 +3,20 @@
 # TODO: This code here doesn't make a lot of sense as a Concern since no other model would
 #       ever use the functionality. It would be better to make it a Service.
 
+# Module that provides helper methods for exporting a Plan in various formats
 # rubocop:disable Metrics/ModuleLength
 module ExportablePlan
-
   include ConditionsHelper
 
+  # rubocop:disable Style/OptionalBooleanParameter
   def as_pdf(user, coversheet = false)
     prepare(user, coversheet)
   end
+  # rubocop:enable Style/OptionalBooleanParameter
 
-  # rubocop:disable Metrics/AbcSize, Metrics/ParameterLists
+  # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/ParameterLists
+  # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+  # rubocop:disable Style/OptionalBooleanParameter
   def as_csv(user,
              headings = true,
              unanswered = true,
@@ -23,11 +27,11 @@ def as_csv(user,
     CSV.generate do |csv|
       prepare_coversheet_for_csv(csv, headings, hash) if show_coversheet
 
-      hdrs = (hash[:phases].many? ? [_("Phase")] : [])
+      hdrs = (hash[:phases].many? ? [_('Phase')] : [])
       hdrs << if headings
-                [_("Section"), _("Question"), _("Answer")]
+                [_('Section'), _('Question'), _('Answer')]
               else
-                [_("Answer")]
+                [_('Answer')]
               end
 
       customization = hash[:customization]
@@ -48,17 +52,20 @@ def as_csv(user,
       end
     end
   end
-  # rubocop:enable Metrics/AbcSize, Metrics/ParameterLists
+  # rubocop:enable Style/OptionalBooleanParameter
+  # rubocop:enable Metrics/AbcSize, Metrics/MethodLength, Metrics/ParameterLists
+  # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
   private
 
   # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+  # rubocop:disable Style/OptionalBooleanParameter
   def prepare(user, coversheet = false)
     hash = coversheet ? prepare_coversheet : {}
     template = Template.includes(phases: { sections: { questions: :question_format } })
                        .joins(phases: { sections: { questions: :question_format } })
                        .where(id: template_id)
-                       .order("sections.number", "questions.number").first
+                       .order('sections.number', 'questions.number').first
     hash[:customization] = template.customization_of.present?
     hash[:title] = title
     hash[:answers] = answers
@@ -91,19 +98,20 @@ def prepare(user, coversheet = false)
     hash
   end
   # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
+  # rubocop:enable Style/OptionalBooleanParameter
 
   # rubocop:disable Metrics/AbcSize
+  # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
   def prepare_coversheet
     hash = {}
-    # name of owner and any co-owners
-    attribution = owner.present? ? [owner.name(false)] : []
-    roles.administrator.not_creator.each do |role|
-      attribution << role.user.name(false)
-    end
+    # Use the name of the DMP owner/creator OR the first Co-owner if there is no
+    # owner for some reason
+    attribution = roles.creator.first&.user&.name(false)
+    roles.administrator.not_creator.first&.user&.name(false) unless attribution.present?
     hash[:attribution] = attribution
 
     # Org name of plan owner's org
-    hash[:affiliation] = owner.present? ? owner.org.name : ""
+    hash[:affiliation] = owner.present? ? owner.org.name : ''
 
     # set the funder name
     hash[:funder] = funder.name if funder.present?
@@ -112,41 +120,38 @@ def prepare_coversheet
 
     # set the template name and customizer name if applicable
     hash[:template] = template.title
-    customizer = ""
+    customizer = ''
     cust_questions = questions.where(modifiable: true).pluck(:id)
     # if the template is customized, and has custom answered questions
     if template.customization_of.present? &&
        Answer.where(plan_id: id, question_id: cust_questions).present?
-      customizer = _(" Customised By: ") + template.org.name
+      customizer = _(' Customised By: ') + template.org.name
     end
     hash[:customizer] = customizer
     hash
   end
   # rubocop:enable Metrics/AbcSize
-  # rubocop:enable
+  # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
-  # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+  # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/PerceivedComplexity
   def prepare_coversheet_for_csv(csv, _headings, hash)
     csv << [if hash[:attribution].many?
-              _("Creators: ")
+              _('Creators: ')
             else
-              _("Creator:")
-            end, _("%{authors}") % { authors: hash[:attribution].join(", ") }]
-    csv << ["Affiliation: ", _("%{affiliation}") % { affiliation: hash[:affiliation] }]
+              _('Creator:')
+            end, format(_('%<authors>s'), authors: hash[:attribution].join(', '))]
+    csv << ['Affiliation: ', format(_('%<affiliation>s'), affiliation: hash[:affiliation])]
     csv << if hash[:funder].present?
-             [_("Template: "), _("%{funder}") % { funder: hash[:funder] }]
+             [_('Template: '), format(_('%<funder>s'), funder: hash[:funder])]
            else
-             [_("Template: "), _("%{template}") % { template: hash[:template] + hash[:customizer] }]
+             [_('Template: '), format(_('%<template>s'), template: hash[:template] + hash[:customizer])]
            end
-    if grant&.value.present?
-      csv << [_("Grant number: "), _("%{grant_number}") % { grant_number: grant&.value }]
-    end
+    csv << [_('Grant number: '), format(_('%<grant_number>s'), grant_number: grant&.value)] if grant&.value.present?
     if description.present?
-      csv << [_("Project abstract: "), _("%{description}") %
-                                       { description: Nokogiri::HTML(description).text }]
+      csv << [_('Project abstract: '), format(_('%<description>s'), description: Nokogiri::HTML(description).text)]
     end
-    csv << [_("Last modified: "), _("%{date}") % { date: updated_at.to_date.strftime("%d-%m-%Y") }]
-    csv << [_("Copyright information:"),
+    csv << [_('Last modified: '), format(_('%<date>s'), date: updated_at.to_date.strftime('%d-%m-%Y'))]
+    csv << [_('Copyright information:'),
             _("The above plan creator(s) have agreed that others may use as
              much of the text of this plan as they would like in their own plans,
              and customise it as necessary. You do not need to credit the creator(s)
@@ -156,32 +161,31 @@ def prepare_coversheet_for_csv(csv, _headings, hash)
     csv << []
     csv << []
   end
-  # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
+  # rubocop:enable Metrics/MethodLength, Metrics/AbcSize, Metrics/PerceivedComplexity
 
   # rubocop:disable Metrics/AbcSize, Metrics/BlockLength, Metrics/MethodLength
+  # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
   # rubocop:disable Metrics/ParameterLists
   def show_section_for_csv(csv, phase, section, headings, unanswered, hash)
     section[:questions].each do |question|
       next if remove_list(hash).include?(question[:id])
 
       answer = self.answer(question[:id], false)
-      answer_text = ""
+      answer_text = ''
       if answer.present?
-        if answer.question_options.any?
-          answer_text += answer.question_options.pluck(:text).join(", ")
-        end
+        answer_text += answer.question_options.pluck(:text).join(', ') if answer.question_options.any?
         answer_text += answer.text if answer.answered?
       elsif unanswered
-        answer_text += _("Not Answered")
+        answer_text += _('Not Answered')
       end
-      single_line_answer_for_csv = sanitize_text(answer_text).gsub(/\r|\n/, " ")
+      single_line_answer_for_csv = sanitize_text(answer_text).gsub(/\r|\n/, ' ')
       flds = (hash[:phases].many? ? [phase[:title]] : [])
       if headings
         question_text = if question[:text].is_a? String
                           question[:text]
                         else
                           (if question[:text].many?
-                             question[:text].join(", ")
+                             question[:text].join(', ')
                            else
                              question[:text][0]
                            end)
@@ -195,9 +199,10 @@ def show_section_for_csv(csv, phase, section, headings, unanswered, hash)
     end
   end
   # rubocop:enable Metrics/AbcSize, Metrics/BlockLength, Metrics/MethodLength
-  # rubocop:enable
+  # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
   # rubocop:enable Metrics/ParameterLists
 
+  # rubocop:disable Metrics/AbcSize
   def record_plan_export(user, format)
     # TODO: Re-evaluate how/why we are doing this. The only place it is used is in statistics
     #       generation as 'downloads' without any regard for the format (although we only call this
@@ -218,10 +223,10 @@ def record_plan_export(user, format)
     end
     exported_plan.save
   end
+  # rubocop:enable Metrics/AbcSize
 
   def sanitize_text(text)
-    ActionView::Base.full_sanitizer.sanitize(text.to_s.gsub(/&nbsp;/i, ""))
+    ActionView::Base.full_sanitizer.sanitize(text.to_s.gsub(/&nbsp;/i, ''))
   end
-
 end
 # rubocop:enable Metrics/ModuleLength
diff --git a/app/models/concerns/identifiable.rb b/app/models/concerns/identifiable.rb
index 3aea3fc227..e1f0e01eef 100644
--- a/app/models/concerns/identifiable.rb
+++ b/app/models/concerns/identifiable.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
+# Module that allows the Model to have identifiers
 module Identifiable
-
   extend ActiveSupport::Concern
 
   # rubocop:disable Metrics/BlockLength
@@ -25,6 +25,7 @@ module Identifiable
     # Expects an array of `identifier_scheme.name` and `identifier.value`
     #   [{ name: "fundref", value: "12345" }, { name: "ror", value: "abc"} ]
     # Returns an instance of the model
+    # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
     def self.from_identifiers(array:)
       return nil unless array.present? && array.any?
 
@@ -44,7 +45,7 @@ def self.from_identifiers(array:)
 
       id.present? ? id.identifiable : nil
     end
-    # rubocop:enable
+    # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
     # ====================
     # = Instance Methods =
@@ -75,5 +76,4 @@ def consolidate_identifiers!(array:)
     end
   end
   # rubocop:enable Metrics/BlockLength
-
 end
diff --git a/app/models/concerns/json_link_validator.rb b/app/models/concerns/json_link_validator.rb
index e15eaa25d0..2e0e037e33 100644
--- a/app/models/concerns/json_link_validator.rb
+++ b/app/models/concerns/json_link_validator.rb
@@ -1,18 +1,17 @@
 # frozen_string_literal: true
 
+# Module that helps validate Template and Org links
 module JSONLinkValidator
-
   # Validates whether or not the value passed is conforming to
   # [{ link: String, text: String}, ...]
   def valid_links?(value)
     if value.is_a?(Array)
       r = value.all? do |o|
-        o.is_a?(Hash) && o.key?("link") && o.key?("text") &&
-          o["link"].is_a?(String) && o["text"].is_a?(String)
+        o.is_a?(Hash) && o.key?('link') && o.key?('text') &&
+          o['link'].is_a?(String) && o['text'].is_a?(String)
       end
       return r
     end
     false
   end
-
 end
diff --git a/app/models/concerns/validation_messages.rb b/app/models/concerns/validation_messages.rb
index 1fb9b3a918..3cf0bff5cc 100644
--- a/app/models/concerns/validation_messages.rb
+++ b/app/models/concerns/validation_messages.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
+# Module that provides consistent validation messaging
 module ValidationMessages
-
   # workaround for errors thrown by puma when eager loading application
   # TODO: see if this is still a problem with translations gem
   # I18n.add_text_domain "app", path: "config/locale", type: :po,
@@ -10,12 +10,11 @@ module ValidationMessages
 
   PRESENCE_MESSAGE = _("can't be blank")
 
-  UNIQUENESS_MESSAGE = _("must be unique")
+  UNIQUENESS_MESSAGE = _('must be unique')
 
   INCLUSION_MESSAGE = _("isn't a valid value")
 
-  OPTION_PRESENCE_MESSAGE = _("You must have at least one option with accompanying text.")
+  OPTION_PRESENCE_MESSAGE = _('You must have at least one option with accompanying text.')
 
   QUESTION_TEXT_PRESENCE_MESSAGE = _("for 'Question text' can't be blank.")
-
 end
diff --git a/app/models/concerns/validation_values.rb b/app/models/concerns/validation_values.rb
index 531e1237eb..3f06ed743f 100644
--- a/app/models/concerns/validation_values.rb
+++ b/app/models/concerns/validation_values.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
+# module that provides default validation values
 module ValidationValues
-
   BOOLEAN_VALUES = [true, false].freeze
-
 end
diff --git a/app/models/concerns/versionable_model.rb b/app/models/concerns/versionable_model.rb
index a972ab677d..91649ca8a2 100644
--- a/app/models/concerns/versionable_model.rb
+++ b/app/models/concerns/versionable_model.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
+# Module that allows a Model to be versioned
 module VersionableModel
-
   extend ActiveSupport::Concern
 
   included do
@@ -12,8 +12,7 @@ module VersionableModel
     attribute :versionable_id,
               :string,
               default: lambda {
-                         unique_uuid(field_name: "versionable_id")
+                         unique_uuid(field_name: 'versionable_id')
                        }
   end
-
 end
diff --git a/app/models/condition.rb b/app/models/condition.rb
index 6fd4859b6d..ef0d79cca3 100644
--- a/app/models/condition.rb
+++ b/app/models/condition.rb
@@ -24,8 +24,8 @@
 #
 #
 
+# Object that represents a condition of a conditional question
 class Condition < ApplicationRecord
-
   belongs_to :question
   enum action_type: %i[remove add_webhook]
   serialize :option_list, Array
@@ -42,5 +42,4 @@ def deep_copy(**options)
     copy.save!(validate: false) if options.fetch(:save, false)
     copy
   end
-
 end
diff --git a/app/models/contributor.rb b/app/models/contributor.rb
index f177935ad9..de5e03eea6 100644
--- a/app/models/contributor.rb
+++ b/app/models/contributor.rb
@@ -26,8 +26,8 @@
 #  fk_rails_...  (org_id => orgs.id)
 #  fk_rails_...  (plan_id => plans.id)
 
+# Object that represents a contributor to a plan
 class Contributor < ApplicationRecord
-
   include FlagShihTzu
   include ValidationMessages
   include Identifiable
@@ -53,13 +53,13 @@ class Contributor < ApplicationRecord
   validates :roles, presence: { message: PRESENCE_MESSAGE }
 
   validates :roles, numericality: { greater_than: 0,
-                                    message: _("You must specify at least one role.") }
+                                    message: _('You must specify at least one role.') }
 
   validate :name_or_email_presence
 
-  ONTOLOGY_NAME = "CRediT - Contributor Roles Taxonomy"
-  ONTOLOGY_LANDING_PAGE = "https://credit.niso.org/"
-  ONTOLOGY_BASE_URL = "http://credit.niso.org/contributor-roles/"
+  ONTOLOGY_NAME = 'CRediT - Contributor Roles Taxonomy'
+  ONTOLOGY_LANDING_PAGE = 'https://credit.niso.org/'
+  ONTOLOGY_BASE_URL = 'http://credit.niso.org/contributor-roles/'
 
   ##
   # Define Bit Field values for roles
@@ -68,7 +68,7 @@ class Contributor < ApplicationRecord
             2 => :investigation,
             3 => :project_administration,
             4 => :other,
-            column: "roles"
+            column: 'roles'
 
   # ==========
   # = Scopes =
@@ -89,28 +89,28 @@ class Contributor < ApplicationRecord
   # ========================
 
   class << self
-
     # returns the default role
     def default_role
-      "other"
+      'other'
     end
-
   end
 
   # Check for equality by matching on Plan, ORCID, email or name
+  # rubocop:disable Metrics/CyclomaticComplexity
   def ==(other)
     return false unless other.is_a?(Contributor) && plan == other.plan
 
-    current_orcid = identifier_for_scheme(scheme: "orcid")&.value
-    new_orcid = other.identifier_for_scheme(scheme: "orcid")&.value
+    current_orcid = identifier_for_scheme(scheme: 'orcid')&.value
+    new_orcid = other.identifier_for_scheme(scheme: 'orcid')&.value
 
     email == other.email || name == other.name ||
       (current_orcid.present? && current_orcid == new_orcid)
   end
+  # rubocop:enable Metrics/CyclomaticComplexity
 
   # Merges the contents of the other Contributor into this one while retaining
   # any existing information
-  # rubocop:disable Metrics/AbcSize
+  # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
   def merge(other)
     self.org = other.org unless org.present?
     self.email = other.email unless email.present?
@@ -122,7 +122,7 @@ def merge(other)
     consolidate_identifiers!(array: other.identifiers.to_a)
     self
   end
-  # rubocop:enable Metrics/AbcSize
+  # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
   # ===================
   # = Private Methods =
@@ -136,5 +136,4 @@ def name_or_email_presence
     errors.add(:name, _("can't be blank if no email is provided"))
     errors.add(:email, _("can't be blank if no name is provided"))
   end
-
 end
diff --git a/app/models/department.rb b/app/models/department.rb
index 8733cf0174..a3c2a189a3 100644
--- a/app/models/department.rb
+++ b/app/models/department.rb
@@ -16,8 +16,8 @@
 #  index_departments_on_org_id  (org_id)
 #
 
+# Object that a department within an Org
 class Department < ApplicationRecord
-
   belongs_to :org
 
   has_many :users, dependent: :nullify
@@ -37,5 +37,4 @@ class Department < ApplicationRecord
 
   # Retrieves every department associated to an org
   scope :by_org, ->(org) { where(org_id: org.id) }
-
 end
diff --git a/app/models/exported_plan.rb b/app/models/exported_plan.rb
index f26d2b140b..66cd73f259 100644
--- a/app/models/exported_plan.rb
+++ b/app/models/exported_plan.rb
@@ -12,8 +12,9 @@
 #  plan_id    :integer
 #  user_id    :integer
 #
-class ExportedPlan < ApplicationRecord
 
+# Object that records when/how a plan was exported/downloaded
+class ExportedPlan < ApplicationRecord
   include SettingsTemplateHelper
 
   # associations between tables
@@ -27,7 +28,7 @@ class ExportedPlan < ApplicationRecord
   # Store settings with the exported plan so it can be recreated later
   # if necessary (otherwise the settings associated with the plan at a
   # given time can be lost)
-  has_settings :export, class_name: "Settings::Template" do |s|
+  has_settings :export, class_name: 'Settings::Template' do |s|
     s.key :export, defaults: Settings::Template::DEFAULT_SETTINGS
   end
 
@@ -80,10 +81,10 @@ def institution
   end
 
   def orcid
-    return "" unless owner.present?
+    return '' unless owner.present?
 
-    ids = owner.identifiers.by_scheme_name("orcid", "User")
-    ids.first.present? ? ids.first.value : ""
+    ids = owner.identifiers.by_scheme_name('orcid', 'User')
+    ids.first.present? ? ids.first.value : ''
   end
 
   def sections
@@ -107,15 +108,16 @@ def title
   # Export formats
 
   # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/BlockLength
+  # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
   def as_csv(sections, unanswered_questions, question_headings)
     CSV.generate do |csv|
       # rubocop:disable Style/ConditionalAssignment
       if question_headings
-        csv << [_("Section"), _("Question"), _("Answer"), _("Selected option(s)"),
-                _("Answered by"), _("Answered at")]
+        csv << [_('Section'), _('Question'), _('Answer'), _('Selected option(s)'),
+                _('Answered by'), _('Answered at')]
       else
-        csv << [_("Section"), _("Answer"), _("Selected option(s)"), _("Answered by"),
-                _("Answered at")]
+        csv << [_('Section'), _('Answer'), _('Selected option(s)'), _('Answered by'),
+                _('Answered at')]
       end
       # rubocop:enable Style/ConditionalAssignment
       sections.each do |section|
@@ -124,18 +126,18 @@ def as_csv(sections, unanswered_questions, question_headings)
           # skip unansewered questions
           next if answer.blank? && !unanswered_questions
 
-          answer_text = answer.present? ? answer.text : ""
+          answer_text = answer.present? ? answer.text : ''
           q_format = question.question_format
           options_string = if q_format.option_based?
-                             answer.question_options.collect(&:text).join("; ")
+                             answer.question_options.collect(&:text).join('; ')
                            else
-                             ""
+                             ''
                            end
           csv << if question_headings
                    [
                      section.title,
                      sanitize_text(question.text),
-                     question.option_comment_display ? sanitize_text(answer_text) : "",
+                     question.option_comment_display ? sanitize_text(answer_text) : '',
                      options_string,
                      user.name,
                      answer.updated_at
@@ -143,7 +145,7 @@ def as_csv(sections, unanswered_questions, question_headings)
                  else
                    [
                      section.title,
-                     question.option_comment_display ? sanitize_text(answer_text) : "",
+                     question.option_comment_display ? sanitize_text(answer_text) : '',
                      options_string,
                      user.name,
                      answer.updated_at
@@ -154,19 +156,20 @@ def as_csv(sections, unanswered_questions, question_headings)
     end
   end
   # rubocop:enable Metrics/AbcSize, Metrics/MethodLength, Metrics/BlockLength
-  # rubocop:enable
+  # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
   # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+  # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
   def as_txt(sections, unanswered_questions, question_headings, details)
     output = "#{plan.title}\n\n#{plan.template.title}\n"
-    output += "\n" + _("Details") + "\n\n"
+    output += "\n#{_('Details')}\n\n"
     if details
       admin_details.each do |at|
         value = send(at)
         output += if value.present?
-                    admin_field_t(at.to_s) + ": " + value + "\n"
+                    "#{admin_field_t(at.to_s)}: #{value}\n"
                   else
-                    admin_field_t(at.to_s) + ": " + _("-") + "\n"
+                    "#{admin_field_t(at.to_s)}: -\n"
                   end
       end
     end
@@ -179,11 +182,11 @@ def as_txt(sections, unanswered_questions, question_headings, details)
         next if answer.nil? && !unanswered_questions
 
         if question_headings
-          qtext = sanitize_text(question.text.gsub(/<li>/, "  * "))
+          qtext = sanitize_text(question.text.gsub(/<li>/, '  * '))
           output += "\n* #{qtext}"
         end
         if answer.nil?
-          output += _("Question not answered.") + "\n"
+          output += _('Question not answered.\n')
         else
           q_format = question.question_format
           if q_format.option_based?
@@ -198,11 +201,12 @@ def as_txt(sections, unanswered_questions, question_headings, details)
     output
   end
   # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
-  # rubocop:enable
+  # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
   private
 
   # Returns an Array of question_ids for the exported settings stored for a plan
+  # rubocop:disable Style/CaseLikeIf
   def questions
     question_settings = settings(:export).fields[:questions]
     @questions ||= if question_settings.present?
@@ -217,9 +221,9 @@ def questions
                      []
                    end
   end
+  # rubocop:enable Style/CaseLikeIf
 
   def sanitize_text(text)
-    ActionView::Base.full_sanitizer.sanitize(text.gsub(/&nbsp;/i, "")) unless text.nil?
+    ActionView::Base.full_sanitizer.sanitize(text.gsub(/&nbsp;/i, '')) unless text.nil?
   end
-
 end
diff --git a/app/models/guidance.rb b/app/models/guidance.rb
index 9443e522c0..b8b240b715 100644
--- a/app/models/guidance.rb
+++ b/app/models/guidance.rb
@@ -33,15 +33,15 @@
 # [+Created:+] 07/07/2014
 # [+Copyright:+] Digital Curation Centre and California Digital Library
 
+# Object that represents themed guidance
 class Guidance < ApplicationRecord
-
   # ================
   # = Associations =
   # ================
 
   belongs_to :guidance_group
 
-  has_and_belongs_to_many :themes, join_table: "themes_in_guidance"
+  has_and_belongs_to_many :themes, join_table: 'themes_in_guidance'
 
   # ===============
   # = Validations =
@@ -64,8 +64,8 @@ class Guidance < ApplicationRecord
   scope :search, lambda { |term|
     search_pattern = "%#{term}%"
     joins(:guidance_group)
-      .where("lower(guidances.text) LIKE lower(?) OR " \
-            "lower(guidance_groups.name) LIKE lower(?)",
+      .where('lower(guidances.text) LIKE lower(?) OR ' \
+             'lower(guidance_groups.name) LIKE lower(?)',
              search_pattern,
              search_pattern)
   }
@@ -84,24 +84,24 @@ class Guidance < ApplicationRecord
   # user - A User object
   #
   # Returns Boolean
+  # rubocop:disable Metrics/AbcSize
   def self.can_view?(user, id)
     guidance = Guidance.find_by(id: id)
     viewable = false
 
-    unless guidance.nil?
-      unless guidance.guidance_group.nil?
-        # guidances are viewable if they are owned by the user's org
-        viewable = true if guidance.guidance_group.org == user.org
-        # guidance groups are viewable if they are owned by the Default Orgs
-        viewable = true if Org.default_orgs.include?(guidance.guidance_group.org)
+    if !guidance.nil? && !guidance.guidance_group.nil?
+      # guidances are viewable if they are owned by the user's org
+      viewable = true if guidance.guidance_group.org == user.org
+      # guidance groups are viewable if they are owned by the Default Orgs
+      viewable = true if Org.default_orgs.include?(guidance.guidance_group.org)
 
-        # guidance groups are viewable if they are owned by a funder
-        viewable = true if Org.funder.include?(guidance.guidance_group.org)
-      end
+      # guidance groups are viewable if they are owned by a funder
+      viewable = true if Org.funder.include?(guidance.guidance_group.org)
     end
 
     viewable
   end
+  # rubocop:enable Metrics/AbcSize
 
   # Returns a list of all guidances which a specified user can view
   # we define guidances viewable to a user by those owned by a guidance group:
@@ -137,10 +137,8 @@ def self.all_viewable(user)
   #
   # Returns Boolean
   def in_group_belonging_to?(org_id)
-    unless guidance_group.nil?
-      return true if guidance_group.org.id == org_id
-    end
+    return true if !guidance_group.nil? && (guidance_group.org.id == org_id)
+
     false
   end
-
 end
diff --git a/app/models/guidance_group.rb b/app/models/guidance_group.rb
index c4c2ba04c7..c108cea48e 100644
--- a/app/models/guidance_group.rb
+++ b/app/models/guidance_group.rb
@@ -24,8 +24,8 @@
 #  fk_rails_...  (org_id => orgs.id)
 #
 
+# Object that represents a grouping of themed guidance
 class GuidanceGroup < ApplicationRecord
-
   attribute :optional_subset, :boolean, default: true
   attribute :published, :boolean, default: false
 
@@ -63,7 +63,7 @@ class GuidanceGroup < ApplicationRecord
 
   scope :search, lambda { |term|
     search_pattern = "%#{term}%"
-    where("lower(name) LIKE lower(?)", search_pattern)
+    where('lower(name) LIKE lower(?)', search_pattern)
   }
 
   scope :published, -> { where(published: true) }
@@ -137,6 +137,7 @@ def self.create_org_default(org)
   # = Instance methods =
   # ====================
 
+  # rubocop:disable Metrics/AbcSize
   def merge!(to_be_merged:)
     return self unless to_be_merged.is_a?(GuidanceGroup)
 
@@ -160,5 +161,5 @@ def merge!(to_be_merged:)
       reload
     end
   end
-
+  # rubocop:enable Metrics/AbcSize
 end
diff --git a/app/models/identifier.rb b/app/models/identifier.rb
index bd300f7004..0ee44592b1 100644
--- a/app/models/identifier.rb
+++ b/app/models/identifier.rb
@@ -17,8 +17,9 @@
 #
 #  index_identifiers_on_identifiable_type_and_identifiable_id  (identifiable_type,identifiable_id)
 #
-class Identifier < ApplicationRecord
 
+# Object that represents an identifier for an object
+class Identifier < ApplicationRecord
   # ================
   # = Associations =
   # ================
@@ -60,13 +61,14 @@ def self.by_scheme_name(scheme, identifiable_type)
   # Ensure that the value of attrs is a hash
   # TODO: evaluate this vs the Serialize approach in condition.rb
   def attrs=(hash)
-    super(hash.is_a?(Hash) ? hash.to_json.to_s : "{}")
+    super(hash.is_a?(Hash) ? hash.to_json.to_s : '{}')
   end
 
   # Appends the identifier scheme's prefix to the identifier if necessary
   # For example:
   #   value   '0000-0000-0000-0001'
   #   becomes 'https://orcid.org/0000-0000-0000-0001'
+  # rubocop:disable Metrics/AbcSize
   def value=(val)
     if identifier_scheme.present? &&
        identifier_scheme.identifier_prefix.present? &&
@@ -74,12 +76,13 @@ def value=(val)
        !val.to_s.starts_with?(identifier_scheme.identifier_prefix)
 
       base = identifier_scheme.identifier_prefix
-      base += "/" unless base.ends_with?("/")
+      base += '/' unless base.ends_with?('/')
       super("#{base}#{val}")
     else
       super(val)
     end
   end
+  # rubocop:enable Metrics/AbcSize
 
   # ===========================
   # = Public instance methods =
@@ -90,14 +93,14 @@ def identifier_format
     scheme = identifier_scheme&.name
     return scheme if %w[orcid ror fundref].include?(scheme)
 
-    return "ark" if value.include?("ark:")
+    return 'ark' if value.include?('ark:')
 
     doi_regex = %r{(doi:)?[0-9]{2}\.[0-9]+/.}
-    return "doi" if value =~ doi_regex
+    return 'doi' if value =~ doi_regex
 
-    return "url" if value.starts_with?("http")
+    return 'url' if value.starts_with?('http')
 
-    "other"
+    'other'
   end
 
   # Returns the value sans the identifier scheme's prefix.
@@ -109,7 +112,7 @@ def value_without_scheme_prefix
                         identifier_scheme.identifier_prefix.present?
 
     base = identifier_scheme.identifier_prefix
-    value.gsub(base, "").sub(%r{^/}, "")
+    value.gsub(base, '').sub(%r{^/}, '')
   end
 
   private
@@ -128,15 +131,14 @@ def value_uniqueness_without_scheme
     # if scheme is nil, then just unique for identifiable
     return unless Identifier.where(identifiable: identifiable, value: value).any?
 
-    errors.add(:value, _("must be unique"))
+    errors.add(:value, _('must be unique'))
   end
 
   # Ensure that the identifiable only has one identifier for the scheme
   def value_uniqueness_with_scheme
     if new_record? && Identifier.where(identifier_scheme: identifier_scheme,
                                        identifiable: identifiable).any?
-      errors.add(:identifier_scheme, _("already assigned a value"))
+      errors.add(:identifier_scheme, _('already assigned a value'))
     end
   end
-
 end
diff --git a/app/models/identifier_scheme.rb b/app/models/identifier_scheme.rb
index 3be538fe68..ea712e3901 100644
--- a/app/models/identifier_scheme.rb
+++ b/app/models/identifier_scheme.rb
@@ -15,8 +15,8 @@
 #  updated_at       :datetime
 #
 
+# Object that represents a type of identifiaction (e.g. ORCID, ROR, etc.)
 class IdentifierScheme < ApplicationRecord
-
   include FlagShihTzu
 
   ##
@@ -41,7 +41,7 @@ class IdentifierScheme < ApplicationRecord
   # ===========================
 
   scope :active, -> { where(active: true) }
-  scope :by_name, ->(value) { active.where("LOWER(name) = LOWER(?)", value) }
+  scope :by_name, ->(value) { active.where('LOWER(name) = LOWER(?)', value) }
 
   ##
   # Define Bit Field values for the scheme's context
@@ -51,7 +51,7 @@ class IdentifierScheme < ApplicationRecord
             3 => :for_plans,
             4 => :for_users,
             5 => :for_contributors,
-            column: "context"
+            column: 'context'
 
   # =========================
   # = Custom Accessor Logic =
@@ -61,11 +61,10 @@ class IdentifierScheme < ApplicationRecord
   #    { "ror": "12345" }
   # so we cannot allow spaces or non alpha characters!
   def name=(value)
-    super(value&.downcase&.gsub(/[^a-z]/, ""))
+    super(value&.downcase&.gsub(/[^a-z]/, ''))
   end
 
   # ===========================
   # = Instance Methods =
   # ===========================
-
 end
diff --git a/app/models/language.rb b/app/models/language.rb
index a62b03cfd7..d08a701911 100644
--- a/app/models/language.rb
+++ b/app/models/language.rb
@@ -11,8 +11,8 @@
 #  name             :string
 #
 
+# Object that represents a locale/language
 class Language < ApplicationRecord
-
   # =============
   # = Constants =
   # =============
@@ -39,7 +39,7 @@ class Language < ApplicationRecord
                    length: { maximum: NAME_MAXIMUM_LENGTH }
 
   validates :abbreviation, presence: { message: "can't be blank" },
-                           uniqueness: { message: "must be unique" },
+                           uniqueness: { message: 'must be unique' },
                            length: { maximum: ABBREVIATION_MAXIMUM_LENGTH },
                            format: { with: ABBREVIATION_FORMAT }
 
@@ -52,7 +52,7 @@ class Language < ApplicationRecord
   # ensure abbreviation is downcase and conforms to I18n locales
   # TODO: evaluate the need for the LocaleService after move to Translation.io
   def abbreviation=(value)
-    value = "" if value.nil?
+    value = '' if value.nil?
     value = value.downcase
     if value.blank? || value =~ /\A[a-z]{2}\Z/i
       super(value)
@@ -77,11 +77,10 @@ def abbreviation=(value)
   # ========================
 
   def self.many?
-    Rails.cache.fetch([model_name, "many?"], expires_in: 1.hour) { all.many? }
+    Rails.cache.fetch([model_name, 'many?'], expires_in: 1.hour) { all.many? }
   end
 
   def self.default
     where(default_language: true).first
   end
-
 end
diff --git a/app/models/mime_type.rb b/app/models/mime_type.rb
deleted file mode 100644
index 7c35a15b27..0000000000
--- a/app/models/mime_type.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-# == Schema Information
-#
-# Table name: mime_types
-#
-#  id          :bigint           not null, primary key
-#  category    :string           not null
-#  description :string           not null
-#  value       :string           not null
-#  created_at  :datetime         not null
-#  updated_at  :datetime         not null
-#
-# Indexes
-#
-#  index_mime_types_on_value  (value)
-#
-class MimeType < ApplicationRecord
-
-  include ValidationMessages
-
-  # ================
-  # = Associations =
-  # ================
-
-  has_many :research_outputs
-
-  # ===============
-  # = Validations =
-  # ===============
-
-  validates :category, :description, :value, presence: { message: PRESENCE_MESSAGE }
-
-  # ==========
-  # = Scopes =
-  # ==========
-
-  # Retrieves the unique list of categories
-  scope :categories, -> { pluck(:category).uniq.sort { |a, b| a <=> b } }
-
-end
diff --git a/app/models/note.rb b/app/models/note.rb
index 6e4b3cffd9..aeed0f2eaa 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -24,8 +24,8 @@
 #  fk_rails_...  (user_id => users.id)
 #
 
+# Object that represents a comment on a Plan
 class Note < ApplicationRecord
-
   # ================
   # = Associations =
   # ================
@@ -46,5 +46,4 @@ class Note < ApplicationRecord
 
   validates :archived, inclusion: { in: BOOLEAN_VALUES,
                                     message: INCLUSION_MESSAGE }
-
 end
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 4ec71198a9..b26be026f7 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -17,8 +17,8 @@
 #  updated_at        :datetime         not null
 #
 
+# Object that represents a global notification
 class Notification < ApplicationRecord
-
   enum level: %i[info warning danger]
   enum notification_type: %i[global]
 
@@ -27,7 +27,7 @@ class Notification < ApplicationRecord
   # ================
 
   has_and_belongs_to_many :users, dependent: :destroy,
-                                  join_table: "notification_acknowledgements"
+                                  join_table: 'notification_acknowledgements'
 
   # ===============
   # = Validations =
@@ -56,7 +56,7 @@ class Notification < ApplicationRecord
   # ==========
 
   scope :active, (lambda do
-    where("starts_at <= :now and :now < expires_at", now: Time.now).where(enabled: true)
+    where('starts_at <= :now and :now < expires_at', now: Time.now).where(enabled: true)
   end)
 
   scope :active_per_user, (lambda do |user|
@@ -75,5 +75,4 @@ class Notification < ApplicationRecord
   def acknowledged?(user)
     dismissable? && user.present? && users.include?(user)
   end
-
 end
diff --git a/app/models/org.rb b/app/models/org.rb
index de2526de38..147f64348a 100644
--- a/app/models/org.rb
+++ b/app/models/org.rb
@@ -29,8 +29,9 @@
 #
 #  fk_rails_...  (language_id => languages.id)
 #
-class Org < ApplicationRecord
 
+# Object that represents an Organization/Institution/Funder
+class Org < ApplicationRecord
   extend FeedbacksHelper
   include FlagShihTzu
   include Identifiable
@@ -41,12 +42,12 @@ class Org < ApplicationRecord
   LOGO_FORMATS = %w[jpeg png gif jpg bmp].freeze
 
   HUMANIZED_ATTRIBUTES = {
-    feedback_msg: _("Feedback email message")
+    feedback_msg: _('Feedback email message')
   }.freeze
 
   attribute :feedback_msg, :text, default: feedback_confirmation_default_message
   attribute :language_id, :integer, default: -> { Language.default&.id }
-  attribute :links, :text, default: { "org": [] }
+  attribute :links, :text, default: { org: [] }
 
   # Stores links as an JSON object:
   #  { org: [{"link":"www.example.com","text":"foo"}, ...] }
@@ -70,7 +71,7 @@ class Org < ApplicationRecord
 
   has_many :plans
 
-  has_many :funded_plans, class_name: "Plan", foreign_key: "funder_id"
+  has_many :funded_plans, class_name: 'Plan', foreign_key: 'funder_id'
 
   has_many :templates
 
@@ -81,7 +82,7 @@ class Org < ApplicationRecord
   has_many :annotations
 
   has_and_belongs_to_many :token_permission_types,
-                          join_table: "org_token_permissions",
+                          join_table: 'org_token_permissions',
                           unique: true
 
   has_many :departments
@@ -119,8 +120,8 @@ class Org < ApplicationRecord
                                    message: INCLUSION_MESSAGE }
 
   validates_property :format, of: :logo, in: LOGO_FORMATS,
-                              message: _("must be one of the following formats: " \
-                                "jpeg, jpg, png, gif, bmp")
+                              message: _('must be one of the following formats: ' \
+                                         'jpeg, jpg, png, gif, bmp')
 
   validates_size_of :logo,
                     maximum: 500.kilobytes,
@@ -155,11 +156,11 @@ def check_for_missing_logo_file
 
     # Attempt to locate the file by name. If it exists update the uid
     logo = Dir.glob("#{data_store_path}/**/*#{logo_name}")
-    if !logo.empty?
-      self.logo_uid = logo.first.gsub(data_store_path, "")
-    else
+    if logo.empty?
       # Otherwise the logo is missing so clear it to prevent save failures
       self.logo = nil
+    else
+      self.logo_uid = logo.first.gsub(data_store_path, '')
     end
   end
 
@@ -172,7 +173,7 @@ def check_for_missing_logo_file
             4 => :research_institute,
             5 => :project,
             6 => :school,
-            column: "org_type"
+            column: 'org_type'
 
   # The default Org is the one whose guidance is auto-attached to
   # plans when a plan is created
@@ -188,16 +189,16 @@ def self.default_orgs
 
   scope :search, lambda { |term|
     search_pattern = "%#{term}%"
-    where("lower(orgs.name) LIKE lower(?) OR " \
-          "lower(orgs.contact_email) LIKE lower(?)",
+    where('lower(orgs.name) LIKE lower(?) OR ' \
+          'lower(orgs.contact_email) LIKE lower(?)',
           search_pattern, search_pattern)
   }
 
   # Scope used in several controllers
   scope :with_template_and_user_counts, lambda {
-    joins("LEFT OUTER JOIN templates ON orgs.id = templates.org_id")
-      .joins("LEFT OUTER JOIN users ON orgs.id = users.org_id")
-      .group("orgs.id")
+    joins('LEFT OUTER JOIN templates ON orgs.id = templates.org_id')
+      .joins('LEFT OUTER JOIN users ON orgs.id = users.org_id')
+      .group('orgs.id')
       .select("orgs.*,
               count(distinct templates.family_id) as template_count,
               count(users.id) as user_count")
@@ -232,17 +233,18 @@ def locale
   # Tests are setup currently to work with this issue.
   #
   # Returns String
+  # rubocop:disable Metrics/CyclomaticComplexity
   def org_type_to_s
     ret = []
-    ret << "Institution" if institution?
-    ret << "Funder" if funder?
-    ret << "Organisation" if organisation?
-    ret << "Research Institute" if research_institute?
-    ret << "Project" if project?
-    ret << "School" if school?
-    (!ret.empty? ? ret.join(", ") : "None")
+    ret << 'Institution' if institution?
+    ret << 'Funder' if funder?
+    ret << 'Organisation' if organisation?
+    ret << 'Research Institute' if research_institute?
+    ret << 'Project' if project?
+    ret << 'School' if school?
+    (ret.empty? ? 'None' : ret.join(', '))
   end
-  # rubocop:enable
+  # rubocop:enable Metrics/CyclomaticComplexity
 
   def funder_only?
     org_type == Org.org_type_values_for(:funder).min
@@ -273,15 +275,16 @@ def short_name
   #
   # Returns ActiveRecord::Relation
   def published_templates
-    templates.where("published = ?", true)
+    templates.where('published = ?', true)
   end
 
   def org_admins
     admin_perms = %w[grant_permissions modify_templates modify_guidance change_org_details]
-    User.joins(:perms).where("users.org_id = ? AND perms.name IN (?)", id, admin_perms)
+    User.joins(:perms).where('users.org_id = ? AND perms.name IN (?)', id, admin_perms)
   end
 
   # This replaces the old plans method. We now use the native plans method and this.
+  # rubocop:disable Metrics/AbcSize
   def org_admin_plans
     combined_plan_ids = (native_plan_ids + affiliated_plan_ids).flatten.uniq
 
@@ -293,6 +296,7 @@ def org_admin_plans
           .where.not(visibility: Plan.visibilities[:is_test])
     end
   end
+  # rubocop:enable Metrics/AbcSize
 
   def grant_api!(token_permission_type)
     token_permission_types << token_permission_type unless
@@ -349,16 +353,16 @@ def merge!(to_be_merged:)
   def resize_image
     return if logo.nil? || logo.height == 100
 
-    self.logo = logo.thumb("x100") # resize height and maintain aspect ratio
+    self.logo = logo.thumb('x100') # resize height and maintain aspect ratio
   end
 
-  # rubocop:disable Metrics/AbcSize
+  # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
   def merge_attributes!(to_be_merged:)
     return false unless to_be_merged.is_a?(Org)
 
     self.target_url = to_be_merged.target_url unless target_url.present?
     self.managed = true if !managed? && to_be_merged.managed?
-    self.links = to_be_merged.links unless links.nil? || links == "{\"org\":[]}"
+    self.links = to_be_merged.links unless links.nil? || links == '{"org":[]}'
     self.logo_uid = to_be_merged.logo_uid unless logo.present?
     self.logo_name = to_be_merged.logo_name unless logo.present?
     self.contact_email = to_be_merged.contact_email unless contact_email.present?
@@ -366,8 +370,9 @@ def merge_attributes!(to_be_merged:)
     self.feedback_enabled = to_be_merged.feedback_enabled unless feedback_enabled?
     self.feedback_msg = to_be_merged.feedback_msg unless feedback_msg.present?
   end
-  # rubocop:enable Metrics/AbcSize
+  # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
+  # rubocop:disable Metrics/AbcSize
   def merge_departments!(to_be_merged:)
     return false unless to_be_merged.is_a?(Org) && to_be_merged.departments.any?
 
@@ -378,6 +383,7 @@ def merge_departments!(to_be_merged:)
       department.update(org_id: id) unless existing.include?(department.name.downcase)
     end
   end
+  # rubocop:enable Metrics/AbcSize
 
   def merge_guidance_groups!(to_be_merged:)
     return false unless to_be_merged.is_a?(Org) && to_be_merged.guidance_groups.any?
@@ -415,5 +421,4 @@ def ensure_api_access
       token_permission_types << perm unless token_permission_types.include?(perm)
     end
   end
-
 end
diff --git a/app/models/perm.rb b/app/models/perm.rb
index 78462904ed..a95f6e6543 100644
--- a/app/models/perm.rb
+++ b/app/models/perm.rb
@@ -10,10 +10,9 @@
 #  updated_at :datetime         not null
 #
 
+# Object that represents a User permission
 class Perm < ApplicationRecord
-
   class << self
-
     private
 
     def lazy_load(name)
@@ -23,7 +22,6 @@ def lazy_load(name)
            end
            .freeze
     end
-
   end
 
   # ================
@@ -44,39 +42,38 @@ def lazy_load(name)
   # =================
 
   def self.add_orgs
-    lazy_load("add_organisations")
+    lazy_load('add_organisations')
   end
 
   def self.change_affiliation
-    lazy_load("change_org_affiliation")
+    lazy_load('change_org_affiliation')
   end
 
   def self.grant_permissions
-    lazy_load("grant_permissions")
+    lazy_load('grant_permissions')
   end
 
   def self.modify_templates
-    lazy_load("modify_templates")
+    lazy_load('modify_templates')
   end
 
   def self.modify_guidance
-    lazy_load("modify_guidance")
+    lazy_load('modify_guidance')
   end
 
   def self.use_api
-    lazy_load("use_api")
+    lazy_load('use_api')
   end
 
   def self.change_org_details
-    lazy_load("change_org_details")
+    lazy_load('change_org_details')
   end
 
   def self.grant_api
-    lazy_load("grant_api_to_orgs")
+    lazy_load('grant_api_to_orgs')
   end
 
   def self.review_plans
-    lazy_load("review_org_plans")
+    lazy_load('review_org_plans')
   end
-
 end
diff --git a/app/models/phase.rb b/app/models/phase.rb
index f45e2294fc..7b466b68b0 100644
--- a/app/models/phase.rb
+++ b/app/models/phase.rb
@@ -30,8 +30,9 @@
 #
 # [+Created:+] 03/09/2014
 # [+Copyright:+] Digital Curation Centre and University of California Curation Center
-class Phase < ApplicationRecord
 
+# Object that represents a Template phase
+class Phase < ApplicationRecord
   include ActsAsSortable
   include VersionableModel
   include ConditionsHelper
@@ -48,9 +49,9 @@ class Phase < ApplicationRecord
   belongs_to :plan, optional: true
 
   has_one :prefix_section, lambda { |phase|
-    modifiable.where("number < ?",
+    modifiable.where('number < ?',
                      phase.sections.not_modifiable.minimum(:number))
-  }, class_name: "Section"
+  }, class_name: 'Section'
 
   has_many :sections, dependent: :destroy
 
@@ -62,7 +63,7 @@ class Phase < ApplicationRecord
 
   has_many :template_sections, lambda {
     not_modifiable
-  }, class_name: "Section"
+  }, class_name: 'Section'
 
   has_many :suffix_sections, lambda { |phase|
     modifiable.where(<<~SQL, phase_id: phase.id, modifiable: false)
@@ -70,7 +71,7 @@ class Phase < ApplicationRecord
                            WHERE sections.modifiable = :modifiable
                            AND sections.phase_id = :phase_id)
     SQL
-  }, class_name: "Section"
+  }, class_name: 'Section'
 
   # ===============
   # = Validations =
@@ -141,5 +142,4 @@ def visibility_allowed?(plan)
     value = Rational(num_answered_questions(plan), plan.num_questions) * 100
     value >= Rails.configuration.x.plans.default_percentage_answered.to_f
   end
-
 end
diff --git a/app/models/plan.rb b/app/models/plan.rb
index ddbf275cd8..2884d28581 100644
--- a/app/models/plan.rb
+++ b/app/models/plan.rb
@@ -40,8 +40,8 @@
 #  fk_rails_...  (research_domain_id => research_domains.id)
 #
 
+# Object that represents an DMP
 class Plan < ApplicationRecord
-
   include ConditionalUserMailer
   include ExportablePlan
   include DateRangeable
@@ -54,10 +54,10 @@ class Plan < ApplicationRecord
   # Returns visibility message given a Symbol type visibility passed, otherwise
   # nil
   VISIBILITY_MESSAGE = {
-    organisationally_visible: _("organisational"),
-    publicly_visible: _("public"),
-    is_test: _("test"),
-    privately_visible: _("private")
+    organisationally_visible: _('organisational'),
+    publicly_visible: _('public'),
+    is_test: _('test'),
+    privately_visible: _('private')
   }.freeze
 
   # ==============
@@ -82,7 +82,7 @@ class Plan < ApplicationRecord
 
   belongs_to :org
 
-  belongs_to :funder, class_name: "Org", optional: true
+  belongs_to :funder, class_name: 'Org', optional: true
 
   belongs_to :research_domain, optional: true
 
@@ -96,10 +96,10 @@ class Plan < ApplicationRecord
 
   has_many :guidances, through: :themes
 
-  has_many :guidance_group_options, -> { distinct.published.reorder("id") },
+  has_many :guidance_group_options, -> { distinct.published.reorder('id') },
            through: :guidances,
            source: :guidance_group,
-           class_name: "GuidanceGroup"
+           class_name: 'GuidanceGroup'
 
   has_many :answers, dependent: :destroy
 
@@ -161,7 +161,7 @@ class Plan < ApplicationRecord
                visibilities[:publicly_visible]
              ])
       .where(
-        "NOT EXISTS (SELECT 1 FROM roles WHERE plan_id = plans.id AND user_id = ?)",
+        'NOT EXISTS (SELECT 1 FROM roles WHERE plan_id = plans.id AND user_id = ?)',
         user.id
       )
   }
@@ -198,7 +198,7 @@ class Plan < ApplicationRecord
 
   ##
   # Settings for the template
-  has_settings :export, class_name: "Settings::Template" do |s|
+  has_settings :export, class_name: 'Settings::Template' do |s|
     s.key :export, defaults: Settings::Template::DEFAULT_SETTINGS
   end
   alias super_settings settings
@@ -234,6 +234,7 @@ def self.load_for_phase(plan_id, phase_id)
   # plan - Plan to be deep copied
   #
   # Returns Plan
+  # rubocop:disable Metrics/AbcSize
   def self.deep_copy(plan)
     plan_copy = plan.dup
     plan_copy.title = "Copy of #{plan.title}"
@@ -249,6 +250,7 @@ def self.deep_copy(plan)
     end
     plan_copy
   end
+  # rubocop:enable Metrics/AbcSize
 
   # ===========================
   # = Public instance methods =
@@ -278,6 +280,7 @@ def settings(key)
   #
   # Returns Answer
   # Returns nil
+  # rubocop:disable Metrics/AbcSize, Style/OptionalBooleanParameter
   def answer(qid, create_if_missing = true)
     answer = answers.select { |a| a.question_id == qid }
                     .max { |a, b| a.created_at <=> b.created_at }
@@ -295,6 +298,7 @@ def answer(qid, create_if_missing = true)
     end
     answer
   end
+  # rubocop:enable Metrics/AbcSize, Style/OptionalBooleanParameter
 
   alias get_guidance_group_options guidance_group_options
 
@@ -335,7 +339,7 @@ def complete_feedback(org_admin)
 
       # Send an email confirmation to the owners and co-owners
       deliver_if(recipients: owner_and_coowners,
-                 key: "users.feedback_provided") do |r|
+                 key: 'users.feedback_provided') do |r|
         UserMailer.feedback_complete(
           r,
           self,
@@ -365,6 +369,7 @@ def editable_by?(user_id)
   # user_id - The Integer id for a user
   #
   # Returns Boolean
+  # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
   def readable_by?(user_id)
     return true if commentable_by?(user_id)
 
@@ -381,7 +386,7 @@ def readable_by?(user_id)
       false
     end
   end
-  # rubocop:enable
+  # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
   # determines if the plan is readable by the specified user.
   #
@@ -482,7 +487,7 @@ def shared?
   def owner_and_coowners
     # We only need to search for :administrator in the bitflag
     # since :creator includes :administrator rights
-    roles.select { |r| r.active && r.administrator }.map(&:user).uniq
+    roles.select { |r| r.active && r.administrator && !r.user.nil? }.map(&:user).uniq
   end
 
   # The creator, administrator and editors
@@ -526,7 +531,7 @@ def visibility_allowed?
   #
   # Returns Boolean
   def question_exists?(question_id)
-    Plan.joins(:questions).exists?(id: id, "questions.id": question_id)
+    Plan.joins(:questions).exists?(id: id, 'questions.id': question_id)
   end
 
   # Determines what percentage of the Plan's questions have been num_answered_questions
@@ -575,6 +580,7 @@ def grant
 
   # Helper method to convert the grant id value entered by the user into an Identifier
   # works with both controller params or an instance of Identifier
+  # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
   def grant=(params)
     val = params.present? ? params[:value] : nil
     current = grant
@@ -590,6 +596,7 @@ def grant=(params)
     current = Identifier.create(identifiable: self, value: val)
     self.grant_id = current.id
   end
+  # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity
 
   private
 
@@ -598,7 +605,6 @@ def end_date_after_start_date
     # allow nil values
     return true if end_date.blank? || start_date.blank?
 
-    errors.add(:end_date, _("must be after the start date")) if end_date < start_date
+    errors.add(:end_date, _('must be after the start date')) if end_date < start_date
   end
-
 end
diff --git a/app/models/pref.rb b/app/models/pref.rb
index 7edd20b938..01f83ee179 100644
--- a/app/models/pref.rb
+++ b/app/models/pref.rb
@@ -9,8 +9,8 @@
 #  user_id  :integer
 #
 
+# Object that represents a User's email preferences
 class Pref < ApplicationRecord
-
   ##
   # Serialize prefs to JSON
   serialize :settings, JSON
@@ -34,5 +34,4 @@ class Pref < ApplicationRecord
   def self.default_settings
     Rails.configuration.x.application.preferences
   end
-
 end
diff --git a/app/models/question.rb b/app/models/question.rb
index 2deb90a5a1..f5f247bbc3 100644
--- a/app/models/question.rb
+++ b/app/models/question.rb
@@ -27,8 +27,9 @@
 #  fk_rails_...  (question_format_id => question_formats.id)
 #  fk_rails_...  (section_id => sections.id)
 #
-class Question < ApplicationRecord
 
+# Object that represents a Template question
+class Question < ApplicationRecord
   include ActsAsSortable
   include VersionableModel
 
@@ -54,7 +55,7 @@ class Question < ApplicationRecord
 
   has_many :annotations, dependent: :destroy, inverse_of: :question
 
-  has_and_belongs_to_many :themes, join_table: "questions_themes"
+  has_and_belongs_to_many :themes, join_table: 'questions_themes'
 
   belongs_to :section
 
@@ -101,11 +102,8 @@ class Question < ApplicationRecord
   accepts_nested_attributes_for :question_options, allow_destroy: true,
                                                    reject_if: ->(a) { a[:text].blank? }
 
-  # rubocop:disable Layout/LineLength
   accepts_nested_attributes_for :annotations, allow_destroy: true,
                                               reject_if: proc { |a| a[:text].blank? && a[:id].blank? }
-  # rubocop:enable Layout/LineLength
-
   # =====================
   # = Delegated methods =
   # =====================
@@ -141,6 +139,7 @@ def deep_copy(**options)
   # org - The Org to find guidance for
   #
   # Returns Hash
+  # rubocop:disable Metrics/AbcSize
   def guidance_for_org(org)
     # pulls together guidance from various sources for question
     guidances = {}
@@ -149,9 +148,7 @@ def guidance_for_org(org)
                    .where(org_id: org.id).each do |group|
         group.guidances.each do |g|
           g.themes.each do |theme|
-            if theme_ids.include? theme.id
-              guidances["#{group.name} " + _("guidance on") + " #{theme.title}"] = g
-            end
+            guidances["#{group.name} " + _('guidance on') + " #{theme.title}"] = g if theme_ids.include? theme.id
           end
         end
       end
@@ -159,6 +156,7 @@ def guidance_for_org(org)
 
     guidances
   end
+  # rubocop:enable Metrics/AbcSize
 
   # get example answer belonging to the currents user for this question
   #
@@ -199,10 +197,8 @@ def annotations_per_org(org_id)
                                          type: Annotation.types[:example_answer])
     guidance = annotations.find_by(org_id: org_id,
                                    type: Annotation.types[:guidance])
-    unless example_answer.present?
-      example_answer = annotations.build(type: :example_answer, text: "", org_id: org_id)
-    end
-    guidance = annotations.build(type: :guidance, text: "", org_id: org_id) unless guidance.present?
+    example_answer = annotations.build(type: :example_answer, text: '', org_id: org_id) unless example_answer.present?
+    guidance = annotations.build(type: :guidance, text: '', org_id: org_id) unless guidance.present?
     [example_answer, guidance]
   end
 
@@ -221,10 +217,10 @@ def update_conditions(param_conditions, old_to_new_opts, question_id_map)
   # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
   def save_condition(value, opt_map, question_id_map)
     c = conditions.build
-    c.action_type = value["action_type"]
-    c.number = value["number"]
+    c.action_type = value['action_type']
+    c.number = value['number']
     # question options may have changed so rewrite them
-    c.option_list = value["question_option"]
+    c.option_list = value['question_option']
     unless opt_map.blank?
       new_question_options = []
       c.option_list.each do |qopt|
@@ -233,8 +229,8 @@ def save_condition(value, opt_map, question_id_map)
       c.option_list = new_question_options
     end
 
-    if value["action_type"] == "remove"
-      c.remove_data = value["remove_question_id"]
+    if value['action_type'] == 'remove'
+      c.remove_data = value['remove_question_id']
       unless question_id_map.blank?
         new_question_ids = []
         c.remove_data.each do |qid|
@@ -244,10 +240,10 @@ def save_condition(value, opt_map, question_id_map)
       end
     else
       c.webhook_data = {
-        name: value["webhook-name"],
-        email: value["webhook-email"],
-        subject: value["webhook-subject"],
-        message: value["webhook-message"]
+        name: value['webhook-name'],
+        email: value['webhook-email'],
+        subject: value['webhook-subject'],
+        message: value['webhook-message']
       }.to_json
     end
     c.save
@@ -264,6 +260,7 @@ def ensure_has_question_options
   # and condition's remove_data and also if that remove_data is empty
   # destroy the condition.
   # abort callback chain if we can't update the condition
+  # rubocop:disable Metrics/AbcSize
   def check_remove_conditions
     id = self.id.to_s
     template.questions.each do |q|
@@ -277,5 +274,5 @@ def check_remove_conditions
       end
     end
   end
-
+  # rubocop:enable Metrics/AbcSize
 end
diff --git a/app/models/question_format.rb b/app/models/question_format.rb
index 6847309d51..360da0e67e 100644
--- a/app/models/question_format.rb
+++ b/app/models/question_format.rb
@@ -13,8 +13,8 @@
 #  updated_at   :datetime         not null
 #
 
+# Object that represents a question type
 class QuestionFormat < ApplicationRecord
-
   ##
   #
   FORMAT_TYPES = %i[textarea textfield radiobuttons checkbox dropdown
@@ -55,5 +55,4 @@ class QuestionFormat < ApplicationRecord
   def self.id_for(formattype)
     where(formattype: formattype).pluck(:id).first
   end
-
 end
diff --git a/app/models/question_option.rb b/app/models/question_option.rb
index cc0787723e..9de8fb6451 100644
--- a/app/models/question_option.rb
+++ b/app/models/question_option.rb
@@ -21,8 +21,8 @@
 #  fk_rails_...  (question_id => questions.id)
 #
 
+# Object that represents an option for a multi-select question
 class QuestionOption < ApplicationRecord
-
   include VersionableModel
 
   # ================
@@ -95,5 +95,4 @@ def check_condition_options
       cond.destroy if cond.option_list.include?(id)
     end
   end
-
 end
diff --git a/app/models/region.rb b/app/models/region.rb
index 3c970f05d2..e091e3721b 100644
--- a/app/models/region.rb
+++ b/app/models/region.rb
@@ -12,15 +12,15 @@
 #  updated_at   :datetime         not null
 #
 
+# Object that represents a regional area
 class Region < ApplicationRecord
-
   # ================
   # = Associations =
   # ================
 
-  has_many :sub_regions, class_name: "Region", foreign_key: "super_region_id"
+  has_many :sub_regions, class_name: 'Region', foreign_key: 'super_region_id'
 
-  belongs_to :super_region, class_name: "Region", optional: true
+  belongs_to :super_region, class_name: 'Region', optional: true
 
   # ===============
   # = Validations =
@@ -33,5 +33,4 @@ class Region < ApplicationRecord
 
   validates :abbreviation, presence: { message: PRESENCE_MESSAGE },
                            uniqueness: { message: UNIQUENESS_MESSAGE }
-
 end
diff --git a/app/models/research_domain.rb b/app/models/research_domain.rb
index be049807c9..87f8abd4a6 100644
--- a/app/models/research_domain.rb
+++ b/app/models/research_domain.rb
@@ -19,14 +19,14 @@
 #
 #  fk_rails_...  (parent_id => research_domains.id)
 #
-class ResearchDomain < ApplicationRecord
 
+# Object that represents a disciple (e.g. Physics, Social Sciences, etc.)
+class ResearchDomain < ApplicationRecord
   # ================
   # = Associations =
   # ================
 
   # Self join
-  has_many :sub_fields, class_name: "ResearchDomain", foreign_key: "parent_id"
-  belongs_to :parent, class_name: "ResearchDomain", optional: true
-
+  has_many :sub_fields, class_name: 'ResearchDomain', foreign_key: 'parent_id'
+  belongs_to :parent, class_name: 'ResearchDomain', optional: true
 end
diff --git a/app/models/research_output.rb b/app/models/research_output.rb
index 858ef06d10..7d90efd8f4 100644
--- a/app/models/research_output.rb
+++ b/app/models/research_output.rb
@@ -27,8 +27,9 @@
 #  index_research_outputs_on_output_type  (output_type)
 #  index_research_outputs_on_plan_id      (plan_id)
 #
-class ResearchOutput < ApplicationRecord
 
+# Object that represents a proposed output for a project
+class ResearchOutput < ApplicationRecord
   include Identifiable
   include ValidationMessages
 
@@ -90,5 +91,4 @@ def resource_types
     # identifiers.select { |id| id.identifier_scheme = scheme }
     []
   end
-
 end
diff --git a/app/models/research_project.rb b/app/models/research_project.rb
index 68f3aea319..9786171dfe 100644
--- a/app/models/research_project.rb
+++ b/app/models/research_project.rb
@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+# Object that represents a grant
 ResearchProject = Struct.new(:grant_id, :description) do
   def to_json(_val = nil)
     { grant_id: grant_id, description: description }.to_json
diff --git a/app/models/role.rb b/app/models/role.rb
index c42755c671..d6df1e10e0 100644
--- a/app/models/role.rb
+++ b/app/models/role.rb
@@ -23,8 +23,8 @@
 #  fk_rails_...  (user_id => users.id)
 #
 
+# Object that represents a User's relationship to a Plan
 class Role < ApplicationRecord
-
   include FlagShihTzu
 
   attribute :active, :boolean, default: true
@@ -45,7 +45,7 @@ class Role < ApplicationRecord
             3 => :editor,             # 4
             4 => :commenter,          # 8
             5 => :reviewer,           # 16
-            column: "access"
+            column: 'access'
 
   # ===============
   # = Validations =
@@ -69,10 +69,10 @@ class Role < ApplicationRecord
   #
   # Return ActiveRecord::Relation
   scope :with_access_flags, lambda { |*flags|
-    bad_flag = flags.detect { |flag| !flag.in?(flag_mapping["access"].keys) }
+    bad_flag = flags.detect { |flag| !flag.in?(flag_mapping['access'].keys) }
     raise ArgumentError, "Unkown access flag '#{bad_flag}'" if bad_flag
 
-    access_values = flags.map { |flag| sql_in_for_flag(flag.to_sym, "access") }
+    access_values = flags.map { |flag| sql_in_for_flag(flag.to_sym, 'access') }
                          .flatten
                          .uniq
     where(access: access_values)
@@ -91,7 +91,7 @@ class Role < ApplicationRecord
   #
   # Returns [Integer]
   def self.bit_values(access)
-    Role.send(:chained_flags_values, "access", access)
+    Role.send(:chained_flags_values, 'access', access)
   end
 
   # ===========================
@@ -113,7 +113,6 @@ def deactivate!
       false
     end
   end
-
 end
 
 # -----------------------------------------------------
diff --git a/app/models/section.rb b/app/models/section.rb
index 4017e7438b..80a495b271 100644
--- a/app/models/section.rb
+++ b/app/models/section.rb
@@ -24,8 +24,8 @@
 #  fk_rails_...  (phase_id => phases.id)
 #
 
+# Object that represents a Template section
 class Section < ApplicationRecord
-
   include ActsAsSortable
   include VersionableModel
 
@@ -132,5 +132,4 @@ def deep_copy(**options)
   def unmodifiable?
     !modifiable?
   end
-
 end
diff --git a/app/models/section_sorter.rb b/app/models/section_sorter.rb
index 385f359635..cedf536ccd 100644
--- a/app/models/section_sorter.rb
+++ b/app/models/section_sorter.rb
@@ -8,8 +8,9 @@
 #   SectionSorter.new(*@phase.sections).sort! # => Array of sorted Sections
 #
 #
-class SectionSorter
 
+# Object allows a user to sort sections of a Template via drag-drop
+class SectionSorter
   ##
   # Access the array of Sections
   #
@@ -29,10 +30,9 @@ def initialize(*sections)
   #
   # Returns Array of Sections
   # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+  # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
   def sort!
-    if all_sections_unmodifiable?
-      sort_as_homogenous_group
-    elsif all_sections_modifiable?
+    if all_sections_unmodifiable? || all_sections_modifiable?
       sort_as_homogenous_group
     else
       # If there are duplicates in the #1 position
@@ -73,7 +73,7 @@ def sort!
     end
   end
   # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
-  # rubocop:enable
+  # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
   private
 
@@ -106,5 +106,4 @@ def all_sections_modifiable?
   def sort_as_homogenous_group
     sections.sort_by { |section| [section.number, section.id] }
   end
-
 end
diff --git a/app/models/settings/template.rb b/app/models/settings/template.rb
index 2a05c58b64..a0ee4c6377 100644
--- a/app/models/settings/template.rb
+++ b/app/models/settings/template.rb
@@ -14,12 +14,11 @@
 #
 
 module Settings
-
+  # Records export settings for a Plan and defaults for the template
   class Template < RailsSettings::SettingObject
-
     VALID_FONT_FACES = [
       '"Times New Roman", Times, Serif',
-      "Arial, Helvetica, Sans-Serif"
+      'Arial, Helvetica, Sans-Serif'
     ].freeze
 
     VALID_FONT_SIZE_RANGE = (8..14).freeze
@@ -39,7 +38,7 @@ class Template < RailsSettings::SettingObject
           left: 12,
           right: 12
         },
-        font_face: "Arial, Helvetica, Sans-Serif",
+        font_face: 'Arial, Helvetica, Sans-Serif',
         font_size: 10 # pt
       },
       max_pages: 3,
@@ -47,13 +46,13 @@ class Template < RailsSettings::SettingObject
         admin: VALID_ADMIN_FIELDS,
         questions: :all
       },
-      title: ""
+      title: ''
     }.freeze
 
     # rubocop:disable Metrics/BlockLength, Metrics/BlockNesting
     validate do
-      formatting = value["formatting"]
-      max_pages  = value["max_pages"]
+      formatting = value['formatting']
+      max_pages  = value['max_pages']
 
       if formatting.present?
         errs = []
@@ -62,12 +61,8 @@ class Template < RailsSettings::SettingObject
         if (default_formatting.keys - formatting.keys).empty?
           if formatting[:margin].is_a?(Hash)
             errs << :negative_margin if formatting[:margin].any? { |_k, v| v.to_i.negative? }
-            unless (formatting[:margin].keys - default_formatting[:margin].keys).empty?
-              errs << :unknown_margin
-            end
-            unless formatting[:margin].all? { |_k, v| VALID_MARGIN_RANGE.member?(v) }
-              errs << :invalid_margin
-            end
+            errs << :unknown_margin unless (formatting[:margin].keys - default_formatting[:margin].keys).empty?
+            errs << :invalid_margin unless formatting[:margin].all? { |_k, v| VALID_MARGIN_RANGE.member?(v) }
           else
             errs << :invalid_margin
           end
@@ -80,36 +75,35 @@ class Template < RailsSettings::SettingObject
         end
 
         errs.map do |key|
-          if key == :missing_key
-            errors.add(:formatting, _("A required setting has not been provided"))
-          elsif key == :invalid_margin
-            errors.add(:formatting, _("Margin value is invalid"))
-          elsif key == :negative_margin
-            errors.add(:formatting, _("Margin cannot be negative"))
-          elsif key == :unknown_margin
-            # rubocop:disable Layout/LineLength
+          case key
+          when :missing_key
+            errors.add(:formatting, _('A required setting has not been provided'))
+          when :invalid_margin
+            errors.add(:formatting, _('Margin value is invalid'))
+          when :negative_margin
+            errors.add(:formatting, _('Margin cannot be negative'))
+          when :unknown_margin
             errors.add(:formatting, _("Unknown margin. Can only be 'top', 'bottom', 'left' or 'right'"))
-            # rubocop:enable Layout/LineLength
-          elsif key == :invalid_font_size
-            errors.add(:formatting, _("Invalid font size"))
-          elsif key == :invalid_font_face
-            errors.add(:formatting, _("Invalid font face"))
-          elsif key == :unknown_key
-            errors.add(:formatting, _("Unknown formatting setting"))
+          when :invalid_font_size
+            errors.add(:formatting, _('Invalid font size'))
+          when :invalid_font_face
+            errors.add(:formatting, _('Invalid font face'))
+          when :unknown_key
+            errors.add(:formatting, _('Unknown formatting setting'))
           end
         end
 
       end
 
       if max_pages.present? && (!max_pages.is_a?(Integer) || max_pages <= 0)
-        errors.add(:max_pages, _("Invalid maximum pages"))
+        errors.add(:max_pages, _('Invalid maximum pages'))
       end
     end
     # rubocop:enable Metrics/BlockLength, Metrics/BlockNesting
 
     before_validation do
       formatting[:font_size] = formatting[:font_size].to_i if formatting[:font_size].present?
-      unless formatting[:margin].nil? or !formatting[:margin].is_a?(Hash)
+      unless formatting[:margin].nil? || !formatting[:margin].is_a?(Hash)
         formatting[:margin].each do |key, val|
           formatting[:margin][key] = val.to_i
         end
@@ -127,7 +121,5 @@ class Template < RailsSettings::SettingObject
       fields[:admin] ||= []
       fields[:questions] ||= []
     end
-
   end
-
 end
diff --git a/app/models/stat.rb b/app/models/stat.rb
index 5f16bae257..7eac950684 100644
--- a/app/models/stat.rb
+++ b/app/models/stat.rb
@@ -15,8 +15,8 @@
 #  org_id     :integer
 #
 
+# Object that represents a generic usage statistic
 class Stat < ApplicationRecord
-
   extend OrgDateRangeable
 
   belongs_to :org, optional: true
@@ -24,18 +24,15 @@ class Stat < ApplicationRecord
   validates_uniqueness_of :type, scope: %i[date org_id filtered]
 
   class << self
-
-    def to_csv(stats, sep = ",")
+    def to_csv(stats, sep = ',')
       data = stats.map do |stat|
         { date: stat.date, count: stat.count }
       end
       Csvable.from_array_of_hashes(data, sep)
     end
-
   end
 
   def to_json(methods: nil)
     super(only: %i[count date], methods: methods)
   end
-
 end
diff --git a/app/models/stat_created_plan.rb b/app/models/stat_created_plan.rb
index 0bd760bdbe..6ba26d2271 100644
--- a/app/models/stat_created_plan.rb
+++ b/app/models/stat_created_plan.rb
@@ -15,18 +15,18 @@
 #  org_id     :integer
 #
 
-require "set"
+require 'set'
 
+# Object that represents a Nbr of Plans created usage statistic
 class StatCreatedPlan < Stat
-
   serialize :details, JSON
 
   def by_template
-    parse_details.fetch("by_template", [])
+    parse_details.fetch('by_template', [])
   end
 
   def using_template
-    parse_details.fetch("using_template", [])
+    parse_details.fetch('using_template', [])
   end
 
   def to_json(_options = nil)
@@ -40,8 +40,7 @@ def parse_details
   end
 
   class << self
-
-    def to_csv(created_plans, details: { by_template: false, sep: "," })
+    def to_csv(created_plans, details: { by_template: false, sep: ',' })
       if details[:by_template]
         to_csv_by_template(created_plans, details[:sep])
       else
@@ -51,31 +50,31 @@ def to_csv(created_plans, details: { by_template: false, sep: "," })
 
     private
 
-    def to_csv_by_template(created_plans, sep = ",")
+    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity
+    def to_csv_by_template(created_plans, sep = ',')
       template_names = lambda do |plns|
         unique = Set.new
         plns.each do |created_plan|
           created_plan.by_template&.each do |name_count|
-            unique.add(name_count.fetch("name"))
+            unique.add(name_count.fetch('name'))
           end
         end
         unique.to_a
       end.call(created_plans)
 
       data = created_plans.map do |created_plan|
-        tuple = { Date: created_plan.date.strftime("%b %Y") }
+        tuple = { Date: created_plan.date.strftime('%b %Y') }
         template_names.each_with_object(tuple) do |name, acc|
           acc[name] = 0
         end
         created_plan.by_template&.each do |name_count|
-          tuple[name_count.fetch("name")] = name_count.fetch("count")
+          tuple[name_count.fetch('name')] = name_count.fetch('count')
         end
         tuple[:Count] = created_plan.count
         tuple
       end
       Csvable.from_array_of_hashes(data, false, sep)
     end
-
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity
   end
-
 end
diff --git a/app/models/stat_created_plan/create_or_update.rb b/app/models/stat_created_plan/create_or_update.rb
index 426ad07f1f..182b510141 100644
--- a/app/models/stat_created_plan/create_or_update.rb
+++ b/app/models/stat_created_plan/create_or_update.rb
@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
+# Usage Stats
 class StatCreatedPlan
-
+  # Usage statistics helper
   class CreateOrUpdate
-
     class << self
-
+      # rubocop:disable Metrics/MethodLength
       def do(start_date:, end_date:, org:, filtered: false)
         count = count_plans(start_date: start_date, end_date: end_date, org: org,
                             filtered: filtered)
@@ -32,6 +32,7 @@ def do(start_date:, end_date:, org:, filtered: false)
           StatCreatedPlan.create(attrs)
         end
       end
+      # rubocop:enable Metrics/MethodLength
 
       private
 
@@ -73,9 +74,9 @@ def plan_statistics(start_date:, end_date:, org:, filtered:, own_templates: fals
         roleable_plan_ids = roleable_plans.pluck(:plan_id).uniq
 
         template_counts = Plan.joins(:template).where(id: roleable_plan_ids)
-                              .group("templates.family_id").count
+                              .group('templates.family_id').count
         most_recent_versions = Template.where(family_id: template_counts.keys)
-                                       .group(:family_id).maximum("version")
+                                       .group(:family_id).maximum('version')
         most_recent_versions = most_recent_versions.map { |k, v| "#{k}=#{v}" }
         template_names = Template.where("CONCAT(family_id, '=', version) IN (?)",
                                         most_recent_versions).pluck(:family_id, :title)
@@ -84,9 +85,6 @@ def plan_statistics(start_date:, end_date:, org:, filtered:, own_templates: fals
         end
       end
       # rubocop:enable Metrics/AbcSize
-
     end
-
   end
-
 end
diff --git a/app/models/stat_exported_plan.rb b/app/models/stat_exported_plan.rb
index 2f9e518cf8..0e56ed19e7 100644
--- a/app/models/stat_exported_plan.rb
+++ b/app/models/stat_exported_plan.rb
@@ -15,14 +15,11 @@
 #  org_id     :integer
 #
 
+# Object that represents a Nbr of Plans exported usage statistic
 class StatExportedPlan < Stat
-
   class << self
-
     def to_csv(exported_plans)
       Stat.to_csv(exported_plans)
     end
-
   end
-
 end
diff --git a/app/models/stat_exported_plan/create_or_update.rb b/app/models/stat_exported_plan/create_or_update.rb
index 6e045905cb..0ef504976c 100644
--- a/app/models/stat_exported_plan/create_or_update.rb
+++ b/app/models/stat_exported_plan/create_or_update.rb
@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
+# Usage Stats
 class StatExportedPlan
-
+  # Usage statistics helper
   class CreateOrUpdate
-
     class << self
-
       def do(start_date:, end_date:, org:, filtered: false)
         count = exported_plans(start_date: start_date, end_date: end_date,
                                org_id: org.id, filtered: filtered)
@@ -46,9 +45,6 @@ def exported_plans(start_date:, end_date:, org_id:, filtered:)
                     .where(created_at: start_date..end_date)
                     .count
       end
-
     end
-
   end
-
 end
diff --git a/app/models/stat_joined_user.rb b/app/models/stat_joined_user.rb
index 2910e8b476..5659b5ed16 100644
--- a/app/models/stat_joined_user.rb
+++ b/app/models/stat_joined_user.rb
@@ -15,14 +15,11 @@
 #  org_id     :integer
 #
 
+# Object that represents a Nbr of Users created usage statistic
 class StatJoinedUser < Stat
-
   class << self
-
     def to_csv(joined_users)
       Stat.to_csv(joined_users)
     end
-
   end
-
 end
diff --git a/app/models/stat_joined_user/create_or_update.rb b/app/models/stat_joined_user/create_or_update.rb
index 977a469369..7481e847aa 100644
--- a/app/models/stat_joined_user/create_or_update.rb
+++ b/app/models/stat_joined_user/create_or_update.rb
@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
+# Usage Stats
 class StatJoinedUser
-
+  # Usage statistics helper
   class CreateOrUpdate
-
     class << self
-
       def do(start_date:, end_date:, org:, filtered: false)
         count = count_users(start_date: start_date, end_date: end_date, org_id: org.id)
         attrs = { date: end_date.to_date, count: count, org_id: org.id, filtered: filtered }
@@ -28,9 +27,6 @@ def do(start_date:, end_date:, org:, filtered: false)
       def count_users(start_date:, end_date:, org_id:)
         User.where(created_at: start_date..end_date, org_id: org_id).count
       end
-
     end
-
   end
-
 end
diff --git a/app/models/stat_shared_plan.rb b/app/models/stat_shared_plan.rb
index 96230bab20..75ab6981f5 100644
--- a/app/models/stat_shared_plan.rb
+++ b/app/models/stat_shared_plan.rb
@@ -15,14 +15,11 @@
 #  org_id     :integer
 #
 
+# Object that represents a Nbr of Plans shared usage statistic
 class StatSharedPlan < Stat
-
   class << self
-
     def to_csv(shared_plans)
       Stat.to_csv(shared_plans)
     end
-
   end
-
 end
diff --git a/app/models/stat_shared_plan/create_or_update.rb b/app/models/stat_shared_plan/create_or_update.rb
index 26dd326fb7..ba3ffe1ddd 100644
--- a/app/models/stat_shared_plan/create_or_update.rb
+++ b/app/models/stat_shared_plan/create_or_update.rb
@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
+# Usage Stats
 class StatSharedPlan
-
+  # Usage statistics helper
   class CreateOrUpdate
-
     class << self
-
       def do(start_date:, end_date:, org:, filtered: false)
         count = shared_plans(start_date: start_date, end_date: end_date,
                              org_id: org.id, filtered: filtered)
@@ -47,9 +46,6 @@ def shared_plans(start_date:, end_date:, org_id:, filtered:)
             .where(created_at: start_date..end_date)
             .count
       end
-
     end
-
   end
-
 end
diff --git a/app/models/template.rb b/app/models/template.rb
index fb56f8591f..31ef1e6492 100644
--- a/app/models/template.rb
+++ b/app/models/template.rb
@@ -32,9 +32,9 @@
 #  fk_rails_...  (org_id => orgs.id)
 #
 
+# Object that represents a DMP template
 # rubocop:disable Metrics/ClassLength
 class Template < ApplicationRecord
-
   include GlobalHelpers
   extend UniqueRandom
 
@@ -188,7 +188,7 @@ class Template < ApplicationRecord
     family_ids = families(funder_ids).distinct
                                      .pluck(:family_id) + [default.family_id]
     published(family_ids.uniq)
-      .where("visibility = :visibility OR is_default = :is_default",
+      .where('visibility = :visibility OR is_default = :is_default',
              visibility: visibilities[:publicly_visible], is_default: true)
   }
 
@@ -208,13 +208,13 @@ class Template < ApplicationRecord
   # passed
   scope :search, lambda { |term|
     unarchived.joins(:org)
-              .where("lower(templates.title) LIKE lower(:term) OR " \
-                     "lower(orgs.name) LIKE lower(:term)",
+              .where('lower(templates.title) LIKE lower(:term) OR ' \
+                     'lower(orgs.name) LIKE lower(:term)',
                      term: "%#{term}%")
   }
 
   # defines the export setting for a template object
-  has_settings :export, class_name: "Settings::Template" do |s|
+  has_settings :export, class_name: 'Settings::Template' do |s|
     s.key :export, defaults: Settings::Template::DEFAULT_SETTINGS
   end
 
@@ -246,7 +246,7 @@ def self.find_or_generate_version!(template)
     elsif template.latest? && !template.generate_version?
       template
     else
-      raise _("A historical template cannot be retrieved for being modified")
+      raise _('A historical template cannot be retrieved for being modified')
     end
   end
 
@@ -256,14 +256,14 @@ def self.find_or_generate_version!(template)
   # Template::latest_version scope method for an adequate instantiation of
   # template instances.
   def self.latest_version_per_family(family_id = nil)
-    chained_scope = unarchived.select("MAX(version) AS version", :family_id)
+    chained_scope = unarchived.select('MAX(version) AS version', :family_id)
     chained_scope = chained_scope.where(family_id: family_id) if family_id.present?
     chained_scope.group(:family_id)
   end
 
   def self.latest_customized_version_per_customised_of(customization_of = nil,
                                                        org_id = nil)
-    chained_scope = select("MAX(version) AS version", :customization_of)
+    chained_scope = select('MAX(version) AS version', :customization_of)
     chained_scope = chained_scope.where(customization_of: customization_of)
     chained_scope = chained_scope.where(org_id: org_id) if org_id.present?
     chained_scope.group(:customization_of)
@@ -276,7 +276,8 @@ def self.latest_customized_version_per_customised_of(customization_of = nil,
   # Creates a copy of the current template
   # raises ActiveRecord::RecordInvalid when save option is true and validations
   # fails.
-  # rubocop:disable Metrics/AbcSize
+  # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+  # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
   def deep_copy(attributes: {}, **options)
     copy = dup
     if attributes.respond_to?(:each_pair)
@@ -309,7 +310,8 @@ def deep_copy(attributes: {}, **options)
 
     copy
   end
-  # rubocop:enable Metrics/AbcSize
+  # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+  # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
   # Retrieves the template's org or the org of the template this one is derived
   # from of it is a customization
@@ -325,7 +327,7 @@ def base_org
   #
   # Returns Boolean
   def latest?
-    id == Template.latest_version(family_id).pluck("templates.id").first
+    id == Template.latest_version(family_id).pluck('templates.id').first
   end
 
   # Determines whether or not a new version should be generated
@@ -368,48 +370,42 @@ def removable?
   # for the specified org
   def generate_copy!(org)
     # Assume customizing_org is persisted
-    raise _("generate_copy! requires an organisation target") unless org.is_a?(Org)
+    raise _('generate_copy! requires an organisation target') unless org.is_a?(Org)
 
-    template = deep_copy(
+    deep_copy(
       attributes: {
         version: 0,
         published: false,
         family_id: new_family_id,
         org: org,
         is_default: false,
-        title: _("Copy of %{template}") % { template: title }
+        title: format(_('Copy of %<template>s'), template: title)
       }, modifiable: true, save: true
     )
-    template
   end
 
   # Generates a new copy of self with an incremented version number
   def generate_version!
-    raise _("generate_version! requires a published template") unless published
+    raise _('generate_version! requires a published template') unless published
 
-    template = deep_copy(
+    deep_copy(
       attributes: {
         version: version + 1,
         published: false,
         org: org
       }, save: true
     )
-    template
   end
 
   # Generates a new copy of self for the specified customizing_org
   def customize!(customizing_org)
     # Assume customizing_org is persisted
-    unless customizing_org.is_a?(Org)
-      raise ArgumentError, _("customize! requires an organisation target")
-    end
+    raise ArgumentError, _('customize! requires an organisation target') unless customizing_org.is_a?(Org)
 
     # Assume self has org associated
-    if !org.funder_only? && !is_default
-      raise ArgumentError, _("customize! requires a template from a funder")
-    end
+    raise ArgumentError, _('customize! requires a template from a funder') if !org.funder_only? && !is_default
 
-    customization = deep_copy(
+    deep_copy(
       attributes: {
         version: 0,
         published: false,
@@ -420,7 +416,6 @@ def customize!(customizing_org)
         is_default: false
       }, modifiable: false, save: true
     )
-    customization
   end
 
   # Generates a new copy of self including latest changes from the funder this
@@ -438,50 +433,50 @@ def publish!
   end
 
   # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+  # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
   def publishability
-    error = ""
+    error = ''
     publishable = true
     # template must be the most recent draft
     if published
-      error += _("You can not publish a published template.  ")
+      error += _('You can not publish a published template.  ')
       publishable = false
     end
     unless latest?
-      error += _("You can not publish a historical version of this template.  ")
+      error += _('You can not publish a historical version of this template.  ')
       publishable = false
       # all templates have atleast one phase
     end
     if phases.count <= 0
-      error += _("You can not publish a template without phases.  ")
+      error += _('You can not publish a template without phases.  ')
       publishable = false
       # all phases must have atleast 1 section
     end
-    unless phases.map { |p| p.sections.count.positive? }.reduce(true) { |fin, val| fin and val }
-      error += _("You can not publish a template without sections in a phase.  ")
+    unless phases.map { |p| p.sections.count.positive? }.reduce(true) { |fin, val| fin && val }
+      error += _('You can not publish a template without sections in a phase.  ')
       publishable = false
       # all sections must have atleast one question
     end
-    unless sections.map { |s| s.questions.count.positive? }.reduce(true) { |fin, val| fin and val }
-      error += _("You can not publish a template without questions in a section.  ")
+    unless sections.map { |s| s.questions.count.positive? }.reduce(true) { |fin, val| fin && val }
+      error += _('You can not publish a template without questions in a section.  ')
       publishable = false
     end
     if invalid_condition_order
-      error += _("Conditions in the template refer backwards")
+      error += _('Conditions in the template refer backwards')
       publishable = false
     end
     [publishable, error]
   end
   # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
-  # rubocop:enable
+  # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
   # TODO: refactor to use UniqueRandom
   # Generate a new random family identifier
   def self.new_family_id
-    family_id = loop do
+    loop do
       random = rand 2_147_483_647
       break random unless Template.exists?(family_id: random)
     end
-    family_id
   end
 
   private
@@ -509,7 +504,7 @@ def invalid_condition_order
       next unless question.option_based?
 
       question.conditions.each do |condition|
-        next unless condition.action_type == "remove"
+        next unless condition.action_type == 'remove'
 
         condition.remove_data.each do |rem_id|
           rem_question = Question.find(rem_id.to_s)
@@ -524,6 +519,5 @@ def before(question1, question2)
     question1.section.number < question2.section.number ||
       (question1.section.number == question2.section.number && question1.number < question2.number)
   end
-
 end
 # rubocop:enable Metrics/ClassLength
diff --git a/app/models/theme.rb b/app/models/theme.rb
index 3764ee558d..98d2a1e69c 100644
--- a/app/models/theme.rb
+++ b/app/models/theme.rb
@@ -12,14 +12,14 @@
 #  updated_at  :datetime         not null
 #
 
+# Object that represents a question/guidance theme
 class Theme < ApplicationRecord
-
   # ================
   # = Associations =
   # ================
 
-  has_and_belongs_to_many :questions, join_table: "questions_themes"
-  has_and_belongs_to_many :guidances, join_table: "themes_in_guidance"
+  has_and_belongs_to_many :questions, join_table: 'questions_themes'
+  has_and_belongs_to_many :guidances, join_table: 'themes_in_guidance'
 
   # ===============
   # = Validations =
@@ -33,7 +33,7 @@ class Theme < ApplicationRecord
 
   scope :search, lambda { |term|
     search_pattern = "%#{term}%"
-    where("lower(title) LIKE lower(?) OR description LIKE lower(?)",
+    where('lower(title) LIKE lower(?) OR description LIKE lower(?)',
           search_pattern, search_pattern)
   }
 
@@ -47,5 +47,4 @@ class Theme < ApplicationRecord
   def to_s
     title
   end
-
 end
diff --git a/app/models/token_permission_type.rb b/app/models/token_permission_type.rb
index 57b558f81f..e030bebb04 100644
--- a/app/models/token_permission_type.rb
+++ b/app/models/token_permission_type.rb
@@ -11,33 +11,33 @@
 #  updated_at       :datetime
 #
 
+# Object that represents an API permission for V0
 class TokenPermissionType < ApplicationRecord
-
   # =============
   # = Constants =
   # =============
 
   ##
   #
-  GUIDANCES   = TokenPermissionType.where(token_type: "guidances").first.freeze
+  GUIDANCES   = TokenPermissionType.where(token_type: 'guidances').first.freeze
 
   ##
   #
-  PLANS       = TokenPermissionType.where(token_type: "plans").first.freeze
+  PLANS       = TokenPermissionType.where(token_type: 'plans').first.freeze
 
   ##
   #
-  TEMPLATES   = TokenPermissionType.where(token_type: "templates").first.freeze
+  TEMPLATES   = TokenPermissionType.where(token_type: 'templates').first.freeze
 
   ##
   #
-  STATISTICS  = TokenPermissionType.where(token_type: "statistics").first.freeze
+  STATISTICS  = TokenPermissionType.where(token_type: 'statistics').first.freeze
 
   # ================
   # = Associations =
   # ================
 
-  has_and_belongs_to_many :orgs, join_table: "org_token_permissions", unique: true
+  has_and_belongs_to_many :orgs, join_table: 'org_token_permissions', unique: true
 
   # ==============
   # = Validators =
@@ -52,5 +52,4 @@ class TokenPermissionType < ApplicationRecord
   def to_s
     token_type
   end
-
 end
diff --git a/app/models/tracker.rb b/app/models/tracker.rb
index 39628c5389..7e62838d12 100644
--- a/app/models/tracker.rb
+++ b/app/models/tracker.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
+# Object that represents a Google Analytics tracker code
 class Tracker < ApplicationRecord
-
   belongs_to :org
   validates :code, format: { with: /\A\z|\AUA-[0-9]+-[0-9]+\z/,
-                             message: "wrong format" }
-
+                             message: 'wrong format' }
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index ff4ac5043a..da05ae6aac 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -50,8 +50,9 @@
 #  fk_rails_...  (language_id => languages.id)
 #  fk_rails_...  (org_id => orgs.id)
 #
-class User < ApplicationRecord
 
+# Object that represents a User
+class User < ApplicationRecord
   include ConditionalUserMailer
   include DateRangeable
   include Identifiable
@@ -99,7 +100,7 @@ class User < ApplicationRecord
   has_many :plans, through: :roles
 
   has_and_belongs_to_many :notifications, dependent: :destroy,
-                                          join_table: "notification_acknowledgements"
+                                          join_table: 'notification_acknowledgements'
 
   # ===============
   # = Validations =
@@ -123,8 +124,8 @@ class User < ApplicationRecord
 
   # Retrieves all of the org_admins for the specified org
   scope :org_admins, lambda { |org_id|
-    joins(:perms).where("users.org_id = ? AND perms.name IN (?) AND " \
-                        "users.active = ?",
+    joins(:perms).where('users.org_id = ? AND perms.name IN (?) AND ' \
+                        'users.active = ?',
                         org_id,
                         %w[grant_permissions
                            modify_templates
@@ -141,9 +142,9 @@ class User < ApplicationRecord
       # MySQL does not support standard string concatenation and since concat_ws
       # or concat functions do not exist for sqlite, we have to come up with this
       # conditional
-      if ActiveRecord::Base.connection.adapter_name == "Mysql2"
+      if ActiveRecord::Base.connection.adapter_name == 'Mysql2'
         where("lower(concat_ws(' ', firstname, surname)) LIKE lower(?) OR " \
-              "lower(email) LIKE lower(?)",
+              'lower(email) LIKE lower(?)',
               search_pattern, search_pattern)
       else
         joins(:org)
@@ -176,7 +177,7 @@ class User < ApplicationRecord
   ##
   # Load the user based on the scheme and id provided by the Omniauth call
   def self.from_omniauth(auth)
-    Identifier.by_scheme_name(auth.provider.downcase, "User")
+    Identifier.by_scheme_name(auth.provider.downcase, 'User')
               .where(value: auth.uid)
               .first&.identifiable
   end
@@ -216,6 +217,7 @@ def locale
   # user_email - Use the email if there is no firstname or surname (defaults: true)
   #
   # Returns String
+  # rubocop:disable Style/OptionalBooleanParameter
   def name(use_email = true)
     if (firstname.blank? && surname.blank?) || use_email
       email
@@ -224,6 +226,7 @@ def name(use_email = true)
       name.strip
     end
   end
+  # rubocop:enable Style/OptionalBooleanParameter
 
   # The user's identifier for the specified scheme name
   #
@@ -231,7 +234,7 @@ def name(use_email = true)
   #
   # Returns UserIdentifier
   def identifier_for(scheme)
-    identifiers.by_scheme_name(scheme, "User")&.first
+    identifiers.by_scheme_name(scheme, 'User')&.first
   end
 
   # Checks if the user is a super admin. If the user has any privelege which requires
@@ -246,6 +249,7 @@ def can_super_admin?
   # requires them to see the org-admin pages then they are an org admin.
   #
   # Returns Boolean
+  # rubocop:disable Metrics/CyclomaticComplexity
   def can_org_admin?
     return true if can_super_admin?
 
@@ -256,7 +260,7 @@ def can_org_admin?
       can_modify_templates? || can_modify_org_details? ||
       can_review_plans?
   end
-  # rubocop:enable
+  # rubocop:enable Metrics/CyclomaticComplexity
 
   # Can the User add new organisations?
   #
@@ -345,7 +349,7 @@ def keep_or_generate_token!
 
   # Generates a new token
   def generate_token!
-    new_token = User.unique_random(field_name: "api_token")
+    new_token = User.unique_random(field_name: 'api_token')
     update_column(:api_token, new_token)
   end
 
@@ -377,9 +381,8 @@ def get_preferences(key)
 
   # Override devise_invitable email title
   def deliver_invitation(options = {})
-    super(options.merge(subject: _("A Data Management Plan in " \
-      "%{application_name} has been shared with you") %
-      { application_name: ApplicationService.application_name })
+    super(options.merge(subject: format(_('A Data Management Plan in %<application_name>s has been shared with you'),
+                                        application_name: ApplicationService.application_name))
     )
   end
 
@@ -392,9 +395,7 @@ def deliver_invitation(options = {})
   # Returns ActiveRecord::Relation
   # Raises ArgumentError
   def self.where_case_insensitive(field, val)
-    unless columns.map(&:name).include?(field.to_s)
-      raise ArgumentError, "Field #{field} is not present on users table"
-    end
+    raise ArgumentError, "Field #{field} is not present on users table" unless columns.map(&:name).include?(field.to_s)
 
     User.where("LOWER(#{field}) = :value", value: val.to_s.downcase)
   end
@@ -413,14 +414,13 @@ def acknowledge(notification)
   # leave account in-place, with org for statistics (until we refactor those)
   #
   # Returns boolean
+  # rubocop:disable Metrics/AbcSize
   def archive
-    # rubocop:disable Layout/LineLength
-    suffix = Rails.configuration.x.application.fetch(:archived_accounts_email_suffix, "@example.org")
-    # rubocop:enable Layout/LineLength
-    self.firstname = "Deleted"
-    self.surname = "User"
-    self.email = User.unique_random(field_name: "email",
-                                    prefix: "user_",
+    suffix = Rails.configuration.x.application.fetch(:archived_accounts_email_suffix, '@example.org')
+    self.firstname = 'Deleted'
+    self.surname = 'User'
+    self.email = User.unique_random(field_name: 'email',
+                                    prefix: 'user_',
                                     suffix: suffix,
                                     length: 5)
     self.recovery_email = nil
@@ -431,7 +431,9 @@ def archive
     self.active = false
     save
   end
+  # rubocop:enable Metrics/AbcSize
 
+  # rubocop:disable Metrics/AbcSize
   def merge(to_be_merged)
     scheme_ids = identifiers.pluck(:identifier_scheme_id)
     # merge logic
@@ -449,6 +451,7 @@ def merge(to_be_merged)
     # => ignore any perms the deleted user has
     to_be_merged.destroy
   end
+  # rubocop:enable Metrics/AbcSize
 
   private
 
@@ -463,5 +466,4 @@ def delete_perms!
   def clear_department_id
     self.department_id = nil
   end
-
 end
diff --git a/app/models/user/at_csv.rb b/app/models/user/at_csv.rb
index 7414ee7def..81d79bc1c2 100644
--- a/app/models/user/at_csv.rb
+++ b/app/models/user/at_csv.rb
@@ -1,16 +1,18 @@
 # frozen_string_literal: true
 
+# Helper for Admins
 class User
-
+  # Helper to export a list of Users as CSV
   class AtCsv
-
-    HEADERS = ["Name", "E-Mail", "Created Date", "Last Activity", "Plans",
-               "Current Privileges", "Active", "Department"].freeze
+    HEADERS = ['Name', 'E-Mail', 'Created Date', 'Last Activity', 'Plans',
+               'Current Privileges', 'Active', 'Department'].freeze
 
     def initialize(users)
       @users = users
     end
 
+    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
     def to_csv
       CSV.generate(headers: true) do |csv|
         csv << HEADERS
@@ -20,24 +22,24 @@ def to_csv
           created = I18n.l user.created_at.to_date, format: :csv
           last_activity = I18n.l user.updated_at.to_date, format: :csv
           plans = user.plans.size
-          active = user.active ? "Yes" : "No"
+          active = user.active ? 'Yes' : 'No'
 
           current_privileges = if user.can_super_admin?
-                                 "Super Admin"
+                                 'Super Admin'
                                elsif user.can_org_admin?
-                                 "Organisational Admin"
+                                 'Organisational Admin'
                                else
-                                 ""
+                                 ''
                                end
 
-          department = user&.department&.name || ""
+          department = user&.department&.name || ''
 
           csv << [name, email, created, last_activity, plans, current_privileges,
                   active, department]
         end
       end
     end
-
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
   end
-
 end
diff --git a/app/policies/annotation_policy.rb b/app/policies/annotation_policy.rb
index fbac714c9b..5b0c7d3f88 100644
--- a/app/policies/annotation_policy.rb
+++ b/app/policies/annotation_policy.rb
@@ -1,31 +1,22 @@
 # frozen_string_literal: true
 
+# Security rules for editing Annotations: Example Answers, Question level guidance
+# Note the method names here correspond with controller actions
 class AnnotationPolicy < ApplicationPolicy
-
-  attr_reader :user, :annotation
-
-  def initialize(user, annotation)
-    raise Pundit::NotAuthorizedError, "must be logged in" unless user
-
-    @user = user
-    @annotation = annotation
-  end
+  # NOTE: @user is the signed_in_user and @record is an instance of Annotation
 
   def create?
-    question = Question.find_by(id: @annotation.question_id)
-    if question.present?
-      return @user.can_modify_templates? && question.template.org_id == @user.org_id
-    end
+    question = Question.find_by(id: @record.question_id)
+    return @user.can_modify_templates? && question.template.org_id == @user.org_id if question.present?
 
     false
   end
 
   def update?
-    @user.can_modify_templates? && annotation.template.org_id == @user.org_id
+    @user.can_modify_templates? && @record.template.org_id == @user.org_id
   end
 
   def destroy?
     update?
   end
-
 end
diff --git a/app/policies/answer_policy.rb b/app/policies/answer_policy.rb
index 34db43a008..11e687e197 100644
--- a/app/policies/answer_policy.rb
+++ b/app/policies/answer_policy.rb
@@ -1,21 +1,13 @@
 # frozen_string_literal: true
 
+# Security rules for answering questions
+# Note the method names here correspond with controller actions
 class AnswerPolicy < ApplicationPolicy
-
-  attr_reader :user
-  attr_reader :answer
-
-  def initialize(user, answer)
-    raise Pundit::NotAuthorizedError, "must be logged in" unless user
-
-    @user = user
-    @answer = answer
-  end
+  # NOTE: @user is the signed_in_user and @record is an instance of Answer
 
   def create_or_update?
     # TODO: Remove the owner check after the Roles have been updated
     # is the plan editable by the user or the user is the owner of the plan
-    @answer.plan.editable_by?(@user.id) || @user == @answer.plan.owner
+    @record.plan.editable_by?(@user.id) || @user == @record.plan.owner
   end
-
 end
diff --git a/app/policies/api/v0/departments_policy.rb b/app/policies/api/v0/departments_policy.rb
index 18430ce13c..3c1c42f186 100644
--- a/app/policies/api/v0/departments_policy.rb
+++ b/app/policies/api/v0/departments_policy.rb
@@ -1,19 +1,10 @@
 # frozen_string_literal: true
 
 module Api
-
   module V0
-
+    # Security rules for API V0 Departments endpoints
     class DepartmentsPolicy < ApplicationPolicy
-
-      attr_reader :user, :department
-
-      def initialize(user, department)
-        raise Pundit::NotAuthorizedError, _("must be logged in") unless user
-
-        @user = user
-        @department = department
-      end
+      # NOTE: @user is the signed_in_user and @record is an instance of Department
 
       ##
       # an org-admin can create a department for their organisation
@@ -37,8 +28,8 @@ def users?
       # an org-admin may assign users (from their org) to a department (from their org)
       def assign_users?
         @user.can_org_admin? &&
-          @department.present? &&
-          @department.org == @user.org
+          @record.present? &&
+          @record.org == @user.org
       end
 
       ##
@@ -46,9 +37,6 @@ def assign_users?
       def unassign_users?
         @user.can_org_admin?
       end
-
     end
-
   end
-
 end
diff --git a/app/policies/api/v0/guidance_group_policy.rb b/app/policies/api/v0/guidance_group_policy.rb
index d1db053c26..2d6af19a8f 100644
--- a/app/policies/api/v0/guidance_group_policy.rb
+++ b/app/policies/api/v0/guidance_group_policy.rb
@@ -1,27 +1,23 @@
 # frozen_string_literal: true
 
 module Api
-
   module V0
-
+    # Security rules for API V0 Guidance Group endpoints
     class GuidanceGroupPolicy < ApplicationPolicy
-
-      attr_reader :user, :guidance_group
+      # NOTE: @user is the signed_in_user and @record is the guidance_group
 
       def initialize(user, guidance_group)
-        raise Pundit::NotAuthorizedError, _("must be logged in") unless user
         unless user.org.token_permission_types.include? TokenPermissionType::GUIDANCES
-          raise Pundit::NotAuthorizedError, _("must have access to guidances api")
+          raise Pundit::NotAuthorizedError, _('must have access to guidances api')
         end
 
-        @user = user
-        @guidance_group = guidance_group
+        super(user, guidance_group)
       end
 
       ##
       # is the plan editable by the user
       def show?
-        GuidanceGroup.can_view?(@user, @guidance_group)
+        GuidanceGroup.can_view?(@user, @record)
       end
 
       ##
@@ -29,9 +25,6 @@ def show?
       def index?
         true
       end
-
     end
-
   end
-
 end
diff --git a/app/policies/api/v0/guidance_policy.rb b/app/policies/api/v0/guidance_policy.rb
index 1562b5350e..a3853f6516 100644
--- a/app/policies/api/v0/guidance_policy.rb
+++ b/app/policies/api/v0/guidance_policy.rb
@@ -1,28 +1,23 @@
 # frozen_string_literal: true
 
 module Api
-
   module V0
-
+    # Security rules for API V0 Guidance endpoints
     class GuidancePolicy < ApplicationPolicy
-
-      attr_reader :user
-      attr_reader :guidance
+      # NOTE: @user is the signed_in_user and @record is the guidance
 
       def initialize(user, guidance)
-        raise Pundit::NotAuthorizedError, _("must be logged in") unless user
         unless user.org.token_permission_types.include? TokenPermissionType::GUIDANCES
-          raise Pundit::NotAuthorizedError, _("must have access to guidances api")
+          raise Pundit::NotAuthorizedError, _('must have access to guidances api')
         end
 
-        @user = user
-        @guidance = guidance
+        super(user, guidance)
       end
 
       ##
       # is the plan editable by the user
       def show?
-        Guidance.can_view(@user, @guidance.id)
+        Guidance.can_view(@user, @record.id)
       end
 
       ##
@@ -30,9 +25,6 @@ def show?
       def index?
         true
       end
-
     end
-
   end
-
 end
diff --git a/app/policies/api/v0/plans_policy.rb b/app/policies/api/v0/plans_policy.rb
index 5d30b987ac..b1c313d7d7 100644
--- a/app/policies/api/v0/plans_policy.rb
+++ b/app/policies/api/v0/plans_policy.rb
@@ -1,36 +1,28 @@
 # frozen_string_literal: true
 
 module Api
-
   module V0
-
+    # Security rules for API V0 Plan endpoints
     class PlansPolicy < ApplicationPolicy
+      # NOTE: @user is the signed_in_user and @record is the plan
 
-      attr_reader :user
-      attr_reader :template
-
-      def initialize(user, template)
-        raise Pundit::NotAuthorizedError, _("must be logged in") unless user
+      def initialize(user, plan)
         unless user.org.token_permission_types.include? TokenPermissionType::PLANS
-          raise Pundit::NotAuthorizedError, _("must have access to plans api")
+          raise Pundit::NotAuthorizedError, _('must have access to plans api')
         end
 
-        @user     = user
-        @template = template
+        super(user, plan)
       end
 
       ##
       # users can create a plan if their template exists
       def create?
-        @template.present?
+        @record.present?
       end
 
       def index?
         @user.can_org_admin?
       end
-
     end
-
   end
-
 end
diff --git a/app/policies/api/v0/statistics_policy.rb b/app/policies/api/v0/statistics_policy.rb
index 07a8db97d4..57996a7362 100644
--- a/app/policies/api/v0/statistics_policy.rb
+++ b/app/policies/api/v0/statistics_policy.rb
@@ -1,21 +1,17 @@
 # frozen_string_literal: true
 
 module Api
-
   module V0
-
+    # Security rules for API V0 Usage Statistic endpoints
     class StatisticsPolicy < ApplicationPolicy
-
-      attr_reader :user
+      # NOTE: @user is the signed_in_user and @record is the statistic
 
       def initialize(user, statistic)
-        raise Pundit::NotAuthorizedError, _("must be logged in") unless user
         unless user.org.token_permission_types.include? TokenPermissionType::STATISTICS
-          raise Pundit::NotAuthorizedError, _("must have access to guidances api")
+          raise Pundit::NotAuthorizedError, _('must have access to guidances api')
         end
 
-        @user = user
-        @statistic = statistic
+        super(user, statistic)
       end
 
       ##
@@ -31,7 +27,7 @@ def completed_plans?
       ##
       # need to check if your org owns this template
       def using_template?
-        @statistic.org_id == @user.org_id
+        @record.org_id == @user.org_id
       end
 
       ##
@@ -45,9 +41,6 @@ def plans_by_template?
       def plans?
         true
       end
-
     end
-
   end
-
 end
diff --git a/app/policies/api/v0/template_policy.rb b/app/policies/api/v0/template_policy.rb
index 48d33643ca..67f360ca13 100644
--- a/app/policies/api/v0/template_policy.rb
+++ b/app/policies/api/v0/template_policy.rb
@@ -1,21 +1,15 @@
 # frozen_string_literal: true
 
 module Api
-
   module V0
-
+    # Security rules for API V0 Template endpoints
     class TemplatePolicy < ApplicationPolicy
-
-      attr_reader :user, :template
-
       def initialize(user, template)
-        raise Pundit::NotAuthorizedError, _("must be logged in") unless user
         unless user.org.token_permission_types.include? TokenPermissionType::TEMPLATES
-          raise Pundit::NotAuthorizedError, _("must have access to guidances api")
+          raise Pundit::NotAuthorizedError, _('must have access to templates api')
         end
 
-        @user = user
-        @template = template
+        super(user, template)
       end
 
       ##
@@ -23,9 +17,6 @@ def initialize(user, template)
       def index?
         true
       end
-
     end
-
   end
-
 end
diff --git a/app/policies/api/v1/plans_policy.rb b/app/policies/api/v1/plans_policy.rb
index 32990de9b2..b873756aae 100644
--- a/app/policies/api/v1/plans_policy.rb
+++ b/app/policies/api/v1/plans_policy.rb
@@ -1,52 +1,42 @@
 # frozen_string_literal: true
 
 module Api
-
   module V1
-
+    # Security rules for API V1 Plan endpoints
     class PlansPolicy < ApplicationPolicy
+      # NOTE: @user is either a User or an ApiClient
 
-      attr_reader :client, :plan
-
+      # A helper method that takes the current client and returns the plans they
+      # have acess to
       class Scope
-
-        attr_reader :client, :scope
-
-        def initialize(client, scope)
-          @client = client
-          @scope = scope
-        end
-
         ## return the visible plans (via the API) to a given client
         # ALL can view: public
         # ApiClient can view: anything from the API client
         #                     anything belonging to their Org (if applicable)
         # User (non-admin) can view: any personal or organisationally_visible
         # User (admin) can view: all from users of their organisation
-        # rubocop:disable Metrics/AbcSize
         def resolve
           ids = Plan.publicly_visible.pluck(:id)
-          if client.is_a?(ApiClient)
-            ids += client.plans.pluck(&:id)
-            ids += client.org.plans.pluck(&:id) if client.org.present?
-          elsif client.is_a?(User)
-            ids += client.org.plans.organisationally_visible.pluck(:id)
-            ids += client.plans.pluck(:id)
-            ids += client.org.plans.pluck(:id) if client.can_org_admin?
-          end
+          ids += plans_for_client if @user.is_a?(ApiClient)
+          ids += plans_for_user if @user.is_a?(User)
           Plan.where(id: ids.uniq)
         end
-        # rubocop:enable Metrics/AbcSize
 
-      end
+        private
 
-      def initialize(client, plan)
-        @client = client
-        @plan = plan
-      end
+        def plans_for_client
+          ids = @user.plans.pluck(&:id)
+          ids += @user.org.plans.pluck(&:id) if @user.org.present?
+          ids
+        end
 
+        def plans_for_user
+          ids = @user.org.plans.organisationally_visible.pluck(:id)
+          ids += @user.plans.pluck(:id)
+          ids += @user.org.plans.pluck(:id) if @user.can_org_admin?
+          ids
+        end
+      end
     end
-
   end
-
 end
diff --git a/app/policies/api_client_policy.rb b/app/policies/api_client_policy.rb
index 8334fdee2a..e0da52d6a8 100644
--- a/app/policies/api_client_policy.rb
+++ b/app/policies/api_client_policy.rb
@@ -1,12 +1,9 @@
 # frozen_string_literal: true
 
+# Security rules for API Clients
+# Note the method names here correspond with controller actions
 class ApiClientPolicy < ApplicationPolicy
-
-  def initialize(user, *_args)
-    raise Pundit::NotAuthorizedError, _("must be logged in") unless user
-
-    @user = user
-  end
+  # NOTE: @user is the signed_in_user
 
   def index?
     @user.can_super_admin?
@@ -39,5 +36,4 @@ def refresh_credentials?
   def email_credentials?
     @user.can_super_admin?
   end
-
 end
diff --git a/app/policies/application_policy.rb b/app/policies/application_policy.rb
index be9da399a9..1c514cb96e 100644
--- a/app/policies/application_policy.rb
+++ b/app/policies/application_policy.rb
@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
+# Security rules for ?? Not sure where or how these are used, look like defaults
 class ApplicationPolicy
-
   attr_reader :user, :record
 
   def initialize(user, record)
-    raise Pundit::NotAuthorizedError, "must be logged in" unless user
+    raise Pundit::NotAuthorizedError, 'must be logged in' unless user
 
     @user = user
     @record = record
@@ -43,8 +43,8 @@ def scope
     Pundit.policy_scope!(user, record.class)
   end
 
+  # Default scope
   class Scope
-
     attr_reader :user, :scope
 
     def initialize(user, scope)
@@ -55,7 +55,5 @@ def initialize(user, scope)
     def resolve
       @scope = []
     end
-
   end
-
 end
diff --git a/app/policies/department_policy.rb b/app/policies/department_policy.rb
index 3e865a9f95..95018eb5cf 100644
--- a/app/policies/department_policy.rb
+++ b/app/policies/department_policy.rb
@@ -1,15 +1,13 @@
 # frozen_string_literal: true
 
+# Security rules for department editing
+# Note the method names here correspond with controller actions
 class DepartmentPolicy < ApplicationPolicy
+  # NOTE: @user is the signed_in_user and @record is an instance of Department
 
-  attr_reader :user
-  attr_reader :department
-
-  def initialize(user, department)
-    raise Pundit::NotAuthorizedError, "must be logged in" unless user
-
-    @user = user
-    @department = department
+  def index?
+    (@user.can_org_admin? && @user.org.id == @department.org_id) ||
+      @user.can_super_admin?
   end
 
   def new?
@@ -21,18 +19,17 @@ def create?
   end
 
   def edit?
-    (@user.can_org_admin? && @user.org.id == @department.org_id) ||
+    (@user.can_org_admin? && @user.org.id == @record.org_id) ||
       @user.can_super_admin?
   end
 
   def update?
-    (@user.can_org_admin? && @user.org.id == @department.org_id) ||
+    (@user.can_org_admin? && @user.org.id == @record.org_id) ||
       @user.can_super_admin?
   end
 
   def destroy?
-    (@user.can_org_admin? && @user.org.id == @department.org_id) ||
+    (@user.can_org_admin? && @user.org.id == @record.org_id) ||
       @user.can_super_admin?
   end
-
 end
diff --git a/app/policies/guidance_group_policy.rb b/app/policies/guidance_group_policy.rb
index d282310303..3b6fc21376 100644
--- a/app/policies/guidance_group_policy.rb
+++ b/app/policies/guidance_group_policy.rb
@@ -1,54 +1,46 @@
 # frozen_string_literal: true
 
+# Security rules for guidance group editing
+# Note the method names here correspond with controller actions
 class GuidanceGroupPolicy < ApplicationPolicy
-
-  attr_reader :user, :guidance_group
-
-  def initialize(user, guidance_group)
-    raise Pundit::NotAuthorizedError, "must be logged in" unless user
-
-    @user = user
-    @guidance_group = guidance_group
-  end
+  # NOTE: @user is the signed_in_user and @record is an instance of GuidanceGroup
 
   def admin_show?
-    user.can_modify_guidance? && (guidance_group.org_id == user.org_id)
+    @user.can_modify_guidance? && (@record.org_id == @user.org_id)
   end
 
   def admin_edit?
-    user.can_modify_guidance? && (guidance_group.org_id == user.org_id)
+    @user.can_modify_guidance? && (@record.org_id == @user.org_id)
   end
 
   def admin_update?
-    user.can_modify_guidance? && (guidance_group.org_id == user.org_id)
+    @user.can_modify_guidance? && (@record.org_id == @user.org_id)
   end
 
   def admin_update_publish?
-    user.can_modify_guidance? && (guidance_group.org_id == user.org_id)
+    @user.can_modify_guidance? && (@record.org_id == @user.org_id)
   end
 
   def admin_update_unpublish?
-    user.can_modify_guidance? && (guidance_group.org_id == user.org_id)
+    @user.can_modify_guidance? && (@record.org_id == @user.org_id)
   end
 
   def admin_new?
-    user.can_modify_guidance?
+    @user.can_modify_guidance?
   end
 
   def admin_create?
-    user.can_modify_guidance?
+    @user.can_modify_guidance?
   end
 
   def admin_destroy?
-    user.can_modify_guidance? && (guidance_group.org_id == user.org_id)
+    @user.can_modify_guidance? && (@record.org_id == @user.org_id)
   end
 
+  # Returns the guidance groups for the specified org
   class Scope < Scope
-
     def resolve
-      scope.where(org_id: user.org_id)
+      scope.where(org_id: @user.org_id)
     end
-
   end
-
 end
diff --git a/app/policies/guidance_policy.rb b/app/policies/guidance_policy.rb
index d95d3cdad4..7856dfc39d 100644
--- a/app/policies/guidance_policy.rb
+++ b/app/policies/guidance_policy.rb
@@ -1,26 +1,20 @@
 # frozen_string_literal: true
 
+# Security rules for guidance
+# Note the method names here correspond with controller actions
 class GuidancePolicy < ApplicationPolicy
-
-  attr_reader :user, :guidance
-
-  def initialize(user, guidance)
-    raise Pundit::NotAuthorizedError, "must be logged in" unless user
-
-    @user = user
-    @guidance = guidance
-  end
+  # NOTE: @user is the signed_in_user and @record is an instance of Guidance
 
   def admin_show?
-    user.can_modify_guidance? && guidance.in_group_belonging_to?(user.org_id)
+    @user.can_modify_guidance? && @record.in_group_belonging_to?(@user.org_id)
   end
 
   def admin_edit?
-    user.can_modify_guidance? && guidance.in_group_belonging_to?(user.org_id)
+    @user.can_modify_guidance? && @record.in_group_belonging_to?(@user.org_id)
   end
 
   def admin_update?
-    user.can_modify_guidance? && guidance.in_group_belonging_to?(user.org_id)
+    @user.can_modify_guidance? && @record.in_group_belonging_to?(@user.org_id)
   end
 
   def index?
@@ -28,27 +22,26 @@ def index?
   end
 
   def admin_index?
-    user.can_modify_guidance?
+    @user.can_modify_guidance?
   end
 
   def admin_new?
-    user.can_modify_guidance?
+    @user.can_modify_guidance?
   end
 
   def admin_create?
-    user.can_modify_guidance?
+    @user.can_modify_guidance?
   end
 
   def admin_destroy?
-    user.can_modify_guidance? && guidance.in_group_belonging_to?(user.org_id)
+    @user.can_modify_guidance? && @record.in_group_belonging_to?(@user.org_id)
   end
 
   def admin_publish?
-    user.can_modify_guidance?
+    @user.can_modify_guidance?
   end
 
   def admin_unpublish?
-    user.can_modify_guidance?
+    @user.can_modify_guidance?
   end
-
 end
diff --git a/app/policies/identifier_policy.rb b/app/policies/identifier_policy.rb
index d9afca3286..ce5929dcc9 100644
--- a/app/policies/identifier_policy.rb
+++ b/app/policies/identifier_policy.rb
@@ -1,24 +1,18 @@
 # frozen_string_literal: true
 
+# Security rules for un-associating a user from their Shib or ORCID
+# Note the method names here correspond with controller actions
 class IdentifierPolicy < ApplicationPolicy
-
-  def initialize(user, users)
-    raise Pundit::NotAuthorizedError, "must be logged in" unless user
-
-    @user = user
-    @users = users
-  end
+  # NOTE: @user is the signed_in_user
 
   def destroy?
-    !user.nil?
+    !@user.nil?
   end
 
+  # Returns the identifiers for the user
   class Scope < Scope
-
     def resolve
-      scope.where(user_id: user.id)
+      @scope.where(user_id: @user.id)
     end
-
   end
-
 end
diff --git a/app/policies/note_policy.rb b/app/policies/note_policy.rb
index 98d4eb5a01..0b3b4dc562 100644
--- a/app/policies/note_policy.rb
+++ b/app/policies/note_policy.rb
@@ -1,27 +1,19 @@
 # frozen_string_literal: true
 
+# Security rules for comments
+# Note the method names here correspond with controller actions
 class NotePolicy < ApplicationPolicy
-
-  attr_reader :user
-  attr_reader :note
-
-  def initialize(user, note)
-    raise Pundit::NotAuthorizedError, "must be logged in" unless user
-
-    @user = user
-    @note = note
-  end
+  # NOTE: @user is the signed_in_user and @record is an instance of Note
 
   def create?
-    @note.answer.plan.commentable_by?(@user.id)
+    @record.answer.plan.commentable_by?(@user.id)
   end
 
   def update?
-    Plan.find(@note.answer.plan_id).commentable_by?(@user.id) && @note.user_id == @user.id
+    Plan.find(@record.answer.plan_id).commentable_by?(@user.id) && @record.user_id == @user.id
   end
 
   def archive?
-    Plan.find(@note.answer.plan_id).commentable_by?(@user.id)
+    Plan.find(@record.answer.plan_id).commentable_by?(@user.id)
   end
-
 end
diff --git a/app/policies/notification_policy.rb b/app/policies/notification_policy.rb
index 9f24481b8c..0397c21286 100644
--- a/app/policies/notification_policy.rb
+++ b/app/policies/notification_policy.rb
@@ -1,12 +1,9 @@
 # frozen_string_literal: true
 
+# Security rules for system wide notifications
+# Note the method names here correspond with controller actions
 class NotificationPolicy < ApplicationPolicy
-
-  def initialize(user, *_args)
-    raise Pundit::NotAuthorizedError, _("must be logged in") unless user
-
-    @user = user
-  end
+  # NOTE: @user is the signed_in_user
 
   def index?
     @user.can_super_admin?
@@ -35,5 +32,4 @@ def destroy?
   def enable?
     @user.can_super_admin?
   end
-
 end
diff --git a/app/policies/org_policy.rb b/app/policies/org_policy.rb
index 8a927ced14..c27c78c8e0 100644
--- a/app/policies/org_policy.rb
+++ b/app/policies/org_policy.rb
@@ -1,42 +1,36 @@
 # frozen_string_literal: true
 
+# Security rules for orgs
+# Note the method names here correspond with controller actions
 class OrgPolicy < ApplicationPolicy
-
-  attr_reader :user, :org
-
-  def initialize(user, org)
-    raise Pundit::NotAuthorizedError, "must be logged in" unless user
-
-    @user = user
-    @org = org
-  end
+  # NOTE: @user is the signed_in_user and @record is an instance of Org
 
   def admin_show?
-    user.can_modify_org_details? && (user.org_id == org.id)
+    @user.can_modify_org_details? && (@user.org_id == @record.id)
   end
 
   def admin_edit?
-    user.can_modify_org_details? && (user.org_id == org.id || user.can_super_admin?)
+    @user.can_modify_org_details? && (@user.org_id == @record.id || @user.can_super_admin?)
   end
 
   def admin_update?
-    user.can_modify_org_details? && (user.org_id == org.id || user.can_super_admin?)
+    @user.can_modify_org_details? && (@user.org_id == @record.id || @user.can_super_admin?)
   end
 
   def index?
-    user.can_super_admin?
+    @user.can_super_admin?
   end
 
   def new?
-    user.can_super_admin?
+    @user.can_super_admin?
   end
 
   def create?
-    user.can_super_admin?
+    @user.can_super_admin?
   end
 
   def destroy?
-    user.can_super_admin?
+    @user.can_super_admin?
   end
 
   def parent?
@@ -52,11 +46,10 @@ def templates?
   end
 
   def merge_analyze?
-    user.can_super_admin?
+    @user.can_super_admin?
   end
 
   def merge_commit?
-    user.can_super_admin?
+    @user.can_super_admin?
   end
-
 end
diff --git a/app/policies/paginable/plan_policy.rb b/app/policies/paginable/plan_policy.rb
index 0008443321..69d9683af0 100644
--- a/app/policies/paginable/plan_policy.rb
+++ b/app/policies/paginable/plan_policy.rb
@@ -1,12 +1,9 @@
 # frozen_string_literal: true
 
 module Paginable
-
+  # Security rules for plan tables
   class PlanPolicy < ApplicationPolicy
-
-    def initialize(user)
-      @user = user
-    end
+    # NOTE: @user is the signed_in_user
 
     def privately_visible?
       @user.is_a?(User)
@@ -15,7 +12,5 @@ def privately_visible?
     def organisationally_or_publicly_visible?
       @user.is_a?(User)
     end
-
   end
-
 end
diff --git a/app/policies/phase_policy.rb b/app/policies/phase_policy.rb
index 5ccb6bf384..5d2b683162 100644
--- a/app/policies/phase_policy.rb
+++ b/app/policies/phase_policy.rb
@@ -1,15 +1,9 @@
 # frozen_string_literal: true
 
+# Security rules for template phases
+# Note the method names here correspond with controller actions
 class PhasePolicy < ApplicationPolicy
-
-  attr_reader :user, :phase
-
-  def initialize(user, phase)
-    raise Pundit::NotAuthorizedError, "must be logged in" unless user
-
-    @user = user
-    @phase = phase
-  end
+  # NOTE: @user is the signed_in_user and @record is an instance of Phase
 
   ##
   # Org-admin side
@@ -18,31 +12,34 @@ def initialize(user, phase)
   #  - The template which they are modifying belongs to their org
 
   def show?
-    user.can_modify_templates?  && (phase.template.org_id == user.org_id)
+    @user.can_modify_templates? && (@record.template.org_id == @user.org_id)
   end
 
   def preview?
-    user.can_modify_templates?  &&  (phase.template.org_id == user.org_id)
+    @user.can_modify_templates? && (@record.template.org_id == @user.org_id)
+  end
+
+  def edit?
+    user.can_modify_templates? && (@record.template.org_id == user.org_id)
   end
 
   def update?
-    user.can_modify_templates?  &&  (phase.template.org_id == user.org_id)
+    @user.can_modify_templates? && (@record.template.org_id == @user.org_id)
   end
 
   def new?
-    user.can_modify_templates?  && (phase.template.org_id == user.org_id)
+    @user.can_modify_templates? && (@record.template.org_id == @user.org_id)
   end
 
   def create?
-    user.can_modify_templates?  &&  (phase.template.org_id == user.org_id)
+    @user.can_modify_templates? && (@record.template.org_id == @user.org_id)
   end
 
   def destroy?
-    user.can_modify_templates?  &&  (phase.template.org_id == user.org_id)
+    @user.can_modify_templates? && (@record.template.org_id == @user.org_id)
   end
 
   def sort?
-    user.can_modify_templates?  &&  (phase.template.org_id == user.org_id)
+    @user.can_modify_templates? && (@record.template.org_id == @user.org_id)
   end
-
 end
diff --git a/app/policies/plan_policy.rb b/app/policies/plan_policy.rb
index 3ea2637022..a2a95f92b6 100644
--- a/app/policies/plan_policy.rb
+++ b/app/policies/plan_policy.rb
@@ -1,85 +1,85 @@
 # frozen_string_literal: true
 
+# Security rules for plans
+# Note the method names here correspond with controller actions
 class PlanPolicy < ApplicationPolicy
+  # NOTE: @user is the signed_in_user and @record is an instance of Plan
 
-  attr_reader :user
-  attr_reader :plan
-
-  def initialize(user, plan)
-    raise Pundit::NotAuthorizedError, _("must be logged in") unless user
-
-    unless plan || plan.publicly_visible?
-      raise Pundit::NotAuthorizedError,
-            _("are not authorized to view that plan")
-    end
-    @user = user
-    @plan = plan
+  def index?
+    @user.present?
   end
 
   def show?
-    @plan.readable_by?(@user.id)
+    @record.readable_by?(@user.id)
   end
 
   def share?
-    @plan.editable_by?(@user.id) ||
+    @record.editable_by?(@user.id) ||
       (@user.can_org_admin? &&
        @user.org.plans.include?(@plan))
   end
 
   def export?
-    @plan.readable_by?(@user.id)
+    @record.readable_by?(@user.id)
   end
 
   def download?
-    @plan.readable_by?(@user.id)
+    @record.readable_by?(@user.id)
   end
 
   def edit?
-    @plan.readable_by?(@user.id)
+    @record.readable_by?(@user.id)
   end
 
   def update?
-    @plan.editable_by?(@user.id)
+    @record.editable_by?(@user.id)
   end
 
   def destroy?
-    @plan.editable_by?(@user.id)
+    @record.editable_by?(@user.id)
   end
 
   def status?
-    @plan.readable_by?(@user.id)
+    @record.readable_by?(@user.id)
   end
 
   def duplicate?
-    @plan.editable_by?(@user.id)
+    @record.editable_by?(@user.id)
   end
 
   def visibility?
-    @plan.administerable_by?(@user.id)
+    @record.administerable_by?(@user.id)
   end
 
   def set_test?
-    @plan.administerable_by?(@user.id)
+    @record.administerable_by?(@user.id)
   end
 
   def answer?
-    @plan.readable_by?(@user.id)
+    @record.readable_by?(@user.id)
   end
 
   def request_feedback?
-    @plan.administerable_by?(@user.id)
+    @record.administerable_by?(@user.id)
   end
 
   def overview?
-    @plan.readable_by?(@user.id)
+    @record.readable_by?(@user.id)
   end
 
   def select_guidances_list?
-    @plan.readable_by?(@user.id)
+    @record.readable_by?(@user.id)
   end
 
   def update_guidances_list?
-    @plan.editable_by?(@user.id)
+    @record.editable_by?(@user.id)
   end
 
+  def privately_visible?
+    @user.present?
+  end
+
+  def organisationally_or_publicly_visible?
+    @user.present?
+  end
 end
diff --git a/app/policies/public_page_policy.rb b/app/policies/public_page_policy.rb
index b75cb66ece..08124f3b76 100644
--- a/app/policies/public_page_policy.rb
+++ b/app/policies/public_page_policy.rb
@@ -1,11 +1,9 @@
 # frozen_string_literal: true
 
+# Security rules for the public pages
+# Note the method names here correspond with controller actions
 class PublicPagePolicy < ApplicationPolicy
-
-  def initialize(object, object2 = nil)
-    @object = object
-    @object2 = object2
-  end
+  # NOTE: @user is the signed_in_user and @record is an instance of Plan
 
   def plan_index?
     true
@@ -16,22 +14,20 @@ def template_index?
   end
 
   def template_export?
-    @object.present? && @object.published?
+    @record.present? && @record.published?
   end
 
   def plan_export?
-    @object.publicly_visible?
+    @record.publicly_visible?
   end
 
   def plan_organisationally_exportable?
-    plan = @object
-    user = @object2
-    if plan.is_a?(Plan) && user.is_a?(User)
-      return plan.publicly_visible? || (plan.organisationally_visible? && plan.owner.present? &&
-        plan.owner.org_id == user.org_id)
+    if @record.is_a?(Plan) && @user.is_a?(User)
+      return @record.publicly_visible? ||
+             (@record.organisationally_visible? && @record.owner.present? &&
+              @record.owner.org_id == @user.org_id)
     end
 
     false
   end
-
 end
diff --git a/app/policies/question_option_policy.rb b/app/policies/question_option_policy.rb
index a7fc9d3bc4..573dc0d054 100644
--- a/app/policies/question_option_policy.rb
+++ b/app/policies/question_option_policy.rb
@@ -1,15 +1,9 @@
 # frozen_string_literal: true
 
+# Security rules for options of multi select questions
+# Note the method names here correspond with controller actions
 class QuestionOptionPolicy < ApplicationPolicy
-
-  attr_reader :user, :question_option
-
-  def initialize(user, question_option)
-    raise Pundit::NotAuthorizedError, "must be logged in" unless user
-
-    @user = user
-    @question_option = question_option
-  end
+  # NOTE: @user is the signed_in_user and @record is an instance of QuestionOption
 
   ##
   # The only action specifically on question_options is delete.
@@ -18,10 +12,8 @@ def initialize(user, question_option)
   #  - They can modify templates
   #  - The template which they are modifying belongs to their org
   ##
-
   def destroy?
-    user.can_modify_templates? &&
-      (question_option.question.section.phase.template.org_id == user.org_id)
+    @user.can_modify_templates? &&
+      (@record.question.section.phase.template.org_id == @user.org_id)
   end
-
 end
diff --git a/app/policies/question_policy.rb b/app/policies/question_policy.rb
index f290368045..f3440b5536 100644
--- a/app/policies/question_policy.rb
+++ b/app/policies/question_policy.rb
@@ -1,57 +1,49 @@
 # frozen_string_literal: true
 
+# Security rules for questions
+# Note the method names here correspond with controller actions
 class QuestionPolicy < ApplicationPolicy
-
-  attr_reader :user, :question
-
-  def initialize(user, question)
-    raise Pundit::NotAuthorizedError, "must be logged in" unless user
-
-    @user = user
-    @question = question
-  end
+  # NOTE: @user is the signed_in_user and @record is an instance of Question
 
   ##
   # Users can modify questions if:
   #  - They can modify templates
   #  - The template which they are modifying belongs to their org
   ##
-
   def index?
-    user.present?
+    @user.present?
   end
 
   def show?
-    user.present?
+    @user.present?
   end
 
   def open_conditions?
-    user.can_modify_templates?  &&  (question.section.phase.template.org_id == user.org_id)
+    @user.can_modify_templates?  &&  (@record.section.phase.template.org_id == @user.org_id)
   end
 
   def edit?
-    user.can_modify_templates?  &&  (question.section.phase.template.org_id == user.org_id)
+    @user.can_modify_templates?  &&  (@record.section.phase.template.org_id == @user.org_id)
   end
 
   def new?
-    user.can_modify_templates?  &&  (question.section.phase.template.org_id == user.org_id)
+    @user.can_modify_templates?  &&  (@record.section.phase.template.org_id == @user.org_id)
   end
 
   def create?
-    user.can_modify_templates?  &&  (question.section.phase.template.org_id == user.org_id)
+    @user.can_modify_templates?  &&  (@record.section.phase.template.org_id == @user.org_id)
   end
 
   def update?
-    user.can_modify_templates?  &&  (question.section.phase.template.org_id == user.org_id)
+    @user.can_modify_templates?  &&  (@record.section.phase.template.org_id == @user.org_id)
   end
 
   def destroy?
-    user.can_modify_templates?  &&  (question.section.phase.template.org_id == user.org_id)
+    @user.can_modify_templates?  &&  (@record.section.phase.template.org_id == @user.org_id)
   end
 
   # TODO: Remove this after annotations controller is refactored
   def admin_update?
-    user.can_modify_templates?  &&  (question.section.phase.template.org_id == user.org_id)
+    @user.can_modify_templates?  &&  (@record.section.phase.template.org_id == @user.org_id)
   end
-
 end
diff --git a/app/policies/role_policy.rb b/app/policies/role_policy.rb
index a44f69a60d..17ffe5a995 100644
--- a/app/policies/role_policy.rb
+++ b/app/policies/role_policy.rb
@@ -1,31 +1,23 @@
 # frozen_string_literal: true
 
+# Security rules for changing a Users role on a plan from the collaborators section
+# Note the method names here correspond with controller actions
 class RolePolicy < ApplicationPolicy
-
-  attr_reader :user
-  attr_reader :role
-
-  def initialize(user, role)
-    raise Pundit::NotAuthorizedError, "must be logged in" unless user
-
-    @user = user
-    @role = role
-  end
+  # NOTE: @user is the signed_in_user and @record is an instance of Role
 
   def create?
-    @role.plan.administerable_by?(@user.id)
+    @record.plan.administerable_by?(@user.id)
   end
 
   def update?
-    @role.plan.administerable_by?(@user.id)
+    @record.plan.administerable_by?(@user.id)
   end
 
   def destroy?
-    @role.plan.administerable_by?(@user.id)
+    @record.plan.administerable_by?(@user.id)
   end
 
   def deactivate?
-    @role.user_id == @user.id
+    @record.user_id == @user.id
   end
-
 end
diff --git a/app/policies/section_policy.rb b/app/policies/section_policy.rb
index 58c14a62ac..501745f48a 100644
--- a/app/policies/section_policy.rb
+++ b/app/policies/section_policy.rb
@@ -1,48 +1,40 @@
 # frozen_string_literal: true
 
+# Security rules for template sections
+# Note the method names here correspond with controller actions
 class SectionPolicy < ApplicationPolicy
-
-  attr_reader :user, :section
-
-  def initialize(user, section)
-    raise Pundit::NotAuthorizedError, "must be logged in" unless user
-
-    @user = user
-    @section = section
-  end
+  # NOTE: @user is the signed_in_user and @record is an instance of Section
 
   ##
   # Users can modify sections if:
   #  - They can modify templates
   #  - The template which they are modifying belongs to their org
   ##
-
   def index?
-    user.present?
+    @user.present?
   end
 
   def show?
-    user.present?
+    @user.present?
   end
 
   def edit?
-    user.can_modify_templates?  &&  (section.phase.template.org_id == user.org_id)
+    @user.can_modify_templates?  &&  (@record.phase.template.org_id == @user.org_id)
   end
 
   def new?
-    user.can_modify_templates?  &&  (section.phase.template.org_id == user.org_id)
+    @user.can_modify_templates?  &&  (@record.phase.template.org_id == @user.org_id)
   end
 
   def create?
-    user.can_modify_templates?  &&  (section.phase.template.org_id == user.org_id)
+    @user.can_modify_templates?  &&  (@record.phase.template.org_id == @user.org_id)
   end
 
   def update?
-    user.can_modify_templates?  &&  (section.phase.template.org_id == user.org_id)
+    @user.can_modify_templates?  &&  (@record.phase.template.org_id == @user.org_id)
   end
 
   def destroy?
-    user.can_modify_templates?  &&  (section.phase.template.org_id == user.org_id)
+    @user.can_modify_templates?  &&  (@record.phase.template.org_id == @user.org_id)
   end
-
 end
diff --git a/app/policies/settings/plan_policy.rb b/app/policies/settings/plan_policy.rb
index b343f1489c..e85b0168d2 100644
--- a/app/policies/settings/plan_policy.rb
+++ b/app/policies/settings/plan_policy.rb
@@ -1,23 +1,16 @@
 # frozen_string_literal: true
 
-class Settings::PlanPolicy < ApplicationPolicy
+module Settings
+  # Security rules plan export settings
+  class PlanPolicy < ApplicationPolicy
+    # NOTE: @user is the signed_in_user and @record is an instance of Plan
 
-  attr_reader :user
-  attr_reader :plan
+    def show?
+      @record.readable_by(@user.id)
+    end
 
-  def initialize(user, plan)
-    raise Pundit::NotAuthorizedError, "must be logged in" unless user
-
-    @user = user
-    @plan = plan
-  end
-
-  def show?
-    @plan.readable_by(@user.id)
+    def update?
+      @record.editable_by(@user.id)
+    end
   end
-
-  def update?
-    @plan.editable_by(@user.id)
-  end
-
 end
diff --git a/app/policies/settings/project_policy.rb b/app/policies/settings/project_policy.rb
index bd091d2a2c..5a5fbe8c0c 100644
--- a/app/policies/settings/project_policy.rb
+++ b/app/policies/settings/project_policy.rb
@@ -1,28 +1,17 @@
 # frozen_string_literal: true
 
-class Settings::ProjectPolicy < ApplicationPolicy
-
-  # this is the policy for app/controllers/settings/projects_controller.rb
-
-  attr_reader :user
-  attr_reader :projects
-
-  def initialize(user, settings)
-    raise Pundit::NotAuthorizedError, "must be logged in" unless user
-
-    @user = user
-    @settings = settings
-  end
-
-  # for this controller, we allow all actions as the "settings" object
-  # is curated by rails based on user, not on a passed param
-
-  def show?
-    true
+module Settings
+  # Security rules project export settings
+  class ProjectPolicy < ApplicationPolicy
+    # this is the policy for app/controllers/settings/projects_controller.rb
+    # for this controller, we allow all actions as the "settings" object
+    # is curated by rails based on user, not on a passed param
+    def show?
+      true
+    end
+
+    def update?
+      true
+    end
   end
-
-  def update?
-    true
-  end
-
 end
diff --git a/app/policies/template_policy.rb b/app/policies/template_policy.rb
index 7a30916a23..edceac110f 100644
--- a/app/policies/template_policy.rb
+++ b/app/policies/template_policy.rb
@@ -1,79 +1,73 @@
 # frozen_string_literal: true
 
+# Security rules for templates
+# Note the method names here correspond with controller actions
 class TemplatePolicy < ApplicationPolicy
-
-  attr_reader :user, :template
-
-  def initialize(user, template = Template.new)
-    raise Pundit::NotAuthorizedError, _("must be logged in") unless user.is_a?(User)
-
-    @user = user
-    @template = template
-  end
+  # NOTE: @user is the signed_in_user and @record is an instance of Template
 
   def index?
-    user.can_super_admin?
+    @user.can_super_admin?
   end
 
   def organisational?
-    user.can_modify_templates?
+    @user.can_modify_templates?
   end
 
   def customisable?
-    user.can_modify_templates?
+    @user.can_modify_templates?
   end
 
   def new?
-    user.can_super_admin? || user.can_modify_templates?
+    @user.can_super_admin? || @user.can_modify_templates?
   end
 
   def create?
-    user.can_super_admin? || user.can_modify_templates?
+    @user.can_super_admin? || @user.can_modify_templates?
   end
 
   def show?
-    user.can_super_admin? || (user.can_modify_templates? && template.org_id == user.org_id)
+    @user.can_super_admin? || (@user.can_modify_templates? && @record.org_id == @user.org_id)
   end
 
   def edit?
-    user.can_super_admin? || (user.can_modify_templates? && template.org_id == user.org_id)
+    @user.can_super_admin? || (@user.can_modify_templates? && @record.org_id == @user.org_id)
   end
 
   def update?
-    user.can_super_admin? || (user.can_modify_templates? && template.org_id == user.org_id)
+    @user.can_super_admin? || (@user.can_modify_templates? && @record.org_id == @user.org_id)
   end
 
   def destroy?
-    user.can_super_admin? || (user.can_modify_templates? && (template.org_id == user.org_id))
+    @user.can_super_admin? || (@user.can_modify_templates? && (@record.org_id == @user.org_id))
   end
 
   def history?
-    user.can_super_admin? || (user.can_modify_templates? && template.org_id == user.org_id)
+    @user.can_super_admin? || (@user.can_modify_templates? && @record.org_id == @user.org_id)
   end
 
   def customize?
-    user.can_super_admin? || user.can_modify_templates?
+    @user.can_super_admin? || @user.can_modify_templates?
   end
 
   def transfer_customization?
-    user.can_super_admin? || user.can_modify_templates?
+    @user.can_super_admin? || @user.can_modify_templates?
   end
 
   def template_export?
-    user.can_super_admin? || (user.can_modify_templates?  &&  (template.org_id == user.org_id))
+    @user.can_super_admin? || (@user.can_modify_templates?  &&  (@record.org_id == @user.org_id))
   end
 
   # AJAX Calls
   def copy?
-    user.can_super_admin? || (user.can_modify_templates?  &&  (template.org_id == user.org_id))
+    @user.can_super_admin? || (@user.can_modify_templates?  &&  (@record.org_id == @user.org_id))
   end
 
   def publish?
-    user.can_super_admin? || (user.can_modify_templates?  &&  (template.org_id == user.org_id))
+    @user.can_super_admin? || (@user.can_modify_templates?  &&  (@record.org_id == @user.org_id))
   end
 
   def unpublish?
-    user.can_super_admin? || (user.can_modify_templates?  &&  (template.org_id == user.org_id))
+    @user.can_super_admin? || (@user.can_modify_templates?  &&  (@record.org_id == @user.org_id))
   end
 
   ##
@@ -85,7 +79,6 @@ def unpublish?
   # Anyone with an account should be able to get templates for the sepecified research_org + funder
   # This policy is applicable to the Create Plan page
   def template_options?
-    user.present?
+    @user.present?
   end
-
 end
diff --git a/app/policies/theme_policy.rb b/app/policies/theme_policy.rb
index 4c44add700..9643db4ea5 100644
--- a/app/policies/theme_policy.rb
+++ b/app/policies/theme_policy.rb
@@ -1,12 +1,9 @@
 # frozen_string_literal: true
 
+# Security rules for editing themes
+# Note the method names here correspond with controller actions
 class ThemePolicy < ApplicationPolicy
-
-  def initialize(user, *_args)
-    raise Pundit::NotAuthorizedError, _("must be logged in") unless user
-
-    @user = user
-  end
+  # NOTE: @user is the signed_in_user
 
   def index?
     @user.can_super_admin?
@@ -31,5 +28,4 @@ def update?
   def destroy?
     @user.can_super_admin?
   end
-
 end
diff --git a/app/policies/token_permission_type_policy.rb b/app/policies/token_permission_type_policy.rb
index 99c2d77c64..eb5b5f4372 100644
--- a/app/policies/token_permission_type_policy.rb
+++ b/app/policies/token_permission_type_policy.rb
@@ -1,18 +1,11 @@
 # frozen_string_literal: true
 
+# Security rules for viewing API V0 token permission types
+# Note the method names here correspond with controller actions
 class TokenPermissionTypePolicy < ApplicationPolicy
-
-  attr_reader :user, :token_permission_type
-
-  def initialize(user, token_permission_type)
-    raise Pundit::NotAuthorizedError, "must be logged in" unless user
-
-    @user = user
-    @token_permission_type = token_permission_type
-  end
+  # NOTE: @user is the signed_in_user
 
   def index?
-    user.can_use_api? && user.org.token_permission_types.count.positive?
+    @user.can_use_api? && @user.org.token_permission_types.count.positive?
   end
-
 end
diff --git a/app/policies/usage_policy.rb b/app/policies/usage_policy.rb
index 926f25cb70..298dcb9619 100644
--- a/app/policies/usage_policy.rb
+++ b/app/policies/usage_policy.rb
@@ -4,12 +4,12 @@
 # a policy that is not associated with a model (per the pundit README)
 # rubocop:disable Style/StructInheritance
 class UsagePolicy < Struct.new(:user, :usage)
-
   attr_reader :user
 
-  def initialize(user, _usage)
-    raise Pundit::NotAuthorizedError, "must be logged in" unless user
+  def initialize(user, usage)
+    raise Pundit::NotAuthorizedError, 'must be logged in' unless user
 
+    super(user, usage)
     @user = user
   end
 
@@ -44,6 +44,5 @@ def yearly_plans?
   def filter?
     @user.can_org_admin?
   end
-
 end
 # rubocop:enable Style/StructInheritance
diff --git a/app/policies/user_policy.rb b/app/policies/user_policy.rb
index 0a404c34a5..5a1e2c4dba 100644
--- a/app/policies/user_policy.rb
+++ b/app/policies/user_policy.rb
@@ -1,54 +1,45 @@
 # frozen_string_literal: true
 
+# Security rules for users
+# Note the method names here correspond with controller actions
 class UserPolicy < ApplicationPolicy
-
-  attr_reader :signed_in_user
-  attr_reader :user
-
-  def initialize(signed_in_user, user)
-    raise Pundit::NotAuthorizedError, "must be logged in" unless signed_in_user
-
-    @signed_in_user = signed_in_user
-    @user = user
-  end
-
   def index?
     admin_index?
   end
 
   def admin_index?
-    signed_in_user.can_grant_permissions?
+    @user.can_grant_permissions?
   end
 
   def admin_grant_permissions?
-    (signed_in_user.can_grant_permissions? && user.org_id == signed_in_user.org_id) ||
-      signed_in_user.can_super_admin?
+    (@user.can_grant_permissions? && user.org_id == @user.org_id) ||
+      @user.can_super_admin?
   end
 
   def admin_update_permissions?
-    (signed_in_user.can_grant_permissions? && user.org_id == signed_in_user.org_id) ||
-      signed_in_user.can_super_admin?
+    (@user.can_grant_permissions? && user.org_id == @user.org_id) ||
+      @user.can_super_admin?
   end
 
   # Allows the user to swap their org affiliation on the fly
   def org_swap?
-    signed_in_user.can_super_admin?
+    @user.can_super_admin?
   end
 
   def activate?
-    signed_in_user.can_super_admin?
+    @user.can_super_admin?
   end
 
   def edit?
-    signed_in_user.can_super_admin? || signed_in_user.can_org_admin?
+    @user.can_super_admin? || @user.can_org_admin?
   end
 
   def update?
-    signed_in_user.can_super_admin? || signed_in_user.can_org_admin?
+    @user.can_super_admin? || @user.can_org_admin?
   end
 
   def user_plans?
-    signed_in_user.can_super_admin? || signed_in_user.can_org_admin?
+    @user.can_super_admin? || @user.can_org_admin?
   end
 
   def update_email_preferences?
@@ -60,32 +51,30 @@ def acknowledge_notification?
   end
 
   def refresh_token?
-    signed_in_user.can_super_admin? ||
-      (signed_in_user.can_org_admin? && signed_in_user.can_use_api?)
+    @user.can_super_admin? ||
+      (@user.can_org_admin? && @user.can_use_api?)
   end
 
   def merge?
-    signed_in_user.can_super_admin?
+    @user.can_super_admin?
   end
 
   def archive?
-    signed_in_user.can_super_admin?
+    @user.can_super_admin?
   end
 
   def search?
-    signed_in_user.can_super_admin?
+    @user.can_super_admin?
   end
 
   def org_admin_other_user?
-    signed_in_user.can_super_admin? || signed_in_user.can_org_admin?
+    @user.can_super_admin? || @user.can_org_admin?
   end
 
+  # returns the users for the org
   class Scope < Scope
-
     def resolve
-      scope.where(org_id: user.org_id)
+      @scope.where(org_id: @user.org_id)
     end
-
   end
-
 end
diff --git a/app/presenters/api/v1/contributor_presenter.rb b/app/presenters/api/v1/contributor_presenter.rb
index 6970433bd7..4ed0c1ca68 100644
--- a/app/presenters/api/v1/contributor_presenter.rb
+++ b/app/presenters/api/v1/contributor_presenter.rb
@@ -1,29 +1,22 @@
 # frozen_string_literal: true
 
 module Api
-
   module V1
-
+    # Helper class for the API V1 contributors views
     class ContributorPresenter
-
       class << self
-
         # Convert the specified role into a CRediT Taxonomy URL
         def role_as_uri(role:)
           return nil unless role.present?
-          return "other" if role.to_s.downcase == "other"
+          return 'other' if role.to_s.downcase == 'other'
 
           "#{Contributor::ONTOLOGY_BASE_URL}/#{role.to_s.downcase.gsub('_', '-')}"
         end
 
         def contributor_id(identifiers:)
-          identifiers.select { |id| id.identifier_scheme.name == "orcid" }.first
+          identifiers.select { |id| id.identifier_scheme.name == 'orcid' }.first
         end
-
       end
-
     end
-
   end
-
 end
diff --git a/app/presenters/api/v1/funding_presenter.rb b/app/presenters/api/v1/funding_presenter.rb
index 2216ace28c..d2c221630a 100644
--- a/app/presenters/api/v1/funding_presenter.rb
+++ b/app/presenters/api/v1/funding_presenter.rb
@@ -1,32 +1,25 @@
 # frozen_string_literal: true
 
 module Api
-
   module V1
-
+    # Helper class for the API V1 funding section
     class FundingPresenter
-
       class << self
-
         # If the plan has a grant number then it has been awarded/granted
         # otherwise it is 'planned'
         def status(plan:)
-          return "planned" unless plan.present?
+          return 'planned' unless plan.present?
 
           case plan.funding_status
-          when "funded"
-            "granted"
-          when "denied"
-            "rejected"
+          when 'funded'
+            'granted'
+          when 'denied'
+            'rejected'
           else
-            "planned"
+            'planned'
           end
         end
-
       end
-
     end
-
   end
-
 end
diff --git a/app/presenters/api/v1/language_presenter.rb b/app/presenters/api/v1/language_presenter.rb
index c326fc2501..aa017c6dcc 100644
--- a/app/presenters/api/v1/language_presenter.rb
+++ b/app/presenters/api/v1/language_presenter.rb
@@ -1,91 +1,84 @@
 # frozen_string_literal: true
 
 module Api
-
   module V1
-
+    # Helper class for the API V1 language values
     class LanguagePresenter
-
       class << self
-
         LANGUAGE_MAP = {
-          aa: "aar", ab: "abk", af: "afr", ak: "aka", am: "amh", ar: "ara", an: "arg",
-          as: "asm", av: "ava", ae: "ave", ay: "aym", az: "aze",
+          aa: 'aar', ab: 'abk', af: 'afr', ak: 'aka', am: 'amh', ar: 'ara', an: 'arg',
+          as: 'asm', av: 'ava', ae: 'ave', ay: 'aym', az: 'aze',
 
-          ba: "bak", bm: "bam", be: "bel", bn: "ben", bh: "bih", bi: "bis", bo: "tib",
-          bs: "bos", br: "bre", bg: "bul",
+          ba: 'bak', bm: 'bam', be: 'bel', bn: 'ben', bh: 'bih', bi: 'bis', bo: 'tib',
+          bs: 'bos', br: 'bre', bg: 'bul',
 
-          ca: "cat", cs: "cze", ch: "cha", ce: "che", cu: "chu", cv: "chv", co: "cos",
-          cr: "cre", cy: "wel",
+          ca: 'cat', cs: 'cze', ch: 'cha', ce: 'che', cu: 'chu', cv: 'chv', co: 'cos',
+          cr: 'cre', cy: 'wel',
 
-          da: "dan", de: "deu", dv: "div", dz: "dzo",
+          da: 'dan', de: 'deu', dv: 'div', dz: 'dzo',
 
-          el: "gre", en: "eng", eo: "epo", es: "spa", et: "est", eu: "baq", ee: "ewe",
+          el: 'gre', en: 'eng', eo: 'epo', es: 'spa', et: 'est', eu: 'baq', ee: 'ewe',
 
-          fo: "fao", fa: "per", fj: "fij", fi: "fin", fr: "fre", fy: "fry", ff: "ful",
+          fo: 'fao', fa: 'per', fj: 'fij', fi: 'fin', fr: 'fre', fy: 'fry', ff: 'ful',
 
-          gd: "gla", ga: "gle", gl: "glg", gv: "glv", gn: "grn", gu: "guj",
+          gd: 'gla', ga: 'gle', gl: 'glg', gv: 'glv', gn: 'grn', gu: 'guj',
 
-          ht: "hat", ha: "hau", he: "heb", hz: "her", hi: "hin", ho: "hmo", hr: "hrv",
-          hu: "hun", hy: "arm",
+          ht: 'hat', ha: 'hau', he: 'heb', hz: 'her', hi: 'hin', ho: 'hmo', hr: 'hrv',
+          hu: 'hun', hy: 'arm',
 
-          ig: "ibo", io: "ido", ii: "iii", iu: "iku", ie: "ile", ia: "ina", id: "ind",
-          ik: "ipk", is: "ice", it: "ita",
+          ig: 'ibo', io: 'ido', ii: 'iii', iu: 'iku', ie: 'ile', ia: 'ina', id: 'ind',
+          ik: 'ipk', is: 'ice', it: 'ita',
 
-          jv: "jav", ja: "jpn",
+          jv: 'jav', ja: 'jpn',
 
-          kl: "kal", kn: "kan", ks: "kas", kr: "kau", kk: "kaz", km: "khm", ki: "kik",
-          ky: "kir", kv: "kom", kg: "kon", ko: "kor", kj: "kua", ku: "kur", ka: "geo",
-          kw: "cor",
+          kl: 'kal', kn: 'kan', ks: 'kas', kr: 'kau', kk: 'kaz', km: 'khm', ki: 'kik',
+          ky: 'kir', kv: 'kom', kg: 'kon', ko: 'kor', kj: 'kua', ku: 'kur', ka: 'geo',
+          kw: 'cor',
 
-          lo: "lao", la: "lat", lv: "lav", li: "lim", ln: "lin", lt: "lit", lb: "ltz",
-          lu: "lub", lg: "lug",
+          lo: 'lao', la: 'lat', lv: 'lav', li: 'lim', ln: 'lin', lt: 'lit', lb: 'ltz',
+          lu: 'lub', lg: 'lug',
 
-          mk: "mac", mh: "mah", ml: "mal", mi: "mao", mr: "mar", ms: "may", mg: "mlg",
-          mt: "mlt", mn: "mon", my: "bur",
+          mk: 'mac', mh: 'mah', ml: 'mal', mi: 'mao', mr: 'mar', ms: 'may', mg: 'mlg',
+          mt: 'mlt', mn: 'mon', my: 'bur',
 
-          na: "nau", nv: "nav", nr: "nbl", nd: "nde", ng: "ndo", ne: "nep", nl: "dut",
-          nn: "nno", nb: "nob", no: "nor", ny: "nya",
+          na: 'nau', nv: 'nav', nr: 'nbl', nd: 'nde', ng: 'ndo', ne: 'nep', nl: 'dut',
+          nn: 'nno', nb: 'nob', no: 'nor', ny: 'nya',
 
-          oc: "oci", oj: "oji", or: "ori", om: "orm", os: "oss",
+          oc: 'oci', oj: 'oji', or: 'ori', om: 'orm', os: 'oss',
 
-          pa: "pan", pi: "pli", pl: "pol", pt: "por", ps: "pus",
+          pa: 'pan', pi: 'pli', pl: 'pol', pt: 'por', ps: 'pus',
 
-          qu: "que",
+          qu: 'que',
 
-          rm: "roh", ro: "rum", rn: "run", ru: "rus", rw: "kin",
+          rm: 'roh', ro: 'rum', rn: 'run', ru: 'rus', rw: 'kin',
 
-          sg: "sag", sa: "san", si: "sin", sk: "slo", sl: "slv", se: "sme", sm: "smo",
-          sn: "sna", sd: "snd", so: "som", st: "sot", sq: "alb", sc: "srd", sr: "srp",
-          ss: "ssw", su: "sun", sw: "swa", sv: "swe",
+          sg: 'sag', sa: 'san', si: 'sin', sk: 'slo', sl: 'slv', se: 'sme', sm: 'smo',
+          sn: 'sna', sd: 'snd', so: 'som', st: 'sot', sq: 'alb', sc: 'srd', sr: 'srp',
+          ss: 'ssw', su: 'sun', sw: 'swa', sv: 'swe',
 
-          ty: "tah", ta: "tam", tt: "tat", te: "tel", tg: "tgk", tl: "tgl", th: "tha",
-          ti: "tir", to: "ton", tn: "tsn", ts: "tso", tk: "tuk", tr: "tur", tw: "twi",
+          ty: 'tah', ta: 'tam', tt: 'tat', te: 'tel', tg: 'tgk', tl: 'tgl', th: 'tha',
+          ti: 'tir', to: 'ton', tn: 'tsn', ts: 'tso', tk: 'tuk', tr: 'tur', tw: 'twi',
 
-          ug: "uig", uk: "ukr", ur: "urd", uz: "uzb",
+          ug: 'uig', uk: 'ukr', ur: 'urd', uz: 'uzb',
 
-          ve: "ven", vi: "vie", vo: "vol",
+          ve: 'ven', vi: 'vie', vo: 'vol',
 
-          wa: "wln", wo: "wol",
+          wa: 'wln', wo: 'wol',
 
-          xh: "xho",
+          xh: 'xho',
 
-          yi: "yid", yo: "yor",
+          yi: 'yid', yo: 'yor',
 
-          za: "zha", zh: "chi", zu: "zul"
+          za: 'zha', zh: 'chi', zu: 'zul'
         }.freeze
 
         # Convert the incoming 2 (e.g. en - ISO 639-1) or 2+region (e.g. en-UK)
         # into the 3 character code (e.g. eng - ISO 639-2)
         def three_char_code(lang:)
-          two_char_code = lang.to_s.split("-").first
+          two_char_code = lang.to_s.split('-').first
           LANGUAGE_MAP[two_char_code.to_sym]
         end
-
       end
-
     end
-
   end
-
 end
diff --git a/app/presenters/api/v1/org_presenter.rb b/app/presenters/api/v1/org_presenter.rb
index aa430c96fc..5ada0166b1 100644
--- a/app/presenters/api/v1/org_presenter.rb
+++ b/app/presenters/api/v1/org_presenter.rb
@@ -1,24 +1,17 @@
 # frozen_string_literal: true
 
 module Api
-
   module V1
-
+    # Helper class for the API V1 affiliation sections
     class OrgPresenter
-
       class << self
-
         def affiliation_id(identifiers:)
-          ident = identifiers.select { |id| id.identifier_scheme&.name == "ror" }.first
+          ident = identifiers.select { |id| id.identifier_scheme&.name == 'ror' }.first
           return ident if ident.present?
 
-          identifiers.select { |id| id.identifier_scheme&.name == "fundref" }.first
+          identifiers.select { |id| id.identifier_scheme&.name == 'fundref' }.first
         end
-
       end
-
     end
-
   end
-
 end
diff --git a/app/presenters/api/v1/pagination_presenter.rb b/app/presenters/api/v1/pagination_presenter.rb
index 4ffb718c23..5cd07eeebc 100644
--- a/app/presenters/api/v1/pagination_presenter.rb
+++ b/app/presenters/api/v1/pagination_presenter.rb
@@ -1,11 +1,9 @@
 # frozen_string_literal: true
 
 module Api
-
   module V1
-
+    # Helper class for genewric API V1 pagination
     class PaginationPresenter
-
       def initialize(current_url:, per_page:, total_items:, current_page: 1)
         @url = current_url
         @per_page = per_page
@@ -16,11 +14,11 @@ def initialize(current_url:, per_page:, total_items:, current_page: 1)
       def url_without_pagination
         return nil unless @url.present? && @url.is_a?(String)
 
-        url = @url.gsub(/per_page=\d+/, "")
-                  .gsub(/page=\d+/, "")
-                  .gsub(/(&)+$/, "").gsub(/\?$/, "")
+        url = @url.gsub(/per_page=\d+/, '')
+                  .gsub(/page=\d+/, '')
+                  .gsub(/(&)+$/, '').gsub(/\?$/, '')
 
-        (url.include?("?") ? "#{url}&" : "#{url}?")
+        (url.include?('?') ? "#{url}&" : "#{url}?")
       end
 
       def prev_page?
@@ -47,9 +45,6 @@ def total_pages
 
         (@total_items.to_f / @per_page).ceil
       end
-
     end
-
   end
-
 end
diff --git a/app/presenters/api/v1/plan_presenter.rb b/app/presenters/api/v1/plan_presenter.rb
index a8e2510390..291f3bb930 100644
--- a/app/presenters/api/v1/plan_presenter.rb
+++ b/app/presenters/api/v1/plan_presenter.rb
@@ -1,14 +1,10 @@
 # frozen_string_literal: true
 
 module Api
-
   module V1
-
+    # Helper class for the API V1 project / DMP
     class PlanPresenter
-
-      attr_reader :data_contact
-      attr_reader :contributors
-      attr_reader :costs
+      attr_reader :data_contact, :contributors, :costs
 
       def initialize(plan:)
         @contributors = []
@@ -43,7 +39,7 @@ def identifier
 
       # Retrieve the answers that have the Budget theme
       def plan_costs(plan:)
-        theme = Theme.where(title: "Cost").first
+        theme = Theme.where(title: 'Cost').first
         return [] unless theme.present?
 
         # TODO: define a new 'Currency' question type that includes a float field
@@ -55,12 +51,9 @@ def plan_costs(plan:)
         answers.map do |answer|
           # TODO: Investigate whether question level guidance should be the description
           { title: answer.question.text, description: nil,
-            currency_code: "usd", value: answer.text }
+            currency_code: 'usd', value: answer.text }
         end
       end
-
     end
-
   end
-
 end
diff --git a/app/presenters/api/v1/template_presenter.rb b/app/presenters/api/v1/template_presenter.rb
index 60870c40d9..50414a349c 100644
--- a/app/presenters/api/v1/template_presenter.rb
+++ b/app/presenters/api/v1/template_presenter.rb
@@ -1,11 +1,9 @@
 # frozen_string_literal: true
 
 module Api
-
   module V1
-
+    # Helper class for the API V1 template info
     class TemplatePresenter
-
       def initialize(template:)
         @template = template
       end
@@ -17,9 +15,6 @@ def title
 
         "#{@template.title} - with additional questions for #{@template.org.name}"
       end
-
     end
-
   end
-
 end
diff --git a/app/presenters/contributor_presenter.rb b/app/presenters/contributor_presenter.rb
index e2b1c03689..e0ea57ee7e 100644
--- a/app/presenters/contributor_presenter.rb
+++ b/app/presenters/contributor_presenter.rb
@@ -1,29 +1,28 @@
 # frozen_string_literal: true
 
+# Helper class for the Contributor pages
 class ContributorPresenter
-
   class << self
-
     # Returns the name with each word capitalized
     def display_name(name:)
-      return "" unless name.present?
+      return '' unless name.present?
 
-      name.split.map(&:capitalize).join(" ")
+      name.split.map(&:capitalize).join(' ')
     end
 
     # Returns the string name for each role
     def display_roles(roles:)
-      return "None" unless roles.present? && roles.any?
+      return 'None' unless roles.present? && roles.any?
 
-      roles.map { |role| role_symbol_to_string(symbol: role) }.join("<br/>").html_safe
+      roles.map { |role| role_symbol_to_string(symbol: role) }.join('<br/>').html_safe
     end
 
     # Fetches the contributor's ORCID or initializes one
     def orcid(contributor:)
-      orcid = contributor.identifier_for_scheme(scheme: "orcid")
+      orcid = contributor.identifier_for_scheme(scheme: 'orcid')
       return orcid if orcid.present?
 
-      scheme = IdentifierScheme.by_name("orcid").first
+      scheme = IdentifierScheme.by_name('orcid').first
       return nil unless scheme.present?
 
       Identifier.new(identifiable: contributor, identifier_scheme: scheme)
@@ -40,13 +39,13 @@ def roles_for_radio(contributor:)
     def role_symbol_to_string(symbol:)
       case symbol
       when :data_curation
-        _("Data Manager")
+        _('Data Manager')
       when :project_administration
-        _("Project Administrator")
+        _('Project Administrator')
       when :investigation
-        _("Principal Investigator")
+        _('Principal Investigator')
       else
-        _("Other")
+        _('Other')
       end
     end
 
@@ -54,17 +53,15 @@ def role_symbol_to_string(symbol:)
     def role_tooltip(symbol:)
       case symbol
       when :data_curation
-        _("Management activities to annotate (produce metadata), scrub data and maintain research data (including software code, where it is necessary for interpreting the data itself) for initial use and later re-use.")
+        _('Management activities to annotate (produce metadata), scrub data and maintain research data (including software code, where it is necessary for interpreting the data itself) for initial use and later re-use.')
       when :investigation
-        _("Conducting a research and investigation process, specifically performing the experiments, or data/evidence collection.")
+        _('Conducting a research and investigation process, specifically performing the experiments, or data/evidence collection.')
       when :project_administration
-        _("Management and coordination responsibility for the research activity planning and execution.")
+        _('Management and coordination responsibility for the research activity planning and execution.')
       else
-        ""
+        ''
       end
     end
     # rubocop:enable Layout/LineLength
-
   end
-
 end
diff --git a/app/presenters/guidance_presenter.rb b/app/presenters/guidance_presenter.rb
index c2acdd6b9a..d015be1b46 100644
--- a/app/presenters/guidance_presenter.rb
+++ b/app/presenters/guidance_presenter.rb
@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
+# Helper class for the guidance pages
 class GuidancePresenter
-
-  attr_accessor :plan
-  attr_accessor :guidance_groups
+  attr_accessor :plan, :guidance_groups
 
   def initialize(plan)
     @plan = plan
     @guidance_groups = plan.guidance_groups.where(published: true)
   end
 
+  # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
   def any?(org: nil, question: nil)
     if org.nil?
       return hashified_annotations? || hashified_guidance_groups? unless question.present?
@@ -30,7 +30,7 @@ def any?(org: nil, question: nil)
     guidance_annotations?(org: org, question: question) ||
       guidance_groups_by_theme?(org: org, question: question)
   end
-  # rubocop:enable
+  # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
   # filters through the orgs with annotations and guidance groups to create a
   # set of tabs with display names and any guidance/annotations to show
@@ -38,6 +38,7 @@ def any?(org: nil, question: nil)
   # question  - The question to which guidance pretains
   #
   # Returns an array of tab hashes.  These
+  # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize
   def tablist(question)
     # start with orgs
     # filter into hash with annotation_presence, main_group presence, and
@@ -60,6 +61,7 @@ def tablist(question)
     end
     display_tabs
   end
+  # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize
 
   private
 
@@ -105,13 +107,14 @@ def guidance_annotations?(org: nil, question: nil)
     return false unless hashified_annotations.key?(org)
 
     hashified_annotations[org].find do |annotation|
-      (annotation.question_id == question.id) && (annotation.type == "guidance")
+      (annotation.question_id == question.id) && (annotation.type == 'guidance')
     end.present?
   end
 
   # Returns a hash of guidance groups for an org and question passed with the following
   # structure:
   # { guidance_group: { theme: [guidance, ...], ... }, ... }
+  # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize
   def guidance_groups_by_theme(org: nil, question: nil)
     raise ArgumentError unless question.is_a?(Question)
     raise ArgumentError unless org.is_a?(Org)
@@ -127,6 +130,7 @@ def guidance_groups_by_theme(org: nil, question: nil)
       acc[gg] = filtered_gg if filtered_gg.present?
     end
   end
+  # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize
 
   # Returns a collection of annotations (type guidance) for an org and question passed
   def guidance_annotations(org: nil, question: nil)
@@ -134,7 +138,7 @@ def guidance_annotations(org: nil, question: nil)
     return [] unless hashified_annotations.key?(org)
 
     hashified_annotations[org].select do |annotation|
-      (annotation.question_id == question.id) && (annotation.type == "guidance")
+      (annotation.question_id == question.id) && (annotation.type == 'guidance')
     end
   end
 
@@ -143,7 +147,7 @@ def orgs_from_guidance_groups
 
     @orgs_from_guidance_groups = Org.joins(:guidance_groups)
                                     .where(guidance_groups: { id: guidance_groups.ids })
-                                    .distinct("orgs.id")
+                                    .distinct('orgs.id')
     @orgs_from_guidance_groups
   end
 
@@ -224,5 +228,4 @@ def hashify_annotations
       acc[org] = annotations.select { |annotation| annotation.org_id = org.id }
     end
   end
-
 end
diff --git a/app/presenters/identifier_presenter.rb b/app/presenters/identifier_presenter.rb
index f01845455f..77e66d6bbe 100644
--- a/app/presenters/identifier_presenter.rb
+++ b/app/presenters/identifier_presenter.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
+# Helper class for displaying identifiers
 class IdentifierPresenter
-
-  attr_reader :schemes
-  attr_reader :identifiable
+  attr_reader :schemes, :identifiable
 
   def initialize(identifiable:)
     @identifiable = identifiable
@@ -25,6 +24,8 @@ def scheme_by_name(name:)
 
   private
 
+  # rubocop:disable Metrics/AbcSize
+  # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
   def load_schemes
     # Load the schemes for the current context
     schemes = IdentifierScheme.for_orgs if @identifiable.is_a?(Org)
@@ -38,9 +39,10 @@ def load_schemes
     # a curated list of Orgs that can use institutional login
     if @identifiable.is_a?(Org) &&
        !Rails.configuration.x.shibboleth.use_filtered_discovery_service
-      schemes = schemes.reject { |scheme| scheme.name.downcase == "shibboleth" }
+      schemes = schemes.reject { |scheme| scheme.name.downcase == 'shibboleth' }
     end
     schemes
   end
-
+  # rubocop:enable Metrics/AbcSize
+  # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 end
diff --git a/app/presenters/org_selection_presenter.rb b/app/presenters/org_selection_presenter.rb
index b31f2e2b31..2d8820eecc 100644
--- a/app/presenters/org_selection_presenter.rb
+++ b/app/presenters/org_selection_presenter.rb
@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
+# Helper class for the Org selection typeahead
 class OrgSelectionPresenter
-
   attr_accessor :suggestions
 
   def initialize(orgs:, selection:)
     @crosswalk = []
 
-    @name = selection.present? ? selection.name : ""
+    @name = selection.present? ? selection.name : ''
 
     orgs = [selection] if !orgs.present? || orgs.empty?
 
@@ -38,5 +38,4 @@ def crosswalk_entry_from_org_id(value:)
   rescue StandardError
     {}.to_json
   end
-
 end
diff --git a/app/presenters/plan_presenter.rb b/app/presenters/plan_presenter.rb
index 1d24a9148e..0c34fb8859 100644
--- a/app/presenters/plan_presenter.rb
+++ b/app/presenters/plan_presenter.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
+# Helper class for plans
 class PlanPresenter
-
   attr_accessor :plan
 
   def initialize(plan)
@@ -17,7 +17,6 @@ def project_dates_to_readonly_display
     return "Starts on #{sd}" if sd.present?
     return "Ends on #{ed}" if ed.present?
 
-    ""
+    ''
   end
-
 end
diff --git a/app/presenters/super_admin/orgs/merge_presenter.rb b/app/presenters/super_admin/orgs/merge_presenter.rb
index 0e503408e7..7adad112c3 100644
--- a/app/presenters/super_admin/orgs/merge_presenter.rb
+++ b/app/presenters/super_admin/orgs/merge_presenter.rb
@@ -1,23 +1,22 @@
 # frozen_string_literal: true
 
 module SuperAdmin
-
   module Orgs
-
+    # Helper class for the analysis that the Super Admin sees before actually merging orgs
     class MergePresenter
-
       attr_accessor :from_org, :to_org, :from_org_name, :to_org_name,
                     :from_org_entries, :to_org_entries, :mergeable_entries,
                     :categories, :from_org_attributes, :to_org_attributes,
                     :mergeable_attributes
 
+      # rubocop:disable Metrics/AbcSize
       def initialize(from_org:, to_org:)
         @from_org = from_org
         @to_org = to_org
 
         # Abbreviated Org names for display in tables
-        @from_org_name = @from_org.name.split(" ")[0..2].join(" ")
-        @to_org_name = @to_org.name.split(" ")[0..2].join(" ")
+        @from_org_name = @from_org.name.split[0..2].join(' ')
+        @to_org_name = @to_org.name.split[0..2].join(' ')
 
         # Association records
         @from_org_entries = prepare_org(org: @from_org)
@@ -30,10 +29,12 @@ def initialize(from_org:, to_org:)
         @to_org_attributes = org_attributes(org: @to_org)
         @mergeable_attributes = mergeable_columns
       end
+      # rubocop:enable Metrics/AbcSize
 
       private
 
       # rubocop:disable Metrics/AbcSize
+      # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       def prepare_org(org:)
         return {} unless org.present? && org.is_a?(Org)
 
@@ -54,6 +55,7 @@ def prepare_org(org:)
         }
       end
       # rubocop:enable Metrics/AbcSize
+      # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
       def prepare_mergeables
         return {} unless @from_org_entries.any? && @to_org_entries.any?
@@ -73,6 +75,7 @@ def prepare_mergeables
       end
 
       # rubocop:disable Metrics/AbcSize
+      # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       def diff_from_and_to(category:)
         return [] unless category.present? && @from_org_entries.fetch(category, []).any?
 
@@ -101,6 +104,7 @@ def diff_from_and_to(category:)
         end
       end
       # rubocop:enable Metrics/AbcSize
+      # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
       def org_attributes(org:)
         return {} unless org.is_a?(Org)
@@ -118,6 +122,7 @@ def org_attributes(org:)
         }
       end
 
+      # rubocop:disable Metrics/AbcSize
       def mergeable_columns
         out = {}
         out[:target_url] = @from_org.target_url if mergeable_column?(column: :target_url)
@@ -138,12 +143,15 @@ def mergeable_columns
         end
         out
       end
+      # rubocop:enable Metrics/AbcSize
 
+      # rubocop:disable Metrics/AbcSize
+      # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       def mergeable_column?(column:)
         case column
         when :links
-          (@to_org.links.nil? || @to_org.links.fetch("org", []).empty?) &&
-            (@from_org.links.present? || @from_org.links.fetch("org", [].any?))
+          (@to_org.links.nil? || @to_org.links.fetch('org', []).empty?) &&
+            (@from_org.links.present? || @from_org.links.fetch('org', [].any?))
         when :managed
           !@to_org.managed? && @from_org.managed?
         when :feedback_enabled
@@ -154,9 +162,8 @@ def mergeable_column?(column:)
             @to_org != @from_org
         end
       end
-
+      # rubocop:enable Metrics/AbcSize
+      # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
     end
-
   end
-
 end
diff --git a/app/scrubbers/table_free_scrubber.rb b/app/scrubbers/table_free_scrubber.rb
index 4b5f87d8e2..ad2dd77482 100644
--- a/app/scrubbers/table_free_scrubber.rb
+++ b/app/scrubbers/table_free_scrubber.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
+# Logic that ensures that table tags are allowed from TinyMCE editor results
 class TableFreeScrubber < Rails::Html::PermitScrubber
-
   TABLE_TAGS = %w[table thead tbody tr td th tfoot caption].freeze
 
   ALLOWED_TAGS = Rails.application.config.action_view.sanitized_allowed_tags - TABLE_TAGS
@@ -10,5 +10,4 @@ def initialize
     super
     self.tags = ALLOWED_TAGS
   end
-
 end
diff --git a/app/services/api/v1/auth/jwt/authentication_service.rb b/app/services/api/v1/auth/jwt/authentication_service.rb
index 59d03dc1c5..8bb0ab765b 100644
--- a/app/services/api/v1/auth/jwt/authentication_service.rb
+++ b/app/services/api/v1/auth/jwt/authentication_service.rb
@@ -1,13 +1,9 @@
 # frozen_string_literal: true
 
 module Api
-
   module V1
-
     module Auth
-
       module Jwt
-
         # This class provides Authentication for:
         #
         #   ApiClients (aka machines) with the following JSON body: {
@@ -23,21 +19,19 @@ module Jwt
         #   }
         #
         class AuthenticationService
-
-          attr_reader :errors
-          attr_reader :expiration
+          attr_reader :errors, :expiration
 
           def initialize(json: {})
             json = json.nil? ? {} : json.with_indifferent_access
-            type = json.fetch(:grant_type, "client_credentials")
-            parse_client(json: json) if type == "client_credentials"
-            parse_code(json: json) if type == "authorization_code"
+            type = json.fetch(:grant_type, 'client_credentials')
+            parse_client(json: json) if type == 'client_credentials'
+            parse_code(json: json) if type == 'authorization_code'
 
             @errors = {}
 
             if @client_id.nil? || @client_secret.nil? ||
                !%w[client_credentials authorization_code].include?(type)
-              @errors[:client_authentication] = _("Invalid grant type")
+              @errors[:client_authentication] = _('Invalid grant type')
             end
           end
 
@@ -63,10 +57,7 @@ def call
 
           private
 
-          attr_reader :client_id
-          attr_reader :client_secret
-          attr_reader :api_client
-          attr_reader :auth_method
+          attr_reader :client_id, :client_secret, :api_client, :auth_method
 
           # Returns the matching ApiClient if authentication succeeds
           def client
@@ -76,7 +67,7 @@ def client
             return @api_client if @api_client.present?
 
             # Record an error if no ApiClient or User was authenticated
-            @errors[:client_authentication] = _("Invalid credentials")
+            @errors[:client_authentication] = _('Invalid credentials')
             nil
           end
 
@@ -93,7 +84,7 @@ def authenticate_client
           # Tries to find a User whose email matches the :client_id. If found
           # it will attempt to authenticate the :api_token against the :client_secret
           def authenticate_user
-            users = User.where("lower(email) LIKE lower(?)", @client_id)
+            users = User.where('lower(email) LIKE lower(?)', @client_id)
             return nil unless users.present? && users.any?
 
             usr = users.first
@@ -106,22 +97,17 @@ def authenticate_user
           def parse_client(json: {})
             @client_id = json.fetch(:client_id, nil)
             @client_secret = json.fetch(:client_secret, nil)
-            @auth_method = "authenticate_client"
+            @auth_method = 'authenticate_client'
           end
 
           # Handles User credentials
           def parse_code(json: {})
             @client_id = json.fetch(:email, nil)
             @client_secret = json.fetch(:code, nil)
-            @auth_method = "authenticate_user"
+            @auth_method = 'authenticate_user'
           end
-
         end
-
       end
-
     end
-
   end
-
 end
diff --git a/app/services/api/v1/auth/jwt/authorization_service.rb b/app/services/api/v1/auth/jwt/authorization_service.rb
index bb9450d904..52caea688e 100644
--- a/app/services/api/v1/auth/jwt/authorization_service.rb
+++ b/app/services/api/v1/auth/jwt/authorization_service.rb
@@ -1,15 +1,11 @@
 # frozen_string_literal: true
 
 module Api
-
   module V1
-
     module Auth
-
       module Jwt
-
+        # Class to handle User authorization
         class AuthorizationService
-
           def initialize(headers: {})
             @headers = headers.nil? ? {} : headers
             @errors = ActiveSupport::HashWithIndifferentAccess.new
@@ -24,12 +20,13 @@ def call
           private
 
           # Lookup the Client bassed on the client_id embedded in the JWT
+          # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
           def client
             return @api_client if @api_client.present?
 
             token = decoded_auth_token
             # If the token is missing or invalid then set the client to nil
-            errors[:token] = _("Invalid token") unless token.present?
+            errors[:token] = _('Invalid token') unless token.present?
             @api_client = nil unless token.present? && token[:client_id].present?
             return @api_client unless token.present? && token[:client_id].present?
 
@@ -38,7 +35,7 @@ def client
 
             @api_client = User.where(email: token[:client_id]).first
           end
-          # rubocop:enable
+          # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity
 
           def decoded_auth_token
             return @token if @token.present?
@@ -46,25 +43,20 @@ def decoded_auth_token
             @token = JsonWebToken.decode(token: http_auth_header)
             @token
           rescue JWT::ExpiredSignature
-            errors[:token] = _("Token expired")
+            errors[:token] = _('Token expired')
             nil
           end
 
           # Extract the token from the Authorization header
           def http_auth_header
             hdr = @headers[:Authorization]
-            errors[:token] = _("Missing token") unless hdr.present?
+            errors[:token] = _('Missing token') unless hdr.present?
             return nil unless hdr.present?
 
             hdr.split.last
           end
-
         end
-
       end
-
     end
-
   end
-
 end
diff --git a/app/services/api/v1/auth/jwt/json_web_token.rb b/app/services/api/v1/auth/jwt/json_web_token.rb
index 3f51e4314c..d788ad0d77 100644
--- a/app/services/api/v1/auth/jwt/json_web_token.rb
+++ b/app/services/api/v1/auth/jwt/json_web_token.rb
@@ -1,17 +1,12 @@
 # frozen_string_literal: true
 
 module Api
-
   module V1
-
     module Auth
-
       module Jwt
-
+        # Class to handle encryption/descryption of the JWT
         class JsonWebToken
-
           class << self
-
             def encode(payload:, exp: 24.hours.from_now)
               payload[:exp] = exp.to_i
               JWT.encode(payload, Rails.application.credentials.secret_key_base)
@@ -29,15 +24,9 @@ def decode(token:)
               Rails.logger.error "Api::V1::Auth::Jwt::JsonWebToken.decode - #{e.message}"
               nil
             end
-
           end
-
         end
-
       end
-
     end
-
   end
-
 end
diff --git a/app/services/api/v1/contextual_error_service.rb b/app/services/api/v1/contextual_error_service.rb
index 7dc67ad464..b9ad32d761 100644
--- a/app/services/api/v1/contextual_error_service.rb
+++ b/app/services/api/v1/contextual_error_service.rb
@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
 module Api
-
   module V1
-
     # Service that takes standard ActiveModel errors and contextualizes them
     # so that they relate to the structure of the JSON format used by the API
     # to help the caller understand the errors.
@@ -12,9 +10,7 @@ module V1
     #   "Name can't be blank" becomes "Funder name can't be blank"
     #   "Contributors org name can't ..." becomes "Contact/Contributor affiliation name can't ..."
     class ContextualErrorService
-
       class << self
-
         # Process the plan's errors and any of its associations
         # rubocop:disable Metrics/AbcSize
         def process_plan_errors(plan:)
@@ -24,31 +20,33 @@ def process_plan_errors(plan:)
           return errs unless plan.funder.present? || plan.grant.present?
 
           plan.funder.valid?
-          errs << contextualize(errors: plan.funder.errors, context: "Funding")
+          errs << contextualize(errors: plan.funder.errors, context: 'Funding')
           return errs unless plan.grant.present?
 
           plan.grant.valid?
-          errs << contextualize(errors: plan.grant.errors, context: "Grant")
+          errs << contextualize(errors: plan.grant.errors, context: 'Grant')
           errs.flatten.compact.uniq
         end
         # rubocop:enable Metrics/AbcSize
 
         # Add context to the standard error message
-        def contextualize(errors:, context: "DMP")
+        # rubocop:disable Metrics/AbcSize
+        def contextualize(errors:, context: 'DMP')
           errs = errors.is_a?(ActiveModel::Errors) ? errors.full_messages : []
           errs = errors if errors.is_a?(Array) && errs.empty?
           return errs unless errs.any?
 
           errs.map do |msg|
-            msg.gsub("org name", "affiliation name")
-               .gsub("identifiers value", "identifier values")
-               .gsub("Contributors", "Contact/Contributor")
+            msg.gsub('org name', 'affiliation name')
+               .gsub('identifiers value', 'identifier values')
+               .gsub('Contributors', 'Contact/Contributor')
                .gsub(/^Identifiers/, "#{context.capitalize} identifier")
                .gsub(/^Name/, "#{context.capitalize} name")
                .gsub(/^Title/, "#{context.capitalize} title")
                .gsub(/^Value/, "#{context.capitalize} value")
           end
         end
+        # rubocop:enable Metrics/AbcSize
 
         # Checks the plan and optional associations for validity
         def valid_plan?(plan:)
@@ -56,11 +54,7 @@ def valid_plan?(plan:)
             (plan.funder.blank? || plan.funder.valid?) &&
             (plan.grant.blank? || plan.grant.value.present?)
         end
-
       end
-
     end
-
   end
-
 end
diff --git a/app/services/api/v1/conversion_service.rb b/app/services/api/v1/conversion_service.rb
index 9b9af2c270..d024ccc926 100644
--- a/app/services/api/v1/conversion_service.rb
+++ b/app/services/api/v1/conversion_service.rb
@@ -1,27 +1,24 @@
 # frozen_string_literal: true
 
 module Api
-
   module V1
-
+    # Helper service that translates to/from the RDA common standard
     class ConversionService
-
       class << self
-
         # Converts a boolean field to [yes, no, unknown]
         def boolean_to_yes_no_unknown(value)
-          return "yes" if [true, 1].include?(value)
+          return 'yes' if [true, 1].include?(value)
 
-          return "no" if [false, 0].include?(value)
+          return 'no' if [false, 0].include?(value)
 
-          "unknown"
+          'unknown'
         end
 
         # Converts a [yes, no, unknown] field to boolean (or nil)
         def yes_no_unknown_to_boolean(value)
-          return true if value&.downcase == "yes"
+          return true if value&.downcase == 'yes'
 
-          return nil if value.blank? || value&.downcase == "unknown"
+          return nil if value.blank? || value&.downcase == 'unknown'
 
           false
         end
@@ -35,11 +32,7 @@ def to_identifier(context:, value:)
           scheme = IdentifierScheme.new(name: context)
           Identifier.new(value: value, identifier_scheme: scheme)
         end
-
       end
-
     end
-
   end
-
 end
diff --git a/app/services/api/v1/deserialization/contributor.rb b/app/services/api/v1/deserialization/contributor.rb
index 9c6f5dc75d..79a2eff48e 100644
--- a/app/services/api/v1/deserialization/contributor.rb
+++ b/app/services/api/v1/deserialization/contributor.rb
@@ -1,15 +1,11 @@
 # frozen_string_literal: true
 
 module Api
-
   module V1
-
     module Deserialization
-
+      # Logic to deserialize RDA common standard to a Contributor object
       class Contributor
-
         class << self
-
           # Convert the incoming JSON into a Contributor
           #   {
           #     "role": [
@@ -67,13 +63,13 @@ def find_or_initialize(id_json:, json: {})
             return nil unless json.present?
 
             contrib = Api::V1::DeserializationService.object_from_identifier(
-              class_name: "Contributor", json: id_json
+              class_name: 'Contributor', json: id_json
             )
             return duplicate_contributor(contributor: contrib) if contrib.present?
 
             if json[:mbox].present?
               # Try to find by email
-              contrib = ::Contributor.where("LOWER(email) = ?", json[:mbox]&.downcase).last
+              contrib = ::Contributor.where('LOWER(email) = ?', json[:mbox]&.downcase).last
               return duplicate_contributor(contributor: contrib) if contrib.present?
             end
 
@@ -106,13 +102,8 @@ def assign_roles(contributor:, json: {})
             end
             contributor
           end
-
         end
-
       end
-
     end
-
   end
-
 end
diff --git a/app/services/api/v1/deserialization/dataset.rb b/app/services/api/v1/deserialization/dataset.rb
index 37762c1fa2..53220636db 100644
--- a/app/services/api/v1/deserialization/dataset.rb
+++ b/app/services/api/v1/deserialization/dataset.rb
@@ -1,15 +1,11 @@
 # frozen_string_literal: true
 
 module Api
-
   module V1
-
     module Deserialization
-
+      # Logic to deserialize RDA common standard to a ResearchOutput object
       class Dataset
-
         class << self
-
           # Convert incoming JSON into a Dataset
           #    {
           #      "title": "Cerebral cortex imaging series",
@@ -35,13 +31,8 @@ def deserialize(json: {})
             # TODO: Implement once we have determined the Dataset model
             nil
           end
-
         end
-
       end
-
     end
-
   end
-
 end
diff --git a/app/services/api/v1/deserialization/funding.rb b/app/services/api/v1/deserialization/funding.rb
index ea4d8c4d47..563690e562 100644
--- a/app/services/api/v1/deserialization/funding.rb
+++ b/app/services/api/v1/deserialization/funding.rb
@@ -1,15 +1,11 @@
 # frozen_string_literal: true
 
 module Api
-
   module V1
-
     module Deserialization
-
+      # Logic to deserialize RDA common standard to a Plan funder and grant infor
       class Funding
-
         class << self
-
           # Convert the funding information and attach to the Plan
           #    {
           #      "$ref": "SEE Org.deserialize! for details",
@@ -33,13 +29,8 @@ def deserialize(plan:, json: {})
             )
             plan
           end
-
         end
-
       end
-
     end
-
   end
-
 end
diff --git a/app/services/api/v1/deserialization/identifier.rb b/app/services/api/v1/deserialization/identifier.rb
index 8053547f87..5cbf8a44c7 100644
--- a/app/services/api/v1/deserialization/identifier.rb
+++ b/app/services/api/v1/deserialization/identifier.rb
@@ -1,15 +1,11 @@
 # frozen_string_literal: true
 
 module Api
-
   module V1
-
     module Deserialization
-
+      # Logic to deserialize RDA common standard to an Identifier object
       class Identifier
-
         class << self
-
           # Convert the incoming JSON into an Identifier
           #    {
           #      "type": "ror",
@@ -29,13 +25,8 @@ def deserialize(class_name:, json: {})
 
             ::Identifier.new(identifier_scheme: scheme, value: json[:identifier])
           end
-
         end
-
       end
-
     end
-
   end
-
 end
diff --git a/app/services/api/v1/deserialization/org.rb b/app/services/api/v1/deserialization/org.rb
index 1adbdb9f8b..65773951b6 100644
--- a/app/services/api/v1/deserialization/org.rb
+++ b/app/services/api/v1/deserialization/org.rb
@@ -1,15 +1,11 @@
 # frozen_string_literal: true
 
 module Api
-
   module V1
-
     module Deserialization
-
+      # Logic to deserialize RDA common standard to a Org object
       class Org
-
         class << self
-
           # Convert the incoming JSON into an Org
           #     {
           #       "name": "University of Somewhere",
@@ -19,6 +15,7 @@ class << self
           #         "identifier": "https://ror.org/43y4g4"
           #       }
           #     }
+          # rubocop:disable Metrics/AbcSize
           def deserialize(json: {})
             return nil unless Api::V1::JsonValidationService.org_valid?(json: json)
 
@@ -27,7 +24,7 @@ def deserialize(json: {})
             # Try to find the Org by the identifier
             id_json = json.fetch(:affiliation_id, json.fetch(:funder_id, {}))
             org = Api::V1::DeserializationService.object_from_identifier(
-              class_name: "Org", json: id_json
+              class_name: 'Org', json: id_json
             )
 
             # Try to find the Org by name
@@ -42,6 +39,7 @@ def deserialize(json: {})
             # Attach the identifier
             Api::V1::DeserializationService.attach_identifier(object: org, json: id_json)
           end
+          # rubocop:enable Metrics/AbcSize
 
           # ===================
           # = PRIVATE METHODS =
@@ -56,7 +54,7 @@ def find_by_name(json: {})
             name = json[:name]
 
             # Search the DB
-            org = ::Org.where("LOWER(name) = ?", name.downcase).first
+            org = ::Org.where('LOWER(name) = ?', name.downcase).first
             return org if org.present?
 
             # External ROR search
@@ -72,13 +70,8 @@ def find_by_name(json: {})
             result ||= { name: name }
             OrgSelection::HashToOrgService.to_org(hash: result)
           end
-
         end
-
       end
-
     end
-
   end
-
 end
diff --git a/app/services/api/v1/deserialization/plan.rb b/app/services/api/v1/deserialization/plan.rb
index 5fbd2101bc..13a118754a 100644
--- a/app/services/api/v1/deserialization/plan.rb
+++ b/app/services/api/v1/deserialization/plan.rb
@@ -1,15 +1,11 @@
 # frozen_string_literal: true
 
 module Api
-
   module V1
-
     module Deserialization
-
+      # Logic to deserialize RDA common standard to a Plan object
       class Plan
-
         class << self
-
           # Convert the incoming JSON into a Plan
           #   {
           #     "dmp": {
@@ -48,6 +44,7 @@ class << self
           #       }]
           #     }
           #   }
+          # rubocop:disable Metrics/AbcSize
           def deserialize(json: {})
             return nil unless Api::V1::JsonValidationService.plan_valid?(json: json)
 
@@ -73,6 +70,7 @@ def deserialize(json: {})
             plan = deserialize_contributors(plan: plan, json: json)
             deserialize_datasets(plan: plan, json: json)
           end
+          # rubocop:enable Metrics/AbcSize
 
           # ===================
           # = PRIVATE METHODS =
@@ -88,12 +86,12 @@ def find_or_initialize(id_json:, json: {})
               if Api::V1::DeserializationService.doi?(value: id)
                 # Find by the DOI or ARK
                 plan = Api::V1::DeserializationService.object_from_identifier(
-                  class_name: "Plan", json: id_json
+                  class_name: 'Plan', json: id_json
                 )
               else
                 # For URL based identifiers
                 begin
-                  plan = ::Plan.find_by(id: id.split("/").last.to_i)
+                  plan = ::Plan.find_by(id: id.split('/').last.to_i)
                 rescue StandardError
                   # Catches scenarios where the dmp_id is NOT one of our URLs
                   plan = nil
@@ -115,6 +113,7 @@ def deserialize_datasets(plan:, json: {})
           end
 
           # Deserialize the project information and attach to Plan
+          # rubocop:disable Metrics/AbcSize
           def deserialize_project(plan:, json: {})
             return plan unless json.present? &&
                                json[:project].present? &&
@@ -130,7 +129,7 @@ def deserialize_project(plan:, json: {})
 
             Api::V1::Deserialization::Funding.deserialize(plan: plan, json: funding)
           end
-          # rubocop:enable
+          # rubocop:enable Metrics/AbcSize
 
           # Deserialize the contact as a Contributor
           def deserialize_contact(plan:, json: {})
@@ -172,13 +171,8 @@ def template_id(json: {})
 
             extensions.fetch(:template, {})[:id]
           end
-
         end
-
       end
-
     end
-
   end
-
 end
diff --git a/app/services/api/v1/deserialization_service.rb b/app/services/api/v1/deserialization_service.rb
index 2291781a27..b8dd459edb 100644
--- a/app/services/api/v1/deserialization_service.rb
+++ b/app/services/api/v1/deserialization_service.rb
@@ -1,13 +1,10 @@
 # frozen_string_literal: true
 
 module Api
-
   module V1
-
+    # Generic deserialization helper methods
     class DeserializationService
-
       class << self
-
         # Finds the object by the specified identifier
         def object_from_identifier(class_name:, json:)
           return nil unless class_name.present? && json.present? &&
@@ -24,6 +21,7 @@ def object_from_identifier(class_name:, json:)
         end
 
         # Attach the identifier to the object if it does not already exist
+        # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         def attach_identifier(object:, json:)
           return object unless object.present? && object.respond_to?(:identifiers) &&
                                json.present? &&
@@ -39,6 +37,7 @@ def attach_identifier(object:, json:)
           )
           object
         end
+        # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
         # Translates the role in the json to a Contributor role
         def translate_role(role:)
@@ -49,7 +48,7 @@ def translate_role(role:)
 
           # Strip off the URL if present
           url = ::Contributor::ONTOLOGY_BASE_URL
-          role = role.gsub("#{url}/", "").downcase if role.include?(url)
+          role = role.gsub("#{url}/", '').downcase if role.include?(url)
 
           # Return the role if its a valid one otherwise defualt
           return role if ::Contributor.new.all_roles.include?(role.downcase.to_sym)
@@ -58,13 +57,15 @@ def translate_role(role:)
         end
 
         # Retrieve any JSON schema extensions for this application
+        # rubocop:disable Metrics/AbcSize
         def app_extensions(json: {})
           return {} unless json.present? && json[:extension].present?
 
-          app = ::ApplicationService.application_name.split("-").first.downcase
+          app = ::ApplicationService.application_name.split('-').first.downcase
           ext = json[:extension].select { |item| item[app.to_sym].present? }
           ext.first.present? ? ext.first[app.to_sym] : {}
         end
+        # rubocop:enable Metrics/AbcSize
 
         # Determines whether or not the value is a DOI/ARK
         def doi?(value:)
@@ -73,7 +74,7 @@ def doi?(value:)
           # The format must match a DOI or ARK and a DOI IdentifierScheme
           # must also be present!
           identifier = ::Identifier.new(value: value)
-          scheme = ::IdentifierScheme.find_by(name: "doi")
+          scheme = ::IdentifierScheme.find_by(name: 'doi')
           %w[ark doi].include?(identifier.identifier_format) && scheme.present?
         end
 
@@ -85,11 +86,7 @@ def safe_date(value:)
         rescue ArgumentError
           value.to_s
         end
-
       end
-
     end
-
   end
-
 end
diff --git a/app/services/api/v1/json_validation_service.rb b/app/services/api/v1/json_validation_service.rb
index 6adb24c8fd..8b716e5a48 100644
--- a/app/services/api/v1/json_validation_service.rb
+++ b/app/services/api/v1/json_validation_service.rb
@@ -1,23 +1,16 @@
 # frozen_string_literal: true
 
 module Api
-
   module V1
-
     # Service used to validate incoming JSON
     class JsonValidationService
-
-      # rubocop:disable Layout/LineLength
       BAD_PLAN_MSG = _(":title and the contact's :mbox are both required fields").freeze
-      BAD_ID_MSG = _(":type and :identifier are required for all ids").freeze
-      BAD_ORG_MSG = _(":name is required for every :affiliation and :funding").freeze
-      BAD_CONTRIB_MSG = _(":role and either the :name or :email are required for each :contributor").freeze
-      BAD_FUNDING_MSG = _(":name, :funder_id or :grant_id are required for each funding").freeze
-      BAD_DATASET_MSSG = _(":title is required for each :dataset").freeze
-      # rubocop:enable Layout/LineLength
-
+      BAD_ID_MSG = _(':type and :identifier are required for all ids').freeze
+      BAD_ORG_MSG = _(':name is required for every :affiliation and :funding').freeze
+      BAD_CONTRIB_MSG = _(':role and either the :name or :email are required for each :contributor').freeze
+      BAD_FUNDING_MSG = _(':name, :funder_id or :grant_id are required for each funding').freeze
+      BAD_DATASET_MSSG = _(':title is required for each :dataset').freeze
       class << self
-
         def plan_valid?(json:)
           json.present? && json[:title].present? && json[:contact].present? &&
             json[:contact][:mbox].present?
@@ -54,14 +47,13 @@ def dataset_valid?(json:)
         # rubocop:disable Metrics/AbcSize
         # Scans the entire JSON document for invalid metadata and returns
         # friendly errors to help the caller resolve the issue
+        # rubocop:disable Metrics/CyclomaticComplexity
         def validation_errors(json:)
           errs = []
-          return [_("invalid JSON")] unless json.present?
+          return [_('invalid JSON')] unless json.present?
 
           errs << BAD_PLAN_MSG unless plan_valid?(json: json)
-          if json[:dmp_id].present?
-            errs << BAD_ID_MSG unless identifier_valid?(json: json[:dmp_id])
-          end
+          errs << BAD_ID_MSG if json[:dmp_id].present? && !identifier_valid?(json: json[:dmp_id])
 
           # Handle Contact
           errs << contributor_validation_errors(json: json[:contact])
@@ -70,6 +62,7 @@ def validation_errors(json:)
           errs << json.fetch(:contributor, []).map do |contributor|
             contributor_validation_errors(json: contributor)
           end
+          # rubocop:enable Metrics/CyclomaticComplexity
 
           # Handle the Project and Fundings
           json.fetch(:project, []).each do |project|
@@ -93,9 +86,7 @@ def contributor_validation_errors(json:)
                                                               is_contact: true)
             errs << org_validation_errors(json: json[:affiliation]) if json[:affiliation].present?
             id = json.fetch(:contributor_id, json[:contact_id])
-            if id.present?
-              errs << BAD_ID_MSG unless identifier_valid?(json: id)
-            end
+            errs << BAD_ID_MSG if id.present? && !identifier_valid?(json: id)
           end
           errs
         end
@@ -106,9 +97,7 @@ def funding_validation_errors(json:)
 
           errs << BAD_FUNDING_MSG unless funding_valid?(json: json)
           errs << org_validation_errors(json: json)
-          if json[:grant_id].present?
-            errs << BAD_ID_MSG unless identifier_valid?(json: json[:grant_id])
-          end
+          errs << BAD_ID_MSG if json[:grant_id].present? && !identifier_valid?(json: json[:grant_id])
           errs
         end
 
@@ -118,16 +107,10 @@ def org_validation_errors(json:)
 
           errs << BAD_ORG_MSG unless org_valid?(json: json)
           id = json.fetch(:affiliation_id, json[:funder_id])
-          if id.present?
-            errs << BAD_ID_MSG unless identifier_valid?(json: id)
-          end
+          errs << BAD_ID_MSG if id.present? && !identifier_valid?(json: id)
           errs
         end
-
-      end
-
+end
     end
-
   end
-
 end
diff --git a/app/services/api/v1/persistence_service.rb b/app/services/api/v1/persistence_service.rb
index 1de5403129..3a92230256 100644
--- a/app/services/api/v1/persistence_service.rb
+++ b/app/services/api/v1/persistence_service.rb
@@ -1,14 +1,11 @@
 # frozen_string_literal: true
 
 module Api
-
   module V1
-
     # Service used to ensure the entire DMP stack is saved
     class PersistenceService
-
       class << self
-
+        # rubocop:disable Metrics/AbcSize
         def safe_save(plan:)
           return nil unless plan.is_a?(Plan) && plan.valid?
 
@@ -32,6 +29,7 @@ def safe_save(plan:)
             plan.reload
           end
         end
+        # rubocop:enable Metrics/AbcSize
 
         private
 
@@ -67,6 +65,7 @@ def safe_save_org(org:)
           end
         end
 
+        # rubocop:disable Metrics/AbcSize
         def safe_save_contributor(contributor:)
           return nil unless contributor.is_a?(Contributor) && contributor.valid?
 
@@ -85,9 +84,11 @@ def safe_save_contributor(contributor:)
             contrib.reload
           end
         end
+        # rubocop:enable Metrics/AbcSize
 
         # Consolidate the contributors so that we don't end up trying to insert
         # duplicate records!
+        # rubocop:disable Metrics/CyclomaticComplexity
         def deduplicate_contributors(contributors:)
           out = []
           return out unless contributors.respond_to?(:any?) && contributors.any?
@@ -104,6 +105,7 @@ def deduplicate_contributors(contributors:)
           end
           out.flatten.compact.uniq
         end
+        # rubocop:enable Metrics/CyclomaticComplexity
 
         def id_for(model, scheme)
           return nil unless model.respond_to?(:identifier_for_scheme) && scheme.present?
@@ -115,11 +117,7 @@ def saveable_attributes(attrs:)
           %w[id created_at updated_at].each { |key| attrs.delete(key) }
           attrs
         end
-
       end
-
     end
-
   end
-
 end
diff --git a/app/services/api/v1/validation_service.rb b/app/services/api/v1/validation_service.rb
index b06a72e5b0..83aefb40c6 100644
--- a/app/services/api/v1/validation_service.rb
+++ b/app/services/api/v1/validation_service.rb
@@ -1,14 +1,10 @@
 # frozen_string_literal: true
 
 module Api
-
   module V1
-
     # Service used to validate incoming JSON
     class ValidationService
-
       class << self
-
         def plan_valid?(json:)
           json.present? && json[:title].present? && json[:contact].present? &&
             json[:contact][:mbox].present?
@@ -45,11 +41,7 @@ def dataset_valid?(json:)
           # TODO: implement this once we support them in the DB
           json.present?
         end
-
       end
-
     end
-
   end
-
 end
diff --git a/app/services/application_service.rb b/app/services/application_service.rb
index bbe5bbbaab..15de313f12 100644
--- a/app/services/application_service.rb
+++ b/app/services/application_service.rb
@@ -1,16 +1,13 @@
 # frozen_string_literal: true
 
+# Generic methods used throughout the site
 class ApplicationService
-
   class << self
-
     # Returns either the name specified in dmproadmap.rb initializer or
     # the Rails application name
     def application_name
-      default = Rails.application.class.name.split("::").first
+      default = Rails.application.class.name.split('::').first
       Rails.configuration.x.application.fetch(:name, default)
     end
-
   end
-
 end
diff --git a/app/services/external_apis/base_service.rb b/app/services/external_apis/base_service.rb
index bd13298aa8..8d8f9c7e9b 100644
--- a/app/services/external_apis/base_service.rb
+++ b/app/services/external_apis/base_service.rb
@@ -1,15 +1,14 @@
 # frozen_string_literal: true
 
-require "httparty"
+require 'httparty'
 
 module ExternalApis
-
+  # Errors for External Api services
   class ExternalApiError < StandardError; end
 
+  # Abstract service that provides HTTP methods for individual external api services
   class BaseService
-
     class << self
-
       # The following should be defined in each inheriting service's initializer.
       # For example:
       #   ExternalApis::RorService.setup do |config|
@@ -46,11 +45,11 @@ def active?
       # `http_get`
       def headers
         hash = {
-          "Content-Type": "application/json",
-          "Accept": "application/json",
-          "User-Agent": "#{app_name} (#{app_email})"
+          'Content-Type': 'application/json',
+          Accept: 'application/json',
+          'User-Agent': "#{app_name} (#{app_email})"
         }
-        hash.merge({ "Host": URI(api_base_url).hostname.to_s })
+        hash.merge({ Host: URI(api_base_url).hostname.to_s })
       rescue URI::InvalidURIError => e
         handle_uri_failure(method: "BaseService.headers #{e.message}",
                            uri: api_base_url)
@@ -87,7 +86,7 @@ def app_name
 
       # Retrieves the helpdesk email from dmproadmap.rb initializer or uses the contact page url
       def app_email
-        dflt = Rails.application.routes.url_helpers.contact_us_url || ""
+        dflt = Rails.application.routes.url_helpers.contact_us_url || ''
         Rails.configuration.x.organisation.fetch(:helpdesk_email, dflt)
       end
 
@@ -117,9 +116,6 @@ def options(additional_headers: {}, debug: false)
         hash[:debug_output] = $stdout if debug
         hash
       end
-
     end
-
   end
-
 end
diff --git a/app/services/external_apis/doi_service.rb b/app/services/external_apis/doi_service.rb
index ac57dcd56b..ab364a052c 100644
--- a/app/services/external_apis/doi_service.rb
+++ b/app/services/external_apis/doi_service.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 module ExternalApis
-
   # This service provides an interface to minting/registering DOIs
   # To enable the feature you will need to:
   #   - Identify a DOI minting authority (e.g. Datacite, Crossref, etc.)
@@ -9,9 +8,7 @@ module ExternalApis
   #   - Update the `config/initializers/external_apis/doi.rb`
   #   - Update this service to mint DOIs (based on their API documentation)
   class DoiService < BaseService
-
     class << self
-
       # Retrieve the config settings from the initializer
       def landing_page_url
         Rails.configuration.x.doi&.landing_page_url || super
@@ -69,9 +66,6 @@ def mint(plan:)
         # exports and will become the `dmp_id` in this system's API responses
       end
       # rubocop:enable Lint/UnusedMethodArgument
-
     end
-
   end
-
 end
diff --git a/app/services/external_apis/open_aire_service.rb b/app/services/external_apis/open_aire_service.rb
index 189f849bd0..573dadb591 100644
--- a/app/services/external_apis/open_aire_service.rb
+++ b/app/services/external_apis/open_aire_service.rb
@@ -1,14 +1,11 @@
 # frozen_string_literal: true
 
-require "nokogiri"
+require 'nokogiri'
 
 module ExternalApis
-
   # This service provides an interface to the OpenAire API.
   class OpenAireService < BaseService
-
     class << self
-
       # Retrieve the config settings from the initializer
       def api_base_url
         Rails.configuration.x.open_aire&.api_base_url || super
@@ -34,13 +31,13 @@ def search(funder: default_funder)
 
         target = "#{api_base_url}#{search_path % funder}"
         hdrs = {
-          "Accept": "application/xml",
-          "Content-Type": "*/*"
+          Accept: 'application/xml',
+          'Content-Type': '*/*'
         }
         resp = http_get(uri: target, additional_headers: hdrs, debug: false)
 
         unless resp.code == 200
-          handle_http_failure(method: "OpenAire search", http_response: resp)
+          handle_http_failure(method: 'OpenAire search', http_response: resp)
           return []
         end
         parse_xml(xml: resp.body)
@@ -52,20 +49,17 @@ def search(funder: default_funder)
       def parse_xml(xml:)
         return [] unless xml.present?
 
-        Nokogiri::XML(xml).xpath("//pair/displayed-value").map do |node|
-          parts = node.content.split("-")
+        Nokogiri::XML(xml).xpath('//pair/displayed-value').map do |node|
+          parts = node.content.split('-')
           grant_id = parts.shift.to_s.strip
-          description = parts.join(" - ").strip
+          description = parts.join(' - ').strip
           ResearchProject.new(grant_id, description)
         end
       # If a JSON parse error occurs then return results of a local table search
       rescue Nokogiri::XML::SyntaxError => e
-        log_error(method: "OpenAire search", error: e)
+        log_error(method: 'OpenAire search', error: e)
         []
       end
-
     end
-
   end
-
 end
diff --git a/app/services/external_apis/ror_service.rb b/app/services/external_apis/ror_service.rb
index a0ae5f8c38..fba6f4e4ba 100644
--- a/app/services/external_apis/ror_service.rb
+++ b/app/services/external_apis/ror_service.rb
@@ -1,14 +1,11 @@
 # frozen_string_literal: true
 
 module ExternalApis
-
   # This service provides an interface to the Research Organization Registry (ROR)
   # API.
   # For more information: https://github.com/ror-community/ror-api
   class RorService < BaseService
-
     class << self
-
       # Retrieve the config settings from the initializer
       def landing_page_url
         Rails.configuration.x.ror&.landing_page_url || super
@@ -74,7 +71,7 @@ def search(term:, filters: [])
 
       # If a JSON parse error occurs then return results of a local table search
       rescue JSON::ParserError => e
-        log_error(method: "ROR search", error: e)
+        log_error(method: 'ROR search', error: e)
         []
       end
 
@@ -93,7 +90,7 @@ def query_ror(term:, page: 1, filters: [])
                         debug: false)
 
         unless resp.present? && resp.code == 200
-          handle_http_failure(method: "ROR search", http_response: resp)
+          handle_http_failure(method: 'ROR search', http_response: resp)
           return []
         end
         JSON.parse(resp.body)
@@ -104,15 +101,16 @@ def query_ror(term:, page: 1, filters: [])
       def query_string(term:, page: 1, filters: [])
         query_string = ["query=#{term}", "page=#{page}"]
         query_string << "filter=#{filters.join(',')}" if filters.any?
-        query_string.join("&")
+        query_string.join('&')
       end
 
       # Recursive method that can handle multiple ROR result pages if necessary
+      # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
       def process_pages(term:, json:, filters: [])
         return [] if json.blank?
 
         results = parse_results(json: json)
-        num_of_results = json.fetch("number_of_results", 1).to_i
+        num_of_results = json.fetch('number_of_results', 1).to_i
 
         # Determine if there are multiple pages of results
         pages = (num_of_results / max_results_per_page.to_f).to_f.ceil
@@ -128,42 +126,45 @@ def process_pages(term:, json:, filters: [])
       # If we encounter a JSON parse error on subsequent page requests then just
       # return what we have so far
       rescue JSON::ParserError => e
-        log_error(method: "ROR search", error: e)
+        log_error(method: 'ROR search', error: e)
         results || []
       end
+      # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity
 
       # Convert the JSON items into a hash
+      # rubocop:disable Metrics/AbcSize
       def parse_results(json:)
         results = []
-        return results unless json.present? && json.fetch("items", []).any?
+        return results unless json.present? && json.fetch('items', []).any?
 
-        json["items"].each do |item|
-          next unless item["id"].present? && item["name"].present?
+        json['items'].each do |item|
+          next unless item['id'].present? && item['name'].present?
 
           results << {
-            ror: item["id"].gsub(/^#{landing_page_url}/, ""),
+            ror: item['id'].gsub(/^#{landing_page_url}/, ''),
             name: org_name(item: item),
-            sort_name: item["name"],
-            url: item.fetch("links", []).first,
+            sort_name: item['name'],
+            url: item.fetch('links', []).first,
             language: org_language(item: item),
             fundref: fundref_id(item: item),
-            abbreviation: item.fetch("acronyms", []).first
+            abbreviation: item.fetch('acronyms', []).first
           }
         end
         results
       end
+      # rubocop:enable Metrics/AbcSize
 
       # Org names are not unique, so include the Org URL if available or
       # the country. For example:
       #    "Example College (example.edu)"
       #    "Example College (Brazil)"
       def org_name(item:)
-        return "" unless item.present? && item["name"].present?
+        return '' unless item.present? && item['name'].present?
 
-        country = item.fetch("country", {}).fetch("country_name", "")
+        country = item.fetch('country', {}).fetch('country_name', '')
         website = org_website(item: item)
         # If no website or country then just return the name
-        return item["name"] unless website.present? || country.present?
+        return item['name'] unless website.present? || country.present?
 
         # Otherwise return the contextualized name
         "#{item['name']} (#{website || country})"
@@ -171,39 +172,36 @@ def org_name(item:)
 
       # Extracts the org's ISO639 if available
       def org_language(item:)
-        dflt = I18n.default_locale || "en"
+        dflt = I18n.default_locale || 'en'
         return dflt unless item.present?
 
-        labels = item.fetch("labels", [{ "iso639": dflt }])
-        labels.first&.fetch("iso639", I18n.default_locale) || dflt
+        labels = item.fetch('labels', [{ iso639: dflt }])
+        labels.first&.fetch('iso639', I18n.default_locale) || dflt
       end
 
       # Extracts the website domain from the item
       def org_website(item:)
-        return nil unless item.present? && item.fetch("links", [])&.any?
-        return nil if item["links"].first.blank?
+        return nil unless item.present? && item.fetch('links', [])&.any?
+        return nil if item['links'].first.blank?
 
         # A website was found, so extract just the domain without the www
         domain_regex = %r{^(?:http://|www\.|https://)([^/]+)}
-        website = item["links"].first.scan(domain_regex).last.first
-        website.gsub("www.", "")
+        website = item['links'].first.scan(domain_regex).last.first
+        website.gsub('www.', '')
       end
 
       # Extracts the FundRef Id if available
       def fundref_id(item:)
-        return "" unless item.present? && item["external_ids"].present?
-        return "" unless item["external_ids"].fetch("FundRef", {}).any?
+        return '' unless item.present? && item['external_ids'].present?
+        return '' unless item['external_ids'].fetch('FundRef', {}).any?
 
         # If a preferred Id was specified then use it
-        ret = item["external_ids"].fetch("FundRef", {}).fetch("preferred", "")
+        ret = item['external_ids'].fetch('FundRef', {}).fetch('preferred', '')
         return ret if ret.present?
 
         # Otherwise take the first one listed
-        item["external_ids"].fetch("FundRef", {}).fetch("all", []).first
+        item['external_ids'].fetch('FundRef', {}).fetch('all', []).first
       end
-
     end
-
   end
-
 end
diff --git a/app/services/locale_service.rb b/app/services/locale_service.rb
index 2c2c87e946..b091221c13 100644
--- a/app/services/locale_service.rb
+++ b/app/services/locale_service.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
+# Helpers methods for handling I18n and GetText
 class LocaleService
-
   class << self
-
     # Returns the default locale/language
     def default_locale
       abbrev = Language.default.try(:abbreviation) if Language.table_exists?
@@ -14,9 +13,7 @@ def default_locale
 
     # Returns the available locales/languages
     def available_locales
-      # rubocop:disable Layout/LineLength
       locales = Language.sorted_by_abbreviation.pluck(:abbreviation).presence if Language.table_exists?
-      # rubocop:enable Layout/LineLength
       locales.present? ? locales : [default_locale]
     end
 
@@ -44,7 +41,5 @@ def convert(string:, join_char: Rails.configuration.x.locales.gettext_join_chara
       region.upcase!     if region.present?
       region.present? ? "#{language}#{join_char}#{region}" : language
     end
-
   end
-
 end
diff --git a/app/services/org/create_created_plan_service.rb b/app/services/org/create_created_plan_service.rb
index 8e3297bb8f..2f88950305 100644
--- a/app/services/org/create_created_plan_service.rb
+++ b/app/services/org/create_created_plan_service.rb
@@ -11,12 +11,11 @@
 Perm.class
 Template.class
 
+# Org usage --- TODO: This should likely be a module
 class Org
-
+  # Usage for Nbr of created plans
   class CreateCreatedPlanService
-
     class << self
-
       def call(org = nil, threads: 0)
         orgs = org.nil? ? Org.all : [org]
 
@@ -37,9 +36,6 @@ def call(org = nil, threads: 0)
           end
         end
       end
-
     end
-
   end
-
 end
diff --git a/app/services/org/create_exported_plan_service.rb b/app/services/org/create_exported_plan_service.rb
index 4bc3db22d6..7fe475b98b 100644
--- a/app/services/org/create_exported_plan_service.rb
+++ b/app/services/org/create_exported_plan_service.rb
@@ -10,12 +10,11 @@
 User.class
 ExportedPlan.class
 
+# Org usage --- TODO: This should likely be a module
 class Org
-
+  # Usage for Nbr of exported plans
   class CreateExportedPlanService
-
     class << self
-
       def call(org = nil, threads: 0)
         orgs = org.nil? ? Org.all : [org]
 
@@ -35,9 +34,6 @@ def call(org = nil, threads: 0)
           end
         end
       end
-
     end
-
   end
-
 end
diff --git a/app/services/org/create_joined_user_service.rb b/app/services/org/create_joined_user_service.rb
index 441bf937a5..cc8707467f 100644
--- a/app/services/org/create_joined_user_service.rb
+++ b/app/services/org/create_joined_user_service.rb
@@ -7,12 +7,11 @@
 StatJoinedUser::CreateOrUpdate.class
 User.class
 
+# Org usage --- TODO: This should likely be a module
 class Org
-
+  # Usage for Nbr of created users
   class CreateJoinedUserService
-
     class << self
-
       def call(org = nil, threads: 0)
         orgs = org.nil? ? Org.all : [org]
 
@@ -27,9 +26,6 @@ def call(org = nil, threads: 0)
         end
         # pp StatJoinedUser.where.not(count: 0)
       end
-
     end
-
   end
-
 end
diff --git a/app/services/org/create_last_month_created_plan_service.rb b/app/services/org/create_last_month_created_plan_service.rb
index 22abd20029..6176b4bd30 100644
--- a/app/services/org/create_last_month_created_plan_service.rb
+++ b/app/services/org/create_last_month_created_plan_service.rb
@@ -11,12 +11,11 @@
 Perm.class
 Template.class
 
+# Org usage --- TODO: This should likely be a module
 class Org
-
+  # Usage for Nbr of created plans in the prior month
   class CreateLastMonthCreatedPlanService
-
     class << self
-
       def call(org = nil, threads: 0)
         orgs = org.nil? ? Org.all : [org]
 
@@ -38,9 +37,6 @@ def call(org = nil, threads: 0)
           )
         end
       end
-
     end
-
   end
-
 end
diff --git a/app/services/org/create_last_month_exported_plan_service.rb b/app/services/org/create_last_month_exported_plan_service.rb
index 37d5a4619d..39b474df10 100644
--- a/app/services/org/create_last_month_exported_plan_service.rb
+++ b/app/services/org/create_last_month_exported_plan_service.rb
@@ -10,12 +10,11 @@
 User.class
 ExportedPlan.class
 
+# Org usage --- TODO: This should likely be a module
 class Org
-
+  # Usage for Nbr of exported plans in the prior month
   class CreateLastMonthExportedPlanService
-
     class << self
-
       def call(org = nil, threads: 0)
         orgs = org.nil? ? Org.all : [org]
 
@@ -37,9 +36,6 @@ def call(org = nil, threads: 0)
           )
         end
       end
-
     end
-
   end
-
 end
diff --git a/app/services/org/create_last_month_joined_user_service.rb b/app/services/org/create_last_month_joined_user_service.rb
index b2d66f3d9c..db45dd6f6d 100644
--- a/app/services/org/create_last_month_joined_user_service.rb
+++ b/app/services/org/create_last_month_joined_user_service.rb
@@ -7,12 +7,11 @@
 StatJoinedUser::CreateOrUpdate.class
 User.class
 
+# Org usage --- TODO: This should likely be a module
 class Org
-
+  # Usage for Nbr of created users in the prior month
   class CreateLastMonthJoinedUserService
-
     class << self
-
       def call(org = nil, threads: 0)
         orgs = org.nil? ? ::Org.all : [org]
 
@@ -28,9 +27,6 @@ def call(org = nil, threads: 0)
           )
         end
       end
-
     end
-
   end
-
 end
diff --git a/app/services/org/create_last_month_shared_plan_service.rb b/app/services/org/create_last_month_shared_plan_service.rb
index c7bca818be..ca6305ea2b 100644
--- a/app/services/org/create_last_month_shared_plan_service.rb
+++ b/app/services/org/create_last_month_shared_plan_service.rb
@@ -9,12 +9,11 @@
 Plan.class
 Role.class
 
+# Org usage --- TODO: This should likely be a module
 class Org
-
+  # Usage for Nbr of shared plans in the prior month
   class CreateLastMonthSharedPlanService
-
     class << self
-
       def call(org = nil, threads: 0)
         orgs = org.nil? ? Org.all : [org]
 
@@ -36,9 +35,6 @@ def call(org = nil, threads: 0)
           )
         end
       end
-
     end
-
   end
-
 end
diff --git a/app/services/org/create_shared_plan_service.rb b/app/services/org/create_shared_plan_service.rb
index ec75ba4f42..7a914816ee 100644
--- a/app/services/org/create_shared_plan_service.rb
+++ b/app/services/org/create_shared_plan_service.rb
@@ -9,12 +9,11 @@
 Plan.class
 Role.class
 
+# Org usage --- TODO: This should likely be a module
 class Org
-
+  # Usage for Nbr of shared plans
   class CreateSharedPlanService
-
     class << self
-
       def call(org = nil, threads: 0)
         orgs = org.nil? ? Org.all : [org]
 
@@ -34,9 +33,6 @@ def call(org = nil, threads: 0)
           end
         end
       end
-
     end
-
   end
-
 end
diff --git a/app/services/org/monthly_usage_service.rb b/app/services/org/monthly_usage_service.rb
index c6984d7f04..6d6b460181 100644
--- a/app/services/org/monthly_usage_service.rb
+++ b/app/services/org/monthly_usage_service.rb
@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
+# Org usage --- TODO: This should likely be a module
 class Org
-
+  # Usage by month
   class MonthlyUsageService
-
     class << self
-
       def call(current_user, filtered: false)
         total = build_from_joined_user(current_user, filtered)
         build_from_created_plan(current_user, filtered, total)
@@ -27,7 +26,7 @@ def build_model(month:, new_plans: 0, new_users: 0, downloads: 0, plans_shared:
       end
 
       def reducer_body(acc, rec, key_target)
-        month = rec.date.strftime("%b-%y")
+        month = rec.date.strftime('%b-%y')
         count = rec.count
 
         if acc[month].present?
@@ -72,9 +71,6 @@ def build_from_exported_plan(current_user, filtered, total = {})
           reducer_body(acc, rec, :downloads)
         end
       end
-
     end
-
   end
-
 end
diff --git a/app/services/org/total_count_created_plan_service.rb b/app/services/org/total_count_created_plan_service.rb
index 5739792b3c..3c4a5af4c4 100644
--- a/app/services/org/total_count_created_plan_service.rb
+++ b/app/services/org/total_count_created_plan_service.rb
@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
+# Org usage --- TODO: This should likely be a module
 class Org
-
+  # Usage - total nbr of created plans
   class TotalCountCreatedPlanService
-
     class << self
-
       def call(org = nil, filtered: false)
         return for_orgs(filtered) unless org.present?
 
@@ -18,8 +17,8 @@ def for_orgs(filtered)
         result = ::StatCreatedPlan
                  .where(filtered: filtered)
                  .includes(:org)
-                 .select(:"orgs.name", :count)
-                 .group(:"orgs.name")
+                 .select(:'orgs.name', :count)
+                 .group(:'orgs.name')
                  .sum(:count)
         result.each_pair.map do |pair|
           build_model(org_name: pair[0], count: pair[1].to_i)
@@ -34,9 +33,6 @@ def for_org(org, filtered)
       def build_model(org_name:, count:)
         { org_name: org_name, count: count }
       end
-
     end
-
   end
-
 end
diff --git a/app/services/org/total_count_joined_user_service.rb b/app/services/org/total_count_joined_user_service.rb
index a07147c82f..13695c412c 100644
--- a/app/services/org/total_count_joined_user_service.rb
+++ b/app/services/org/total_count_joined_user_service.rb
@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
+# Org usage --- TODO: This should likely be a module
 class Org
-
+  # Usage - total nbr of created users
   class TotalCountJoinedUserService
-
     class << self
-
       def call(org = nil, filtered: false)
         return for_orgs(filtered) unless org.present?
 
@@ -18,8 +17,8 @@ def for_orgs(filtered)
         result = ::StatJoinedUser
                  .where(filtered: filtered)
                  .includes(:org)
-                 .select(:"orgs.name", :count)
-                 .group(:"orgs.name")
+                 .select(:'orgs.name', :count)
+                 .group(:'orgs.name')
                  .sum(:count)
         result.each_pair.map do |pair|
           build_model(org_name: pair[0], count: pair[1].to_i)
@@ -34,9 +33,6 @@ def for_org(org, filtered)
       def build_model(org_name:, count:)
         { org_name: org_name, count: count }
       end
-
     end
-
   end
-
 end
diff --git a/app/services/org/total_count_stat_service.rb b/app/services/org/total_count_stat_service.rb
index 78a15507f7..a8c1062b98 100644
--- a/app/services/org/total_count_stat_service.rb
+++ b/app/services/org/total_count_stat_service.rb
@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
+# Org usage --- TODO: This should likely be a module
 class Org
-
+  # Usage - totals
   class TotalCountStatService
-
     class << self
-
       def call(filtered: false)
         total = build_from_joined_user
         build_from_created_plan(filtered, total)
@@ -51,9 +50,6 @@ def build_from_created_plan(filtered, total = {})
           reducer_body(acc, count, :total_plans)
         end
       end
-
     end
-
   end
-
 end
diff --git a/app/services/org_selection/hash_to_org_service.rb b/app/services/org_selection/hash_to_org_service.rb
index ef722429a1..1c7ec818c7 100644
--- a/app/services/org_selection/hash_to_org_service.rb
+++ b/app/services/org_selection/hash_to_org_service.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-require "text"
+require 'text'
 
 module OrgSelection
-
   # This class provides conversion methods for turning OrgSelection::Search
   # results into Orgs and Identifiers
   # For example:
@@ -17,9 +16,7 @@ module OrgSelection
   #             identifier (ROR) = "http://example.org/123"
   #
   class HashToOrgService
-
     class << self
-
       def to_org(hash:, allow_create: true)
         return nil unless hash.present?
 
@@ -43,6 +40,7 @@ def to_org(hash:, allow_create: true)
         allow_create ? initialize_org(hash: hash) : nil
       end
 
+      # rubocop:disable Metrics/AbcSize
       def to_identifiers(hash:)
         return [] unless hash.present?
 
@@ -61,6 +59,7 @@ def to_identifiers(hash:)
         end
         out
       end
+      # rubocop:enable Metrics/AbcSize
 
       private
 
@@ -89,7 +88,7 @@ def lookup_org_by_name(hash:)
       def initialize_org(hash:)
         return nil unless hash.present? && hash[:name].present?
 
-        org = Org.new(
+        Org.new(
           name: hash[:name],
           links: links_from_hash(name: hash[:name], website: hash[:url]),
           language: language_from_hash(hash: hash),
@@ -98,14 +97,13 @@ def initialize_org(hash:)
           is_other: false,
           abbreviation: abbreviation_from_hash(hash: hash)
         )
-        org
       end
 
       # Convert the name and website into Org.links
       def links_from_hash(name:, website:)
-        return { "org": [] } unless name.present? && website.present?
+        return { org: [] } unless name.present? && website.present?
 
-        { "org": [{ "link": website, "text": name }] }
+        { org: [{ link: website, text: name }] }
       end
 
       # Converts the Org name over to a unique abbreviation
@@ -116,7 +114,7 @@ def abbreviation_from_hash(hash:)
 
         # Get the first letter of each word if no abbreviiation was provided
         OrgSelection::SearchService.name_without_alias(name: hash[:name])
-                                   .split(" ").map(&:first).join.upcase
+                                   .split.map(&:first).join.upcase
       end
 
       # Get the language from the hash or use the default
@@ -142,9 +140,6 @@ def exact_match?(rec:, name2:)
 
         OrgSelection::SearchService.exact_match?(name1: rec.name, name2: name2)
       end
-
     end
-
   end
-
 end
diff --git a/app/services/org_selection/org_to_hash_service.rb b/app/services/org_selection/org_to_hash_service.rb
index 0f37ee18c9..01085ec5aa 100644
--- a/app/services/org_selection/org_to_hash_service.rb
+++ b/app/services/org_selection/org_to_hash_service.rb
@@ -1,15 +1,12 @@
 # frozen_string_literal: true
 
-require "text"
+require 'text'
 
 module OrgSelection
-
   # This class provides a search mechanism for Orgs that looks at records in the
   # the database along with any available external APIs
   class OrgToHashService
-
     class << self
-
       # Convert an Identifiable Model over to hash results like:
       # An Org with id = 123, name = "Foo (foo.org)",
       #             identifier (ROR) = "http://example.org/123"
@@ -36,9 +33,6 @@ def to_hash(org:)
         end
         out
       end
-
     end
-
   end
-
 end
diff --git a/app/services/org_selection/search_service.rb b/app/services/org_selection/search_service.rb
index 891aa9537c..67aa023c5d 100644
--- a/app/services/org_selection/search_service.rb
+++ b/app/services/org_selection/search_service.rb
@@ -1,15 +1,12 @@
 # frozen_string_literal: true
 
-require "text"
+require 'text'
 
 module OrgSelection
-
   # This class provides a search mechanism for Orgs that looks at records in the
   # the database along with any available external APIs
   class SearchService
-
     class << self
-
       # Search for organizations both locally and externally
       def search_combined(search_term:)
         return [] unless search_term.present? && search_term.length > 2
@@ -56,9 +53,9 @@ def exact_match?(name1:, name2:)
       # Removes the parenthesis portion of the name. For example:
       #   "Foo College (foo.edu)" --> "Foo College"
       def name_without_alias(name:)
-        return "" unless name.present?
+        return '' unless name.present?
 
-        name.split(" (")&.first&.strip
+        name.split(' (')&.first&.strip
       end
 
       private
@@ -71,7 +68,7 @@ def expiry
       def local_search(search_term:)
         return [] unless search_term.present?
 
-        Rails.cache.fetch(["org_selection-local", search_term], expires_in: expiry) do
+        Rails.cache.fetch(['org_selection-local', search_term], expires_in: expiry) do
           Org.includes(identifiers: :identifier_scheme)
              .search(name_without_alias(name: search_term)).to_a
         end
@@ -80,7 +77,7 @@ def local_search(search_term:)
       def externals_search(search_term:)
         return [] unless ExternalApis::RorService.active? && search_term.present?
 
-        Rails.cache.fetch(["org_selection-ror", search_term], expires_in: expiry) do
+        Rails.cache.fetch(['org_selection-ror', search_term], expires_in: expiry) do
           ExternalApis::RorService.search(term: search_term)
         end
       end
@@ -172,9 +169,6 @@ def filter(array:)
           hash.fetch(:score, 0) <= 25 || hash.fetch(:weight, 1) < 2
         end
       end
-
     end
-
   end
-
 end
diff --git a/app/services/template/upgrade_customization_service.rb b/app/services/template/upgrade_customization_service.rb
index 0a859150a9..5a055f8199 100644
--- a/app/services/template/upgrade_customization_service.rb
+++ b/app/services/template/upgrade_customization_service.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class Template
-
   # Service object to upgrade a customization Template with new changes from the original
   # funder Template. Remember: {updated_template} is a customization of funder Template.
   #
@@ -22,7 +21,6 @@ class Template
   #   {#updated_template}
   #
   class UpgradeCustomizationService
-
     # Exception raised when the Template is not a customization.
     class NotACustomizationError < StandardError
     end
@@ -61,17 +59,16 @@ def initialize(template)
     # Run the script
     #
     # Returns {Template}
+    # rubocop:disable Metrics/MethodLength
     def call
       Template.transaction do
         if @source_template.customization_of.blank?
           raise NotACustomizationError,
-                _("upgrade_customization! requires a customised template")
+                _('upgrade_customization! requires a customised template')
         end
         if @original_funder_template.nil?
-          # rubocop:disable Layout/LineLength
           raise NoFunderTemplateError,
-                _("upgrade cannot be carried out since there is no published template of its current funder")
-          # rubocop:enable Layout/LineLength
+                _('upgrade cannot be carried out since there is no published template of its current funder')
         end
 
         # Merges modifiable sections or questions from source into updated_template object
@@ -95,6 +92,7 @@ def call
       end
       @updated_template
     end
+    # rubocop:enable Metrics/MethodLength
 
     private
 
@@ -160,7 +158,5 @@ def sort_sections_within_phase(phase)
     def template_org
       @source_template.org
     end
-
   end
-
 end
diff --git a/app/validators/after_validator.rb b/app/validators/after_validator.rb
index d5cb6c5e6e..869a39f6cd 100644
--- a/app/validators/after_validator.rb
+++ b/app/validators/after_validator.rb
@@ -1,16 +1,17 @@
 # frozen_string_literal: true
 
+# Validation to ensure that an end date must come after a begin/start date
 class AfterValidator < ActiveModel::EachValidator
+  DEFAULT_MESSAGE = _('must be after %<date>s')
 
-  DEFAULT_MESSAGE = _("must be after %{date}")
-
+  # rubocop:disable Metrics/AbcSize
   def validate_each(record, attribute, value)
     return if value.nil?
-    return if record.persisted? && options[:on].to_s == "create"
-    return if record.new_record? && options[:on].to_s == "update"
+    return if record.persisted? && options[:on].to_s == 'create'
+    return if record.new_record? && options[:on].to_s == 'update'
 
-    msg = options.fetch(:message, DEFAULT_MESSAGE % { date: options[:date] })
+    msg = options.fetch(:message, format(DEFAULT_MESSAGE, date: options[:date]))
     record.errors.add(attribute, msg) if value.to_date < options[:date]
   end
-
+  # rubocop:enable Metrics/AbcSize
 end
diff --git a/app/validators/answer_for_correct_template_validator.rb b/app/validators/answer_for_correct_template_validator.rb
index 4aa899354f..20723a8eb5 100644
--- a/app/validators/answer_for_correct_template_validator.rb
+++ b/app/validators/answer_for_correct_template_validator.rb
@@ -1,13 +1,12 @@
 # frozen_string_literal: true
 
+# Validation to ensure that the question for the plan exists in the template
 class AnswerForCorrectTemplateValidator < ActiveModel::Validator
-
   def validate(record)
     return if record.plan.nil? || record.question.nil?
     # Make sure that the question and plan belong to the same template!
     return unless record.plan.template == record.question.section.phase.template
 
-    record.errors[:question] << I18n.t("helpers.answer.question_must_belong_to_correct_template")
+    record.errors[:question] << I18n.t('helpers.answer.question_must_belong_to_correct_template')
   end
-
 end
diff --git a/app/validators/email_validator.rb b/app/validators/email_validator.rb
index b53c79873c..05e46d9efb 100644
--- a/app/validators/email_validator.rb
+++ b/app/validators/email_validator.rb
@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
+# Validation for email format
 class EmailValidator < ActiveModel::EachValidator
-
   def validate_each(record, attribute, value)
     return if value =~ /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i
 
-    record.errors[attribute] << (options[:message] || "is not a valid email address")
+    record.errors[attribute] << (options[:message] || 'is not a valid email address')
   end
-
 end
diff --git a/app/validators/org_links_validator.rb b/app/validators/org_links_validator.rb
index 3d5e3124b2..1f720e6458 100644
--- a/app/validators/org_links_validator.rb
+++ b/app/validators/org_links_validator.rb
@@ -1,17 +1,16 @@
 # frozen_string_literal: true
 
+# Validation for the format of the JSON for Org links
 class OrgLinksValidator < ActiveModel::Validator
-
   include JSONLinkValidator
   def validate(record)
     links = record.links
     if links.is_a?(Hash)
-      unless links.with_indifferent_access.key?("org")
-        record.errors[:links] << _('A key "org" is expected for links hash') % { key: k }
+      unless links.with_indifferent_access.key?('org')
+        record.errors[:links] << (format(_('A key "org" is expected for links hash'), key: k))
       end
     else
-      record.errors[:links] << _("A hash is expected for links")
+      record.errors[:links] << _('A hash is expected for links')
     end
   end
-
 end
diff --git a/app/validators/template_links_validator.rb b/app/validators/template_links_validator.rb
index 4ccf44a370..a4ad53d13e 100644
--- a/app/validators/template_links_validator.rb
+++ b/app/validators/template_links_validator.rb
@@ -1,25 +1,27 @@
 # frozen_string_literal: true
 
+# Validation for the format of the JSON for Template links
 class TemplateLinksValidator < ActiveModel::Validator
-
   include JSONLinkValidator
+
+  # rubocop:disable Metrics/AbcSize
   def validate(record)
     links = record.links
     expected_keys = %w[funder sample_plan]
     if links.is_a?(Hash)
       expected_keys.each do |k|
-        if !links.key?(k)
-          record.errors[:links] << _("A key %{key} is expected for links hash") % { key: k }
-        else
+        if links.key?(k)
           unless valid_links?(links[k])
-            msg = _("The key %{key} does not have a valid set of object links")
-            record.errors[:links] << msg % { key: k }
+            msg = _('The key %<key>s does not have a valid set of object links')
+            record.errors[:links] << (format(msg, key: k))
           end
+        else
+          record.errors[:links] << (format(_('A key %<key>s is expected for links hash'), key: k))
         end
       end
     else
-      record.errors[:links] << _("A hash is expected for links")
+      record.errors[:links] << _('A hash is expected for links')
     end
   end
-
+  # rubocop:enable Metrics/AbcSize
 end
diff --git a/app/validators/url_validator.rb b/app/validators/url_validator.rb
index 5c40574527..cdaed9416f 100644
--- a/app/validators/url_validator.rb
+++ b/app/validators/url_validator.rb
@@ -1,12 +1,11 @@
 # frozen_string_literal: true
 
+# Validation for URL format
 class UrlValidator < ActiveModel::EachValidator
-
   def validate_each(record, attribute, value)
     reg = %r{https?://[-a-zA-Z0-9@:%_+.~#?&/=]{2,256}\.[a-z]{2,4}\b(/[-a-zA-Z0-9@:%_+.~#?&/=]*)?}
     return unless value =~ reg
 
-    record.errors[attribute] << (options[:message] || "is not a valid URL")
+    record.errors[attribute] << (options[:message] || 'is not a valid URL')
   end
-
 end
diff --git a/app/views/api/v0/statistics/plans.json.jbuilder b/app/views/api/v0/statistics/plans.json.jbuilder
index bfef9c9061..c76e9ea751 100644
--- a/app/views/api/v0/statistics/plans.json.jbuilder
+++ b/app/views/api/v0/statistics/plans.json.jbuilder
@@ -2,6 +2,7 @@
 
 json.prettify!
 
+# rubocop:disable Metrics/BlockLength
 json.plans @org_plans.each do |plan|
   json.id             plan.id
   json.grant_number   plan.grant&.value
@@ -14,15 +15,19 @@ json.plans @org_plans.each do |plan|
   end
 
   json.funder do
-    json.name         plan.template.org.funder? ? plan.template.org.name : ""
+    json.name         plan.template.org.funder? ? plan.template.org.name : ''
   end
 
   json.principal_investigator do
     json.name         plan.contributors.investigation.first&.name
   end
 
+  json.owner do
+    json.email plan.owner.present? ? plan.owner.email : ""
+  end
+
   json.data_contact do
-    json.info         plan.contributors.data_curation.first&.name
+    json.info plan.contributors.data_curation.first&.name
   end
 
   json.description    plan.description
@@ -35,3 +40,4 @@ json.plans @org_plans.each do |plan|
     json.answered_questions  plan.answers.count
   end
 end
+# rubocop:enable Metrics/BlockLength
diff --git a/app/views/api/v1/contributors/_show.json.jbuilder b/app/views/api/v1/contributors/_show.json.jbuilder
index 757f5db7c9..c0b9dda45b 100644
--- a/app/views/api/v1/contributors/_show.json.jbuilder
+++ b/app/views/api/v1/contributors/_show.json.jbuilder
@@ -7,33 +7,31 @@ is_contact ||= false
 json.name contributor.name
 json.mbox contributor.email
 
-unless is_contact
-  if contributor.selected_roles.any?
-    roles = contributor.selected_roles.map do |role|
-      Api::V1::ContributorPresenter.role_as_uri(role: role)
-    end
-    json.role roles if roles.any?
+if !is_contact && contributor.selected_roles.any?
+  roles = contributor.selected_roles.map do |role|
+    Api::V1::ContributorPresenter.role_as_uri(role: role)
   end
+  json.role roles if roles.any?
 end
 
 if contributor.org.present?
   json.affiliation do
-    json.partial! "api/v1/orgs/show", org: contributor.org
+    json.partial! 'api/v1/orgs/show', org: contributor.org
   end
 end
 
-orcid = contributor.identifier_for_scheme(scheme: "orcid")
+orcid = contributor.identifier_for_scheme(scheme: 'orcid')
 if orcid.present?
   id = Api::V1::ContributorPresenter.contributor_id(
     identifiers: contributor.identifiers
   )
   if is_contact
     json.contact_id do
-      json.partial! "api/v1/identifiers/show", identifier: id
+      json.partial! 'api/v1/identifiers/show', identifier: id
     end
   else
     json.contributor_id do
-      json.partial! "api/v1/identifiers/show", identifier: id
+      json.partial! 'api/v1/identifiers/show', identifier: id
     end
   end
 end
diff --git a/app/views/api/v1/datasets/_show.json.jbuilder b/app/views/api/v1/datasets/_show.json.jbuilder
index 3a3bb0b3b3..cc146a57a3 100644
--- a/app/views/api/v1/datasets/_show.json.jbuilder
+++ b/app/views/api/v1/datasets/_show.json.jbuilder
@@ -4,20 +4,20 @@
 
 presenter = Api::V1::PlanPresenter.new(plan: plan)
 
-json.title "Generic Dataset"
-json.personal_data "unknown"
-json.sensitive_data "unknown"
+json.title 'Generic Dataset'
+json.personal_data 'unknown'
+json.sensitive_data 'unknown'
 
 json.dataset_id do
-  json.partial! "api/v1/identifiers/show", identifier: presenter.identifier
+  json.partial! 'api/v1/identifiers/show', identifier: presenter.identifier
 end
 
 json.distribution [plan] do |distribution|
   json.title "PDF - #{distribution.title}"
-  json.data_access "open"
+  json.data_access 'open'
   json.download_url plan_export_url(distribution, format: :pdf)
   json.format do
-    json.array! ["application/pdf"]
+    json.array! ['application/pdf']
   end
 end
 
diff --git a/app/views/api/v1/error.json.jbuilder b/app/views/api/v1/error.json.jbuilder
index 6cf9443c02..20ee5939dd 100644
--- a/app/views/api/v1/error.json.jbuilder
+++ b/app/views/api/v1/error.json.jbuilder
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-json.partial! "api/v1/standard_response"
+json.partial! 'api/v1/standard_response'
 
 json.items []
 json.errors @payload[:errors]
diff --git a/app/views/api/v1/heartbeat.json.jbuilder b/app/views/api/v1/heartbeat.json.jbuilder
index af0fcdbdbb..ba0b561899 100644
--- a/app/views/api/v1/heartbeat.json.jbuilder
+++ b/app/views/api/v1/heartbeat.json.jbuilder
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-json.partial! "api/v1/standard_response"
+json.partial! 'api/v1/standard_response'
 
 json.items []
diff --git a/app/views/api/v1/orgs/_show.json.jbuilder b/app/views/api/v1/orgs/_show.json.jbuilder
index 69b7ebaa0a..65ba3f39dd 100644
--- a/app/views/api/v1/orgs/_show.json.jbuilder
+++ b/app/views/api/v1/orgs/_show.json.jbuilder
@@ -9,6 +9,6 @@ json.region org.region&.abbreviation
 if org.identifiers.any?
   json.affiliation_id do
     id = Api::V1::OrgPresenter.affiliation_id(identifiers: org.identifiers)
-    json.partial! "api/v1/identifiers/show", identifier: id
+    json.partial! 'api/v1/identifiers/show', identifier: id
   end
 end
diff --git a/app/views/api/v1/plans/_funding.json.jbuilder b/app/views/api/v1/plans/_funding.json.jbuilder
index 725cda1358..72b4204dc7 100644
--- a/app/views/api/v1/plans/_funding.json.jbuilder
+++ b/app/views/api/v1/plans/_funding.json.jbuilder
@@ -9,14 +9,14 @@ if plan.funder.present?
 
   if id.present?
     json.funder_id do
-      json.partial! "api/v1/identifiers/show", identifier: id
+      json.partial! 'api/v1/identifiers/show', identifier: id
     end
   end
 end
 
 if plan.grant_id.present? && plan.grant.present?
   json.grant_id do
-    json.partial! "api/v1/identifiers/show", identifier: plan.grant
+    json.partial! 'api/v1/identifiers/show', identifier: plan.grant
   end
 end
 
@@ -29,7 +29,7 @@ json.funding_status Api::V1::FundingPresenter.status(plan: plan)
 # The ID would typically be something relevant to the funder or research organization
 if plan.identifier.present?
   json.dmproadmap_funding_opportunity_id do
-    json.partial! "api/v1/identifiers/show", identifier: Identifier.new(identifiable: plan,
+    json.partial! 'api/v1/identifiers/show', identifier: Identifier.new(identifiable: plan,
                                                                         value: plan.identifier)
   end
 end
@@ -37,5 +37,5 @@ end
 # Since the Plan owner (aka contact) and contributor orgs could be different than the
 # one associated with the Plan, we add it here.
 json.dmproadmap_funded_affiliations [plan.org] do |funded_org|
-  json.partial! "api/v1/orgs/show", org: funded_org
+  json.partial! 'api/v1/orgs/show', org: funded_org
 end
diff --git a/app/views/api/v1/plans/_project.json.jbuilder b/app/views/api/v1/plans/_project.json.jbuilder
index bb4ba3ef0f..df656a2a48 100644
--- a/app/views/api/v1/plans/_project.json.jbuilder
+++ b/app/views/api/v1/plans/_project.json.jbuilder
@@ -8,11 +8,11 @@ json.description plan.description
 start_date = plan.start_date || Time.now
 json.start start_date.to_formatted_s(:iso8601)
 
-end_date = plan.end_date || Time.now + 2.years
+end_date = plan.end_date || (Time.now + 2.years)
 json.end end_date&.to_formatted_s(:iso8601)
 
 if plan.funder.present? || plan.grant_id.present?
   json.funding [plan] do
-    json.partial! "api/v1/plans/funding", plan: plan
+    json.partial! 'api/v1/plans/funding', plan: plan
   end
 end
diff --git a/app/views/api/v1/plans/_show.json.jbuilder b/app/views/api/v1/plans/_show.json.jbuilder
index 6f8d226f5f..2d3d9397fb 100644
--- a/app/views/api/v1/plans/_show.json.jbuilder
+++ b/app/views/api/v1/plans/_show.json.jbuilder
@@ -2,7 +2,7 @@
 
 # locals: plan
 
-json.schema "https://github.com/RDA-DMP-Common/RDA-DMP-Common-Standard/tree/master/examples/JSON/JSON-schema/1.0"
+json.schema 'https://github.com/RDA-DMP-Common/RDA-DMP-Common-Standard/tree/master/examples/JSON/JSON-schema/1.0'
 
 presenter = Api::V1::PlanPresenter.new(plan: plan)
 # A JSON representation of a Data Management Plan in the
@@ -22,13 +22,13 @@ json.ethical_issues_report plan.ethical_issues_report
 id = presenter.identifier
 if id.present?
   json.dmp_id do
-    json.partial! "api/v1/identifiers/show", identifier: id
+    json.partial! 'api/v1/identifiers/show', identifier: id
   end
 end
 
 if presenter.data_contact.present?
   json.contact do
-    json.partial! "api/v1/contributors/show", contributor: presenter.data_contact,
+    json.partial! 'api/v1/contributors/show', contributor: presenter.data_contact,
                                               is_contact: true
   end
 end
@@ -36,27 +36,27 @@ end
 unless @minimal
   if presenter.contributors.any?
     json.contributor presenter.contributors do |contributor|
-      json.partial! "api/v1/contributors/show", contributor: contributor,
+      json.partial! 'api/v1/contributors/show', contributor: contributor,
                                                 is_contact: false
     end
   end
 
   if presenter.costs.any?
     json.cost presenter.costs do |cost|
-      json.partial! "api/v1/plans/cost", cost: cost
+      json.partial! 'api/v1/plans/cost', cost: cost
     end
   end
 
   json.project [plan] do |pln|
-    json.partial! "api/v1/plans/project", plan: pln
+    json.partial! 'api/v1/plans/project', plan: pln
   end
 
   json.dataset [plan] do |dataset|
-    json.partial! "api/v1/datasets/show", plan: plan, dataset: dataset
+    json.partial! 'api/v1/datasets/show', plan: plan, dataset: dataset
   end
 
   json.extension [plan.template] do |template|
-    json.set! ApplicationService.application_name.split("-").first.to_sym do
+    json.set! ApplicationService.application_name.split('-').first.to_sym do
       json.template do
         json.id template.id
         json.title template.title
diff --git a/app/views/api/v1/plans/index.json.jbuilder b/app/views/api/v1/plans/index.json.jbuilder
index 48d9ef740f..590dab179f 100644
--- a/app/views/api/v1/plans/index.json.jbuilder
+++ b/app/views/api/v1/plans/index.json.jbuilder
@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-json.partial! "api/v1/standard_response", total_items: @total_items
+json.partial! 'api/v1/standard_response', total_items: @total_items
 
 json.items @items do |item|
   json.dmp do
-    json.partial! "api/v1/plans/show", plan: item
+    json.partial! 'api/v1/plans/show', plan: item
   end
 end
diff --git a/app/views/api/v1/templates/index.json.jbuilder b/app/views/api/v1/templates/index.json.jbuilder
index ba5991f3d8..99d4af8662 100644
--- a/app/views/api/v1/templates/index.json.jbuilder
+++ b/app/views/api/v1/templates/index.json.jbuilder
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-json.partial! "api/v1/standard_response", total_items: @total_items
+json.partial! 'api/v1/standard_response', total_items: @total_items
 
 json.items @items do |template|
   presenter = Api::V1::TemplatePresenter.new(template: template)
@@ -13,13 +13,13 @@ json.items @items do |template|
     json.modified template.updated_at.to_formatted_s(:iso8601)
 
     json.affiliation do
-      json.partial! "api/v1/orgs/show", org: template.org
+      json.partial! 'api/v1/orgs/show', org: template.org
     end
 
     json.template_id do
       identifier = Api::V1::ConversionService.to_identifier(context: @application,
                                                             value: template.id)
-      json.partial! "api/v1/identifiers/show", identifier: identifier
+      json.partial! 'api/v1/identifiers/show', identifier: identifier
     end
   end
 end
diff --git a/app/views/paginable/plans/_org_admin_other_user.html.erb b/app/views/paginable/plans/_org_admin_other_user.html.erb
index 1ea1cd663b..e4ddfcbde6 100644
--- a/app/views/paginable/plans/_org_admin_other_user.html.erb
+++ b/app/views/paginable/plans/_org_admin_other_user.html.erb
@@ -21,8 +21,8 @@
             <% end %>
           </td>
           <td><%= plan.template.title %></td>
-          <td><%= plan.owner.org.name %></td>
-          <td><%= plan.owner.name(false) %></td>
+          <td><%= plan.owner&.org&.name %></td>
+          <td><%= plan.owner&.name(false) %></td>
           <td><%= l(plan.updated_at.to_date, formats: :short) %></td>
           <td class="plan-visibility">
             <%= plan.visibility === 'is_test' ? _('Test') : sanitize(display_visibility(plan.visibility)) %>
diff --git a/app/views/plans/_project_details.html.erb b/app/views/plans/_project_details.html.erb
index 10d913c6bb..125d3cabfc 100644
--- a/app/views/plans/_project_details.html.erb
+++ b/app/views/plans/_project_details.html.erb
@@ -192,7 +192,7 @@ ethics_report_tooltip = _("Link to a protocol from a meeting with an ethics comm
                                       autocomplete: "off",
                                       aria: { required: false } %>
           <%= grant_fields.hidden_field :value %>
-          <span class="text-muted" id="grant_number_info">Grant number: <%= plan.grant&.value %></span>
+          <span class="text-muted" id="grant_number_info"><%= _("Grant number:") -%> <%= plan.grant&.value %></span>
         <% else %>
           <%= grant_fields.text_field(:value, class: "form-control",
                                             data: { toggle: "tooltip" },
diff --git a/app/views/plans/export.xml.builder b/app/views/plans/export.xml.builder
index e45e8449ed..b7ae35fca6 100644
--- a/app/views/plans/export.xml.builder
+++ b/app/views/plans/export.xml.builder
@@ -2,9 +2,9 @@
 
 xml.instruct!
 # rubocop:disable Metrics/BlockLength
-xml.plan("id" => @plan.id) do
-  xml.project(@plan.project.title, "id" => @plan.project.id)
-  xml.phase(@plan.version.phase.title, "id" => @plan.version.phase.id)
+xml.plan('id' => @plan.id) do
+  xml.project(@plan.project.title, 'id' => @plan.project.id)
+  xml.phase(@plan.version.phase.title, 'id' => @plan.version.phase.id)
 
   details = @exported_plan.admin_details
   if details.present?
@@ -18,22 +18,22 @@ xml.plan("id" => @plan.id) do
 
   xml.sections do
     @exported_plan.sections.each do |section|
-      xml.section("id" => section.id, "number" => section.number, "title" => section.title) do
+      xml.section('id' => section.id, 'number' => section.number, 'title' => section.title) do
         xml.answers do
           questions = @exported_plan.questions_for_section(section.id)
           questions.each do |question|
-            xml.question("id" => question.id, "number" => question.number,
-                         "question_format" => question.question_format) do
+            xml.question('id' => question.id, 'number' => question.number,
+                         'question_format' => question.question_format) do
               q_format = question.question_format
               xml.question_text question.text
               answer = @plan.answer(question.id, false)
               unless answer.nil?
-                xml.answer("id" => answer.id) do # should add user and date info here
-                  if q_format.title == _("Check box") || q_format.title == _("Multi select box") ||
-                     q_format.title == _("Radio buttons") || q_format.title == _("Dropdown")
+                xml.answer('id' => answer.id) do # should add user and date info here
+                  if q_format.title == _('Check box') || q_format.title == _('Multi select box') ||
+                     q_format.title == _('Radio buttons') || q_format.title == _('Dropdown')
                     xml.selections do
                       answer.options.each do |option|
-                        xml.selection(option.text, "id" => option.id, "number" => option.number)
+                        xml.selection(option.text, 'id' => option.id, 'number' => option.number)
                       end
                     end
                     xml.comment_text answer.text if question.option_comment_display == true
diff --git a/app/views/shared/export/_plan.erb b/app/views/shared/export/_plan.erb
index f5c2e45e83..423de9ae25 100644
--- a/app/views/shared/export/_plan.erb
+++ b/app/views/shared/export/_plan.erb
@@ -78,7 +78,7 @@
                     <br>
                   <%# case for displaying comments OR text %>
                   <% elsif !blank %>
-                    <%= sanitize answer.text %>
+                    <%= sanitize answer&.text %>
                     <br><br>
                   <% end %>
                 <% end %>
diff --git a/app/views/shared/export/_plan_coversheet.erb b/app/views/shared/export/_plan_coversheet.erb
index df16331646..370fdf2338 100644
--- a/app/views/shared/export/_plan_coversheet.erb
+++ b/app/views/shared/export/_plan_coversheet.erb
@@ -3,9 +3,7 @@
 <p><em><%= _("A Data Management Plan created using %{application_name}") % { application_name: ApplicationService.application_name } %></em></p>
 <br/>
 <div class="cover-page">
-  <%# Using <b> tags as the htmltoword gem does not recognise css styles defined %>
-  <%# Allow raw html (==) for plan_attribution as it has <b> tags %>
-  <p><%== plan_attribution(@hash[:attribution]) %></p><br>
+  <p><strong><%= _("Creator:") %></strong><%= @hash[:attribution] %></p><br>
 
   <p><b><%= _("Affiliation: ") %></b><%= @hash[:affiliation] %></p><br>
 
diff --git a/app/views/shared/export/_plan_txt.erb b/app/views/shared/export/_plan_txt.erb
index fd8ce323e6..32f83e8303 100644
--- a/app/views/shared/export/_plan_txt.erb
+++ b/app/views/shared/export/_plan_txt.erb
@@ -1,7 +1,7 @@
 <%= "#{@plan.title}" %>
 <%= "----------------------------------------------------------\n" %>
 <% if @show_coversheet %>
-<%= @hash[:attribution].many? ? _("Creators: ") : _('Creator:') %> <%= @hash[:attribution].join(', ') %>
+<%= @hash[:attribution].length > 1 ? _("Creators: ") : _('Creator:') %> <%= @hash[:attribution].join(', ') %>
 <%= _("Affiliation: ") + @hash[:affiliation] %>
   <% if @hash[:funder].present? %>
 <%= _("Template: ") + @hash[:funder] %>
@@ -24,7 +24,7 @@
 <% @hash[:phases].each do |phase| %>
 <%# Only render selected phase %>
 <% if phase[:title] == @selected_phase.title %>
-<%= (@hash[:phases].many? ? "#{phase[:title]}" : "") %>
+<%= (@hash[:phases].length > 1 ? "#{phase[:title]}" : "") %>
   <% phase[:sections].each do |section| %>
     <% if display_section?(@hash[:customization], section, @show_custom_sections) && num_section_questions(@plan, section, phase) > 0 %>
       <% if @show_sections_questions %>
diff --git a/config.ru b/config.ru
index 08dee95cd3..4eb3d8a92b 100644
--- a/config.ru
+++ b/config.ru
@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 # This file is used by Rack-based servers to start the application.
-require File.expand_path(File.dirname(__FILE__) + "/config/environment")
+require File.expand_path("#{File.dirname(__FILE__)}/config/environment")
 
-map ENV["RAILS_RELATIVE_URL_ROOT"] || "/" do
+map ENV['RAILS_RELATIVE_URL_ROOT'] || '/' do
   run DMPRoadmap::Application
 end
diff --git a/config/application.rb b/config/application.rb
index ea737baa8c..d1d65c2638 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -1,19 +1,18 @@
 # frozen_string_literal: true
 
-require_relative "boot"
+require_relative 'boot'
 
-require "rails/all"
+require 'rails/all'
 
-require "csv"
+require 'csv'
 
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.
 Bundler.require(*Rails.groups)
 
 module DMPRoadmap
-
+  # DMPRoadmap application
   class Application < Rails::Application
-
     # Initialize configuration defaults for originally generated Rails version.
     config.load_defaults 5.2
 
@@ -47,7 +46,5 @@ class Application < Rails::Application
 
     # Set the default host for mailer URLs
     config.action_mailer.default_url_options = { host: Socket.gethostname.to_s }
-
   end
-
 end
diff --git a/config/boot.rb b/config/boot.rb
index aef6d031ee..c04863fa7d 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 
-require "bundler/setup" # Set up gems listed in the Gemfile.
-require "bootsnap/setup" # Speed up boot time by caching expensive operations.
+require 'bundler/setup' # Set up gems listed in the Gemfile.
+require 'bootsnap/setup' # Speed up boot time by caching expensive operations.
diff --git a/config/brakeman.ignore b/config/brakeman.ignore
index 7460461fd8..0ccd7ed98b 100644
--- a/config/brakeman.ignore
+++ b/config/brakeman.ignore
@@ -7,7 +7,7 @@
       "check_name": "SQL",
       "message": "Possible SQL injection",
       "file": "app/models/user.rb",
-      "line": 396,
+      "line": 400,
       "link": "https://brakemanscanner.org/docs/warning_types/sql_injection/",
       "code": "User.where(\"LOWER(#{field}) = :value\", :value => val.to_s.downcase)",
       "render_path": null,
@@ -20,6 +20,26 @@
       "confidence": "Medium",
       "note": ""
     },
+    {
+      "warning_type": "SQL Injection",
+      "warning_code": 0,
+      "fingerprint": "a5ed3314d376e328714a71d1bc2d560e63c241e5722e5fdf7ad6f29717db9259",
+      "check_name": "SQL",
+      "message": "Possible SQL injection",
+      "file": "app/controllers/concerns/paginable.rb",
+      "line": 152,
+      "link": "https://brakemanscanner.org/docs/warning_types/sql_injection/",
+      "code": "scope.search(@args.with_indifferent_access[:search]).order(ActiveRecord::Base.sanitize_sql(@args.with_indifferent_access[:sort_field].partition(\".\").last).to_sym => sort_direction.to_s).includes(@args.with_indifferent_access[:sort_field].partition(\".\").first.singularize.to_sym).order(\"#{ActiveRecord::Base.sanitize_sql(@args.with_indifferent_access[:sort_field])} #{sort_direction}\")",
+      "render_path": null,
+      "location": {
+        "type": "method",
+        "class": "Paginable",
+        "method": "refine_query"
+      },
+      "user_input": "sort_direction",
+      "confidence": "Weak",
+      "note": ""
+    },
     {
       "warning_type": "Redirect",
       "warning_code": 18,
@@ -27,7 +47,7 @@
       "check_name": "Redirect",
       "message": "Possible unprotected redirect",
       "file": "app/controllers/plans_controller.rb",
-      "line": 364,
+      "line": 394,
       "link": "https://brakemanscanner.org/docs/warning_types/redirect/",
       "code": "redirect_to(Plan.deep_copy(Plan.find(params[:id])), :notice => success_message(Plan.deep_copy(Plan.find(params[:id])), _(\"copied\")))",
       "render_path": null,
@@ -47,7 +67,7 @@
       "check_name": "Redirect",
       "message": "Possible unprotected redirect",
       "file": "app/controllers/orgs_controller.rb",
-      "line": 131,
+      "line": 141,
       "link": "https://brakemanscanner.org/docs/warning_types/redirect/",
       "code": "redirect_to(\"#{shib_login_url}?#{shib_callback_url}&#{\"entityID=#{Identifier.by_scheme_name(\"shibboleth\", \"Org\").where(:identifiable => Org.where(:id => shib_params[:org_id])).first.value}\"}\")",
       "render_path": null,
@@ -61,6 +81,6 @@
       "note": ""
     }
   ],
-  "updated": "2020-12-17 10:14:39 -0800",
-  "brakeman_version": "4.10.0"
+  "updated": "2021-11-03 09:56:48 -0700",
+  "brakeman_version": "5.1.1"
 }
diff --git a/config/environment.rb b/config/environment.rb
index 7df99e89c6..d5abe55806 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Load the Rails application.
-require_relative "application"
+require_relative 'application'
 
 # Initialize the Rails application.
 Rails.application.initialize!
diff --git a/config/environments/development.rb b/config/environments/development.rb
index d222d888a1..6180a5db75 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -16,12 +16,12 @@
 
   # Enable/disable caching. By default caching is disabled.
   # Run rails dev:cache to toggle caching.
-  if Rails.root.join("tmp", "caching-dev.txt").exist?
+  if Rails.root.join('tmp', 'caching-dev.txt').exist?
     config.action_controller.perform_caching = true
 
     config.cache_store = :memory_store
     config.public_file_server.headers = {
-      "Cache-Control" => "public, max-age=#{2.days.to_i}"
+      'Cache-Control' => "public, max-age=#{2.days.to_i}"
     }
   else
     config.action_controller.perform_caching = false
@@ -39,14 +39,14 @@
 
   # settings for mailcatcher
   config.action_mailer.delivery_method = :smtp
-  config.action_mailer.smtp_settings = { address: "mailcatcher", port: 1025 }
+  config.action_mailer.smtp_settings = { address: 'mailcatcher', port: 1025 }
 
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 
   # Use the lowest log level to ensure availability of diagnostic information
   # when problems arise.
-  config.log_level = ENV["RAILS_LOG_LEVEL"]&.to_sym || :debug
+  config.log_level = ENV['RAILS_LOG_LEVEL']&.to_sym || :debug
 
   # Raise an error on page load if there are pending migrations.
   config.active_record.migration_error = :page_load
@@ -71,4 +71,4 @@
 end
 
 # Used by Rails' routes url_helpers (typically when including a link in an email)
-Rails.application.routes.default_url_options[:host] = "localhost:3000"
+Rails.application.routes.default_url_options[:host] = 'localhost:3000'
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 7b640d4973..91c4b08438 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -22,7 +22,7 @@
 
   # Disable serving static files from the `/public` folder by default since
   # Apache or NGINX already handles this.
-  config.public_file_server.enabled = ENV["RAILS_SERVE_STATIC_FILES"].present?
+  config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
 
   # Compress JavaScripts and CSS.
   # config.assets.css_compressor = :sass
@@ -53,7 +53,7 @@
 
   # Use the lowest log level to ensure availability of diagnostic information
   # when problems arise.
-  config.log_level = ENV["RAILS_LOG_LEVEL"]&.to_sym || :info
+  config.log_level = ENV['RAILS_LOG_LEVEL']&.to_sym || :info
 
   # Prepend all log lines with the following tags.
   config.log_tags = [:request_id]
@@ -85,8 +85,8 @@
   # require 'syslog/logger'
   # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name')
 
-  if ENV["RAILS_LOG_TO_STDOUT"].present?
-    logger           = ActiveSupport::Logger.new(STDOUT)
+  if ENV['RAILS_LOG_TO_STDOUT'].present?
+    logger           = ActiveSupport::Logger.new($stdout)
     logger.formatter = config.log_formatter
     config.logger    = ActiveSupport::TaggedLogging.new(logger)
   end
@@ -94,6 +94,5 @@
   # Do not dump schema after migrations.
   config.active_record.dump_schema_after_migration = false
 end
-
 # Used by Rails' routes url_helpers (typically when including a link in an email)
-Rails.application.routes.default_url_options[:host] = "example.org"
+Rails.application.routes.default_url_options[:host] = 'example.org'
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 8d4fac41a4..0825f8d56a 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -17,7 +17,7 @@
   # Configure public file server for tests with Cache-Control for performance.
   config.public_file_server.enabled = true
   config.public_file_server.headers = {
-    "Cache-Control" => "public, max-age=#{1.hour.to_i}"
+    'Cache-Control' => "public, max-age=#{1.hour.to_i}"
   }
 
   # Disable fragment caching used in ExternalApis and OrgSelection services
@@ -53,4 +53,4 @@
 end
 
 # Used by Rails' routes url_helpers (typically when including a link in an email)
-Rails.application.routes.default_url_options[:host] = "example.org"
+Rails.application.routes.default_url_options[:host] = 'example.org'
diff --git a/config/initializers/_dmproadmap.rb b/config/initializers/_dmproadmap.rb
index 0d44e72c5f..2886e46178 100644
--- a/config/initializers/_dmproadmap.rb
+++ b/config/initializers/_dmproadmap.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "csv"
+require 'csv'
 
 # DMPRoadmap constants
 #
@@ -14,39 +14,39 @@
 #
 # This file's name begins with an underscore so that it is processed first and its
 # values are available to all other initializers within this directory!
-# rubocop:disable Layout/LineLength
 module DMPRoadmap
-
+  # Base configuration for the DMPRoadmap system
   class Application < Rails::Application
-
     # --------------------- #
     # ORGANISATION SETTINGS #
     # --------------------- #
 
     # Your organisation name, used in various places throught the application
-    config.x.organisation.name = "Curation Center"
+    config.x.organisation.name = 'Curation Center'
     # Your organisation's abbreviation
-    config.x.organisation.abbreviation = "CC"
+    config.x.organisation.abbreviation = 'CC'
     # Your organisation's homepage, used in some of the public facing pages
-    config.x.organisation.url = "https://github.com/DMPRoadmap/roadmap/wiki"
+    config.x.organisation.url = 'https://github.com/DMPRoadmap/roadmap/wiki'
     # Your organisation's legal (official) name - used in the copyright portion of the footer
-    config.x.organisation.copywrite_name = "Curation Centre (CC)"
+    config.x.organisation.copywrite_name = 'Curation Centre (CC)'
     # This email is used as the 'from' address for emails generated by the application
-    config.x.organisation.email = "tester@example.org"
+    config.x.organisation.email = 'tester@example.org'
     # This email is used as the 'from' address for the feedback_complete email to users
-    config.x.organisation.do_not_reply_email "do-not-reply@cc_curation_centre.org"
+    config.x.organisation.do_not_reply_email 'do-not-reply@cc_curation_centre.org'
     # This email is used in email communications
-    config.x.organisation.helpdesk_email = "help@example.org"
+    config.x.organisation.helpdesk_email = 'help@example.org'
     # Your organisation's telephone number - used on the contact us page
-    config.x.organisation.telephone = "+1-123-123-1234"
+    config.x.organisation.telephone = '+1-123-123-1234'
     # Your organisation's address - used on the contact us page
+    # rubocop:disable Naming/VariableNumber
     config.x.organisation.address = {
-      line_1: "Princess Elisabeth Station",
-      line_2: "123 Freezing Cold Street",
-      line_3: "Suite 123",
-      line_4: "Polar Vortex, ABC-345",
-      country: "Antarctica"
+      line_1: 'Princess Elisabeth Station',
+      line_2: '123 Freezing Cold Street',
+      line_3: 'Suite 123',
+      line_4: 'Polar Vortex, ABC-345',
+      country: 'Antarctica'
     }
+    # rubocop:enable Naming/VariableNumber
 
     # The Google maps link to your organisation's location - used to display the
     # Google map on the contact us page.
@@ -55,7 +55,7 @@ class Application < Rails::Application
     # once the menu opens, click the 'share or embed' link and the 'embed' tab on
     # the dialog window that opens. DO NOT place the entire <iframe> tag below, just
     # the address!
-    config.x.organisation.google_maps_link = "https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d29046286.09795864!2d-34.22768319424708!3d-63.61874004304689!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x0%3A0xb57520cc078b16a9!2sPrincess%20Elisabeth%20Station!5e0!3m2!1sen!2sus!4v1587495708129!5m2!1sen!2sus"
+    config.x.organisation.google_maps_link = 'https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d29046286.09795864!2d-34.22768319424708!3d-63.61874004304689!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x0%3A0xb57520cc078b16a9!2sPrincess%20Elisabeth%20Station!5e0!3m2!1sen!2sus!4v1587495708129!5m2!1sen!2sus'
 
     # Uncomment the following line if you want to redirect your users to an
     # organisational contact/help page instead of using the built-in contact_us form
@@ -66,36 +66,36 @@ class Application < Rails::Application
     # -------------------- #
 
     # Used throughout the system via ApplicationService.application_name
-    config.x.application.name = "DMPRoadmap"
+    config.x.application.name = 'DMPRoadmap'
     # Used as the default domain when 'archiving' (aka anonymizing) a user account
     # for example `jane.doe@uni.edu` becomes `1234@removed_accounts-example.org`
-    config.x.application.archived_accounts_email_suffix = "@removed_accounts-example.org"
+    config.x.application.archived_accounts_email_suffix = '@removed_accounts-example.org'
     # Available CSV separators, the default is ','
-    config.x.application.csv_separators = [",", "|", "#"]
+    config.x.application.csv_separators = [',', '|', '#']
     # The largest page size allowed in requests to the API (all versions)
     config.x.application.api_max_page_size = 100
     # The link to the API documentation - used in emails about the API
     config.x.application.api_documentation_urls = {
-      v0: "https://github.com/DMPRoadmap/roadmap/wiki/API-V0-Documentation",
-      v1: "https://github.com/DMPRoadmap/roadmap/wiki/API-Documentation-V1"
+      v0: 'https://github.com/DMPRoadmap/roadmap/wiki/API-V0-Documentation',
+      v1: 'https://github.com/DMPRoadmap/roadmap/wiki/API-Documentation-V1'
     }
     # The links that appear on the home page. Add any number of links
     config.x.application.welcome_links = [
       {
-        title: "Digital Curation Centre",
-        url: "https://dcc.ac.uk/"
+        title: 'Digital Curation Centre',
+        url: 'https://dcc.ac.uk/'
       }, {
-        title: "UC3: University of California Curation Center",
-        url: "https://www.cdlib.org/uc3/"
+        title: 'UC3: University of California Curation Center',
+        url: 'https://www.cdlib.org/uc3/'
       }, {
-        title: "UK funder requirements for Data Management Plans",
-        url: "http://www.dcc.ac.uk/resources/data-management-plans/funders-requirements"
+        title: 'UK funder requirements for Data Management Plans',
+        url: 'http://www.dcc.ac.uk/resources/data-management-plans/funders-requirements'
       }, {
-        title: "US funder requirements for Data Management Plans",
-        url: "https://dmptool.org/guidance"
+        title: 'US funder requirements for Data Management Plans',
+        url: 'https://dmptool.org/guidance'
       }, {
-        title: "DCC Checklist for a Data Management Plan",
-        url: "https://dmponline.dcc.ac.uk/files/DMP_Checklist_2013.pdf"
+        title: 'DCC Checklist for a Data Management Plan',
+        url: 'https://dmponline.dcc.ac.uk/files/DMP_Checklist_2013.pdf'
       }
     ]
     # The default user email preferences used when a new account is created
@@ -126,8 +126,8 @@ class Application < Rails::Application
     config.x.shibboleth.enabled = true
 
     # Relative path to Shibboleth SSO Logouts
-    config.x.shibboleth.login_url = "/Shibboleth.sso/Login"
-    config.x.shibboleth.logout_url = "/Shibboleth.sso/Logout?return="
+    config.x.shibboleth.login_url = '/Shibboleth.sso/Login'
+    config.x.shibboleth.logout_url = '/Shibboleth.sso/Logout?return='
 
     # If this value is set to true your users will be presented with a list of orgs that have a
     # shibboleth identifier in the orgs_identifiers table. If it is set to false (default), the user
@@ -141,13 +141,13 @@ class Application < Rails::Application
     # ------- #
 
     # The default locale (use the i18n format!)
-    config.x.locales.default = "en-GB"
+    config.x.locales.default = 'en-GB'
     # The character that separates a locale's ISO code for i18n. (e.g. `en-GB` or `en`)
     # Changing this value is not recommended!
-    config.x.locales.i18n_join_character = "-"
+    config.x.locales.i18n_join_character = '-'
     # The character that separates a locale's ISO code for Gettext. (e.g. `en_GB` or `en`)
     # Changing this value is not recommended!
-    config.x.locales.gettext_join_character = "_"
+    config.x.locales.gettext_join_character = '_'
 
     # ---------- #
     # THRESHOLDS #
@@ -169,7 +169,7 @@ class Application < Rails::Application
 
     # The default visibility a plan receives when it is created.
     # options: 'privately_visible', 'organisationally_visible' and 'publicly_visibile'
-    config.x.plans.default_visibility = "privately_visible"
+    config.x.plans.default_visibility = 'privately_visible'
 
     # The percentage of answers that have been filled out that determine if a plan
     # will be marked as complete. Plan completion has implications on whether or
@@ -197,7 +197,7 @@ class Application < Rails::Application
     # Google Analytics #
     # ---------------- #
     # this is the abbreviation for the installation's root org as set in the org table
-    config.x.google_analytics.tracker_root = ""
+    config.x.google_analytics.tracker_root = ''
 
     # ------------------------------------------------------------------------ #
     # reCAPTCHA - recaptcha appears on the create account and contact us forms #
@@ -209,8 +209,5 @@ class Application < Rails::Application
     # --------------------------------------------------- #
     config.x.madmp.enable_ethical_issues = false
     config.x.madmp.enable_research_domain = false
-
   end
-
 end
-# rubocop:enable Layout/LineLength
diff --git a/config/initializers/api_pagination.rb b/config/initializers/api_pagination.rb
index eff4a209f6..99682982dd 100644
--- a/config/initializers/api_pagination.rb
+++ b/config/initializers/api_pagination.rb
@@ -5,13 +5,13 @@
   config.paginator = :kaminari # or :will_paginate
 
   # By default, this is set to 'Total'
-  config.total_header = "X-Total"
+  config.total_header = 'X-Total'
 
   # By default, this is set to 'Per-Page'
-  config.per_page_header = "X-Per-Page"
+  config.per_page_header = 'X-Per-Page'
 
   # Optional: set this to add a header with the current page number.
-  config.page_header = "X-Page"
+  config.page_header = 'X-Page'
 
   # Optional: set this to add other response format. Useful with tools that define :jsonapi format
   config.response_formats = [:json]
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index ba194685a2..a9b0d0f108 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -3,12 +3,12 @@
 # Be sure to restart your server when you modify this file.
 
 # Version of your assets, change this if you want to expire all your assets.
-Rails.application.config.assets.version = "1.0"
+Rails.application.config.assets.version = '1.0'
 
 # Add additional assets to the asset load path.
 # Rails.application.config.assets.paths << Emoji.images_path
 # Add Yarn node_modules folder to the asset load path.
-Rails.application.config.assets.paths << Rails.root.join("node_modules")
+Rails.application.config.assets.paths << Rails.root.join('node_modules')
 
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in the app/assets
diff --git a/config/initializers/contact_us.rb b/config/initializers/contact_us.rb
index b566da0efa..74fe2d315e 100644
--- a/config/initializers/contact_us.rb
+++ b/config/initializers/contact_us.rb
@@ -11,7 +11,7 @@
   config.mailer_from = nil
 
   # Configure the e-mail address which should receive the contact form email notifications.
-  config.mailer_to = "roadmap-l@listserv.ucop.edu"
+  config.mailer_to = 'roadmap-l@listserv.ucop.edu'
 
   # ==> Form Configuration
 
diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb
index 6ed8dfd910..040582a186 100644
--- a/config/initializers/content_security_policy.rb
+++ b/config/initializers/content_security_policy.rb
@@ -30,7 +30,5 @@
 
 # This allows Webpacker dev server to work
 Rails.application.config.content_security_policy do |policy|
-  if Rails.env.development?
-    policy.connect_src :self, :https, "http://localhost:3035", "ws://localhost:3035"
-  end
+  policy.connect_src :self, :https, 'http://localhost:3035', 'ws://localhost:3035' if Rails.env.development?
 end
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index c20e7199c3..1cb771e8f6 100755
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -10,7 +10,7 @@
   # Configure the e-mail address which will be shown in Devise::Mailer,
   # note that it will be overwritten if you use your own mailer class with
   # default "from" parameter.
-  config.mailer_sender = "example@email.address"
+  config.mailer_sender = 'example@email.address'
 
   # Configure the class responsible to send e-mails.
   # config.mailer = "Devise::Mailer"
@@ -19,7 +19,7 @@
   # Load and configure the ORM. Supports :active_record (default) and
   # :mongoid (bson_ext recommended) by default. Other ORMs may be
   # available as additional gems.
-  require "devise/orm/active_record"
+  require 'devise/orm/active_record'
 
   # ==> Configuration for any authentication mechanism
   # Configure which keys are used when authenticating a user. The default is
@@ -247,7 +247,7 @@
   # should add them to the navigational formats lists.
   #
   # The "*/*" below is required to match Internet Explorer requests.
-  config.navigational_formats = ["*/*", :html, :js]
+  config.navigational_formats = ['*/*', :html, :js]
 
   # The default HTTP method used to sign out a resource. Default is :delete.
   config.sign_out_via = :delete
@@ -259,11 +259,11 @@
 
   # Any entries here MUST match a corresponding entry in the identifier_schemes table as
   # well as an identifier_schemes.schemes section in each locale file!
-  OmniAuth.config.full_host = "https://my_service.hostname"
+  OmniAuth.config.full_host = 'https://my_service.hostname'
   OmniAuth.config.allowed_request_methods = [:post]
 
   config.omniauth :orcid,
-                  "client_id", "client_secret",
+                  'client_id', 'client_secret',
                   {
                     # member: false,
                   }
@@ -302,7 +302,7 @@
   #
   # When using omniauth, Devise cannot automatically set Omniauth path,
   # so you need to do it manually. For the users scope, it would be:
-  config.omniauth_path_prefix = "/users/auth"
+  config.omniauth_path_prefix = '/users/auth'
 
   config.warden do |manager|
     manager.failure_app = CustomFailure
diff --git a/config/initializers/dmproadmap_schema_dumper.rb b/config/initializers/dmproadmap_schema_dumper.rb
index 6ef74ded91..1305d80189 100644
--- a/config/initializers/dmproadmap_schema_dumper.rb
+++ b/config/initializers/dmproadmap_schema_dumper.rb
@@ -1,16 +1,15 @@
 # frozen_string_literal: true
 
 module ActiveRecord
-
   # The Rails 5.x SchemaDumper includes an `options:` arrgument on table definitions
   # that is not DB agnostic. This Monkey Patch comments out the `options:` section.
   #
   # TODO: Determine if this is still necessary in Rails 6.x+
   class SchemaDumper
-
     # Method definition taken from the 5.2-stable branch of ActiveRecord:
     #  https://github.com/rails/rails/blob/5-2-stable/activerecord/lib/active_record/schema_dumper.rb
     # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
     def table(table, stream)
       columns = @connection.columns(table)
       begin
@@ -23,14 +22,14 @@ def table(table, stream)
 
         case pk
         when String
-          tbl.print ", primary_key: #{pk.inspect}" unless pk == "id"
+          tbl.print ", primary_key: #{pk.inspect}" unless pk == 'id'
           pkcol = columns.detect { |c| c.name == pk }
           pkcolspec = column_spec_for_primary_key(pkcol)
           tbl.print ", #{format_colspec(pkcolspec)}" if pkcolspec.present?
         when Array
           tbl.print ", primary_key: #{pk.inspect}"
         else
-          tbl.print ", id: false"
+          tbl.print ', id: false'
         end
 
         # Commenting out Table Options because they are not DB agnostic
@@ -39,7 +38,7 @@ def table(table, stream)
         #   tbl.print ", #{format_options(table_options)}"
         # end
 
-        tbl.puts ", force: :cascade do |t|"
+        tbl.puts ', force: :cascade do |t|'
 
         # then dump all non-primary key columns
         columns.each do |column|
@@ -56,7 +55,7 @@ def table(table, stream)
 
         indexes_in_create(table, tbl)
 
-        tbl.puts "  end"
+        tbl.puts '  end'
         tbl.puts
 
         tbl.rewind
@@ -68,7 +67,6 @@ def table(table, stream)
       end
     end
     # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
-
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
   end
-
 end
diff --git a/config/initializers/dragonfly.rb b/config/initializers/dragonfly.rb
index a105d8cefd..9b6c1577c5 100644
--- a/config/initializers/dragonfly.rb
+++ b/config/initializers/dragonfly.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "dragonfly"
+require 'dragonfly'
 
 # Configure
 Dragonfly.app.configure do
@@ -9,27 +9,27 @@
   # set in credentials file
   secret Rails.application.credentials.dragonfly_secret
 
-  url_format "/media/:job/:name"
+  url_format '/media/:job/:name'
 
   # If the DRAGONFLY_AWS environment variable is set to 'true', configure the app to
   # use Amazon S3 for storage:
-  if ENV["DRAGONFLY_AWS"] == "true"
-    require "dragonfly/s3_data_store"
+  if ENV['DRAGONFLY_AWS'] == 'true'
+    require 'dragonfly/s3_data_store'
     datastore(:s3, {
-                bucket_name: ENV["AWS_BUCKET_NAME"],
-                access_key_id: ENV["AWS_ACCESS_KEY_ID"],
-                secret_access_key: ENV["AWS_SECRET_ACCESS_KEY"],
-                region: ENV["AWS_REGION"],
+                bucket_name: ENV['AWS_BUCKET_NAME'],
+                access_key_id: ENV['AWS_ACCESS_KEY_ID'],
+                secret_access_key: ENV['AWS_SECRET_ACCESS_KEY'],
+                region: ENV['AWS_REGION'],
                 root_path: Rails.env,
-                url_scheme: "https"
+                url_scheme: 'https'
               })
 
   # Otherwise, revert to the default:
   else
 
     datastore(:file, {
-                root_path: Rails.root.join("public/system/dragonfly", Rails.env),
-                server_root: Rails.root.join("public")
+                root_path: Rails.root.join('public/system/dragonfly', Rails.env),
+                server_root: Rails.root.join('public')
               })
 
   end
diff --git a/config/initializers/external_apis/doi.rb b/config/initializers/external_apis/doi.rb
index 1a0fb82677..620d2e1fbd 100644
--- a/config/initializers/external_apis/doi.rb
+++ b/config/initializers/external_apis/doi.rb
@@ -6,9 +6,9 @@
 # `app/services/external_apis/doi.rb` to communicate with their API.
 #
 # To disable thiis feature, simply set 'active' to false
-Rails.configuration.x.doi.landing_page_url = "https://my.doi.org/"
-Rails.configuration.x.doi.api_base_url = "https://my.doi.org/api/"
-Rails.configuration.x.doi.auth_path = "auth_path"
-Rails.configuration.x.doi.heartbeat_path = "heartbeat"
-Rails.configuration.x.doi.mint_path = "doi"
+Rails.configuration.x.doi.landing_page_url = 'https://my.doi.org/'
+Rails.configuration.x.doi.api_base_url = 'https://my.doi.org/api/'
+Rails.configuration.x.doi.auth_path = 'auth_path'
+Rails.configuration.x.doi.heartbeat_path = 'heartbeat'
+Rails.configuration.x.doi.mint_path = 'doi'
 Rails.configuration.x.doi.active = false
diff --git a/config/initializers/external_apis/open_aire.rb b/config/initializers/external_apis/open_aire.rb
index 3cd2b76c70..e153e7e617 100644
--- a/config/initializers/external_apis/open_aire.rb
+++ b/config/initializers/external_apis/open_aire.rb
@@ -3,8 +3,8 @@
 # These configuration settings are used to communicate with the
 # Open Aire Research Project Registry API. For more information about
 # the API and to verify that your configuration settings are correct.
-Rails.configuration.x.open_aire.api_base_url = "https://api.openaire.eu/"
+Rails.configuration.x.open_aire.api_base_url = 'https://api.openaire.eu/'
 # The api_url should contain `%s. This is where the funder is appended!
-Rails.configuration.x.open_aire.search_path = "projects/dspace/%s/ALL/ALL"
-Rails.configuration.x.open_aire.default_funder = "H2020"
+Rails.configuration.x.open_aire.search_path = 'projects/dspace/%s/ALL/ALL'
+Rails.configuration.x.open_aire.default_funder = 'H2020'
 Rails.configuration.x.open_aire.active = true
diff --git a/config/initializers/external_apis/ror.rb b/config/initializers/external_apis/ror.rb
index caa4d21bce..2b37937234 100644
--- a/config/initializers/external_apis/ror.rb
+++ b/config/initializers/external_apis/ror.rb
@@ -4,10 +4,10 @@
 # Research Organization Registry (ROR) API. For more information about
 # the API and to verify that your configuration settings are correct,
 # please refer to: https://github.com/ror-community/ror-api
-Rails.configuration.x.ror.landing_page_url = "https://ror.org/"
-Rails.configuration.x.ror.api_base_url = "https://api.ror.org/"
-Rails.configuration.x.ror.heartbeat_path = "heartbeat"
-Rails.configuration.x.ror.search_path = "organizations"
+Rails.configuration.x.ror.landing_page_url = 'https://ror.org/'
+Rails.configuration.x.ror.api_base_url = 'https://api.ror.org/'
+Rails.configuration.x.ror.heartbeat_path = 'heartbeat'
+Rails.configuration.x.ror.search_path = 'organizations'
 Rails.configuration.x.ror.max_pages = 2
 Rails.configuration.x.ror.max_results_per_page = 20
 Rails.configuration.x.ror.max_redirects = 3
diff --git a/config/initializers/htmlto_word_xslt_helper.rb b/config/initializers/htmlto_word_xslt_helper.rb
index 25b6d30498..5eda752980 100644
--- a/config/initializers/htmlto_word_xslt_helper.rb
+++ b/config/initializers/htmlto_word_xslt_helper.rb
@@ -6,17 +6,14 @@
 # We applied this gem gem htmltoword-1.1.0.
 
 module Htmltoword
-
+  # Helper for the HtmlToWord library
   module XSLTHelper
-
     def xslt_path(template_name)
-      if template_name == "numbering"
-        File.join(Rails.root.join("app", "assets", "xslt", "htmltoword"), "#{template_name}.xslt")
+      if template_name == 'numbering'
+        File.join(Rails.root.join('app', 'assets', 'xslt', 'htmltoword'), "#{template_name}.xslt")
       else
         File.join(Htmltoword.config.default_xslt_path, "#{template_name}.xslt")
       end
     end
-
   end
-
 end
diff --git a/config/initializers/jbuilder_prettify.rb b/config/initializers/jbuilder_prettify.rb
index 0c66dc26b3..36ce733f01 100644
--- a/config/initializers/jbuilder_prettify.rb
+++ b/config/initializers/jbuilder_prettify.rb
@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 # config/initializers/jbuilder_prettify.rb
-require "jbuilder"
+require 'jbuilder'
 
+# Helper for JBuilder that allows JSON to be output in human readable format
 class Jbuilder
-
   ##
   # Allows you to set @prettify manually in your .jbuilder files.
   # Example:
@@ -27,5 +27,4 @@ def prettify!
   def target!
     @prettify ? ::JSON.pretty_generate(@attributes) : _original_target
   end
-
 end
diff --git a/config/initializers/locale.rb b/config/initializers/locale.rb
index 998472cd74..bfebb7b682 100644
--- a/config/initializers/locale.rb
+++ b/config/initializers/locale.rb
@@ -3,5 +3,5 @@
 # This initilializer should not be removed unless all internationalisation is handled by
 # gettext_rails
 DMPRoadmap::Application.config.i18n.load_path += Dir[
-  Rails.root.join("config", "locales", "**", "*.yml").to_s
+  Rails.root.join('config', 'locales', '**', '*.yml').to_s
 ]
diff --git a/config/initializers/recaptcha.rb b/config/initializers/recaptcha.rb
index c70f193d9d..b1db17d428 100644
--- a/config/initializers/recaptcha.rb
+++ b/config/initializers/recaptcha.rb
@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require "recaptcha/rails"
+require 'recaptcha/rails'
 
 # the keys are set in config/credentials.yml.env
 
 Recaptcha.configure do |config|
   config.site_key = Rails.application.credentials.recaptcha[:site_key]
   config.secret_key = Rails.application.credentials.recaptcha[:secret_key]
-  config.proxy = "http://someproxy.com:port"
+  config.proxy = 'http://someproxy.com:port'
 end
diff --git a/config/initializers/rollbar.rb b/config/initializers/rollbar.rb
index 1e11f6d1f0..7c6adc2dba 100644
--- a/config/initializers/rollbar.rb
+++ b/config/initializers/rollbar.rb
@@ -2,7 +2,7 @@
 
 begin
   # If Rollbar has been included in the Bundle, load it here.
-  require "rollbar"
+  require 'rollbar'
 rescue LoadError
   # noop
 end
@@ -12,7 +12,7 @@
     # Without configuration, Rollbar is enabled in all environments.
     # To disable in specific environments, set config.enabled=false.
 
-    config.access_token = ENV["ROLLBAR_ACCESS_TOKEN"]
+    config.access_token = ENV['ROLLBAR_ACCESS_TOKEN']
 
     # Here we'll disable in 'test':
     config.enabled = false if Rails.env.test?
@@ -20,8 +20,8 @@
     # By default, Rollbar will try to call the `current_user` controller method
     # to fetch the logged-in user object, and then call that object's `id`
     # method to fetch this property. To customize:
-    config.person_method = "current_user"
-    config.person_id_method = "id"
+    config.person_method = 'current_user'
+    config.person_id_method = 'id'
 
     # Read GDPR guidelines here: https://docs.rollbar.com/docs/ruby#section-gdpr-hipaa
     config.collect_user_ip = true
@@ -32,7 +32,7 @@
     # config.person_email_method = "email"
 
     # Additionally, you may specify the following:
-    config.person_username_method = "name"
+    config.person_username_method = 'name'
     # config.person_email_method = "email"
 
     # If you want to attach custom data to all exception and message reports,
@@ -83,6 +83,6 @@
     # environment variable like this: `ROLLBAR_ENV=staging`. This is a recommended
     # setup for Heroku. See:
     # https://devcenter.heroku.com/articles/deploying-to-a-custom-rails-environment
-    config.environment = ENV["ROLLBAR_ENV"].presence || Rails.env
+    config.environment = ENV['ROLLBAR_ENV'].presence || Rails.env
   end
 end
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index 8a7eb8fc2d..3908990fbf 100644
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -2,5 +2,5 @@
 
 # Be sure to restart your server when you modify this file.
 
-Rails.application.config.session_store :cookie_store, key: "_dmp_roadmap_session",
+Rails.application.config.session_store :cookie_store, key: '_dmp_roadmap_session',
                                                       same_site: :lax
diff --git a/config/initializers/translation.rb b/config/initializers/translation.rb
index f1ac30a667..346da2d33b 100644
--- a/config/initializers/translation.rb
+++ b/config/initializers/translation.rb
@@ -9,53 +9,53 @@
 #
 # When generating the translations, the rake:tasks will need to be run with each
 # domain specified in order to generate both sets of translation keys.
-if !ENV["DOMAIN"] || ENV["DOMAIN"] == "app"
+if !ENV['DOMAIN'] || ENV['DOMAIN'] == 'app'
   TranslationIO.configure do |config|
-    config.api_key              = ENV["TRANSLATION_API_ROADMAP"]
-    config.source_locale        = "en"
+    config.api_key              = ENV['TRANSLATION_API_ROADMAP']
+    config.source_locale        = 'en'
     config.target_locales       = %w[de en-GB en-US es fr-FR fi sv-FI pt-BR en-CA fr-CA tr-TR]
-    config.text_domain          = "app"
+    config.text_domain          = 'app'
     config.bound_text_domains   = %w[app client]
-    config.ignored_source_paths = ["app/views/branded/"]
-    config.locales_path         = Rails.root.join("config", "locale")
+    config.ignored_source_paths = ['app/views/branded/']
+    config.locales_path         = Rails.root.join('config', 'locale')
   end
-elsif ENV["DOMAIN"] == "client"
+elsif ENV['DOMAIN'] == 'client'
   TranslationIO.configure do |config|
-    config.api_key              = ENV["TRANSLATION_API_CLIENT"]
-    config.source_locale        = "en"
+    config.api_key              = ENV['TRANSLATION_API_CLIENT']
+    config.source_locale        = 'en'
     config.target_locales       = %w[fi sv-FI]
-    config.text_domain          = "client"
-    config.bound_text_domains = ["client"]
+    config.text_domain          = 'client'
+    config.bound_text_domains = ['client']
     config.ignored_source_paths = ignore_paths
     config.disable_yaml         = true
-    config.locales_path         = Rails.root.join("config", "locale")
+    config.locales_path         = Rails.root.join('config', 'locale')
   end
 end
 
 # Control ignored source paths
 # Note, all prefixes of the directory you want to translate must be defined here
 def ignore_paths
-  Dir.glob("**/*").select { |f| File.directory? f }
+  Dir.glob('**/*').select { |f| File.directory? f }
      .collect { |name| "#{name}/" }
-  - ["app/",
-     "app/views/",
-     "app/views/branded/",
-     "app/views/branded/public_pages/",
-     "app/views/branded/home/",
-     "app/views/branded/contact_us/",
-     "app/views/branded/contact_us/contacts/",
-     "app/views/branded/shared/",
-     "app/views/branded/layouts/",
-     "app/views/branded/static_pages/"]
+  - ['app/',
+     'app/views/',
+     'app/views/branded/',
+     'app/views/branded/public_pages/',
+     'app/views/branded/home/',
+     'app/views/branded/contact_us/',
+     'app/views/branded/contact_us/contacts/',
+     'app/views/branded/shared/',
+     'app/views/branded/layouts/',
+     'app/views/branded/static_pages/']
 end
 
 # Setup languages
 # rubocop:disable Style/RescueModifier
-table = ActiveRecord::Base.connection.table_exists?("languages") rescue false
+table = ActiveRecord::Base.connection.table_exists?('languages') rescue false
 # rubocop:enable Style/RescueModifier
 if table
   def default_locale
-    Language.default.try(:abbreviation) || "en-GB"
+    Language.default.try(:abbreviation) || 'en-GB'
   end
 
   def available_locales
@@ -64,17 +64,17 @@ def available_locales
 
   I18n.available_locales = Language.all.pluck(:abbreviation)
 
-  I18n.default_locale = Language.default.try(:abbreviation) || "en-GB"
+  I18n.default_locale = Language.default.try(:abbreviation) || 'en-GB'
 else
   def default_locale
-    Rails.application.config.i18n.available_locales.first || "en-GB"
+    Rails.application.config.i18n.available_locales.first || 'en-GB'
   end
 
   def available_locales
     Rails.application.config.i18n.available_locales = %w[en-GB en-US]
   end
 
-  I18n.available_locales = ["en-GB"]
+  I18n.available_locales = ['en-GB']
 
-  I18n.default_locale = "en-GB"
+  I18n.default_locale = 'en-GB'
 end
diff --git a/config/locale/app.pot b/config/locale/app.pot
index ae410efe3e..bc5ca09dfb 100644
--- a/config/locale/app.pot
+++ b/config/locale/app.pot
@@ -20,12 +20,12 @@ msgstr ""
 
 #: ../../app/controllers/answers_controller.rb:24
 msgid ""
-"There is no question with id %{question_id} associated to plan id %{plan_id} f"
+"There is no question with id %<question_id>s associated to plan id %<plan_id>s f"
 "or which to create or update an answer"
 msgstr ""
 
 #: ../../app/controllers/answers_controller.rb:34
-msgid "There is no plan with id %{id} for which to create or update an answer"
+msgid "There is no plan with id %<id>s for which to create or update an answer"
 msgstr ""
 
 #: ../../app/controllers/api/v0/base_controller.rb:124
@@ -133,11 +133,11 @@ msgid "You need to sign in or sign up before continuing."
 msgstr ""
 
 #: ../../app/controllers/application_controller.rb:100
-msgid "Unable to %{action} the %{object}.%{errors}"
+msgid "Unable to %<action>s the %<object>s.%<errors>s"
 msgstr ""
 
 #: ../../app/controllers/application_controller.rb:108
-msgid "Successfully %{action} the %{object}."
+msgid "Successfully %<action>s the %<object>s."
 msgstr ""
 
 #: ../../app/controllers/application_controller.rb:123
@@ -201,7 +201,7 @@ msgid "Restricted access to View All the records"
 msgstr ""
 
 #: ../../app/controllers/concerns/paginable.rb:180
-msgid "Sort by %{sort_field}"
+msgid "Sort by %<sort_field>s"
 msgstr ""
 
 #: ../../app/controllers/concerns/template_methods.rb:10
@@ -403,11 +403,11 @@ msgid "Your guidance is no longer published and will not be available to users."
 msgstr ""
 
 #: ../../app/controllers/identifiers_controller.rb:18
-msgid "Successfully unlinked your account from %{is}."
+msgid "Successfully unlinked your account from %<is>s."
 msgstr ""
 
 #: ../../app/controllers/identifiers_controller.rb:22
-msgid "Unable to unlink your account from %{is}."
+msgid "Unable to unlink your account from %<is>s."
 msgstr ""
 
 #: ../../app/controllers/org_admin/phases_controller.rb:18
@@ -456,7 +456,7 @@ msgid "update"
 msgstr ""
 
 #: ../../app/controllers/org_admin/plans_controller.rb:32
-msgid "%{plan_owner} has been notified that you have finished providing feedback"
+msgid "%<plan_owner>s has been notified that you have finished providing feedback"
 msgstr ""
 
 #: ../../app/controllers/org_admin/plans_controller.rb:38
@@ -548,7 +548,7 @@ msgstr ""
 
 #: ../../app/controllers/org_admin/templates_controller.rb:48
 #: ../../app/views/org_admin/templates/index.html.erb:52
-msgid "%{org_name} Templates"
+msgid "%<org_name>s Templates"
 msgstr ""
 
 #: ../../app/controllers/org_admin/templates_controller.rb:50
@@ -561,12 +561,12 @@ msgid "Customizable Templates"
 msgstr ""
 
 #: ../../app/controllers/org_admin/templates_controller.rb:214
-msgid "Error parsing links for a %{template}"
+msgid "Error parsing links for a %<template>s"
 msgstr ""
 
 #: ../../app/controllers/org_admin/templates_controller.rb:345
 #: ../../app/controllers/public_pages_controller.rb:68
-msgid "Template created using the %{application_name} service. Last modified %{date}"
+msgid "Template created using the %<application_name>s service. Last modified %<date>s"
 msgstr ""
 
 #: ../../app/controllers/org_admin/templates_controller.rb:360
@@ -587,7 +587,7 @@ msgid "Please choose an organisation"
 msgstr ""
 
 #: ../../app/controllers/plan_exports_controller.rb:85
-msgid "Created using %{application_name}. Last modified %{date}"
+msgid "Created using %<application_name>s. Last modified %<date>s"
 msgstr ""
 
 #: ../../app/controllers/plans_controller.rb:51
@@ -629,12 +629,12 @@ msgstr ""
 
 #: ../../app/controllers/plans_controller.rb:408
 msgid ""
-"Unable to change the plan's status since it is needed at least %{percentage} p"
+"Unable to change the plan's status since it is needed at least %<percentage>s p"
 "ercentage responded"
 msgstr ""
 
 #: ../../app/controllers/plans_controller.rb:416
-msgid "Unable to find plan id %{plan_id}"
+msgid "Unable to find plan id %<plan_id>s"
 msgstr ""
 
 #: ../../app/controllers/plans_controller.rb:433
@@ -650,13 +650,13 @@ msgid "Unable to change the plan's test status"
 msgstr ""
 
 #: ../../app/controllers/plans_controller.rb:451
-msgid "There is no plan associated with id %{id}"
+msgid "There is no plan associated with id %<id>s"
 msgstr ""
 
 #: ../../app/controllers/registrations_controller.rb:35
 msgid ""
 "Please make a choice below. After linking your\n"
-"                       details to a %{application_name} account,\n"
+"                       details to a %<application_name>s account,\n"
 "                       you will be able to sign in directly with your\n"
 "                       institutional credentials."
 msgstr ""
@@ -730,12 +730,12 @@ msgstr ""
 
 #: ../../app/controllers/roles_controller.rb:26
 msgid ""
-"Cannot share plan with %{email} since that email matches with the owner of the"
+"Cannot share plan with %<email>s since that email matches with the owner of the"
 " plan."
 msgstr ""
 
 #: ../../app/controllers/roles_controller.rb:37
-msgid "Plan is already shared with %{email}."
+msgid "Plan is already shared with %<email>s."
 msgstr ""
 
 #: ../../app/controllers/roles_controller.rb:44
@@ -748,11 +748,11 @@ msgid "Surname"
 msgstr ""
 
 #: ../../app/controllers/roles_controller.rb:48
-msgid "Invitation to %{email} issued successfully."
+msgid "Invitation to %<email>s issued successfully."
 msgstr ""
 
 #: ../../app/controllers/roles_controller.rb:53
-msgid "Plan shared with %{email}."
+msgid "Plan shared with %<email>s."
 msgstr ""
 
 #: ../../app/controllers/roles_controller.rb:68
@@ -765,7 +765,7 @@ msgstr ""
 
 #: ../../app/controllers/roles_controller.rb:93
 msgid ""
-"Successfully changed the permissions for %{email}. They have been notified via"
+"Successfully changed the permissions for %<email>s. They have been notified via"
 " email."
 msgstr ""
 
@@ -796,7 +796,7 @@ msgid "An error has occurred while saving/resetting your export settings."
 msgstr ""
 
 #: ../../app/controllers/super_admin/api_clients_controller.rb:45
-msgid ". The API credentials have been emailed to %{email}"
+msgid ". The API credentials have been emailed to %<email>s"
 msgstr ""
 
 #: ../../app/controllers/super_admin/notifications_controller.rb:69
@@ -812,13 +812,13 @@ msgid "Unable to change the notification's active status"
 msgstr ""
 
 #: ../../app/controllers/super_admin/notifications_controller.rb:104
-msgid "There is no notification associated with id  %{id}"
+msgid "There is no notification associated with id  %<id>s"
 msgstr ""
 
 #: ../../app/controllers/super_admin/org_swaps_controller.rb:22
 msgid ""
 "Your organisation affiliation has been changed. You may now edit templates for"
-" %{org_name}."
+" %<org_name>s."
 msgstr ""
 
 #: ../../app/controllers/super_admin/org_swaps_controller.rb:25
@@ -878,15 +878,15 @@ msgid "Successfully signed in"
 msgstr ""
 
 #: ../../app/controllers/users/omniauth_callbacks_controller.rb:56
-msgid "Your account has been successfully linked to %{scheme}."
+msgid "Your account has been successfully linked to %<scheme>s."
 msgstr ""
 
 #: ../../app/controllers/users/omniauth_callbacks_controller.rb:61
-msgid "Unable to link your account to %{scheme}."
+msgid "Unable to link your account to %<scheme>s."
 msgstr ""
 
 #: ../../app/controllers/users_controller.rb:141
-msgid "Successfully %{action} %{username}'s account."
+msgid "Successfully %<action>s %<username>s's account."
 msgstr ""
 
 #: ../../app/controllers/users_controller.rb:142
@@ -898,7 +898,7 @@ msgid "deactivated"
 msgstr ""
 
 #: ../../app/controllers/users_controller.rb:149
-msgid "Unable to %{action} %{username}"
+msgid "Unable to %<action>s %<username>s"
 msgstr ""
 
 #: ../../app/controllers/users_controller.rb:150
@@ -965,16 +965,16 @@ msgid "Creator:"
 msgstr ""
 
 #: ../../app/helpers/feedbacks_helper.rb:6
-msgid "%{application_name}: Your plan has been submitted for feedback"
+msgid "%<application_name>s: Your plan has been submitted for feedback"
 msgstr ""
 
 #: ../../app/helpers/feedbacks_helper.rb:10
 msgid ""
-"<p>Hello %{user_name}.</p><p>Your plan \"%{plan_name}\" has been submitted for f"
+"<p>Hello %<user_name>s.</p><p>Your plan \"%<plan_name>s\" has been submitted for f"
 "eedback from an\n"
 "      administrator at your organisation. If you have questions pertaining to "
 "this action, please contact us\n"
-"      at %{organisation_email}.</p>"
+"      at %<organisation_email>s.</p>"
 msgstr ""
 
 #: ../../app/helpers/identifier_helper.rb:6
@@ -1008,10 +1008,10 @@ msgstr ""
 
 #: ../../app/helpers/orgs_helper.rb:14
 msgid ""
-"<p>A data librarian from %{org_name} will respond to your request within 48\n"
+"<p>A data librarian from %<org_name>s will respond to your request within 48\n"
 "       hours. If you have questions pertaining to this action please contact u"
 "s\n"
-"       at %{organisation_email}.</p>"
+"       at %<organisation_email>s.</p>"
 msgstr ""
 
 #: ../../app/helpers/perms_helper.rb:9
@@ -1145,7 +1145,7 @@ msgid "None"
 msgstr ""
 
 #: ../../app/helpers/super_admin/orgs/merge_helper.rb:31
-msgid "Guidance for: %{themes}"
+msgid "Guidance for: %<themes>s"
 msgstr ""
 
 #: ../../app/helpers/super_admin/orgs/merge_helper.rb:53
@@ -1153,7 +1153,7 @@ msgid "Nothing to merge"
 msgstr ""
 
 #: ../../app/helpers/super_admin/orgs/merge_helper.rb:55
-msgid "<p>The following %{object_types} will be moved over to '%{org_name}':</p>"
+msgid "<p>The following %<object_types>s will be moved over to '%<org_name>s':</p>"
 msgstr ""
 
 #: ../../app/helpers/template_helper.rb:46
@@ -1189,47 +1189,47 @@ msgstr ""
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:6
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:5
 #: ../../app/views/user_mailer/_email_signature.html.erb:2
-msgid "Query or feedback related to %{tool_name}"
+msgid "Query or feedback related to %<tool_name>s"
 msgstr ""
 
 #: ../../app/mailers/user_mailer.rb:23
-msgid "Welcome to %{tool_name}"
+msgid "Welcome to %<tool_name>s"
 msgstr ""
 
 #: ../../app/mailers/user_mailer.rb:58
-msgid "A Data Management Plan in %{tool_name} has been shared with you"
+msgid "A Data Management Plan in %<tool_name>s has been shared with you"
 msgstr ""
 
 #: ../../app/mailers/user_mailer.rb:76
-msgid "Changed permissions on a Data Management Plan in %{tool_name}"
+msgid "Changed permissions on a Data Management Plan in %<tool_name>s"
 msgstr ""
 
 #: ../../app/mailers/user_mailer.rb:92
-msgid "Permissions removed on a DMP in %{tool_name}"
+msgid "Permissions removed on a DMP in %<tool_name>s"
 msgstr ""
 
 #: ../../app/mailers/user_mailer.rb:111
-msgid "%{user_name} has requested feedback on a %{tool_name} plan"
+msgid "%<user_name>s has requested feedback on a %<tool_name>s plan"
 msgstr ""
 
 #: ../../app/mailers/user_mailer.rb:134
-msgid "%{tool_name}: Expert feedback has been provided for %{plan_title}"
+msgid "%<tool_name>s: Expert feedback has been provided for %<plan_title>s"
 msgstr ""
 
 #: ../../app/mailers/user_mailer.rb:169
-msgid "DMP Visibility Changed: %{plan_title}"
+msgid "DMP Visibility Changed: %<plan_title>s"
 msgstr ""
 
 #: ../../app/mailers/user_mailer.rb:200
-msgid "%{tool_name}: A new comment was added to %{plan_title}"
+msgid "%<tool_name>s: A new comment was added to %<plan_title>s"
 msgstr ""
 
 #: ../../app/mailers/user_mailer.rb:218
-msgid "Administrator privileges granted in %{tool_name}"
+msgid "Administrator privileges granted in %<tool_name>s"
 msgstr ""
 
 #: ../../app/mailers/user_mailer.rb:235
-msgid "%{tool_name} API changes"
+msgid "%<tool_name>s API changes"
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:26
@@ -1262,11 +1262,11 @@ msgid "Creators: "
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:134
-msgid "%{authors}"
+msgid "%<authors>s"
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:135
-msgid "%{affiliation}"
+msgid "%<affiliation>s"
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:137
@@ -1278,11 +1278,11 @@ msgid "Template: "
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:137
-msgid "%{funder}"
+msgid "%<funder>s"
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:139
-msgid "%{template}"
+msgid "%<template>s"
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:142
@@ -1291,7 +1291,7 @@ msgid "Grant number: "
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:142
-msgid "%{grant_number}"
+msgid "%<grant_number>s"
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:145
@@ -1301,7 +1301,7 @@ msgid "Project abstract: "
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:145
-msgid "%{description}"
+msgid "%<description>s"
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:148
@@ -1311,7 +1311,7 @@ msgid "Last modified: "
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:148
-msgid "%{date}"
+msgid "%<date>s"
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:149
@@ -1483,7 +1483,7 @@ msgid "generate_copy! requires an organisation target"
 msgstr ""
 
 #: ../../app/models/template.rb:380
-msgid "Copy of %{template}"
+msgid "Copy of %<template>s"
 msgstr ""
 
 #: ../../app/models/template.rb:388
@@ -1523,7 +1523,7 @@ msgid "Conditions in the template refer backwards"
 msgstr ""
 
 #: ../../app/models/user.rb:379
-msgid "A Data Management Plan in %{application_name} has been shared with you"
+msgid "A Data Management Plan in %<application_name>s has been shared with you"
 msgstr ""
 
 #: ../../app/policies/api/v0/departments_policy.rb:12
@@ -1633,7 +1633,7 @@ msgid ""
 msgstr ""
 
 #: ../../app/validators/after_validator.rb:5
-msgid "must be after %{date}"
+msgid "must be after %<date>s"
 msgstr ""
 
 #: ../../app/validators/org_links_validator.rb:10
@@ -1646,11 +1646,11 @@ msgid "A hash is expected for links"
 msgstr ""
 
 #: ../../app/validators/template_links_validator.rb:12
-msgid "A key %{key} is expected for links hash"
+msgid "A key %<key>s is expected for links hash"
 msgstr ""
 
 #: ../../app/validators/template_links_validator.rb:15
-msgid "The key %{key} does not have a valid set of object links"
+msgid "The key %<key>s does not have a valid set of object links"
 msgstr ""
 
 #: ../../app/views/answers/_locking.html.erb:5
@@ -1659,7 +1659,7 @@ msgstr ""
 
 #: ../../app/views/answers/_locking.html.erb:8
 msgid ""
-"since %{name} saved the answer below while you were editing. Please, combine y"
+"since %<name>s saved the answer below while you were editing. Please, combine y"
 "our changes and then save the answer again."
 msgstr ""
 
@@ -1734,7 +1734,7 @@ msgid "Answered"
 msgstr ""
 
 #: ../../app/views/answers/_status.html.erb:10
-msgid " by %{user_name}"
+msgid " by %<user_name>s"
 msgstr ""
 
 #: ../../app/views/answers/_status.html.erb:15
@@ -1812,11 +1812,11 @@ msgstr ""
 
 #: ../../app/views/contact_us/contacts/new.html.erb:6
 msgid ""
-"%{application_name} is provided by the %{organisation_name}.<br /> You can fin"
-"d out more about us on our <a href=\"%{organisation_url}\" class=\"has-new-window"
+"%<application_name>s is provided by the %<organisation_name>s.<br /> You can fin"
+"d out more about us on our <a href=\"%<organisation_url>s\" class=\"has-new-window"
 "-popup-info\" target=\"_blank\">website <em class=\"sr-only\">(new window)</em><spa"
-"n class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>. If you "
-"would like to contact us about %{application_name}, please fill out the form b"
+"n class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a>. If you "
+"would like to contact us about %<application_name>s, please fill out the form b"
 "elow."
 msgstr ""
 
@@ -1978,7 +1978,7 @@ msgid "Create account"
 msgstr ""
 
 #: ../../app/views/devise/mailer/confirmation_instructions.html.erb:2
-msgid "Welcome to %{application_name}"
+msgid "Welcome to %<application_name>s"
 msgstr ""
 
 #: ../../app/views/devise/mailer/confirmation_instructions.html.erb:4
@@ -1999,19 +1999,19 @@ msgstr ""
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:12
 #: ../../app/views/user_mailer/new_comment.html.erb:2
-msgid "Hello %{user_name}"
+msgid "Hello %<user_name>s"
 msgstr ""
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:15
 msgid ""
-"Your colleague %{inviter_name} has invited you to contribute to  their Data Ma"
-"nagement Plan in %{tool_name}"
+"Your colleague %<inviter_name>s has invited you to contribute to  their Data Ma"
+"nagement Plan in %<tool_name>s"
 msgstr ""
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:22
 #: ../../app/views/user_mailer/sharing_notification.html.erb:11
 msgid ""
-"%{click_here} to accept the invitation, (or copy %{link} into your browser). I"
+"%<click_here>s to accept the invitation, (or copy %<link>s into your browser). I"
 "f you don't want to accept the invitation, please ignore this email."
 msgstr ""
 
@@ -2031,7 +2031,7 @@ msgstr ""
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:19
 #: ../../app/views/user_mailer/_email_signature.html.erb:12
 #: ../../app/views/user_mailer/welcome_notification.html.erb:10
-msgid "The %{tool_name} team"
+msgid "The %<tool_name>s team"
 msgstr ""
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:32
@@ -2043,17 +2043,17 @@ msgstr ""
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:33
 msgid ""
-"If you have any questions or need help, please contact us at %{helpdesk_email}"
-" or visit %{contact_us_url}"
+"If you have any questions or need help, please contact us at %<helpdesk_email>s"
+" or visit %<contact_us_url>s"
 msgstr ""
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:9
-msgid "Hello %{user_email}"
+msgid "Hello %<user_email>s"
 msgstr ""
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:12
 msgid ""
-"Someone has requested a link to change your %{tool_name} password. You can do "
+"Someone has requested a link to change your %<tool_name>s password. You can do "
 "this through the link below."
 msgstr ""
 
@@ -2068,8 +2068,8 @@ msgstr ""
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:22
 #: ../../app/views/user_mailer/_email_signature.html.erb:19
 msgid ""
-"If you have any questions or need help, please contact us at %{helpdesk_email}"
-" or visit %{contact_us}"
+"If you have any questions or need help, please contact us at %<helpdesk_email>s"
+" or visit %<contact_us>s"
 msgstr ""
 
 #: ../../app/views/devise/mailer/unlock_instructions.html.erb:2
@@ -2138,15 +2138,15 @@ msgstr ""
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:16
 msgid ""
-"See the <a href=\"%{api_v0_wiki}\">documentation for v0</a> for more details on "
+"See the <a href=\"%<api_v0_wiki>s\">documentation for v0</a> for more details on "
 "the original API which includes access to statistics, the full text of plans a"
 "nd the ability to connect users with departments."
 msgstr ""
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:18
 msgid ""
-"See the <a href=\"%{api_v1_wiki}\">documentation for v1</a> for more details on "
-"the API that supports the <a href=\"%{rda_standard_url}\">RDA Common metadata st"
+"See the <a href=\"%<api_v1_wiki>s\">documentation for v1</a> for more details on "
+"the API that supports the <a href=\"%<rda_standard_url>s\">RDA Common metadata st"
 "andard for DMPs.</a>"
 msgstr ""
 
@@ -2305,7 +2305,7 @@ msgid "Sign in or Create account"
 msgstr ""
 
 #: ../../app/views/devise/registrations/new.html.erb:15
-msgid "Do you have a %{application_name} account?"
+msgid "Do you have a %<application_name>s account?"
 msgstr ""
 
 #: ../../app/views/devise/registrations/new.html.erb:22
@@ -2321,7 +2321,7 @@ msgid "This will link your existing account to your credentials."
 msgstr ""
 
 #: ../../app/views/devise/registrations/new.html.erb:34
-msgid "No %{application_name} account?"
+msgid "No %<application_name>s account?"
 msgstr ""
 
 #: ../../app/views/devise/registrations/new.html.erb:46
@@ -2473,7 +2473,7 @@ msgstr ""
 
 #: ../../app/views/home/_welcome.html.erb:5
 msgid ""
-"<p>%{application_name} has been developed by the <strong>%{organisation_name}<"
+"<p>%<application_name>s has been developed by the <strong>%<organisation_name>s<"
 "/strong> to help you write data management plans.</p>"
 msgstr ""
 
@@ -2660,7 +2660,7 @@ msgid "Logout"
 msgstr ""
 
 #: ../../app/views/layouts/application.html.erb:32
-msgid "%{application_name}"
+msgid "%<application_name>s"
 msgstr ""
 
 #: ../../app/views/layouts/application.html.erb:91
@@ -2734,7 +2734,7 @@ msgstr ""
 
 #: ../../app/views/layouts/application.html.erb:142
 msgid ""
-"%{n} results are available, use up and down arrows to navigate suggestions. Us"
+"%<n>s results are available, use up and down arrows to navigate suggestions. Us"
 "e the Enter key to select a suggestion or the Escape key to close the suggesti"
 "ons."
 msgstr ""
@@ -2787,7 +2787,7 @@ msgid "Example answer"
 msgstr ""
 
 #: ../../app/views/org_admin/annotations/_show.html.erb:4
-msgid "%{org} Example Answer"
+msgid "%<org>s Example Answer"
 msgstr ""
 
 #: ../../app/views/org_admin/conditions/_add.html.erb:3
@@ -2934,7 +2934,7 @@ msgstr ""
 
 #: ../../app/views/org_admin/phases/_phase.html.erb:17
 msgid ""
-"You are about to delete the '%{phase_title}' phase. This will remove all of th"
+"You are about to delete the '%<phase_title>s' phase. This will remove all of th"
 "e sections and questions listed below. Are you sure?"
 msgstr ""
 
@@ -2994,7 +2994,7 @@ msgid "Write plan"
 msgstr ""
 
 #: ../../app/views/org_admin/plans/index.html.erb:4
-msgid "%{org_name} Plans"
+msgid "%<org_name>s Plans"
 msgstr ""
 
 #: ../../app/views/org_admin/plans/index.html.erb:16
@@ -3046,7 +3046,7 @@ msgstr ""
 #: ../../app/views/org_admin/plans/index.html.erb:39
 msgid ""
 "Download plans <em class=\"sr-only\">(new window)</em><span class=\"new-window-po"
-"pup-info\">%{open_in_new_window_text}</span>"
+"pup-info\">%<open_in_new_window_text>s</span>"
 msgstr ""
 
 #: ../../app/views/org_admin/question_options/_option_fields.html.erb:3
@@ -3074,7 +3074,7 @@ msgid ""
 msgstr ""
 
 #: ../../app/views/org_admin/questions/_form.html.erb:4
-msgid "Question %{number}:"
+msgid "Question %<number>s:"
 msgstr ""
 
 #: ../../app/views/org_admin/questions/_form.html.erb:4
@@ -3139,7 +3139,7 @@ msgid "Delete"
 msgstr ""
 
 #: ../../app/views/org_admin/questions/_form.html.erb:102
-msgid "You are about to delete question #%{question_number}. Are you sure?"
+msgid "You are about to delete question #%<question_number>s. Are you sure?"
 msgstr ""
 
 #: ../../app/views/org_admin/questions/_index.html.erb:14
@@ -3229,7 +3229,7 @@ msgstr ""
 
 #: ../../app/views/org_admin/sections/_form.html.erb:20
 msgid ""
-"You are about to delete '%{section_title}'. This will affect questions linked "
+"You are about to delete '%<section_title>s'. This will affect questions linked "
 "to this section. Are you sure?"
 msgstr ""
 
@@ -3255,7 +3255,7 @@ msgstr ""
 
 #: ../../app/views/org_admin/templates/_form.html.erb:25
 #: ../../app/views/org_admin/templates/_show.html.erb:35
-msgid "for internal %{org_name} use only"
+msgid "for internal %<org_name>s use only"
 msgstr ""
 
 #: ../../app/views/org_admin/templates/_form.html.erb:32
@@ -3413,21 +3413,21 @@ msgstr ""
 
 #: ../../app/views/org_admin/templates/index.html.erb:80
 #: ../../app/views/org_admin/templates/index.html.erb:93
-msgid "All (%{count})"
+msgid "All (%<count>s)"
 msgstr ""
 
 #: ../../app/views/org_admin/templates/index.html.erb:83
 #: ../../app/views/org_admin/templates/index.html.erb:96
-msgid "Published (%{count})"
+msgid "Published (%<count>s)"
 msgstr ""
 
 #: ../../app/views/org_admin/templates/index.html.erb:86
 #: ../../app/views/org_admin/templates/index.html.erb:99
-msgid "Unpublished (%{count})"
+msgid "Unpublished (%<count>s)"
 msgstr ""
 
 #: ../../app/views/org_admin/templates/index.html.erb:89
-msgid "Not customised (%{count})"
+msgid "Not customised (%<count>s)"
 msgstr ""
 
 #: ../../app/views/org_admin/templates/index.html.erb:118
@@ -3437,7 +3437,7 @@ msgstr ""
 #: ../../app/views/org_admin/users/edit.html.erb:4
 #: ../../app/views/super_admin/users/edit.html.erb:1
 #: ../../app/views/super_admin/users/edit.html.erb:5
-msgid "Editing profile for %{username}"
+msgid "Editing profile for %<username>s"
 msgstr ""
 
 #: ../../app/views/org_admin/users/edit.html.erb:5
@@ -3446,7 +3446,7 @@ msgid "View all users"
 msgstr ""
 
 #: ../../app/views/org_admin/users/plans.html.erb:3
-msgid "Plans of %{username}"
+msgid "Plans of %<username>s"
 msgstr ""
 
 #: ../../app/views/orgs/_departments.html.erb:1
@@ -3505,7 +3505,7 @@ msgstr ""
 #: ../../app/views/orgs/_merge_form.html.erb:7
 msgid ""
 "Please select the Organisation that will replace the current organisation: '<s"
-"trong>%{org_name}</strong>'."
+"trong>%<org_name>s</strong>'."
 msgstr ""
 
 #: ../../app/views/orgs/_merge_form.html.erb:8
@@ -3680,12 +3680,12 @@ msgstr ""
 
 #: ../../app/views/paginable/api_clients/_index.html.erb:44
 msgid ""
-"You are about to delete '%{client_name}'. They will no longer be able to acces"
+"You are about to delete '%<client_name>s'. They will no longer be able to acces"
 "s the API. Are you sure?"
 msgstr ""
 
 #: ../../app/views/paginable/contributors/_index.html.erb:57
-msgid "You are about to delete '%{contributor_name}'. Are you sure?"
+msgid "You are about to delete '%<contributor_name>s'. Are you sure?"
 msgstr ""
 
 #: ../../app/views/paginable/departments/_index.html.erb:5
@@ -3699,7 +3699,7 @@ msgstr ""
 
 #: ../../app/views/paginable/departments/_index.html.erb:28
 msgid ""
-"You are about to delete '%{department_name}'. This will affect guidance. Are y"
+"You are about to delete '%<department_name>s'. This will affect guidance. Are y"
 "ou sure?"
 msgstr ""
 
@@ -3741,12 +3741,12 @@ msgstr ""
 
 #: ../../app/views/paginable/guidance_groups/_index.html.erb:50
 msgid ""
-"You are about to delete '%{guidance_group_name}'. This will affect guidance. A"
+"You are about to delete '%<guidance_group_name>s'. This will affect guidance. A"
 "re you sure?"
 msgstr ""
 
 #: ../../app/views/paginable/guidances/_index.html.erb:62
-msgid "You are about to delete '%{guidance_summary}'. Are you sure?"
+msgid "You are about to delete '%<guidance_summary>s'. Are you sure?"
 msgstr ""
 
 #: ../../app/views/paginable/notifications/_index.html.erb:5
@@ -3783,7 +3783,7 @@ msgid "Managed"
 msgstr ""
 
 #: ../../app/views/paginable/orgs/_index.html.erb:35
-msgid "You are about to delete '%{org_name}'. Are you sure?"
+msgid "You are about to delete '%<org_name>s'. Are you sure?"
 msgstr ""
 
 #: ../../app/views/paginable/plans/_org_admin.html.erb:3
@@ -3933,7 +3933,7 @@ msgstr ""
 
 #: ../../app/views/paginable/templates/_customisable.html.erb:69
 msgid ""
-"Are you sure you want to remove your customization of \"%{template_title}\"? Any"
+"Are you sure you want to remove your customization of \"%<template_title>s\"? Any"
 " published versions will become unavailable to users."
 msgstr ""
 
@@ -3951,7 +3951,7 @@ msgstr ""
 
 #: ../../app/views/paginable/templates/_organisational.html.erb:76
 msgid ""
-"Are you sure you want to remove \"%{template_title}\"? Any published versions wi"
+"Are you sure you want to remove \"%<template_title>s\"? Any published versions wi"
 "ll become unavailable to users."
 msgstr ""
 
@@ -4103,7 +4103,7 @@ msgstr ""
 #: ../../app/views/plans/_download_form.html.erb:119
 msgid ""
 "Download Plan <em class=\"sr-only\">(new window)</em><span class=\"new-window-pop"
-"up-info\">%{open_in_new_window_text}</span>"
+"up-info\">%<open_in_new_window_text>s</span>"
 msgstr ""
 
 #: ../../app/views/plans/_edit_details.html.erb:13
@@ -4113,7 +4113,7 @@ msgstr ""
 
 #: ../../app/views/plans/_guidance_selection.html.erb:6
 msgid ""
-"To help you write your plan, %{application_name} can show you guidance from a "
+"To help you write your plan, %<application_name>s can show you guidance from a "
 "variety of organisations."
 msgstr ""
 
@@ -4135,7 +4135,7 @@ msgstr ""
 
 #: ../../app/views/plans/_guidance_selection.html.erb:40
 msgid ""
-"To help you write your plan, %{application_name} can show you guidance from a "
+"To help you write your plan, %<application_name>s can show you guidance from a "
 "variety of organisations. Please choose up to 6 organisations of the following"
 " organisations who offer guidance relevant to your plan."
 msgstr ""
@@ -4162,16 +4162,16 @@ msgstr ""
 
 #: ../../app/views/plans/_overview_details.html.erb:9
 msgid ""
-"This plan is based on the \"%{template_title}\" template provided by %{org_name}"
+"This plan is based on the \"%<template_title>s\" template provided by %<org_name>s"
 "."
 msgstr ""
 
 #: ../../app/views/plans/_overview_details.html.erb:17
-msgid "Template version %{template_version}, published on %{published_date}"
+msgid "Template version %<template_version>s, published on %<published_date>s"
 msgstr ""
 
 #: ../../app/views/plans/_overview_details.html.erb:42
-msgid "%{phase_title} (%{sections_size} %{sections}, %{questions_size} %{questions})"
+msgid "%<phase_title>s (%<sections_size>s %<sections>s, %<questions_size>s %<questions>s)"
 msgstr ""
 
 #: ../../app/views/plans/_overview_details.html.erb:43
@@ -4275,7 +4275,7 @@ msgstr ""
 #: ../../app/views/plans/_share_form.html.erb:9
 msgid ""
 "Public or organisational visibility is intended for finished plans. You must a"
-"nswer at least %{percentage}%% of the questions to enable these options. Note:"
+"nswer at least %<percentage>s%% of the questions to enable these options. Note:"
 " test plans are set to private visibility by default."
 msgstr ""
 
@@ -4357,7 +4357,7 @@ msgid "Click the 'Create plan' button below to begin."
 msgstr ""
 
 #: ../../app/views/plans/index.html.erb:35
-msgid "%{org_title} Plans"
+msgid "%<org_title>s Plans"
 msgstr ""
 
 #: ../../app/views/plans/index.html.erb:36
@@ -4429,7 +4429,7 @@ msgstr ""
 
 #: ../../app/views/public_pages/plan_index.html.erb:8
 msgid ""
-"Public DMPs are plans created using the %{application_name} service and shared"
+"Public DMPs are plans created using the %<application_name>s service and shared"
 " publicly by their owners. They are not vetted for quality, completeness, or a"
 "dherence to funder guidelines."
 msgstr ""
@@ -4479,7 +4479,7 @@ msgid "terms and conditions"
 msgstr ""
 
 #: ../../app/views/shared/_create_plan_modal.html.erb:8
-msgid "Would you like to create a plan based on the \"%{name}\" template?"
+msgid "Would you like to create a plan based on the \"%<name>s\" template?"
 msgstr ""
 
 #: ../../app/views/shared/_links.html.erb:7
@@ -4533,7 +4533,7 @@ msgstr ""
 
 #: ../../app/views/shared/export/_plan_coversheet.erb:3
 #: ../../app/views/shared/export/_plan_txt.erb:65
-msgid "A Data Management Plan created using %{application_name}"
+msgid "A Data Management Plan created using %<application_name>s"
 msgstr ""
 
 #: ../../app/views/shared/export/_plan_coversheet.erb:10
@@ -4595,7 +4595,7 @@ msgstr ""
 
 #: ../../app/views/static_pages/about_us.html.erb:1
 #: ../../app/views/static_pages/about_us.html.erb:4
-msgid "About %{application_name}"
+msgid "About %<application_name>s"
 msgstr ""
 
 #: ../../app/views/static_pages/about_us.html.erb:11
@@ -4651,7 +4651,7 @@ msgstr ""
 #: ../../app/views/static_pages/about_us.html.erb:22
 msgid ""
 "get involved<em class=\"sr-only\"> (new window)</em><span class=\"new-window-popu"
-"p-info\">%{open_in_new_window_text}</span>"
+"p-info\">%<open_in_new_window_text>s</span>"
 msgstr ""
 
 #: ../../app/views/static_pages/about_us.html.erb:28
@@ -4671,7 +4671,7 @@ msgid "If you have an account please sign in and start creating or editing your
 msgstr ""
 
 #: ../../app/views/static_pages/about_us.html.erb:34
-msgid "If you do not have a %{application_name} account, click on"
+msgid "If you do not have a %<application_name>s account, click on"
 msgstr ""
 
 #: ../../app/views/static_pages/about_us.html.erb:34
@@ -4836,33 +4836,33 @@ msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:11
 msgid ""
-"The information you provide will be used by the %{org_name} to offer you acces"
-"s to and personalisation of the %{application_name} service."
+"The information you provide will be used by the %<org_name>s to offer you acces"
+"s to and personalisation of the %<application_name>s service."
 msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:13
 msgid ""
-"The %{org_name} processes the personal data of %{application_name} users in or"
-"der to deliver and improve the %{application_name} service in a customised man"
+"The %<org_name>s processes the personal data of %<application_name>s users in or"
+"der to deliver and improve the %<application_name>s service in a customised man"
 "ner and to ensure each user receives relevant information."
 msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:15
 msgid ""
-"The processing of your personal data by the %{org_name} is necessary for pursu"
+"The processing of your personal data by the %<org_name>s is necessary for pursu"
 "ing the following legitimate interests:"
 msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:18
 msgid ""
-"To provide access to the %{application_name} service and personalisation of yo"
+"To provide access to the %<application_name>s service and personalisation of yo"
 "ur user experience e.g. provision of relevant templates and guidance for your "
 "organisation."
 msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:20
 msgid ""
-"To keep you up to date with news about %{application_name} such as new feature"
+"To keep you up to date with news about %<application_name>s such as new feature"
 "s or improvements, or changes to our Privacy Policy."
 msgstr ""
 
@@ -4873,20 +4873,20 @@ msgstr ""
 #: ../../app/views/static_pages/privacy.html.erb:24
 msgid ""
 "We will hold the personal data you provided us for as long as you continue usi"
-"ng the %{application_name} service. Your personal data can be removed from thi"
-"s service upon request to the %{application_name} team within a period of 30 d"
+"ng the %<application_name>s service. Your personal data can be removed from thi"
+"s service upon request to the %<application_name>s team within a period of 30 d"
 "ays."
 msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:26
 msgid ""
-"If you have any questions, please contact the %{application_name} team at: <a "
-"href='mailto:%{helpdesk_email}'>%{helpdesk_email}</a>"
+"If you have any questions, please contact the %<application_name>s team at: <a "
+"href='mailto:%<helpdesk_email>s'>%<helpdesk_email>s</a>"
 msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:30
 msgid ""
-"This statement was last revised on %{revdate} and may be revised at any time w"
+"This statement was last revised on %<revdate>s and may be revised at any time w"
 "ith prior notice."
 msgstr ""
 
@@ -4954,7 +4954,7 @@ msgid ""
 "ookies and how we use them is available on the <a target='_blank' href='http:/"
 "/www.dcc.ac.uk/about-us/about-site/website-terms-use/cookies' class=\"has-new-w"
 "indow-popup-info\">main DCC website<em class=\"sr-only\"> (new window)</em><span "
-"class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>.</p>\n"
+"class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a>.</p>\n"
 "\n"
 "      <h3>Third party APIs</h3>\n"
 "\n"
@@ -4999,7 +4999,7 @@ msgid "Email credentials to contact"
 msgstr ""
 
 #: ../../app/views/super_admin/api_clients/_form.html.erb:81
-msgid "Are you sure you want to delete the API client: \"%{name}\""
+msgid "Are you sure you want to delete the API client: \"%<name>s\""
 msgstr ""
 
 #: ../../app/views/super_admin/api_clients/edit.html.erb:1
@@ -5016,7 +5016,7 @@ msgid "View all API clients"
 msgstr ""
 
 #: ../../app/views/super_admin/api_clients/email_credentials.js.erb:1
-msgid "The credentials have been sent to %{email}."
+msgid "The credentials have been sent to %<email>s."
 msgstr ""
 
 #: ../../app/views/super_admin/api_clients/index.html.erb:1
@@ -5061,7 +5061,7 @@ msgid "Body"
 msgstr ""
 
 #: ../../app/views/super_admin/notifications/_form.html.erb:71
-msgid "Are you sure you want to delete the notification \"%{title}\""
+msgid "Are you sure you want to delete the notification \"%<title>s\""
 msgstr ""
 
 #: ../../app/views/super_admin/notifications/edit.html.erb:1
@@ -5087,7 +5087,7 @@ msgid "New Notification"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:9
-msgid "Merging '%{from_org_name}' into '%{to_org_name}'"
+msgid "Merging '%<from_org_name>s' into '%<to_org_name>s'"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:11
@@ -5096,7 +5096,7 @@ msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:12
 msgid ""
-"Counts of '%{to_org_name}' records before and after a merge with %{from_org_na"
+"Counts of '%<to_org_name>s' records before and after a merge with %{from_org_na"
 "me}."
 msgstr ""
 
@@ -5106,11 +5106,11 @@ msgid "Record Type"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:18
-msgid "'%{to_org_name}' Count - before merge"
+msgid "'%<to_org_name>s' Count - before merge"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:19
-msgid "'%{to_org_name}' Count - after merge"
+msgid "'%<to_org_name>s' Count - after merge"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:38
@@ -5120,17 +5120,17 @@ msgstr ""
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:39
 msgid ""
 "The table below shows the specific changes that will occur during the merge pr"
-"ocess. Once the merge is complete, '%{from_org_name}' will be deleted. You can"
+"ocess. Once the merge is complete, '%<from_org_name>s' will be deleted. You can"
 " then consolidate/correct any merge issues (e.g. remove any departments that w"
 "ere duplicated)"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:45
-msgid "%{from_org_name} - Before"
+msgid "%<from_org_name>s - Before"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:46
-msgid "%{to_org_name} - Before"
+msgid "%<to_org_name>s - Before"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:61
@@ -5155,7 +5155,7 @@ msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:95
 msgid ""
-"Warning: '%{from_org_name}' has Plans that are currently in the review process"
+"Warning: '%<from_org_name>s' has Plans that are currently in the review process"
 ". The Org admins may not be able to see these plans after the merge!"
 msgstr ""
 
@@ -5178,7 +5178,7 @@ msgid "New organisation"
 msgstr ""
 
 #: ../../app/views/super_admin/themes/_form.html.erb:17
-msgid "Are you sure you want to delete the theme \"%{title}\"?"
+msgid "Are you sure you want to delete the theme \"%<title>s\"?"
 msgstr ""
 
 #: ../../app/views/super_admin/themes/edit.html.erb:3
@@ -5206,7 +5206,7 @@ msgstr ""
 
 #: ../../app/views/super_admin/users/edit.html.erb:64
 msgid ""
-"You are about to archive %{user_name}.  This will remove their personal inform"
+"You are about to archive %<user_name>s.  This will remove their personal inform"
 "ation, but retain their plans, answers, and comments.  They will be unable to "
 "sign-in. Are you sure?"
 msgstr ""
@@ -5306,75 +5306,75 @@ msgstr ""
 #: ../../app/views/user_mailer/permissions_change_notification.html.erb:2
 #: ../../app/views/user_mailer/plan_visibility.html.erb:2
 #: ../../app/views/user_mailer/sharing_notification.html.erb:2
-msgid "Hello %{username}"
+msgid "Hello %<username>s"
 msgstr ""
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:6
-msgid "You have been granted administrator privileges in %{tool_name}:"
+msgid "You have been granted administrator privileges in %<tool_name>s:"
 msgstr ""
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:13
-msgid "You have been revoked administrator privileges in %{tool_name}."
+msgid "You have been revoked administrator privileges in %<tool_name>s."
 msgstr ""
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:17
 msgid ""
-"More information about administering the %{tool_name} for users at your organi"
-"sation is available at the %{help_url}."
+"More information about administering the %<tool_name>s for users at your organi"
+"sation is available at the %<help_url>s."
 msgstr ""
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:2
-msgid "Hello %{name},"
+msgid "Hello %<name>s,"
 msgstr ""
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:8
-msgid "Please use the following credentials when accessing the %{tool_name} API."
+msgid "Please use the following credentials when accessing the %<tool_name>s API."
 msgstr ""
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:23
-msgid "Please refer to the API documentation at: %{api_documentation_url}"
+msgid "Please refer to the API documentation at: %<api_documentation_url>s"
 msgstr ""
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:29
 msgid ""
-"Do not share these credentials. They for use with the %{external_application} "
+"Do not share these credentials. They for use with the %<external_application>s "
 "application. If you do share your credentials with another application we rese"
 "rve the right to revoke your access to the API."
 msgstr ""
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:34
 msgid ""
-"If you did not request access to the %{tool_name} API or did not request for y"
-"our credentials to be renewed, please contact us at %{helpdesk_email}"
+"If you did not request access to the %<tool_name>s API or did not request for y"
+"our credentials to be renewed, please contact us at %<helpdesk_email>s"
 msgstr ""
 
 #: ../../app/views/user_mailer/feedback_complete.html.erb:2
-msgid "Hello %{recipient_name}"
+msgid "Hello %<recipient_name>s"
 msgstr ""
 
 #: ../../app/views/user_mailer/feedback_complete.html.erb:5
 msgid ""
-"%{commenter} has finished providing feedback on the plan  \"%{link_html}\". Comm"
+"%<commenter>s has finished providing feedback on the plan  \"%<link_html>s\". Comm"
 "ents can be found in the 'Write plan' tab on the right side of the page (Guida"
 "nce/Comments)."
 msgstr ""
 
 #: ../../app/views/user_mailer/feedback_notification.html.erb:2
-msgid "Hello %{user_name},"
+msgid "Hello %<user_name>s,"
 msgstr ""
 
 #: ../../app/views/user_mailer/feedback_notification.html.erb:5
 msgid ""
-"%{requestor} has requested feedback on a plan %{link_html}. To add comments, p"
-"lease visit the 'Plans' page under the Admin menu in %{tool_name} and open the"
+"%<requestor>s has requested feedback on a plan %<link_html>s. To add comments, p"
+"lease visit the 'Plans' page under the Admin menu in %<tool_name>s and open the"
 " plan."
 msgstr ""
 
 #: ../../app/views/user_mailer/new_comment.html.erb:5
 msgid ""
-"%{commenter_name} has commented on your plan %{plan_title}. To view the commen"
+"%<commenter_name>s has commented on your plan %<plan_title>s. To view the commen"
 "ts, follow the link to the DMP below, or navigate to the plan via My Dashboard"
-" page in %{tool_name}."
+" page in %<tool_name>s."
 msgstr ""
 
 #: ../../app/views/user_mailer/new_comment.html.erb:10
@@ -5388,21 +5388,21 @@ msgid ""
 msgstr ""
 
 #: ../../app/views/user_mailer/new_comment.html.erb:15
-msgid "DMP: %{phase_link}"
+msgid "DMP: %<phase_link>s"
 msgstr ""
 
 #: ../../app/views/user_mailer/new_comment.html.erb:18
-msgid "Section name: %{section_title}"
+msgid "Section name: %<section_title>s"
 msgstr ""
 
 #: ../../app/views/user_mailer/new_comment.html.erb:21
-msgid "Question: %{question_number}"
+msgid "Question: %<question_number>s"
 msgstr ""
 
 #: ../../app/views/user_mailer/permissions_change_notification.html.erb:5
 msgid ""
-"Your permissions relating to %{plan_title} have changed. You now have %{type} "
-"access. This means you can %{placeholder1} %{placeholder2}"
+"Your permissions relating to %<plan_title>s have changed. You now have %<type>s "
+"access. This means you can %<placeholder1>s %<placeholder2>s"
 msgstr ""
 
 #: ../../app/views/user_mailer/plan_access_removed.html.erb:2
@@ -5418,7 +5418,7 @@ msgid " has been removed by "
 msgstr ""
 
 #: ../../app/views/user_mailer/plan_visibility.html.erb:5
-msgid "The plan %{plan_title} had its visibility changed to %{plan_visibility}."
+msgid "The plan %<plan_title>s had its visibility changed to %<plan_visibility>s."
 msgstr ""
 
 #: ../../app/views/user_mailer/plan_visibility.html.erb:9
@@ -5436,11 +5436,11 @@ msgstr ""
 #: ../../app/views/user_mailer/plan_visibility.html.erb:17
 msgid ""
 "If you have questions pertaining to this action, please visit the My Dashboard"
-" page in %{tool_name}"
+" page in %<tool_name>s"
 msgstr ""
 
 #: ../../app/views/user_mailer/question_answered.html.erb:2
-msgid "Hello %{recipient_name},"
+msgid "Hello %<recipient_name>s,"
 msgstr ""
 
 #: ../../app/views/user_mailer/question_answered.html.erb:5
@@ -5461,18 +5461,19 @@ msgstr ""
 
 #: ../../app/views/user_mailer/sharing_notification.html.erb:5
 msgid ""
-"Your colleague %{inviter_name} has invited you to contribute to
\n"
+"Your colleague %<inviter_name>s has invited you to contribute to
+\n"%<tool_name>s
 "          their Data Management Plan in %{tool_name}"
 msgstr ""
 
-#: ../../app/views/user_mailer/welcome_notification.html.erb:2
+#: ../../app/views%<tool_name>s/w%<username>sfication.html.erb:2
 msgid "Welcome to %{tool_name}, %{username}"
 msgstr ""
 
 #: ../../app/views/user_mailer/welcome_notification.html.erb:5
-msgid ""
+m%<tool_name>s
 "%{tool_name} will help you to develop your Data Management Plan. If you have a"
-"ny queries or feedback as you use the tool, please contact us at %{helpdesk_em"
+"ny queries or %<contact_us>sou use the tool, please contact us at %{helpdesk_em"
 "ail} or visit %{contact_us}"
 msgstr ""
 
@@ -5480,7 +5481,7 @@ msgstr ""
 msgid "You may change your notification preferences on your profile page."
 msgstr ""
 
-#: ../../app/views/users/_admin_grant_permissions.html.erb:9
+#: ../../app/views/users/_admi%<username>smissions.html.erb:9
 msgid "Editing privileges for %{username}"
 msgstr ""
 
diff --git a/config/locale/de/app.po b/config/locale/de/app.po
index 4aaadf0be7..f8ad67ba3c 100644
--- a/config/locale/de/app.po
+++ b/config/locale/de/app.po
@@ -20,16 +20,16 @@ msgstr ""
 
 #: ../../app/controllers/answers_controller.rb:24
 msgid ""
-"There is no question with id %{question_id} associated to plan id %{plan_id} f"
+"There is no question with id %<question_id>s associated to plan id %<plan_id>s f"
 "or which to create or update an answer"
 msgstr ""
-"Es gibt keine Frage mit der ID %{question_id}, die der Plan-ID %{plan_id} zuge"
+"Es gibt keine Frage mit der ID %<question_id>s, die der Plan-ID %<plan_id>s zuge"
 "ordnet ist, für die eine Antwort erstellt oder aktualisiert werden soll"
 
 #: ../../app/controllers/answers_controller.rb:34
-msgid "There is no plan with id %{id} for which to create or update an answer"
+msgid "There is no plan with id %<id>s for which to create or update an answer"
 msgstr ""
-"Es gibt keinen Plan mit der ID %{id}, für den eine Antwort erstellt oder aktua"
+"Es gibt keinen Plan mit der ID %<id>s, für den eine Antwort erstellt oder aktua"
 "lisiert werden soll"
 
 #: ../../app/controllers/api/v0/base_controller.rb:124
@@ -139,12 +139,12 @@ msgid "You need to sign in or sign up before continuing."
 msgstr "Bitte melden Sie sich an oder registrieren Sie sich bevor Sie fortfahren."
 
 #: ../../app/controllers/application_controller.rb:100
-msgid "Unable to %{action} the %{object}.%{errors}"
-msgstr "Kann nicht %{action} die %{object}. %{errors}"
+msgid "Unable to %<action>s the %<object>s.%<errors>s"
+msgstr "Kann nicht %<action>s die %<object>s. %<errors>s"
 
 #: ../../app/controllers/application_controller.rb:108
-msgid "Successfully %{action} the %{object}."
-msgstr "Erfolgreich %{action} das %{object}."
+msgid "Successfully %<action>s the %<object>s."
+msgstr "Erfolgreich %<action>s das %<object>s."
 
 #: ../../app/controllers/application_controller.rb:123
 msgid "API client"
@@ -207,8 +207,8 @@ msgid "Restricted access to View All the records"
 msgstr "Eingeschränkter Zugriff auf Alle Datensätze anzeigen"
 
 #: ../../app/controllers/concerns/paginable.rb:180
-msgid "Sort by %{sort_field}"
-msgstr "Sortieren nach %{sort_field}"
+msgid "Sort by %<sort_field>s"
+msgstr "Sortieren nach %<sort_field>s"
 
 #: ../../app/controllers/concerns/template_methods.rb:10
 msgid "customisation"
@@ -417,12 +417,12 @@ msgstr ""
 "ur Verfügung."
 
 #: ../../app/controllers/identifiers_controller.rb:18
-msgid "Successfully unlinked your account from %{is}."
-msgstr "Ihr Konto wurde erfolgreich von %{is} getrennt."
+msgid "Successfully unlinked your account from %<is>s."
+msgstr "Ihr Konto wurde erfolgreich von %<is>s getrennt."
 
 #: ../../app/controllers/identifiers_controller.rb:22
-msgid "Unable to unlink your account from %{is}."
-msgstr "Das Aufheben der Verknüpfung Ihres Kontos von %{is} ist nicht möglich."
+msgid "Unable to unlink your account from %<is>s."
+msgstr "Das Aufheben der Verknüpfung Ihres Kontos von %<is>s ist nicht möglich."
 
 #: ../../app/controllers/org_admin/phases_controller.rb:18
 #: ../../app/controllers/org_admin/templates_controller.rb:114
@@ -472,9 +472,9 @@ msgid "update"
 msgstr "Aktualisierung"
 
 #: ../../app/controllers/org_admin/plans_controller.rb:32
-msgid "%{plan_owner} has been notified that you have finished providing feedback"
+msgid "%<plan_owner>s has been notified that you have finished providing feedback"
 msgstr ""
-"%{plan_owner} wurde informiert, dass Sie Ihre Rückmeldungen abgeschlossen habe"
+"%<plan_owner>s wurde informiert, dass Sie Ihre Rückmeldungen abgeschlossen habe"
 "n."
 
 #: ../../app/controllers/org_admin/plans_controller.rb:38
@@ -570,8 +570,8 @@ msgstr "Alle Vorlagen"
 
 #: ../../app/controllers/org_admin/templates_controller.rb:48
 #: ../../app/views/org_admin/templates/index.html.erb:52
-msgid "%{org_name} Templates"
-msgstr "Vorlagen der/des %{org_name} "
+msgid "%<org_name>s Templates"
+msgstr "Vorlagen der/des %<org_name>s "
 
 #: ../../app/controllers/org_admin/templates_controller.rb:50
 #: ../../app/views/org_admin/templates/index.html.erb:54
@@ -583,15 +583,15 @@ msgid "Customizable Templates"
 msgstr "Anpassbare Vorlagen"
 
 #: ../../app/controllers/org_admin/templates_controller.rb:214
-msgid "Error parsing links for a %{template}"
-msgstr "Fehler beim Analysieren von Links für eine %{template}"
+msgid "Error parsing links for a %<template>s"
+msgstr "Fehler beim Analysieren von Links für eine %<template>s"
 
 #: ../../app/controllers/org_admin/templates_controller.rb:345
 #: ../../app/controllers/public_pages_controller.rb:68
-msgid "Template created using the %{application_name} service. Last modified %{date}"
+msgid "Template created using the %<application_name>s service. Last modified %<date>s"
 msgstr ""
-"Vorlage, die mit dem Service %{application_name} erstellt wurde. Zuletzt geänd"
-"ert %{date}"
+"Vorlage, die mit dem Service %<application_name>s erstellt wurde. Zuletzt geänd"
+"ert %<date>s"
 
 #: ../../app/controllers/org_admin/templates_controller.rb:360
 #: ../../app/controllers/public_pages_controller.rb:83
@@ -611,8 +611,8 @@ msgid "Please choose an organisation"
 msgstr "Bitte wählen Sie eine Organisation"
 
 #: ../../app/controllers/plan_exports_controller.rb:85
-msgid "Created using %{application_name}. Last modified %{date}"
-msgstr "Erstellt mit %{application_name}. Zuletzt geändert am %{date}"
+msgid "Created using %<application_name>s. Last modified %<date>s"
+msgstr "Erstellt mit %<application_name>s. Zuletzt geändert am %<date>s"
 
 #: ../../app/controllers/plans_controller.rb:51
 msgid "This is a"
@@ -653,15 +653,15 @@ msgstr "Kopiert"
 
 #: ../../app/controllers/plans_controller.rb:408
 msgid ""
-"Unable to change the plan's status since it is needed at least %{percentage} p"
+"Unable to change the plan's status since it is needed at least %<percentage>s p"
 "ercentage responded"
 msgstr ""
-"Der Status des Plans konnte nicht geändert werden, da mindestens %{percentage}"
+"Der Status des Plans konnte nicht geändert werden, da mindestens %<percentage>s"
 " Prozentsatz angefordert wurde"
 
 #: ../../app/controllers/plans_controller.rb:416
-msgid "Unable to find plan id %{plan_id}"
-msgstr "Plan-ID konnte nicht gefunden werden %{plan_id}"
+msgid "Unable to find plan id %<plan_id>s"
+msgstr "Plan-ID konnte nicht gefunden werden %<plan_id>s"
 
 #: ../../app/controllers/plans_controller.rb:433
 msgid "Your project is now a test."
@@ -676,18 +676,18 @@ msgid "Unable to change the plan's test status"
 msgstr "Der Teststatus des Plans konnte nicht geändert werden"
 
 #: ../../app/controllers/plans_controller.rb:451
-msgid "There is no plan associated with id %{id}"
-msgstr "Es ist kein Plan mit id %{id} verbunden"
+msgid "There is no plan associated with id %<id>s"
+msgstr "Es ist kein Plan mit id %<id>s verbunden"
 
 #: ../../app/controllers/registrations_controller.rb:35
 msgid ""
 "Please make a choice below. After linking your\n"
-"                       details to a %{application_name} account,\n"
+"                       details to a %<application_name>s account,\n"
 "                       you will be able to sign in directly with your\n"
 "                       institutional credentials."
 msgstr ""
 "Bitte treffen Sie unten eine Auswahl. Nach dem Verlinken Ihres\n"
-"                       Details zu einem %{application_name}-Konto,\n"
+"                       Details zu einem %<application_name>s-Konto,\n"
 "                       Sie können sich direkt mit Ihrem anmelden\n"
 "                       institutionelle Referenzen."
 
@@ -768,15 +768,15 @@ msgstr "Passwort und Bestätigung müssen übereinstimmen"
 
 #: ../../app/controllers/roles_controller.rb:26
 msgid ""
-"Cannot share plan with %{email} since that email matches with the owner of the"
+"Cannot share plan with %<email>s since that email matches with the owner of the"
 " plan."
 msgstr ""
-"Plan kann nicht mit %{email} geteilt werden, da diese E-Mail mit dem Eigentüme"
+"Plan kann nicht mit %<email>s geteilt werden, da diese E-Mail mit dem Eigentüme"
 "r des Plans übereinstimmt."
 
 #: ../../app/controllers/roles_controller.rb:37
-msgid "Plan is already shared with %{email}."
-msgstr "Der Plan wurde bereits mit %{email} geteilt."
+msgid "Plan is already shared with %<email>s."
+msgstr "Der Plan wurde bereits mit %<email>s geteilt."
 
 #: ../../app/controllers/roles_controller.rb:44
 #: ../../app/views/shared/_create_account_form.html.erb:4
@@ -788,12 +788,12 @@ msgid "Surname"
 msgstr "Nachname"
 
 #: ../../app/controllers/roles_controller.rb:48
-msgid "Invitation to %{email} issued successfully."
-msgstr "Einladung zu %{email} erfolgreich ausgestellt."
+msgid "Invitation to %<email>s issued successfully."
+msgstr "Einladung zu %<email>s erfolgreich ausgestellt."
 
 #: ../../app/controllers/roles_controller.rb:53
-msgid "Plan shared with %{email}."
-msgstr "Plan geteilt mit %{email}."
+msgid "Plan shared with %<email>s."
+msgstr "Plan geteilt mit %<email>s."
 
 #: ../../app/controllers/roles_controller.rb:68
 msgid "You must provide a valid email address and select a permission level."
@@ -807,10 +807,10 @@ msgstr "Bitte geben Sie eine E-mail-Adresse ein"
 
 #: ../../app/controllers/roles_controller.rb:93
 msgid ""
-"Successfully changed the permissions for %{email}. They have been notified via"
+"Successfully changed the permissions for %<email>s. They have been notified via"
 " email."
 msgstr ""
-"Die Berechtigungen für %{email} wurden erfolgreich geändert. Sie wurden per E-"
+"Die Berechtigungen für %<email>s wurden erfolgreich geändert. Sie wurden per E-"
 "Mail benachrichtigt."
 
 #: ../../app/controllers/roles_controller.rb:108
@@ -844,8 +844,8 @@ msgstr ""
 "en."
 
 #: ../../app/controllers/super_admin/api_clients_controller.rb:45
-msgid ". The API credentials have been emailed to %{email}"
-msgstr ". Die API-Anmeldeinformationen wurden per E-Mail an %{email} gesendet."
+msgid ". The API credentials have been emailed to %<email>s"
+msgstr ". Die API-Anmeldeinformationen wurden per E-Mail an %<email>s gesendet."
 
 #: ../../app/controllers/super_admin/notifications_controller.rb:69
 msgid "Your notification is now active."
@@ -860,16 +860,16 @@ msgid "Unable to change the notification's active status"
 msgstr "Der aktive Status der Benachrichtigung kann nicht geändert werden"
 
 #: ../../app/controllers/super_admin/notifications_controller.rb:104
-msgid "There is no notification associated with id  %{id}"
-msgstr "Mit der ID %{id} ist keine Benachrichtigung verknüpft"
+msgid "There is no notification associated with id  %<id>s"
+msgstr "Mit der ID %<id>s ist keine Benachrichtigung verknüpft"
 
 #: ../../app/controllers/super_admin/org_swaps_controller.rb:22
 msgid ""
 "Your organisation affiliation has been changed. You may now edit templates for"
-" %{org_name}."
+" %<org_name>s."
 msgstr ""
 "Ihre Organisationszugehörigkeit wurde geändert. Sie können jetzt Vorlagen für "
-"%{org_name} bearbeiten."
+"%<org_name>s bearbeiten."
 
 #: ../../app/controllers/super_admin/org_swaps_controller.rb:25
 msgid "Unable to change your organisation affiliation at this time."
@@ -934,16 +934,16 @@ msgid "Successfully signed in"
 msgstr "Erfolgreich angemeldet"
 
 #: ../../app/controllers/users/omniauth_callbacks_controller.rb:56
-msgid "Your account has been successfully linked to %{scheme}."
-msgstr "Ihr Konto wurde erfolgreich mit %{scheme} verknüpft."
+msgid "Your account has been successfully linked to %<scheme>s."
+msgstr "Ihr Konto wurde erfolgreich mit %<scheme>s verknüpft."
 
 #: ../../app/controllers/users/omniauth_callbacks_controller.rb:61
-msgid "Unable to link your account to %{scheme}."
-msgstr "Ihr Konto konnte nicht mit %{scheme} verknüpft werden."
+msgid "Unable to link your account to %<scheme>s."
+msgstr "Ihr Konto konnte nicht mit %<scheme>s verknüpft werden."
 
 #: ../../app/controllers/users_controller.rb:141
-msgid "Successfully %{action} %{username}'s account."
-msgstr "Erfolgreich %{action} %{username} Konto."
+msgid "Successfully %<action>s %<username>s's account."
+msgstr "Erfolgreich %<action>s %<username>s Konto."
 
 #: ../../app/controllers/users_controller.rb:142
 msgid "activated"
@@ -954,8 +954,8 @@ msgid "deactivated"
 msgstr "Deaktiviert"
 
 #: ../../app/controllers/users_controller.rb:149
-msgid "Unable to %{action} %{username}"
-msgstr "Kann nicht zu %{action} %{username}"
+msgid "Unable to %<action>s %<username>s"
+msgstr "Kann nicht zu %<action>s %<username>s"
 
 #: ../../app/controllers/users_controller.rb:150
 msgid "activate"
@@ -1027,18 +1027,18 @@ msgid "Creator:"
 msgstr "Erzeuger:"
 
 #: ../../app/helpers/feedbacks_helper.rb:6
-msgid "%{application_name}: Your plan has been submitted for feedback"
-msgstr "%{application_name}: Ihr Plan wurde für eine Rückmeldung abgeschickt"
+msgid "%<application_name>s: Your plan has been submitted for feedback"
+msgstr "%<application_name>s: Ihr Plan wurde für eine Rückmeldung abgeschickt"
 
 #: ../../app/helpers/feedbacks_helper.rb:10
 msgid ""
-"<p>Hello %{user_name}.</p><p>Your plan \"%{plan_name}\" has been submitted for f"
+"<p>Hello %<user_name>s.</p><p>Your plan \"%<plan_name>s\" has been submitted for f"
 "eedback from an\n"
 "      administrator at your organisation. If you have questions pertaining to "
 "this action, please contact us\n"
-"      at %{organisation_email}.</p>"
+"      at %<organisation_email>s.</p>"
 msgstr ""
-"<p>Hallo %{user_name}, </p><p> Ihr Plan \"%{plan_name}\" wurde zur Kommentierung"
+"<p>Hallo %<user_name>s, </p><p> Ihr Plan \"%<plan_name>s\" wurde zur Kommentierung"
 " an einen Administrator in Ihrer Organisation übermittelt. Wenn Sie diesbezügl"
 "ich Fragen haben sollten, kontaktieren Sie uns bitte über %{organisation_email"
 "}. </p>"
@@ -1074,14 +1074,14 @@ msgstr "lesen Sie den Plan und kommentieren Sie."
 
 #: ../../app/helpers/orgs_helper.rb:14
 msgid ""
-"<p>A data librarian from %{org_name} will respond to your request within 48\n"
+"<p>A data librarian from %<org_name>s will respond to your request within 48\n"
 "       hours. If you have questions pertaining to this action please contact u"
 "s\n"
-"       at %{organisation_email}.</p>"
+"       at %<organisation_email>s.</p>"
 msgstr ""
-"<p>Ein Daten-Experte vom %{org_name} wird innerhalb von 48 Stunden auf Ihre An"
+"<p>Ein Daten-Experte vom %<org_name>s wird innerhalb von 48 Stunden auf Ihre An"
 "frage antworten. Wenn Sie diesbezüglich Fragen haben sollten, kontaktieren Sie"
-" uns bitte über %{organisation_email}. </p>"
+" uns bitte über %<organisation_email>s. </p>"
 
 #: ../../app/helpers/perms_helper.rb:9
 msgid "Add organisations"
@@ -1214,16 +1214,16 @@ msgid "None"
 msgstr "Keiner"
 
 #: ../../app/helpers/super_admin/orgs/merge_helper.rb:31
-msgid "Guidance for: %{themes}"
-msgstr "Anleitung für: %{themes}"
+msgid "Guidance for: %<themes>s"
+msgstr "Anleitung für: %<themes>s"
 
 #: ../../app/helpers/super_admin/orgs/merge_helper.rb:53
 msgid "Nothing to merge"
 msgstr "Nichts zu verschmelzen"
 
 #: ../../app/helpers/super_admin/orgs/merge_helper.rb:55
-msgid "<p>The following %{object_types} will be moved over to '%{org_name}':</p>"
-msgstr "<p>Die folgenden %{object_types} werden in '%{org_name}' verschoben:</p>"
+msgid "<p>The following %<object_types>s will be moved over to '%<org_name>s':</p>"
+msgstr "<p>Die folgenden %<object_types>s werden in '%<org_name>s' verschoben:</p>"
 
 #: ../../app/helpers/template_helper.rb:46
 #: ../../app/views/plans/index.html.erb:29
@@ -1258,48 +1258,48 @@ msgstr "Letzte 12 Monate"
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:6
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:5
 #: ../../app/views/user_mailer/_email_signature.html.erb:2
-msgid "Query or feedback related to %{tool_name}"
-msgstr "Abfrage oder Feedback zu %{tool_name}"
+msgid "Query or feedback related to %<tool_name>s"
+msgstr "Abfrage oder Feedback zu %<tool_name>s"
 
 #: ../../app/mailers/user_mailer.rb:23
-msgid "Welcome to %{tool_name}"
-msgstr "Willkommen bei %{tool_name}"
+msgid "Welcome to %<tool_name>s"
+msgstr "Willkommen bei %<tool_name>s"
 
 #: ../../app/mailers/user_mailer.rb:58
-msgid "A Data Management Plan in %{tool_name} has been shared with you"
-msgstr "Ein Datenverwaltungsplan in %{tool_name} wurde mit Ihnen geteilt"
+msgid "A Data Management Plan in %<tool_name>s has been shared with you"
+msgstr "Ein Datenverwaltungsplan in %<tool_name>s wurde mit Ihnen geteilt"
 
 #: ../../app/mailers/user_mailer.rb:76
-msgid "Changed permissions on a Data Management Plan in %{tool_name}"
-msgstr "Berechtigungen für einen Datenverwaltungsplan in %{tool_name} geändert"
+msgid "Changed permissions on a Data Management Plan in %<tool_name>s"
+msgstr "Berechtigungen für einen Datenverwaltungsplan in %<tool_name>s geändert"
 
 #: ../../app/mailers/user_mailer.rb:92
-msgid "Permissions removed on a DMP in %{tool_name}"
-msgstr "Berechtigungen für ein DMP in %{tool_name} entfernt"
+msgid "Permissions removed on a DMP in %<tool_name>s"
+msgstr "Berechtigungen für ein DMP in %<tool_name>s entfernt"
 
 #: ../../app/mailers/user_mailer.rb:111
-msgid "%{user_name} has requested feedback on a %{tool_name} plan"
-msgstr "%{user_name} hat um Feedback zu einem %{tool_name}-Plan gebeten"
+msgid "%<user_name>s has requested feedback on a %<tool_name>s plan"
+msgstr "%<user_name>s hat um Feedback zu einem %<tool_name>s-Plan gebeten"
 
 #: ../../app/mailers/user_mailer.rb:134
-msgid "%{tool_name}: Expert feedback has been provided for %{plan_title}"
-msgstr "%{tool_name}: Es wurde Experten-Feedback für %{plan_title} gegeben."
+msgid "%<tool_name>s: Expert feedback has been provided for %<plan_title>s"
+msgstr "%<tool_name>s: Es wurde Experten-Feedback für %<plan_title>s gegeben."
 
 #: ../../app/mailers/user_mailer.rb:169
-msgid "DMP Visibility Changed: %{plan_title}"
-msgstr "DMP-Sichtbarkeit geändert: %{plan_title}"
+msgid "DMP Visibility Changed: %<plan_title>s"
+msgstr "DMP-Sichtbarkeit geändert: %<plan_title>s"
 
 #: ../../app/mailers/user_mailer.rb:200
-msgid "%{tool_name}: A new comment was added to %{plan_title}"
-msgstr "%{tool_name}: Ein neuer Kommentar wurde zu %{plan_title} hinzugefügt."
+msgid "%<tool_name>s: A new comment was added to %<plan_title>s"
+msgstr "%<tool_name>s: Ein neuer Kommentar wurde zu %<plan_title>s hinzugefügt."
 
 #: ../../app/mailers/user_mailer.rb:218
-msgid "Administrator privileges granted in %{tool_name}"
-msgstr "Administratorrechte in erteilt %{tool_name}"
+msgid "Administrator privileges granted in %<tool_name>s"
+msgstr "Administratorrechte in erteilt %<tool_name>s"
 
 #: ../../app/mailers/user_mailer.rb:235
-msgid "%{tool_name} API changes"
-msgstr "%{tool_name} API-Änderungen"
+msgid "%<tool_name>s API changes"
+msgstr "%<tool_name>s API-Änderungen"
 
 #: ../../app/models/concerns/exportable_plan.rb:26
 msgid "Phase"
@@ -1331,12 +1331,12 @@ msgid "Creators: "
 msgstr "Erzeuger:"
 
 #: ../../app/models/concerns/exportable_plan.rb:134
-msgid "%{authors}"
-msgstr "%{authors}"
+msgid "%<authors>s"
+msgstr "%<authors>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:135
-msgid "%{affiliation}"
-msgstr "%{affiliation}"
+msgid "%<affiliation>s"
+msgstr "%<affiliation>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:137
 #: ../../app/models/concerns/exportable_plan.rb:139
@@ -1347,12 +1347,12 @@ msgid "Template: "
 msgstr "Vorlage:"
 
 #: ../../app/models/concerns/exportable_plan.rb:137
-msgid "%{funder}"
-msgstr "%{funder}"
+msgid "%<funder>s"
+msgstr "%<funder>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:139
-msgid "%{template}"
-msgstr "%{template}"
+msgid "%<template>s"
+msgstr "%<template>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:142
 #: ../../app/views/shared/export/_plan_txt.erb:12
@@ -1360,8 +1360,8 @@ msgid "Grant number: "
 msgstr "Grant Nummer:"
 
 #: ../../app/models/concerns/exportable_plan.rb:142
-msgid "%{grant_number}"
-msgstr "%{grant_number}"
+msgid "%<grant_number>s"
+msgstr "%<grant_number>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:145
 #: ../../app/views/shared/export/_plan_coversheet.erb:26
@@ -1370,8 +1370,8 @@ msgid "Project abstract: "
 msgstr "Projekt Zusammenfassung:"
 
 #: ../../app/models/concerns/exportable_plan.rb:145
-msgid "%{description}"
-msgstr "%{description}"
+msgid "%<description>s"
+msgstr "%<description>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:148
 #: ../../app/views/shared/export/_plan_coversheet.erb:42
@@ -1380,8 +1380,8 @@ msgid "Last modified: "
 msgstr "Zuletzt bearbeitet:"
 
 #: ../../app/models/concerns/exportable_plan.rb:148
-msgid "%{date}"
-msgstr "%{date}"
+msgid "%<date>s"
+msgstr "%<date>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:149
 #: ../../app/views/shared/export/_plan_coversheet.erb:49
@@ -1562,8 +1562,8 @@ msgid "generate_copy! requires an organisation target"
 msgstr "generate_copy! erfordert ein Organisationsziel"
 
 #: ../../app/models/template.rb:380
-msgid "Copy of %{template}"
-msgstr "Kopie von %{template}"
+msgid "Copy of %<template>s"
+msgstr "Kopie von %<template>s"
 
 #: ../../app/models/template.rb:388
 msgid "generate_version! requires a published template"
@@ -1604,8 +1604,8 @@ msgid "Conditions in the template refer backwards"
 msgstr "Die Bedingungen in der Vorlage beziehen sich rückwärts"
 
 #: ../../app/models/user.rb:379
-msgid "A Data Management Plan in %{application_name} has been shared with you"
-msgstr "Ein Datenmanagementplan in %{application_name} wurde für Sie freigegeben"
+msgid "A Data Management Plan in %<application_name>s has been shared with you"
+msgstr "Ein Datenmanagementplan in %<application_name>s wurde für Sie freigegeben"
 
 #: ../../app/policies/api/v0/departments_policy.rb:12
 #: ../../app/policies/api/v0/guidance_group_policy.rb:12
@@ -1726,8 +1726,8 @@ msgstr ""
 "es aktuellen Förderers vorhanden ist"
 
 #: ../../app/validators/after_validator.rb:5
-msgid "must be after %{date}"
-msgstr "muss nach dem %{date} erfolgen"
+msgid "must be after %<date>s"
+msgstr "muss nach dem %<date>s erfolgen"
 
 #: ../../app/validators/org_links_validator.rb:10
 msgid "A key \"org\" is expected for links hash"
@@ -1739,12 +1739,12 @@ msgid "A hash is expected for links"
 msgstr "Für Links wird ein Hash erwartet"
 
 #: ../../app/validators/template_links_validator.rb:12
-msgid "A key %{key} is expected for links hash"
-msgstr "Für den Link-Hash wird ein Schlüssel %{key} erwartet"
+msgid "A key %<key>s is expected for links hash"
+msgstr "Für den Link-Hash wird ein Schlüssel %<key>s erwartet"
 
 #: ../../app/validators/template_links_validator.rb:15
-msgid "The key %{key} does not have a valid set of object links"
-msgstr "Der Schlüssel %{key} hat keinen gültigen Satz von Objektverknüpfungen"
+msgid "The key %<key>s does not have a valid set of object links"
+msgstr "Der Schlüssel %<key>s hat keinen gültigen Satz von Objektverknüpfungen"
 
 #: ../../app/views/answers/_locking.html.erb:5
 msgid "The following answer cannot be saved"
@@ -1752,10 +1752,10 @@ msgstr "Die folgende Antwort kann nicht gespeichert werden"
 
 #: ../../app/views/answers/_locking.html.erb:8
 msgid ""
-"since %{name} saved the answer below while you were editing. Please, combine y"
+"since %<name>s saved the answer below while you were editing. Please, combine y"
 "our changes and then save the answer again."
 msgstr ""
-"da %{name} die unten aufgeführte Antwort speicherte, während Sie editiert habe"
+"da %<name>s die unten aufgeführte Antwort speicherte, während Sie editiert habe"
 "n. Bitte kombinieren Sie Ihre Änderungen und speichern Sie die Antwort erneut."
 
 #: ../../app/views/answers/_new_edit.html.erb:15
@@ -1829,8 +1829,8 @@ msgid "Answered"
 msgstr "Beantwortet"
 
 #: ../../app/views/answers/_status.html.erb:10
-msgid " by %{user_name}"
-msgstr " von %{user_name}"
+msgid " by %<user_name>s"
+msgstr " von %<user_name>s"
 
 #: ../../app/views/answers/_status.html.erb:15
 msgid "This answer removes "
@@ -1907,18 +1907,18 @@ msgstr "Kontaktieren Sie uns"
 
 #: ../../app/views/contact_us/contacts/new.html.erb:6
 msgid ""
-"%{application_name} is provided by the %{organisation_name}.<br /> You can fin"
-"d out more about us on our <a href=\"%{organisation_url}\" class=\"has-new-window"
+"%<application_name>s is provided by the %<organisation_name>s.<br /> You can fin"
+"d out more about us on our <a href=\"%<organisation_url>s\" class=\"has-new-window"
 "-popup-info\" target=\"_blank\">website <em class=\"sr-only\">(new window)</em><spa"
-"n class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>. If you "
-"would like to contact us about %{application_name}, please fill out the form b"
+"n class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a>. If you "
+"would like to contact us about %<application_name>s, please fill out the form b"
 "elow."
 msgstr ""
-"%{application_name} wird von %{organisation_name} bereitgestellt. <br /> Mehr "
-"über uns erfahren Sie auf unserer <a href=\"%{organisation_url}\" class=\"has-new"
+"%<application_name>s wird von %<organisation_name>s bereitgestellt. <br /> Mehr "
+"über uns erfahren Sie auf unserer <a href=\"%<organisation_url>s\" class=\"has-new"
 "-window-popup-info\" target=\"_blank\">Website <em class=\"sr-only\">(neues Fenster"
-")</em> <span class=\"new-window-popup-info\">%{open_in_new_window_text}</span></"
-"a> . Wenn Sie uns wegen %{application_name} kontaktieren möchten, füllen Sie b"
+")</em> <span class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></"
+"a> . Wenn Sie uns wegen %<application_name>s kontaktieren möchten, füllen Sie b"
 "itte das folgende Formular aus."
 
 #: ../../app/views/contact_us/contacts/new.html.erb:10
@@ -2083,8 +2083,8 @@ msgid "Create account"
 msgstr "Registrieren"
 
 #: ../../app/views/devise/mailer/confirmation_instructions.html.erb:2
-msgid "Welcome to %{application_name}"
-msgstr "Welcome to %{application_name}"
+msgid "Welcome to %<application_name>s"
+msgstr "Welcome to %<application_name>s"
 
 #: ../../app/views/devise/mailer/confirmation_instructions.html.erb:4
 msgid "Thank you for registering. Please confirm your email address"
@@ -2104,24 +2104,24 @@ msgstr "in Ihren Browser"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:12
 #: ../../app/views/user_mailer/new_comment.html.erb:2
-msgid "Hello %{user_name}"
-msgstr "Hallo %{user_name}"
+msgid "Hello %<user_name>s"
+msgstr "Hallo %<user_name>s"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:15
 msgid ""
-"Your colleague %{inviter_name} has invited you to contribute to  their Data Ma"
-"nagement Plan in %{tool_name}"
+"Your colleague %<inviter_name>s has invited you to contribute to  their Data Ma"
+"nagement Plan in %<tool_name>s"
 msgstr ""
-"Ihr Kollege %{inviter_name} hat Sie eingeladen, einen Beitrag zu seinem Datenv"
-"erwaltungsplan in %{tool_name} zu leisten."
+"Ihr Kollege %<inviter_name>s hat Sie eingeladen, einen Beitrag zu seinem Datenv"
+"erwaltungsplan in %<tool_name>s zu leisten."
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:22
 #: ../../app/views/user_mailer/sharing_notification.html.erb:11
 msgid ""
-"%{click_here} to accept the invitation, (or copy %{link} into your browser). I"
+"%<click_here>s to accept the invitation, (or copy %<link>s into your browser). I"
 "f you don't want to accept the invitation, please ignore this email."
 msgstr ""
-"%{click_here}, um die Einladung anzunehmen (oder kopieren Sie %{link} in Ihren"
+"%<click_here>s, um die Einladung anzunehmen (oder kopieren Sie %<link>s in Ihren"
 " Browser). Wenn Sie die Einladung nicht annehmen möchten, ignorieren Sie bitte"
 " diese E-Mail."
 
@@ -2141,8 +2141,8 @@ msgstr "Viele Grüße"
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:19
 #: ../../app/views/user_mailer/_email_signature.html.erb:12
 #: ../../app/views/user_mailer/welcome_notification.html.erb:10
-msgid "The %{tool_name} team"
-msgstr "Das %{tool_name} -Team"
+msgid "The %<tool_name>s team"
+msgstr "Das %<tool_name>s -Team"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:32
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:22
@@ -2153,22 +2153,22 @@ msgstr "Bitte antworten Sie nicht auf diese Email."
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:33
 msgid ""
-"If you have any questions or need help, please contact us at %{helpdesk_email}"
-" or visit %{contact_us_url}"
+"If you have any questions or need help, please contact us at %<helpdesk_email>s"
+" or visit %<contact_us_url>s"
 msgstr ""
 "Wenn Sie Fragen haben oder Hilfe benötigen, wenden Sie sich bitte an %{helpdes"
-"k_email} oder gehen Sie auf %{contact_us_url}."
+"k_email} oder gehen Sie auf %<contact_us_url>s."
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:9
-msgid "Hello %{user_email}"
-msgstr "Hallo %{user_email}"
+msgid "Hello %<user_email>s"
+msgstr "Hallo %<user_email>s"
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:12
 msgid ""
-"Someone has requested a link to change your %{tool_name} password. You can do "
+"Someone has requested a link to change your %<tool_name>s password. You can do "
 "this through the link below."
 msgstr ""
-"Jemand hat einen Link angefordert, um das %{tool_name} Passwort zu ändern. Sie"
+"Jemand hat einen Link angefordert, um das %<tool_name>s Passwort zu ändern. Sie"
 " können dies über den folgenden Link tun."
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:14
@@ -2182,11 +2182,11 @@ msgstr "Wenn Sie nicht angefordert haben hierzu bitte diese E-Mail ignorieren."
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:22
 #: ../../app/views/user_mailer/_email_signature.html.erb:19
 msgid ""
-"If you have any questions or need help, please contact us at %{helpdesk_email}"
-" or visit %{contact_us}"
+"If you have any questions or need help, please contact us at %<helpdesk_email>s"
+" or visit %<contact_us>s"
 msgstr ""
 "Wenn Sie Fragen haben oder Hilfe benötigen, kontaktieren Sie uns bitte unter %"
-"{helpdesk_email} oder besuchen Sie %{contact_us}"
+"{helpdesk_email} oder besuchen Sie %<contact_us>s"
 
 #: ../../app/views/devise/mailer/unlock_instructions.html.erb:2
 msgid "Hello"
@@ -2258,7 +2258,7 @@ msgstr "Dokumentation"
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:16
 msgid ""
-"See the <a href=\"%{api_v0_wiki}\">documentation for v0</a> for more details on "
+"See the <a href=\"%<api_v0_wiki>s\">documentation for v0</a> for more details on "
 "the original API which includes access to statistics, the full text of plans a"
 "nd the ability to connect users with departments."
 msgstr ""
@@ -2269,13 +2269,13 @@ msgstr ""
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:18
 msgid ""
-"See the <a href=\"%{api_v1_wiki}\">documentation for v1</a> for more details on "
-"the API that supports the <a href=\"%{rda_standard_url}\">RDA Common metadata st"
+"See the <a href=\"%<api_v1_wiki>s\">documentation for v1</a> for more details on "
+"the API that supports the <a href=\"%<rda_standard_url>s\">RDA Common metadata st"
 "andard for DMPs.</a>"
 msgstr ""
-"Weitere Informationen zur API, die den <a href=\"%{rda_standard_url}\">allgemein"
+"Weitere Informationen zur API, die den <a href=\"%<rda_standard_url>s\">allgemein"
 "en RDA-Metadatenstandard für DMPs</a> unterstützt, finden Sie in der <a href=\""
-"%{api_v1_wiki}\">Dokumentation</a> <a href=\"%{rda_standard_url}\">zu Version 1.<"
+"%<api_v1_wiki>s\">Dokumentation</a> <a href=\"%<rda_standard_url>s\">zu Version 1.<"
 "/a>"
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:21
@@ -2453,8 +2453,8 @@ msgid "Sign in or Create account"
 msgstr "Anmelden oder Konto erstellen"
 
 #: ../../app/views/devise/registrations/new.html.erb:15
-msgid "Do you have a %{application_name} account?"
-msgstr "Hast du einen %{application_name}-Account?"
+msgid "Do you have a %<application_name>s account?"
+msgstr "Hast du einen %<application_name>s-Account?"
 
 #: ../../app/views/devise/registrations/new.html.erb:22
 #: ../../app/views/layouts/_navigation.html.erb:63
@@ -2469,8 +2469,8 @@ msgid "This will link your existing account to your credentials."
 msgstr "Dadurch wird Ihr vorhandenes Konto mit Ihren Anmeldeinformationen verknüpft."
 
 #: ../../app/views/devise/registrations/new.html.erb:34
-msgid "No %{application_name} account?"
-msgstr "Nein %{application_name} Konto?"
+msgid "No %<application_name>s account?"
+msgstr "Nein %<application_name>s Konto?"
 
 #: ../../app/views/devise/registrations/new.html.erb:46
 msgid "This will create an account and link it to your credentials."
@@ -2653,10 +2653,10 @@ msgstr "Veröffentlicht?"
 
 #: ../../app/views/home/_welcome.html.erb:5
 msgid ""
-"<p>%{application_name} has been developed by the <strong>%{organisation_name}<"
+"<p>%<application_name>s has been developed by the <strong>%<organisation_name>s<"
 "/strong> to help you write data management plans.</p>"
 msgstr ""
-"<p> %{application_name} wurde vom <strong>%{organisation_name}</strong> entwic"
+"<p> %<application_name>s wurde vom <strong>%<organisation_name>s</strong> entwic"
 "kelt, um Sie beim Erstellen vonDatenmanagementplänen zu unterstützen. </p>"
 
 #: ../../app/views/home/_welcome.html.erb:11
@@ -2842,8 +2842,8 @@ msgid "Logout"
 msgstr "Abmelden"
 
 #: ../../app/views/layouts/application.html.erb:32
-msgid "%{application_name}"
-msgstr "%{application_name}"
+msgid "%<application_name>s"
+msgstr "%<application_name>s"
 
 #: ../../app/views/layouts/application.html.erb:91
 msgid "Error:"
@@ -2918,11 +2918,11 @@ msgstr "Wird in einem neuen Fenster geöffnet"
 
 #: ../../app/views/layouts/application.html.erb:142
 msgid ""
-"%{n} results are available, use up and down arrows to navigate suggestions. Us"
+"%<n>s results are available, use up and down arrows to navigate suggestions. Us"
 "e the Enter key to select a suggestion or the Escape key to close the suggesti"
 "ons."
 msgstr ""
-"%{n} Ergebnisse sind verfügbar. Verwenden Sie die Aufwärts- und Abwärtspfeile,"
+"%<n>s Ergebnisse sind verfügbar. Verwenden Sie die Aufwärts- und Abwärtspfeile,"
 " um durch die Vorschläge zu navigieren. Verwenden Sie die Eingabetaste, um ein"
 "en Vorschlag auszuwählen, oder die Escape-Taste, um die Vorschläge zu schließe"
 "n."
@@ -2975,8 +2975,8 @@ msgid "Example answer"
 msgstr "Beispiel Antwort"
 
 #: ../../app/views/org_admin/annotations/_show.html.erb:4
-msgid "%{org} Example Answer"
-msgstr "%{org} Beispiel-Antwort"
+msgid "%<org>s Example Answer"
+msgstr "%<org>s Beispiel-Antwort"
 
 #: ../../app/views/org_admin/conditions/_add.html.erb:3
 msgid "Add condition"
@@ -3134,10 +3134,10 @@ msgstr "Phase löschen"
 
 #: ../../app/views/org_admin/phases/_phase.html.erb:17
 msgid ""
-"You are about to delete the '%{phase_title}' phase. This will remove all of th"
+"You are about to delete the '%<phase_title>s' phase. This will remove all of th"
 "e sections and questions listed below. Are you sure?"
 msgstr ""
-"Sie sind dabei, die Phase \"%{phase_title}\" zu löschen. Dadurch werden alle unt"
+"Sie sind dabei, die Phase \"%<phase_title>s\" zu löschen. Dadurch werden alle unt"
 "en aufgeführten Abschnitte und Fragen entfernt. Sind Sie sicher?"
 
 #: ../../app/views/org_admin/phases/_phase.html.erb:18
@@ -3196,8 +3196,8 @@ msgid "Write plan"
 msgstr "Schreiben Sie einen Plan"
 
 #: ../../app/views/org_admin/plans/index.html.erb:4
-msgid "%{org_name} Plans"
-msgstr "Pläne der/des %{org_name} "
+msgid "%<org_name>s Plans"
+msgstr "Pläne der/des %<org_name>s "
 
 #: ../../app/views/org_admin/plans/index.html.erb:16
 msgid "Plan"
@@ -3250,10 +3250,10 @@ msgstr ""
 #: ../../app/views/org_admin/plans/index.html.erb:39
 msgid ""
 "Download plans <em class=\"sr-only\">(new window)</em><span class=\"new-window-po"
-"pup-info\">%{open_in_new_window_text}</span>"
+"pup-info\">%<open_in_new_window_text>s</span>"
 msgstr ""
 "Pläne herunterladen <em class=\"sr-only\">(neues Fenster)</em> <span class=\"new-"
-"window-popup-info\">%{open_in_new_window_text}</span>"
+"window-popup-info\">%<open_in_new_window_text>s</span>"
 
 #: ../../app/views/org_admin/question_options/_option_fields.html.erb:3
 msgid "Order"
@@ -3283,8 +3283,8 @@ msgstr ""
 "diese Formatart hier angeben."
 
 #: ../../app/views/org_admin/questions/_form.html.erb:4
-msgid "Question %{number}:"
-msgstr "Frage %{number}:"
+msgid "Question %<number>s:"
+msgstr "Frage %<number>s:"
 
 #: ../../app/views/org_admin/questions/_form.html.erb:4
 msgid "New question:"
@@ -3359,8 +3359,8 @@ msgid "Delete"
 msgstr "Löschen"
 
 #: ../../app/views/org_admin/questions/_form.html.erb:102
-msgid "You are about to delete question #%{question_number}. Are you sure?"
-msgstr "Sie sind dabei, die Frage #%{question_number} zu löschen. Sind Sie sicher?"
+msgid "You are about to delete question #%<question_number>s. Are you sure?"
+msgstr "Sie sind dabei, die Frage #%<question_number>s zu löschen. Sind Sie sicher?"
 
 #: ../../app/views/org_admin/questions/_index.html.erb:14
 msgid "Add Question"
@@ -3460,10 +3460,10 @@ msgstr "Geben Sie einen Titel für den Abschnitt ein"
 
 #: ../../app/views/org_admin/sections/_form.html.erb:20
 msgid ""
-"You are about to delete '%{section_title}'. This will affect questions linked "
+"You are about to delete '%<section_title>s'. This will affect questions linked "
 "to this section. Are you sure?"
 msgstr ""
-"Sie sind dabei '%{section_title}' zu entfernen. Das wird Auswirkungen auf die "
+"Sie sind dabei '%<section_title>s' zu entfernen. Das wird Auswirkungen auf die "
 "Fragen haben, die mit diesem Abschnitt verbunden sind. Sind Sie sicher?"
 
 #: ../../app/views/org_admin/sections/_index.html.erb:61
@@ -3494,8 +3494,8 @@ msgstr ""
 
 #: ../../app/views/org_admin/templates/_form.html.erb:25
 #: ../../app/views/org_admin/templates/_show.html.erb:35
-msgid "for internal %{org_name} use only"
-msgstr "nur für interne Nutzung bei %{org_name} "
+msgid "for internal %<org_name>s use only"
+msgstr "nur für interne Nutzung bei %<org_name>s "
 
 #: ../../app/views/org_admin/templates/_form.html.erb:32
 #: ../../app/views/org_admin/templates/_show.html.erb:13
@@ -3671,22 +3671,22 @@ msgstr "Anpassbare Vorlagen"
 
 #: ../../app/views/org_admin/templates/index.html.erb:80
 #: ../../app/views/org_admin/templates/index.html.erb:93
-msgid "All (%{count})"
-msgstr "Alle (%{count})"
+msgid "All (%<count>s)"
+msgstr "Alle (%<count>s)"
 
 #: ../../app/views/org_admin/templates/index.html.erb:83
 #: ../../app/views/org_admin/templates/index.html.erb:96
-msgid "Published (%{count})"
-msgstr "Veröffentlicht (%{count})"
+msgid "Published (%<count>s)"
+msgstr "Veröffentlicht (%<count>s)"
 
 #: ../../app/views/org_admin/templates/index.html.erb:86
 #: ../../app/views/org_admin/templates/index.html.erb:99
-msgid "Unpublished (%{count})"
-msgstr "Unveröffentlicht (%{count})"
+msgid "Unpublished (%<count>s)"
+msgstr "Unveröffentlicht (%<count>s)"
 
 #: ../../app/views/org_admin/templates/index.html.erb:89
-msgid "Not customised (%{count})"
-msgstr "Nicht angepasst (%{count})"
+msgid "Not customised (%<count>s)"
+msgstr "Nicht angepasst (%<count>s)"
 
 #: ../../app/views/org_admin/templates/index.html.erb:118
 msgid "Create a template"
@@ -3695,8 +3695,8 @@ msgstr "Vorlage erstellen"
 #: ../../app/views/org_admin/users/edit.html.erb:4
 #: ../../app/views/super_admin/users/edit.html.erb:1
 #: ../../app/views/super_admin/users/edit.html.erb:5
-msgid "Editing profile for %{username}"
-msgstr "Profil für %{username} bearbeiten"
+msgid "Editing profile for %<username>s"
+msgstr "Profil für %<username>s bearbeiten"
 
 #: ../../app/views/org_admin/users/edit.html.erb:5
 #: ../../app/views/super_admin/users/edit.html.erb:6
@@ -3704,8 +3704,8 @@ msgid "View all users"
 msgstr "Alle Benutzer anzeigen"
 
 #: ../../app/views/org_admin/users/plans.html.erb:3
-msgid "Plans of %{username}"
-msgstr "Pläne von %{username}"
+msgid "Plans of %<username>s"
+msgstr "Pläne von %<username>s"
 
 #: ../../app/views/orgs/_departments.html.erb:1
 #: ../../app/views/orgs/admin_edit.html.erb:26
@@ -3767,10 +3767,10 @@ msgstr "Organisationen zusammenführen"
 #: ../../app/views/orgs/_merge_form.html.erb:7
 msgid ""
 "Please select the Organisation that will replace the current organisation: '<s"
-"trong>%{org_name}</strong>'."
+"trong>%<org_name>s</strong>'."
 msgstr ""
 "Bitte wählen Sie die Organisation aus, die die aktuelle Organisation ersetzen "
-"soll: ' <strong>%{org_name}</strong> '."
+"soll: ' <strong>%<org_name>s</strong> '."
 
 #: ../../app/views/orgs/_merge_form.html.erb:8
 msgid ""
@@ -3953,15 +3953,15 @@ msgstr "Nie"
 
 #: ../../app/views/paginable/api_clients/_index.html.erb:44
 msgid ""
-"You are about to delete '%{client_name}'. They will no longer be able to acces"
+"You are about to delete '%<client_name>s'. They will no longer be able to acces"
 "s the API. Are you sure?"
 msgstr ""
-"Sie sind dabei, '%{client_name}' zu löschen. Sie können nicht mehr auf die API"
+"Sie sind dabei, '%<client_name>s' zu löschen. Sie können nicht mehr auf die API"
 " zugreifen. Bist du sicher?"
 
 #: ../../app/views/paginable/contributors/_index.html.erb:57
-msgid "You are about to delete '%{contributor_name}'. Are you sure?"
-msgstr "Du bist dabei '%{contributor_name}' zu löschen. Bist du sicher?"
+msgid "You are about to delete '%<contributor_name>s'. Are you sure?"
+msgstr "Du bist dabei '%<contributor_name>s' zu löschen. Bist du sicher?"
 
 #: ../../app/views/paginable/departments/_index.html.erb:5
 #: ../../app/views/paginable/users/_index.html.erb:22
@@ -3974,10 +3974,10 @@ msgstr "Namenskürzel oder Code"
 
 #: ../../app/views/paginable/departments/_index.html.erb:28
 msgid ""
-"You are about to delete '%{department_name}'. This will affect guidance. Are y"
+"You are about to delete '%<department_name>s'. This will affect guidance. Are y"
 "ou sure?"
 msgstr ""
-"Sie möchten '%{department_name}' löschen. Dies wirkt sich auf die Erläuterunge"
+"Sie möchten '%<department_name>s' löschen. Dies wirkt sich auf die Erläuterunge"
 "n aus. Sind Sie sicher?"
 
 #: ../../app/views/paginable/guidance_groups/_index.html.erb:8
@@ -4018,15 +4018,15 @@ msgstr "Veröffentlichen"
 
 #: ../../app/views/paginable/guidance_groups/_index.html.erb:50
 msgid ""
-"You are about to delete '%{guidance_group_name}'. This will affect guidance. A"
+"You are about to delete '%<guidance_group_name>s'. This will affect guidance. A"
 "re you sure?"
 msgstr ""
-"Sie sind dabei '%{guidance_group_name}' zu löschen. Das wird Auswirkungen auf "
+"Sie sind dabei '%<guidance_group_name>s' zu löschen. Das wird Auswirkungen auf "
 "die Hilfetexte haben. Sind Sie sicher?"
 
 #: ../../app/views/paginable/guidances/_index.html.erb:62
-msgid "You are about to delete '%{guidance_summary}'. Are you sure?"
-msgstr "Sie sind dabei, '%{guidance_summary}' zu löschen. Sind Sie sicher?"
+msgid "You are about to delete '%<guidance_summary>s'. Are you sure?"
+msgstr "Sie sind dabei, '%<guidance_summary>s' zu löschen. Sind Sie sicher?"
 
 #: ../../app/views/paginable/notifications/_index.html.erb:5
 #: ../../app/views/super_admin/notifications/_form.html.erb:15
@@ -4062,8 +4062,8 @@ msgid "Managed"
 msgstr "Gelang es"
 
 #: ../../app/views/paginable/orgs/_index.html.erb:35
-msgid "You are about to delete '%{org_name}'. Are you sure?"
-msgstr "Sie sind dabei, '%{org_name}' zu löschen. Sind Sie sicher?"
+msgid "You are about to delete '%<org_name>s'. Are you sure?"
+msgstr "Sie sind dabei, '%<org_name>s' zu löschen. Sind Sie sicher?"
 
 #: ../../app/views/paginable/plans/_org_admin.html.erb:3
 msgid ""
@@ -4232,10 +4232,10 @@ msgstr "Änderungen veröffentlichen"
 
 #: ../../app/views/paginable/templates/_customisable.html.erb:69
 msgid ""
-"Are you sure you want to remove your customization of \"%{template_title}\"? Any"
+"Are you sure you want to remove your customization of \"%<template_title>s\"? Any"
 " published versions will become unavailable to users."
 msgstr ""
-"Sind Sie sicher, dass Sie Ihre Anpassung von \"%{template_title}\" entfernen möc"
+"Sind Sie sicher, dass Sie Ihre Anpassung von \"%<template_title>s\" entfernen möc"
 "hten? Alle veröffentlichten Versionen sind für Benutzer nicht mehr verfügbar."
 
 #: ../../app/views/paginable/templates/_history.html.erb:7
@@ -4252,10 +4252,10 @@ msgstr "Anzeigen von Anpassungen"
 
 #: ../../app/views/paginable/templates/_organisational.html.erb:76
 msgid ""
-"Are you sure you want to remove \"%{template_title}\"? Any published versions wi"
+"Are you sure you want to remove \"%<template_title>s\"? Any published versions wi"
 "ll become unavailable to users."
 msgstr ""
-"Möchten Sie \"%{template_title}\" wirklich entfernen? Alle veröffentlichten Vers"
+"Möchten Sie \"%<template_title>s\" wirklich entfernen? Alle veröffentlichten Vers"
 "ionen sind für Benutzer nicht mehr verfügbar."
 
 #: ../../app/views/paginable/templates/_organisational.html.erb:90
@@ -4421,10 +4421,10 @@ msgstr "Rechts"
 #: ../../app/views/plans/_download_form.html.erb:119
 msgid ""
 "Download Plan <em class=\"sr-only\">(new window)</em><span class=\"new-window-pop"
-"up-info\">%{open_in_new_window_text}</span>"
+"up-info\">%<open_in_new_window_text>s</span>"
 msgstr ""
 "Download Plan <em class=\"sr-only\">(neues Fenster)</em> <span class=\"new-window"
-"-popup-info\">%{open_in_new_window_text}</span>"
+"-popup-info\">%<open_in_new_window_text>s</span>"
 
 #: ../../app/views/plans/_edit_details.html.erb:13
 #: ../../app/views/plans/_guidance_selection.html.erb:38
@@ -4433,10 +4433,10 @@ msgstr "Wählen Sie Führung"
 
 #: ../../app/views/plans/_guidance_selection.html.erb:6
 msgid ""
-"To help you write your plan, %{application_name} can show you guidance from a "
+"To help you write your plan, %<application_name>s can show you guidance from a "
 "variety of organisations."
 msgstr ""
-"Um Ihnen beim Schreiben Ihres Plans zu helfen, kann Ihnen %{application_name} "
+"Um Ihnen beim Schreiben Ihres Plans zu helfen, kann Ihnen %<application_name>s "
 "Anleitungen von verschiedenen Organisationen geben."
 
 #: ../../app/views/plans/_guidance_selection.html.erb:9
@@ -4457,11 +4457,11 @@ msgstr "Für diese Vorlage gibt gibt es keine spezifischen Anleitungen ."
 
 #: ../../app/views/plans/_guidance_selection.html.erb:40
 msgid ""
-"To help you write your plan, %{application_name} can show you guidance from a "
+"To help you write your plan, %<application_name>s can show you guidance from a "
 "variety of organisations. Please choose up to 6 organisations of the following"
 " organisations who offer guidance relevant to your plan."
 msgstr ""
-"Um Ihnen beim Schreiben Ihres Plans zu helfen, kann Ihnen %{application_name} "
+"Um Ihnen beim Schreiben Ihres Plans zu helfen, kann Ihnen %<application_name>s "
 "Anleitungen von verschiedenen Organisationen geben. Bitte wählen Sie bis zu 6 "
 "Organisationen der folgenden Organisationen aus, die für Ihren Plan relevante "
 "Leitlinien anbieten."
@@ -4490,17 +4490,17 @@ msgstr "Schreiben Sie einen Plan"
 
 #: ../../app/views/plans/_overview_details.html.erb:9
 msgid ""
-"This plan is based on the \"%{template_title}\" template provided by %{org_name}"
+"This plan is based on the \"%<template_title>s\" template provided by %<org_name>s"
 "."
-msgstr "Dieser Plan basiert auf der Vorlage [%{template_title}] von %{org_name}."
+msgstr "Dieser Plan basiert auf der Vorlage [%<template_title>s] von %<org_name>s."
 
 #: ../../app/views/plans/_overview_details.html.erb:17
-msgid "Template version %{template_version}, published on %{published_date}"
-msgstr "Vorlagen-Version %{template_version}, veröffentlicht am %{published_date}"
+msgid "Template version %<template_version>s, published on %<published_date>s"
+msgstr "Vorlagen-Version %<template_version>s, veröffentlicht am %<published_date>s"
 
 #: ../../app/views/plans/_overview_details.html.erb:42
-msgid "%{phase_title} (%{sections_size} %{sections}, %{questions_size} %{questions})"
-msgstr "%{phase_title} (%{sections_size} %{sections}, %{questions_size} %{questions})"
+msgid "%<phase_title>s (%<sections_size>s %<sections>s, %<questions_size>s %<questions>s)"
+msgstr "%<phase_title>s (%<sections_size>s %<sections>s, %<questions_size>s %<questions>s)"
 
 #: ../../app/views/plans/_overview_details.html.erb:43
 msgid "section"
@@ -4614,11 +4614,11 @@ msgstr "Plansicht festlegen"
 #: ../../app/views/plans/_share_form.html.erb:9
 msgid ""
 "Public or organisational visibility is intended for finished plans. You must a"
-"nswer at least %{percentage}%% of the questions to enable these options. Note:"
+"nswer at least %<percentage>s%% of the questions to enable these options. Note:"
 " test plans are set to private visibility by default."
 msgstr ""
 "Öffentliche oder organisatorische Sichtbarkeit ist für fertige Pläne vorgesehe"
-"n. Sie müssen mindestens %{percentage} %% der Fragen beantworten, um diese Opt"
+"n. Sie müssen mindestens %<percentage>s %% der Fragen beantworten, um diese Opt"
 "ionen zu aktivieren. Hinweis: Testpläne sind standardmäßig auf private Sichtba"
 "rkeit eingestellt."
 
@@ -4709,8 +4709,8 @@ msgid "Click the 'Create plan' button below to begin."
 msgstr "Klicken Sie auf die Schaltfläche \"Plan erstellen\", um zu beginnen."
 
 #: ../../app/views/plans/index.html.erb:35
-msgid "%{org_title} Plans"
-msgstr "%{org_title} Pläne"
+msgid "%<org_title>s Plans"
+msgstr "%<org_title>s Pläne"
 
 #: ../../app/views/plans/index.html.erb:36
 msgid ""
@@ -4797,11 +4797,11 @@ msgstr "Wir haben mehrere DMP-Vorlagen gefunden, die Ihrem Geldgeber entsprechen
 
 #: ../../app/views/public_pages/plan_index.html.erb:8
 msgid ""
-"Public DMPs are plans created using the %{application_name} service and shared"
+"Public DMPs are plans created using the %<application_name>s service and shared"
 " publicly by their owners. They are not vetted for quality, completeness, or a"
 "dherence to funder guidelines."
 msgstr ""
-"Öffentliche DMPs sind Pläne, die mit dem Dienst %{application_name} erstellt u"
+"Öffentliche DMPs sind Pläne, die mit dem Dienst %<application_name>s erstellt u"
 "nd öffentlich von ihren Eigentümern freigegeben werden. Sie werden nicht auf Q"
 "ualität, Vollständigkeit oder Einhaltung der Richtlinien überprüft."
 
@@ -4852,8 +4852,8 @@ msgid "terms and conditions"
 msgstr "Geschäftsbedingungen"
 
 #: ../../app/views/shared/_create_plan_modal.html.erb:8
-msgid "Would you like to create a plan based on the \"%{name}\" template?"
-msgstr "Möchten Sie einen Plan basierend auf der Vorlage \"%{name}\" erstellen?"
+msgid "Would you like to create a plan based on the \"%<name>s\" template?"
+msgstr "Möchten Sie einen Plan basierend auf der Vorlage \"%<name>s\" erstellen?"
 
 #: ../../app/views/shared/_links.html.erb:7
 msgid "Links"
@@ -4906,8 +4906,8 @@ msgstr "Filterung der Pläne"
 
 #: ../../app/views/shared/export/_plan_coversheet.erb:3
 #: ../../app/views/shared/export/_plan_txt.erb:65
-msgid "A Data Management Plan created using %{application_name}"
-msgstr "Ein Datenmanagementplan, der mit %{application_name} erstellt wurde."
+msgid "A Data Management Plan created using %<application_name>s"
+msgstr "Ein Datenmanagementplan, der mit %<application_name>s erstellt wurde."
 
 #: ../../app/views/shared/export/_plan_coversheet.erb:10
 #: ../../app/views/shared/export/_plan_txt.erb:5
@@ -4977,8 +4977,8 @@ msgstr "Der von Ihnen eingegebene Name war keiner der aufgeführten Vorschläge!
 
 #: ../../app/views/static_pages/about_us.html.erb:1
 #: ../../app/views/static_pages/about_us.html.erb:4
-msgid "About %{application_name}"
-msgstr "Über %{application_name}"
+msgid "About %<application_name>s"
+msgstr "Über %<application_name>s"
 
 #: ../../app/views/static_pages/about_us.html.erb:11
 msgid ""
@@ -5059,10 +5059,10 @@ msgstr "Wir laden Sie ein, das DMPRoadmap GitHub Wiki zu lesen, um zu lernen, wi
 #: ../../app/views/static_pages/about_us.html.erb:22
 msgid ""
 "get involved<em class=\"sr-only\"> (new window)</em><span class=\"new-window-popu"
-"p-info\">%{open_in_new_window_text}</span>"
+"p-info\">%<open_in_new_window_text>s</span>"
 msgstr ""
 "<span class=\"new-window-popup-info\">mach</span> mit <em class=\"sr-only\">(neues"
-" Fenster)</em> <span class=\"new-window-popup-info\">%{open_in_new_window_text}<"
+" Fenster)</em> <span class=\"new-window-popup-info\">%<open_in_new_window_text>s<"
 "/span>"
 
 #: ../../app/views/static_pages/about_us.html.erb:28
@@ -5084,8 +5084,8 @@ msgstr ""
 "ng oder Bearbeitung Ihres DMP."
 
 #: ../../app/views/static_pages/about_us.html.erb:34
-msgid "If you do not have a %{application_name} account, click on"
-msgstr "Wenn Sie kein %{application_name} Konto haben, klicken Sie auf"
+msgid "If you do not have a %<application_name>s account, click on"
+msgstr "Wenn Sie kein %<application_name>s Konto haben, klicken Sie auf"
 
 #: ../../app/views/static_pages/about_us.html.erb:34
 msgid "Sign up"
@@ -5307,48 +5307,48 @@ msgstr "Informationen über Sie: Wie wir es nutzen und mit wem wir es teilen"
 
 #: ../../app/views/static_pages/privacy.html.erb:11
 msgid ""
-"The information you provide will be used by the %{org_name} to offer you acces"
-"s to and personalisation of the %{application_name} service."
+"The information you provide will be used by the %<org_name>s to offer you acces"
+"s to and personalisation of the %<application_name>s service."
 msgstr ""
-"Die von Ihnen angegebenen Informationen werden von %{org_name} verwendet, um I"
-"hnen den Zugriff auf und die Personalisierung des %{application_name} -Dienste"
+"Die von Ihnen angegebenen Informationen werden von %<org_name>s verwendet, um I"
+"hnen den Zugriff auf und die Personalisierung des %<application_name>s -Dienste"
 "s zu ermöglichen."
 
 #: ../../app/views/static_pages/privacy.html.erb:13
 msgid ""
-"The %{org_name} processes the personal data of %{application_name} users in or"
-"der to deliver and improve the %{application_name} service in a customised man"
+"The %<org_name>s processes the personal data of %<application_name>s users in or"
+"der to deliver and improve the %<application_name>s service in a customised man"
 "ner and to ensure each user receives relevant information."
 msgstr ""
-"Die %{org_name} verarbeitet die persönlichen Daten von %{application_name} Ben"
-"utzern, um den %{application_name} Dienst in angepasster Weise bereitzustellen"
+"Die %<org_name>s verarbeitet die persönlichen Daten von %<application_name>s Ben"
+"utzern, um den %<application_name>s Dienst in angepasster Weise bereitzustellen"
 " und zu verbessern und sicherzustellen, dass jeder Benutzer relevante Informat"
 "ionen erhält."
 
 #: ../../app/views/static_pages/privacy.html.erb:15
 msgid ""
-"The processing of your personal data by the %{org_name} is necessary for pursu"
+"The processing of your personal data by the %<org_name>s is necessary for pursu"
 "ing the following legitimate interests:"
 msgstr ""
-"Die Verarbeitung Ihrer personenbezogenen Daten durch die %{org_name} ist notwe"
+"Die Verarbeitung Ihrer personenbezogenen Daten durch die %<org_name>s ist notwe"
 "ndig, um die folgenden legitimen Interessen zu verfolgen:"
 
 #: ../../app/views/static_pages/privacy.html.erb:18
 msgid ""
-"To provide access to the %{application_name} service and personalisation of yo"
+"To provide access to the %<application_name>s service and personalisation of yo"
 "ur user experience e.g. provision of relevant templates and guidance for your "
 "organisation."
 msgstr ""
-"Um Zugriff auf den Service %{application_name} und die Personalisierung Ihrer "
+"Um Zugriff auf den Service %<application_name>s und die Personalisierung Ihrer "
 "Benutzererfahrung zu ermöglichen, z. Bereitstellung von relevanten Vorlagen un"
 "d Anleitungen für Ihre Organisation."
 
 #: ../../app/views/static_pages/privacy.html.erb:20
 msgid ""
-"To keep you up to date with news about %{application_name} such as new feature"
+"To keep you up to date with news about %<application_name>s such as new feature"
 "s or improvements, or changes to our Privacy Policy."
 msgstr ""
-"Um Sie über Neuigkeiten zu %{application_name} auf dem Laufenden zu halten, wi"
+"Um Sie über Neuigkeiten zu %<application_name>s auf dem Laufenden zu halten, wi"
 "e z. B. neue Funktionen oder Verbesserungen oder Änderungen unserer Datenschut"
 "zrichtlinie."
 
@@ -5359,29 +5359,29 @@ msgstr "Für Netzwerk- und Informationssicherheitszwecke."
 #: ../../app/views/static_pages/privacy.html.erb:24
 msgid ""
 "We will hold the personal data you provided us for as long as you continue usi"
-"ng the %{application_name} service. Your personal data can be removed from thi"
-"s service upon request to the %{application_name} team within a period of 30 d"
+"ng the %<application_name>s service. Your personal data can be removed from thi"
+"s service upon request to the %<application_name>s team within a period of 30 d"
 "ays."
 msgstr ""
 "Wir speichern die personenbezogenen Daten, die Sie uns zur Verfügung gestellt "
-"haben, solange Sie den Service %{application_name} weiterhin nutzen. Ihre pers"
+"haben, solange Sie den Service %<application_name>s weiterhin nutzen. Ihre pers"
 "önlichen Daten können innerhalb von 30 Tagen auf Anfrage vom %{application_nam"
 "e} -Team von diesem Service entfernt werden."
 
 #: ../../app/views/static_pages/privacy.html.erb:26
 msgid ""
-"If you have any questions, please contact the %{application_name} team at: <a "
-"href='mailto:%{helpdesk_email}'>%{helpdesk_email}</a>"
+"If you have any questions, please contact the %<application_name>s team at: <a "
+"href='mailto:%<helpdesk_email>s'>%<helpdesk_email>s</a>"
 msgstr ""
-"Wenn Sie Fragen haben, wenden Sie sich bitte an das %{application_name} Team u"
-"nter: <a href='mailto:%{helpdesk_email}'>%{helpdesk_email}</a>"
+"Wenn Sie Fragen haben, wenden Sie sich bitte an das %<application_name>s Team u"
+"nter: <a href='mailto:%<helpdesk_email>s'>%<helpdesk_email>s</a>"
 
 #: ../../app/views/static_pages/privacy.html.erb:30
 msgid ""
-"This statement was last revised on %{revdate} and may be revised at any time w"
+"This statement was last revised on %<revdate>s and may be revised at any time w"
 "ith prior notice."
 msgstr ""
-"Diese Erklärung wurde zuletzt am %{revdate} überarbeitet und kann jederzeit mi"
+"Diese Erklärung wurde zuletzt am %<revdate>s überarbeitet und kann jederzeit mi"
 "t vorheriger Ankündigung geändert werden."
 
 #: ../../app/views/static_pages/termsuse.html.erb:12
@@ -5455,7 +5455,7 @@ msgid ""
 "ookies and how we use them is available on the <a target='_blank' href='http:/"
 "/www.dcc.ac.uk/about-us/about-site/website-terms-use/cookies' class=\"has-new-w"
 "indow-popup-info\">main DCC website<em class=\"sr-only\"> (new window)</em><span "
-"class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>.</p>\n"
+"class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a>.</p>\n"
 "\n"
 "      <h3>Third party APIs</h3>\n"
 "\n"
@@ -5502,7 +5502,7 @@ msgstr ""
 "wendung finden Sie auf der <a target='_blank' href='http://www.dcc.ac.uk/about"
 "-us/about-site/website-terms-use/cookies' class=\"has-new-window-popup-info\">Ha"
 "upt-DCC-Website <em class=\"sr-only\">(neues Fenster)</em> <span class=\"new-wind"
-"ow-popup-info\">%{open_in_new_window_text}</span></a> . </p><h3> APIs von Dritt"
+"ow-popup-info\">%<open_in_new_window_text>s</span></a> . </p><h3> APIs von Dritt"
 "anbietern </h3><p> Bestimmte Funktionen auf dieser Website verwenden Dienste u"
 "nd APIs von Drittanbietern wie InCommon / Shibboleth oder das Hosting gängiger"
 " JavaScript-Bibliotheken oder Web-Schriftarten durch Drittanbieter. Informatio"
@@ -5541,8 +5541,8 @@ msgid "Email credentials to contact"
 msgstr "E-Mail-Anmeldeinformationen zu kontaktieren"
 
 #: ../../app/views/super_admin/api_clients/_form.html.erb:81
-msgid "Are you sure you want to delete the API client: \"%{name}\""
-msgstr "Möchten Sie den API-Client wirklich löschen: \"%{name}\""
+msgid "Are you sure you want to delete the API client: \"%<name>s\""
+msgstr "Möchten Sie den API-Client wirklich löschen: \"%<name>s\""
 
 #: ../../app/views/super_admin/api_clients/edit.html.erb:1
 msgid "Editing API client"
@@ -5558,8 +5558,8 @@ msgid "View all API clients"
 msgstr "Alle API-Clients anzeigen"
 
 #: ../../app/views/super_admin/api_clients/email_credentials.js.erb:1
-msgid "The credentials have been sent to %{email}."
-msgstr "Die Anmeldeinformationen wurden an %{email} gesendet."
+msgid "The credentials have been sent to %<email>s."
+msgstr "Die Anmeldeinformationen wurden an %<email>s gesendet."
 
 #: ../../app/views/super_admin/api_clients/index.html.erb:1
 #: ../../app/views/super_admin/api_clients/index.html.erb:6
@@ -5607,8 +5607,8 @@ msgid "Body"
 msgstr "Körper"
 
 #: ../../app/views/super_admin/notifications/_form.html.erb:71
-msgid "Are you sure you want to delete the notification \"%{title}\""
-msgstr "Möchten Sie die Benachrichtigung \"%{title}\" wirklich löschen?"
+msgid "Are you sure you want to delete the notification \"%<title>s\""
+msgstr "Möchten Sie die Benachrichtigung \"%<title>s\" wirklich löschen?"
 
 #: ../../app/views/super_admin/notifications/edit.html.erb:1
 #: ../../app/views/super_admin/notifications/edit.html.erb:5
@@ -5633,8 +5633,8 @@ msgid "New Notification"
 msgstr "Neue Benachrichtigung"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:9
-msgid "Merging '%{from_org_name}' into '%{to_org_name}'"
-msgstr "Zusammenführen von '%{from_org_name}' in '%{to_org_name}'"
+msgid "Merging '%<from_org_name>s' into '%<to_org_name>s'"
+msgstr "Zusammenführen von '%<from_org_name>s' in '%<to_org_name>s'"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:11
 msgid "Summary:"
@@ -5642,11 +5642,11 @@ msgstr "Zusammenfassung:"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:12
 msgid ""
-"Counts of '%{to_org_name}' records before and after a merge with %{from_org_na"
+"Counts of '%<to_org_name>s' records before and after a merge with %{from_org_na"
 "me}."
 msgstr ""
-"Anzahl der '%{to_org_name}'-Datensätze vor und nach einer Zusammenführung mit "
-"%{from_org_name}."
+"Anzahl der '%<to_org_name>s'-Datensätze vor und nach einer Zusammenführung mit "
+"%<from_org_name>s."
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:17
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:44
@@ -5654,12 +5654,12 @@ msgid "Record Type"
 msgstr "Aufnahmetyp"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:18
-msgid "'%{to_org_name}' Count - before merge"
-msgstr "'%{to_org_name}' Anzahl - vor der Zusammenführung"
+msgid "'%<to_org_name>s' Count - before merge"
+msgstr "'%<to_org_name>s' Anzahl - vor der Zusammenführung"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:19
-msgid "'%{to_org_name}' Count - after merge"
-msgstr "'%{to_org_name}' Anzahl - nach der Zusammenführung"
+msgid "'%<to_org_name>s' Count - after merge"
+msgstr "'%<to_org_name>s' Anzahl - nach der Zusammenführung"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:38
 msgid "Details:"
@@ -5668,23 +5668,23 @@ msgstr "Details:"
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:39
 msgid ""
 "The table below shows the specific changes that will occur during the merge pr"
-"ocess. Once the merge is complete, '%{from_org_name}' will be deleted. You can"
+"ocess. Once the merge is complete, '%<from_org_name>s' will be deleted. You can"
 " then consolidate/correct any merge issues (e.g. remove any departments that w"
 "ere duplicated)"
 msgstr ""
 "Die folgende Tabelle zeigt die spezifischen Änderungen, die während des Zusamm"
 "enführungsprozesses auftreten. Sobald die Zusammenführung abgeschlossen ist, w"
-"ird '%{from_org_name}' gelöscht. Sie können dann alle Zusammenführungsprobleme"
+"ird '%<from_org_name>s' gelöscht. Sie können dann alle Zusammenführungsprobleme"
 " konsolidieren/korrigieren (z. B. alle Abteilungen entfernen, die dupliziert w"
 "urden)."
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:45
-msgid "%{from_org_name} - Before"
-msgstr "%{from_org_name} - Vorher"
+msgid "%<from_org_name>s - Before"
+msgstr "%<from_org_name>s - Vorher"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:46
-msgid "%{to_org_name} - Before"
-msgstr "%{to_org_name} - Vorher"
+msgid "%<to_org_name>s - Before"
+msgstr "%<to_org_name>s - Vorher"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:61
 msgid "The following attributes will be updated"
@@ -5696,7 +5696,7 @@ msgid ""
 "name}' will then be deleted."
 msgstr ""
 "Warnung: Die oben vorgeschlagenen Änderungen werden in die Datenbank übernomme"
-"n. '%{org_name}' wird dann gelöscht."
+"n. '%<org_name>s' wird dann gelöscht."
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:92
 msgid "These changes cannot be undone! Do not proceed unless you are certain."
@@ -5714,10 +5714,10 @@ msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:95
 msgid ""
-"Warning: '%{from_org_name}' has Plans that are currently in the review process"
+"Warning: '%<from_org_name>s' has Plans that are currently in the review process"
 ". The Org admins may not be able to see these plans after the merge!"
 msgstr ""
-"Warnung: '%{from_org_name}' hat Pläne, die sich derzeit im Überprüfungsprozess"
+"Warnung: '%<from_org_name>s' hat Pläne, die sich derzeit im Überprüfungsprozess"
 " befinden. Die Organisationsadministratoren können diese Pläne nach der Zusamm"
 "enführung möglicherweise nicht sehen!"
 
@@ -5742,8 +5742,8 @@ msgid "New organisation"
 msgstr "Neue Organisation"
 
 #: ../../app/views/super_admin/themes/_form.html.erb:17
-msgid "Are you sure you want to delete the theme \"%{title}\"?"
-msgstr "Möchtest du das Thema \"%{title}\" wirklich löschen?"
+msgid "Are you sure you want to delete the theme \"%<title>s\"?"
+msgstr "Möchtest du das Thema \"%<title>s\" wirklich löschen?"
 
 #: ../../app/views/super_admin/themes/edit.html.erb:3
 #: ../../app/views/super_admin/themes/new.html.erb:3
@@ -5772,11 +5772,11 @@ msgstr "Archivieren"
 
 #: ../../app/views/super_admin/users/edit.html.erb:64
 msgid ""
-"You are about to archive %{user_name}.  This will remove their personal inform"
+"You are about to archive %<user_name>s.  This will remove their personal inform"
 "ation, but retain their plans, answers, and comments.  They will be unable to "
 "sign-in. Are you sure?"
 msgstr ""
-"Sie sind dabei, %{user_name} zu archivieren. Dadurch werden ihre persönlichen "
+"Sie sind dabei, %<user_name>s zu archivieren. Dadurch werden ihre persönlichen "
 "Daten entfernt, ihre Pläne, Antworten und Kommentare bleiben jedoch erhalten. "
 "Sie können sich nicht anmelden. Bist du sicher?"
 
@@ -5883,98 +5883,98 @@ msgstr "Sie können Ihre Benachrichtigungseinstellungen auf Ihrer Profilseite ä
 #: ../../app/views/user_mailer/permissions_change_notification.html.erb:2
 #: ../../app/views/user_mailer/plan_visibility.html.erb:2
 #: ../../app/views/user_mailer/sharing_notification.html.erb:2
-msgid "Hello %{username}"
-msgstr "Hallo %{username}"
+msgid "Hello %<username>s"
+msgstr "Hallo %<username>s"
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:6
-msgid "You have been granted administrator privileges in %{tool_name}:"
-msgstr "Ihnen wurden Administratorrechte in %{tool_name} erteilt:"
+msgid "You have been granted administrator privileges in %<tool_name>s:"
+msgstr "Ihnen wurden Administratorrechte in %<tool_name>s erteilt:"
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:13
-msgid "You have been revoked administrator privileges in %{tool_name}."
-msgstr "Ihnen wurden Administratorrechte in %{tool_name} entzogen."
+msgid "You have been revoked administrator privileges in %<tool_name>s."
+msgstr "Ihnen wurden Administratorrechte in %<tool_name>s entzogen."
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:17
 msgid ""
-"More information about administering the %{tool_name} for users at your organi"
-"sation is available at the %{help_url}."
+"More information about administering the %<tool_name>s for users at your organi"
+"sation is available at the %<help_url>s."
 msgstr ""
-"Weitere Informationen zum Verwalten von %{tool_name} für Benutzer in Ihrer Org"
-"anisation finden Sie unter %{help_url}."
+"Weitere Informationen zum Verwalten von %<tool_name>s für Benutzer in Ihrer Org"
+"anisation finden Sie unter %<help_url>s."
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:2
-msgid "Hello %{name},"
-msgstr "Hallo %{name},"
+msgid "Hello %<name>s,"
+msgstr "Hallo %<name>s,"
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:8
-msgid "Please use the following credentials when accessing the %{tool_name} API."
+msgid "Please use the following credentials when accessing the %<tool_name>s API."
 msgstr ""
 "Bitte verwenden Sie die folgenden Anmeldeinformationen, wenn Sie auf die %{too"
 "l_name} -API zugreifen."
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:23
-msgid "Please refer to the API documentation at: %{api_documentation_url}"
+msgid "Please refer to the API documentation at: %<api_documentation_url>s"
 msgstr ""
 "Weitere Informationen finden Sie in der API-Dokumentation unter: %{api_documen"
 "tation_url}"
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:29
 msgid ""
-"Do not share these credentials. They for use with the %{external_application} "
+"Do not share these credentials. They for use with the %<external_application>s "
 "application. If you do share your credentials with another application we rese"
 "rve the right to revoke your access to the API."
 msgstr ""
 "Teilen Sie diese Anmeldeinformationen nicht. Sie zur Verwendung mit der Anwend"
-"ung %{external_application}. Wenn Sie Ihre Anmeldeinformationen mit einer ande"
+"ung %<external_application>s. Wenn Sie Ihre Anmeldeinformationen mit einer ande"
 "ren Anwendung teilen, behalten wir uns das Recht vor, Ihren Zugriff auf die AP"
 "I zu widerrufen."
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:34
 msgid ""
-"If you did not request access to the %{tool_name} API or did not request for y"
-"our credentials to be renewed, please contact us at %{helpdesk_email}"
+"If you did not request access to the %<tool_name>s API or did not request for y"
+"our credentials to be renewed, please contact us at %<helpdesk_email>s"
 msgstr ""
-"Wenn Sie keinen Zugriff auf die %{tool_name} -API angefordert oder die Erneuer"
+"Wenn Sie keinen Zugriff auf die %<tool_name>s -API angefordert oder die Erneuer"
 "ung Ihrer Anmeldeinformationen nicht beantragt haben, kontaktieren Sie uns bit"
-"te unter %{helpdesk_email}."
+"te unter %<helpdesk_email>s."
 
 #: ../../app/views/user_mailer/feedback_complete.html.erb:2
-msgid "Hello %{recipient_name}"
-msgstr "Hallo %{recipient_name}"
+msgid "Hello %<recipient_name>s"
+msgstr "Hallo %<recipient_name>s"
 
 #: ../../app/views/user_mailer/feedback_complete.html.erb:5
 msgid ""
-"%{commenter} has finished providing feedback on the plan  \"%{link_html}\". Comm"
+"%<commenter>s has finished providing feedback on the plan  \"%<link_html>s\". Comm"
 "ents can be found in the 'Write plan' tab on the right side of the page (Guida"
 "nce/Comments)."
 msgstr ""
-"%{commenter} hat die Rückmeldung zum Plan \"%{link_html}\" abgeschlossen. Die Ko"
+"%<commenter>s hat die Rückmeldung zum Plan \"%<link_html>s\" abgeschlossen. Die Ko"
 "mmentare finden Sie im Tab \"Plan schreiben\" auf der rechten Seite (Anleitung /"
 " Kommentare)."
 
 #: ../../app/views/user_mailer/feedback_notification.html.erb:2
-msgid "Hello %{user_name},"
-msgstr "Hallo %{user_name},"
+msgid "Hello %<user_name>s,"
+msgstr "Hallo %<user_name>s,"
 
 #: ../../app/views/user_mailer/feedback_notification.html.erb:5
 msgid ""
-"%{requestor} has requested feedback on a plan %{link_html}. To add comments, p"
-"lease visit the 'Plans' page under the Admin menu in %{tool_name} and open the"
+"%<requestor>s has requested feedback on a plan %<link_html>s. To add comments, p"
+"lease visit the 'Plans' page under the Admin menu in %<tool_name>s and open the"
 " plan."
 msgstr ""
-"%{requestor} hat Feedback zu einem Plan angefordert %{link_html}. Um Kommentar"
+"%<requestor>s hat Feedback zu einem Plan angefordert %<link_html>s. Um Kommentar"
 "e hinzuzufügen, besuchen Sie die Seite \"Pläne\" unter dem Menü \"Admin\" in %{too"
 "l_name} und öffnen Sie den Plan."
 
 #: ../../app/views/user_mailer/new_comment.html.erb:5
 msgid ""
-"%{commenter_name} has commented on your plan %{plan_title}. To view the commen"
+"%<commenter_name>s has commented on your plan %<plan_title>s. To view the commen"
 "ts, follow the link to the DMP below, or navigate to the plan via My Dashboard"
-" page in %{tool_name}."
+" page in %<tool_name>s."
 msgstr ""
-"%{commenter_name} hat Ihren Plan %{plan_title} kommentiert. Um die Kommentare "
+"%<commenter_name>s hat Ihren Plan %<plan_title>s kommentiert. Um die Kommentare "
 "anzuzeigen, folgen Sie dem untenstehenden Link zum DMP oder navigieren Sie übe"
-"r die Seite Mein Dashboard in %{tool_name} zum Plan."
+"r die Seite Mein Dashboard in %<tool_name>s zum Plan."
 
 #: ../../app/views/user_mailer/new_comment.html.erb:10
 msgid "Below is a summary of the sections and questions which have comments."
@@ -5991,24 +5991,24 @@ msgstr ""
 "terungen zu jeder Frage sehen."
 
 #: ../../app/views/user_mailer/new_comment.html.erb:15
-msgid "DMP: %{phase_link}"
-msgstr "DMP: %{phase_link}"
+msgid "DMP: %<phase_link>s"
+msgstr "DMP: %<phase_link>s"
 
 #: ../../app/views/user_mailer/new_comment.html.erb:18
-msgid "Section name: %{section_title}"
-msgstr "Abschnittsname: %{section_title}"
+msgid "Section name: %<section_title>s"
+msgstr "Abschnittsname: %<section_title>s"
 
 #: ../../app/views/user_mailer/new_comment.html.erb:21
-msgid "Question: %{question_number}"
-msgstr "Frage: %{question_number}"
+msgid "Question: %<question_number>s"
+msgstr "Frage: %<question_number>s"
 
 #: ../../app/views/user_mailer/permissions_change_notification.html.erb:5
 msgid ""
-"Your permissions relating to %{plan_title} have changed. You now have %{type} "
-"access. This means you can %{placeholder1} %{placeholder2}"
+"Your permissions relating to %<plan_title>s have changed. You now have %<type>s "
+"access. This means you can %<placeholder1>s %<placeholder2>s"
 msgstr ""
-"Ihre Berechtigungen für %{plan_title} haben sich geändert. Sie haben jetzt %{t"
-"ype} Zugriff. Dies bedeutet, dass Sie %{placeholder1} %{placeholder2}"
+"Ihre Berechtigungen für %<plan_title>s haben sich geändert. Sie haben jetzt %{t"
+"ype} Zugriff. Dies bedeutet, dass Sie %<placeholder1>s %<placeholder2>s"
 
 #: ../../app/views/user_mailer/plan_access_removed.html.erb:2
 msgid "Hello "
@@ -6023,8 +6023,8 @@ msgid " has been removed by "
 msgstr " wurde entfernt von"
 
 #: ../../app/views/user_mailer/plan_visibility.html.erb:5
-msgid "The plan %{plan_title} had its visibility changed to %{plan_visibility}."
-msgstr "Der Plan %{plan_title} wurde in %{plan_visibility} geändert."
+msgid "The plan %<plan_title>s had its visibility changed to %<plan_visibility>s."
+msgstr "Der Plan %<plan_title>s wurde in %<plan_visibility>s geändert."
 
 #: ../../app/views/user_mailer/plan_visibility.html.erb:9
 msgid "Visibility definitions:"
@@ -6041,14 +6041,14 @@ msgstr "Öffentlich: Jeder kann im Internet sehen"
 #: ../../app/views/user_mailer/plan_visibility.html.erb:17
 msgid ""
 "If you have questions pertaining to this action, please visit the My Dashboard"
-" page in %{tool_name}"
+" page in %<tool_name>s"
 msgstr ""
 "Wenn Sie Fragen zu dieser Aktion haben, besuchen Sie bitte die My Dashboard-Se"
-"ite in %{tool_name}"
+"ite in %<tool_name>s"
 
 #: ../../app/views/user_mailer/question_answered.html.erb:2
-msgid "Hello %{recipient_name},"
-msgstr "Hallo %{recipient_name},"
+msgid "Hello %<recipient_name>s,"
+msgstr "Hallo %<recipient_name>s,"
 
 #: ../../app/views/user_mailer/question_answered.html.erb:5
 msgid " is creating a Data Management Plan and has answered "
@@ -6068,33 +6068,35 @@ msgstr " basierend auf der Vorlage"
 
 #: ../../app/views/user_mailer/sharing_notification.html.erb:5
 msgid ""
-"Your colleague %{inviter_name} has invited you to contribute to
\n"
-"          their Data Management Plan in %{tool_name}"
+"Your colleague %<inviter_name>s has invited you to contribute to
+\n"
+"          their Data Management Plan in %<tool_name>s"
 msgstr ""
-"Ihr Kollege %{inviter_name} hat Sie eingeladen, einen Beitrag zu leisten
\n"
-"          ihren Datenverwaltungsplan in %{tool_name}"
+"Ihr Kollege %<inviter_name>s hat Sie eingeladen, einen Beitrag zu leisten
+\n"
+"          ihren Datenverwaltungsplan in %<tool_name>s"
 
 #: ../../app/views/user_mailer/welcome_notification.html.erb:2
-msgid "Welcome to %{tool_name}, %{username}"
-msgstr "Willkommen bei %{tool_name}, %{username}"
+msgid "Welcome to %<tool_name>s, %<username>s"
+msgstr "Willkommen bei %<tool_name>s, %<username>s"
 
 #: ../../app/views/user_mailer/welcome_notification.html.erb:5
 msgid ""
-"%{tool_name} will help you to develop your Data Management Plan. If you have a"
+"%<tool_name>s will help you to develop your Data Management Plan. If you have a"
 "ny queries or feedback as you use the tool, please contact us at %{helpdesk_em"
-"ail} or visit %{contact_us}"
+"ail} or visit %<contact_us>s"
 msgstr ""
-"%{tool_name} hilft Ihnen bei der Entwicklung Ihres Datenmanagementplans. Wenn "
+"%<tool_name>s hilft Ihnen bei der Entwicklung Ihres Datenmanagementplans. Wenn "
 "Sie zum Verwenden des Tools Fragen haben oder Feedback geben möchten, kontakti"
-"eren Sie uns bitte über %{helpdesk_email} oder gehen Sie auf %{contact_us}."
+"eren Sie uns bitte über %<helpdesk_email>s oder gehen Sie auf %<contact_us>s."
 
 #: ../../app/views/user_mailer/welcome_notification.html.erb:13
 msgid "You may change your notification preferences on your profile page."
 msgstr "Sie können Ihre Benachrichtigungseinstellungen auf Ihrer Profilseite ändern."
 
 #: ../../app/views/users/_admin_grant_permissions.html.erb:9
-msgid "Editing privileges for %{username}"
-msgstr "Bearbeitungsrechte für %{username}"
+msgid "Editing privileges for %<username>s"
+msgstr "Bearbeitungsrechte für %<username>s"
 
 #: ../../app/views/users/_admin_grant_permissions.html.erb:19
 msgid ""
diff --git a/config/locale/en_CA/app.po b/config/locale/en_CA/app.po
index b0d0a9e32a..1a5e29f726 100644
--- a/config/locale/en_CA/app.po
+++ b/config/locale/en_CA/app.po
@@ -20,12 +20,12 @@ msgstr ""
 
 #: ../../app/controllers/answers_controller.rb:24
 msgid ""
-"There is no question with id %{question_id} associated to plan id %{plan_id} f"
+"There is no question with id %<question_id>s associated to plan id %<plan_id>s f"
 "or which to create or update an answer"
 msgstr ""
 
 #: ../../app/controllers/answers_controller.rb:34
-msgid "There is no plan with id %{id} for which to create or update an answer"
+msgid "There is no plan with id %<id>s for which to create or update an answer"
 msgstr ""
 
 #: ../../app/controllers/api/v0/base_controller.rb:124
@@ -133,11 +133,11 @@ msgid "You need to sign in or sign up before continuing."
 msgstr "You need to sign in or sign up before continuing."
 
 #: ../../app/controllers/application_controller.rb:100
-msgid "Unable to %{action} the %{object}.%{errors}"
+msgid "Unable to %<action>s the %<object>s.%<errors>s"
 msgstr ""
 
 #: ../../app/controllers/application_controller.rb:108
-msgid "Successfully %{action} the %{object}."
+msgid "Successfully %<action>s the %<object>s."
 msgstr ""
 
 #: ../../app/controllers/application_controller.rb:123
@@ -201,7 +201,7 @@ msgid "Restricted access to View All the records"
 msgstr ""
 
 #: ../../app/controllers/concerns/paginable.rb:180
-msgid "Sort by %{sort_field}"
+msgid "Sort by %<sort_field>s"
 msgstr ""
 
 #: ../../app/controllers/concerns/template_methods.rb:10
@@ -403,11 +403,11 @@ msgid "Your guidance is no longer published and will not be available to users."
 msgstr ""
 
 #: ../../app/controllers/identifiers_controller.rb:18
-msgid "Successfully unlinked your account from %{is}."
+msgid "Successfully unlinked your account from %<is>s."
 msgstr ""
 
 #: ../../app/controllers/identifiers_controller.rb:22
-msgid "Unable to unlink your account from %{is}."
+msgid "Unable to unlink your account from %<is>s."
 msgstr ""
 
 #: ../../app/controllers/org_admin/phases_controller.rb:18
@@ -456,7 +456,7 @@ msgid "update"
 msgstr ""
 
 #: ../../app/controllers/org_admin/plans_controller.rb:32
-msgid "%{plan_owner} has been notified that you have finished providing feedback"
+msgid "%<plan_owner>s has been notified that you have finished providing feedback"
 msgstr ""
 
 #: ../../app/controllers/org_admin/plans_controller.rb:38
@@ -548,7 +548,7 @@ msgstr ""
 
 #: ../../app/controllers/org_admin/templates_controller.rb:48
 #: ../../app/views/org_admin/templates/index.html.erb:52
-msgid "%{org_name} Templates"
+msgid "%<org_name>s Templates"
 msgstr ""
 
 #: ../../app/controllers/org_admin/templates_controller.rb:50
@@ -561,12 +561,12 @@ msgid "Customizable Templates"
 msgstr ""
 
 #: ../../app/controllers/org_admin/templates_controller.rb:214
-msgid "Error parsing links for a %{template}"
+msgid "Error parsing links for a %<template>s"
 msgstr ""
 
 #: ../../app/controllers/org_admin/templates_controller.rb:345
 #: ../../app/controllers/public_pages_controller.rb:68
-msgid "Template created using the %{application_name} service. Last modified %{date}"
+msgid "Template created using the %<application_name>s service. Last modified %<date>s"
 msgstr ""
 
 #: ../../app/controllers/org_admin/templates_controller.rb:360
@@ -587,7 +587,7 @@ msgid "Please choose an organisation"
 msgstr ""
 
 #: ../../app/controllers/plan_exports_controller.rb:85
-msgid "Created using %{application_name}. Last modified %{date}"
+msgid "Created using %<application_name>s. Last modified %<date>s"
 msgstr ""
 
 #: ../../app/controllers/plans_controller.rb:51
@@ -629,12 +629,12 @@ msgstr ""
 
 #: ../../app/controllers/plans_controller.rb:408
 msgid ""
-"Unable to change the plan's status since it is needed at least %{percentage} p"
+"Unable to change the plan's status since it is needed at least %<percentage>s p"
 "ercentage responded"
 msgstr ""
 
 #: ../../app/controllers/plans_controller.rb:416
-msgid "Unable to find plan id %{plan_id}"
+msgid "Unable to find plan id %<plan_id>s"
 msgstr ""
 
 #: ../../app/controllers/plans_controller.rb:433
@@ -650,13 +650,13 @@ msgid "Unable to change the plan's test status"
 msgstr ""
 
 #: ../../app/controllers/plans_controller.rb:451
-msgid "There is no plan associated with id %{id}"
+msgid "There is no plan associated with id %<id>s"
 msgstr ""
 
 #: ../../app/controllers/registrations_controller.rb:35
 msgid ""
 "Please make a choice below. After linking your\n"
-"                       details to a %{application_name} account,\n"
+"                       details to a %<application_name>s account,\n"
 "                       you will be able to sign in directly with your\n"
 "                       institutional credentials."
 msgstr ""
@@ -730,12 +730,12 @@ msgstr ""
 
 #: ../../app/controllers/roles_controller.rb:26
 msgid ""
-"Cannot share plan with %{email} since that email matches with the owner of the"
+"Cannot share plan with %<email>s since that email matches with the owner of the"
 " plan."
 msgstr ""
 
 #: ../../app/controllers/roles_controller.rb:37
-msgid "Plan is already shared with %{email}."
+msgid "Plan is already shared with %<email>s."
 msgstr ""
 
 #: ../../app/controllers/roles_controller.rb:44
@@ -748,11 +748,11 @@ msgid "Surname"
 msgstr ""
 
 #: ../../app/controllers/roles_controller.rb:48
-msgid "Invitation to %{email} issued successfully."
+msgid "Invitation to %<email>s issued successfully."
 msgstr ""
 
 #: ../../app/controllers/roles_controller.rb:53
-msgid "Plan shared with %{email}."
+msgid "Plan shared with %<email>s."
 msgstr ""
 
 #: ../../app/controllers/roles_controller.rb:68
@@ -765,7 +765,7 @@ msgstr ""
 
 #: ../../app/controllers/roles_controller.rb:93
 msgid ""
-"Successfully changed the permissions for %{email}. They have been notified via"
+"Successfully changed the permissions for %<email>s. They have been notified via"
 " email."
 msgstr ""
 
@@ -796,7 +796,7 @@ msgid "An error has occurred while saving/resetting your export settings."
 msgstr ""
 
 #: ../../app/controllers/super_admin/api_clients_controller.rb:45
-msgid ". The API credentials have been emailed to %{email}"
+msgid ". The API credentials have been emailed to %<email>s"
 msgstr ""
 
 #: ../../app/controllers/super_admin/notifications_controller.rb:69
@@ -812,13 +812,13 @@ msgid "Unable to change the notification's active status"
 msgstr ""
 
 #: ../../app/controllers/super_admin/notifications_controller.rb:104
-msgid "There is no notification associated with id  %{id}"
+msgid "There is no notification associated with id  %<id>s"
 msgstr ""
 
 #: ../../app/controllers/super_admin/org_swaps_controller.rb:22
 msgid ""
 "Your organisation affiliation has been changed. You may now edit templates for"
-" %{org_name}."
+" %<org_name>s."
 msgstr ""
 
 #: ../../app/controllers/super_admin/org_swaps_controller.rb:25
@@ -878,15 +878,15 @@ msgid "Successfully signed in"
 msgstr ""
 
 #: ../../app/controllers/users/omniauth_callbacks_controller.rb:56
-msgid "Your account has been successfully linked to %{scheme}."
+msgid "Your account has been successfully linked to %<scheme>s."
 msgstr ""
 
 #: ../../app/controllers/users/omniauth_callbacks_controller.rb:61
-msgid "Unable to link your account to %{scheme}."
+msgid "Unable to link your account to %<scheme>s."
 msgstr ""
 
 #: ../../app/controllers/users_controller.rb:141
-msgid "Successfully %{action} %{username}'s account."
+msgid "Successfully %<action>s %<username>s's account."
 msgstr ""
 
 #: ../../app/controllers/users_controller.rb:142
@@ -898,7 +898,7 @@ msgid "deactivated"
 msgstr ""
 
 #: ../../app/controllers/users_controller.rb:149
-msgid "Unable to %{action} %{username}"
+msgid "Unable to %<action>s %<username>s"
 msgstr ""
 
 #: ../../app/controllers/users_controller.rb:150
@@ -965,16 +965,16 @@ msgid "Creator:"
 msgstr ""
 
 #: ../../app/helpers/feedbacks_helper.rb:6
-msgid "%{application_name}: Your plan has been submitted for feedback"
+msgid "%<application_name>s: Your plan has been submitted for feedback"
 msgstr ""
 
 #: ../../app/helpers/feedbacks_helper.rb:10
 msgid ""
-"<p>Hello %{user_name}.</p><p>Your plan \"%{plan_name}\" has been submitted for f"
+"<p>Hello %<user_name>s.</p><p>Your plan \"%<plan_name>s\" has been submitted for f"
 "eedback from an\n"
 "      administrator at your organisation. If you have questions pertaining to "
 "this action, please contact us\n"
-"      at %{organisation_email}.</p>"
+"      at %<organisation_email>s.</p>"
 msgstr ""
 
 #: ../../app/helpers/identifier_helper.rb:6
@@ -1008,10 +1008,10 @@ msgstr ""
 
 #: ../../app/helpers/orgs_helper.rb:14
 msgid ""
-"<p>A data librarian from %{org_name} will respond to your request within 48\n"
+"<p>A data librarian from %<org_name>s will respond to your request within 48\n"
 "       hours. If you have questions pertaining to this action please contact u"
 "s\n"
-"       at %{organisation_email}.</p>"
+"       at %<organisation_email>s.</p>"
 msgstr ""
 
 #: ../../app/helpers/perms_helper.rb:9
@@ -1145,7 +1145,7 @@ msgid "None"
 msgstr ""
 
 #: ../../app/helpers/super_admin/orgs/merge_helper.rb:31
-msgid "Guidance for: %{themes}"
+msgid "Guidance for: %<themes>s"
 msgstr ""
 
 #: ../../app/helpers/super_admin/orgs/merge_helper.rb:53
@@ -1153,7 +1153,7 @@ msgid "Nothing to merge"
 msgstr ""
 
 #: ../../app/helpers/super_admin/orgs/merge_helper.rb:55
-msgid "<p>The following %{object_types} will be moved over to '%{org_name}':</p>"
+msgid "<p>The following %<object_types>s will be moved over to '%<org_name>s':</p>"
 msgstr ""
 
 #: ../../app/helpers/template_helper.rb:46
@@ -1189,47 +1189,47 @@ msgstr ""
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:6
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:5
 #: ../../app/views/user_mailer/_email_signature.html.erb:2
-msgid "Query or feedback related to %{tool_name}"
+msgid "Query or feedback related to %<tool_name>s"
 msgstr ""
 
 #: ../../app/mailers/user_mailer.rb:23
-msgid "Welcome to %{tool_name}"
+msgid "Welcome to %<tool_name>s"
 msgstr ""
 
 #: ../../app/mailers/user_mailer.rb:58
-msgid "A Data Management Plan in %{tool_name} has been shared with you"
+msgid "A Data Management Plan in %<tool_name>s has been shared with you"
 msgstr ""
 
 #: ../../app/mailers/user_mailer.rb:76
-msgid "Changed permissions on a Data Management Plan in %{tool_name}"
+msgid "Changed permissions on a Data Management Plan in %<tool_name>s"
 msgstr ""
 
 #: ../../app/mailers/user_mailer.rb:92
-msgid "Permissions removed on a DMP in %{tool_name}"
+msgid "Permissions removed on a DMP in %<tool_name>s"
 msgstr ""
 
 #: ../../app/mailers/user_mailer.rb:111
-msgid "%{user_name} has requested feedback on a %{tool_name} plan"
+msgid "%<user_name>s has requested feedback on a %<tool_name>s plan"
 msgstr ""
 
 #: ../../app/mailers/user_mailer.rb:134
-msgid "%{tool_name}: Expert feedback has been provided for %{plan_title}"
+msgid "%<tool_name>s: Expert feedback has been provided for %<plan_title>s"
 msgstr ""
 
 #: ../../app/mailers/user_mailer.rb:169
-msgid "DMP Visibility Changed: %{plan_title}"
+msgid "DMP Visibility Changed: %<plan_title>s"
 msgstr ""
 
 #: ../../app/mailers/user_mailer.rb:200
-msgid "%{tool_name}: A new comment was added to %{plan_title}"
+msgid "%<tool_name>s: A new comment was added to %<plan_title>s"
 msgstr ""
 
 #: ../../app/mailers/user_mailer.rb:218
-msgid "Administrator privileges granted in %{tool_name}"
+msgid "Administrator privileges granted in %<tool_name>s"
 msgstr ""
 
 #: ../../app/mailers/user_mailer.rb:235
-msgid "%{tool_name} API changes"
+msgid "%<tool_name>s API changes"
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:26
@@ -1262,11 +1262,11 @@ msgid "Creators: "
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:134
-msgid "%{authors}"
+msgid "%<authors>s"
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:135
-msgid "%{affiliation}"
+msgid "%<affiliation>s"
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:137
@@ -1278,11 +1278,11 @@ msgid "Template: "
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:137
-msgid "%{funder}"
+msgid "%<funder>s"
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:139
-msgid "%{template}"
+msgid "%<template>s"
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:142
@@ -1291,7 +1291,7 @@ msgid "Grant number: "
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:142
-msgid "%{grant_number}"
+msgid "%<grant_number>s"
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:145
@@ -1301,7 +1301,7 @@ msgid "Project abstract: "
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:145
-msgid "%{description}"
+msgid "%<description>s"
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:148
@@ -1311,7 +1311,7 @@ msgid "Last modified: "
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:148
-msgid "%{date}"
+msgid "%<date>s"
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:149
@@ -1483,7 +1483,7 @@ msgid "generate_copy! requires an organisation target"
 msgstr ""
 
 #: ../../app/models/template.rb:380
-msgid "Copy of %{template}"
+msgid "Copy of %<template>s"
 msgstr ""
 
 #: ../../app/models/template.rb:388
@@ -1523,7 +1523,7 @@ msgid "Conditions in the template refer backwards"
 msgstr ""
 
 #: ../../app/models/user.rb:379
-msgid "A Data Management Plan in %{application_name} has been shared with you"
+msgid "A Data Management Plan in %<application_name>s has been shared with you"
 msgstr ""
 
 #: ../../app/policies/api/v0/departments_policy.rb:12
@@ -1633,7 +1633,7 @@ msgid ""
 msgstr ""
 
 #: ../../app/validators/after_validator.rb:5
-msgid "must be after %{date}"
+msgid "must be after %<date>s"
 msgstr ""
 
 #: ../../app/validators/org_links_validator.rb:10
@@ -1646,11 +1646,11 @@ msgid "A hash is expected for links"
 msgstr ""
 
 #: ../../app/validators/template_links_validator.rb:12
-msgid "A key %{key} is expected for links hash"
+msgid "A key %<key>s is expected for links hash"
 msgstr ""
 
 #: ../../app/validators/template_links_validator.rb:15
-msgid "The key %{key} does not have a valid set of object links"
+msgid "The key %<key>s does not have a valid set of object links"
 msgstr ""
 
 #: ../../app/views/answers/_locking.html.erb:5
@@ -1659,7 +1659,7 @@ msgstr ""
 
 #: ../../app/views/answers/_locking.html.erb:8
 msgid ""
-"since %{name} saved the answer below while you were editing. Please, combine y"
+"since %<name>s saved the answer below while you were editing. Please, combine y"
 "our changes and then save the answer again."
 msgstr ""
 
@@ -1734,7 +1734,7 @@ msgid "Answered"
 msgstr ""
 
 #: ../../app/views/answers/_status.html.erb:10
-msgid " by %{user_name}"
+msgid " by %<user_name>s"
 msgstr ""
 
 #: ../../app/views/answers/_status.html.erb:15
@@ -1812,11 +1812,11 @@ msgstr ""
 
 #: ../../app/views/contact_us/contacts/new.html.erb:6
 msgid ""
-"%{application_name} is provided by the %{organisation_name}.<br /> You can fin"
-"d out more about us on our <a href=\"%{organisation_url}\" class=\"has-new-window"
+"%<application_name>s is provided by the %<organisation_name>s.<br /> You can fin"
+"d out more about us on our <a href=\"%<organisation_url>s\" class=\"has-new-window"
 "-popup-info\" target=\"_blank\">website <em class=\"sr-only\">(new window)</em><spa"
-"n class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>. If you "
-"would like to contact us about %{application_name}, please fill out the form b"
+"n class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a>. If you "
+"would like to contact us about %<application_name>s, please fill out the form b"
 "elow."
 msgstr ""
 
@@ -1978,7 +1978,7 @@ msgid "Create account"
 msgstr ""
 
 #: ../../app/views/devise/mailer/confirmation_instructions.html.erb:2
-msgid "Welcome to %{application_name}"
+msgid "Welcome to %<application_name>s"
 msgstr ""
 
 #: ../../app/views/devise/mailer/confirmation_instructions.html.erb:4
@@ -1999,19 +1999,19 @@ msgstr ""
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:12
 #: ../../app/views/user_mailer/new_comment.html.erb:2
-msgid "Hello %{user_name}"
+msgid "Hello %<user_name>s"
 msgstr ""
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:15
 msgid ""
-"Your colleague %{inviter_name} has invited you to contribute to  their Data Ma"
-"nagement Plan in %{tool_name}"
+"Your colleague %<inviter_name>s has invited you to contribute to  their Data Ma"
+"nagement Plan in %<tool_name>s"
 msgstr ""
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:22
 #: ../../app/views/user_mailer/sharing_notification.html.erb:11
 msgid ""
-"%{click_here} to accept the invitation, (or copy %{link} into your browser). I"
+"%<click_here>s to accept the invitation, (or copy %<link>s into your browser). I"
 "f you don't want to accept the invitation, please ignore this email."
 msgstr ""
 
@@ -2031,7 +2031,7 @@ msgstr ""
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:19
 #: ../../app/views/user_mailer/_email_signature.html.erb:12
 #: ../../app/views/user_mailer/welcome_notification.html.erb:10
-msgid "The %{tool_name} team"
+msgid "The %<tool_name>s team"
 msgstr ""
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:32
@@ -2043,17 +2043,17 @@ msgstr ""
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:33
 msgid ""
-"If you have any questions or need help, please contact us at %{helpdesk_email}"
-" or visit %{contact_us_url}"
+"If you have any questions or need help, please contact us at %<helpdesk_email>s"
+" or visit %<contact_us_url>s"
 msgstr ""
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:9
-msgid "Hello %{user_email}"
+msgid "Hello %<user_email>s"
 msgstr ""
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:12
 msgid ""
-"Someone has requested a link to change your %{tool_name} password. You can do "
+"Someone has requested a link to change your %<tool_name>s password. You can do "
 "this through the link below."
 msgstr ""
 
@@ -2068,8 +2068,8 @@ msgstr ""
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:22
 #: ../../app/views/user_mailer/_email_signature.html.erb:19
 msgid ""
-"If you have any questions or need help, please contact us at %{helpdesk_email}"
-" or visit %{contact_us}"
+"If you have any questions or need help, please contact us at %<helpdesk_email>s"
+" or visit %<contact_us>s"
 msgstr ""
 
 #: ../../app/views/devise/mailer/unlock_instructions.html.erb:2
@@ -2138,15 +2138,15 @@ msgstr ""
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:16
 msgid ""
-"See the <a href=\"%{api_v0_wiki}\">documentation for v0</a> for more details on "
+"See the <a href=\"%<api_v0_wiki>s\">documentation for v0</a> for more details on "
 "the original API which includes access to statistics, the full text of plans a"
 "nd the ability to connect users with departments."
 msgstr ""
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:18
 msgid ""
-"See the <a href=\"%{api_v1_wiki}\">documentation for v1</a> for more details on "
-"the API that supports the <a href=\"%{rda_standard_url}\">RDA Common metadata st"
+"See the <a href=\"%<api_v1_wiki>s\">documentation for v1</a> for more details on "
+"the API that supports the <a href=\"%<rda_standard_url>s\">RDA Common metadata st"
 "andard for DMPs.</a>"
 msgstr ""
 
@@ -2305,7 +2305,7 @@ msgid "Sign in or Create account"
 msgstr ""
 
 #: ../../app/views/devise/registrations/new.html.erb:15
-msgid "Do you have a %{application_name} account?"
+msgid "Do you have a %<application_name>s account?"
 msgstr ""
 
 #: ../../app/views/devise/registrations/new.html.erb:22
@@ -2321,7 +2321,7 @@ msgid "This will link your existing account to your credentials."
 msgstr ""
 
 #: ../../app/views/devise/registrations/new.html.erb:34
-msgid "No %{application_name} account?"
+msgid "No %<application_name>s account?"
 msgstr ""
 
 #: ../../app/views/devise/registrations/new.html.erb:46
@@ -2473,7 +2473,7 @@ msgstr ""
 
 #: ../../app/views/home/_welcome.html.erb:5
 msgid ""
-"<p>%{application_name} has been developed by the <strong>%{organisation_name}<"
+"<p>%<application_name>s has been developed by the <strong>%<organisation_name>s<"
 "/strong> to help you write data management plans.</p>"
 msgstr ""
 
@@ -2660,7 +2660,7 @@ msgid "Logout"
 msgstr ""
 
 #: ../../app/views/layouts/application.html.erb:32
-msgid "%{application_name}"
+msgid "%<application_name>s"
 msgstr ""
 
 #: ../../app/views/layouts/application.html.erb:91
@@ -2734,7 +2734,7 @@ msgstr ""
 
 #: ../../app/views/layouts/application.html.erb:142
 msgid ""
-"%{n} results are available, use up and down arrows to navigate suggestions. Us"
+"%<n>s results are available, use up and down arrows to navigate suggestions. Us"
 "e the Enter key to select a suggestion or the Escape key to close the suggesti"
 "ons."
 msgstr ""
@@ -2787,7 +2787,7 @@ msgid "Example answer"
 msgstr ""
 
 #: ../../app/views/org_admin/annotations/_show.html.erb:4
-msgid "%{org} Example Answer"
+msgid "%<org>s Example Answer"
 msgstr ""
 
 #: ../../app/views/org_admin/conditions/_add.html.erb:3
@@ -2934,7 +2934,7 @@ msgstr ""
 
 #: ../../app/views/org_admin/phases/_phase.html.erb:17
 msgid ""
-"You are about to delete the '%{phase_title}' phase. This will remove all of th"
+"You are about to delete the '%<phase_title>s' phase. This will remove all of th"
 "e sections and questions listed below. Are you sure?"
 msgstr ""
 
@@ -2994,7 +2994,7 @@ msgid "Write plan"
 msgstr ""
 
 #: ../../app/views/org_admin/plans/index.html.erb:4
-msgid "%{org_name} Plans"
+msgid "%<org_name>s Plans"
 msgstr ""
 
 #: ../../app/views/org_admin/plans/index.html.erb:16
@@ -3046,7 +3046,7 @@ msgstr ""
 #: ../../app/views/org_admin/plans/index.html.erb:39
 msgid ""
 "Download plans <em class=\"sr-only\">(new window)</em><span class=\"new-window-po"
-"pup-info\">%{open_in_new_window_text}</span>"
+"pup-info\">%<open_in_new_window_text>s</span>"
 msgstr ""
 
 #: ../../app/views/org_admin/question_options/_option_fields.html.erb:3
@@ -3074,7 +3074,7 @@ msgid ""
 msgstr ""
 
 #: ../../app/views/org_admin/questions/_form.html.erb:4
-msgid "Question %{number}:"
+msgid "Question %<number>s:"
 msgstr ""
 
 #: ../../app/views/org_admin/questions/_form.html.erb:4
@@ -3139,7 +3139,7 @@ msgid "Delete"
 msgstr ""
 
 #: ../../app/views/org_admin/questions/_form.html.erb:102
-msgid "You are about to delete question #%{question_number}. Are you sure?"
+msgid "You are about to delete question #%<question_number>s. Are you sure?"
 msgstr ""
 
 #: ../../app/views/org_admin/questions/_index.html.erb:14
@@ -3229,7 +3229,7 @@ msgstr ""
 
 #: ../../app/views/org_admin/sections/_form.html.erb:20
 msgid ""
-"You are about to delete '%{section_title}'. This will affect questions linked "
+"You are about to delete '%<section_title>s'. This will affect questions linked "
 "to this section. Are you sure?"
 msgstr ""
 
@@ -3255,7 +3255,7 @@ msgstr ""
 
 #: ../../app/views/org_admin/templates/_form.html.erb:25
 #: ../../app/views/org_admin/templates/_show.html.erb:35
-msgid "for internal %{org_name} use only"
+msgid "for internal %<org_name>s use only"
 msgstr ""
 
 #: ../../app/views/org_admin/templates/_form.html.erb:32
@@ -3413,21 +3413,21 @@ msgstr ""
 
 #: ../../app/views/org_admin/templates/index.html.erb:80
 #: ../../app/views/org_admin/templates/index.html.erb:93
-msgid "All (%{count})"
+msgid "All (%<count>s)"
 msgstr ""
 
 #: ../../app/views/org_admin/templates/index.html.erb:83
 #: ../../app/views/org_admin/templates/index.html.erb:96
-msgid "Published (%{count})"
+msgid "Published (%<count>s)"
 msgstr ""
 
 #: ../../app/views/org_admin/templates/index.html.erb:86
 #: ../../app/views/org_admin/templates/index.html.erb:99
-msgid "Unpublished (%{count})"
+msgid "Unpublished (%<count>s)"
 msgstr ""
 
 #: ../../app/views/org_admin/templates/index.html.erb:89
-msgid "Not customised (%{count})"
+msgid "Not customised (%<count>s)"
 msgstr ""
 
 #: ../../app/views/org_admin/templates/index.html.erb:118
@@ -3437,7 +3437,7 @@ msgstr ""
 #: ../../app/views/org_admin/users/edit.html.erb:4
 #: ../../app/views/super_admin/users/edit.html.erb:1
 #: ../../app/views/super_admin/users/edit.html.erb:5
-msgid "Editing profile for %{username}"
+msgid "Editing profile for %<username>s"
 msgstr ""
 
 #: ../../app/views/org_admin/users/edit.html.erb:5
@@ -3446,7 +3446,7 @@ msgid "View all users"
 msgstr ""
 
 #: ../../app/views/org_admin/users/plans.html.erb:3
-msgid "Plans of %{username}"
+msgid "Plans of %<username>s"
 msgstr ""
 
 #: ../../app/views/orgs/_departments.html.erb:1
@@ -3505,7 +3505,7 @@ msgstr ""
 #: ../../app/views/orgs/_merge_form.html.erb:7
 msgid ""
 "Please select the Organisation that will replace the current organisation: '<s"
-"trong>%{org_name}</strong>'."
+"trong>%<org_name>s</strong>'."
 msgstr ""
 
 #: ../../app/views/orgs/_merge_form.html.erb:8
@@ -3680,12 +3680,12 @@ msgstr ""
 
 #: ../../app/views/paginable/api_clients/_index.html.erb:44
 msgid ""
-"You are about to delete '%{client_name}'. They will no longer be able to acces"
+"You are about to delete '%<client_name>s'. They will no longer be able to acces"
 "s the API. Are you sure?"
 msgstr ""
 
 #: ../../app/views/paginable/contributors/_index.html.erb:57
-msgid "You are about to delete '%{contributor_name}'. Are you sure?"
+msgid "You are about to delete '%<contributor_name>s'. Are you sure?"
 msgstr ""
 
 #: ../../app/views/paginable/departments/_index.html.erb:5
@@ -3699,7 +3699,7 @@ msgstr ""
 
 #: ../../app/views/paginable/departments/_index.html.erb:28
 msgid ""
-"You are about to delete '%{department_name}'. This will affect guidance. Are y"
+"You are about to delete '%<department_name>s'. This will affect guidance. Are y"
 "ou sure?"
 msgstr ""
 
@@ -3741,12 +3741,12 @@ msgstr ""
 
 #: ../../app/views/paginable/guidance_groups/_index.html.erb:50
 msgid ""
-"You are about to delete '%{guidance_group_name}'. This will affect guidance. A"
+"You are about to delete '%<guidance_group_name>s'. This will affect guidance. A"
 "re you sure?"
 msgstr ""
 
 #: ../../app/views/paginable/guidances/_index.html.erb:62
-msgid "You are about to delete '%{guidance_summary}'. Are you sure?"
+msgid "You are about to delete '%<guidance_summary>s'. Are you sure?"
 msgstr ""
 
 #: ../../app/views/paginable/notifications/_index.html.erb:5
@@ -3783,7 +3783,7 @@ msgid "Managed"
 msgstr ""
 
 #: ../../app/views/paginable/orgs/_index.html.erb:35
-msgid "You are about to delete '%{org_name}'. Are you sure?"
+msgid "You are about to delete '%<org_name>s'. Are you sure?"
 msgstr ""
 
 #: ../../app/views/paginable/plans/_org_admin.html.erb:3
@@ -3933,7 +3933,7 @@ msgstr ""
 
 #: ../../app/views/paginable/templates/_customisable.html.erb:69
 msgid ""
-"Are you sure you want to remove your customization of \"%{template_title}\"? Any"
+"Are you sure you want to remove your customization of \"%<template_title>s\"? Any"
 " published versions will become unavailable to users."
 msgstr ""
 
@@ -3951,7 +3951,7 @@ msgstr ""
 
 #: ../../app/views/paginable/templates/_organisational.html.erb:76
 msgid ""
-"Are you sure you want to remove \"%{template_title}\"? Any published versions wi"
+"Are you sure you want to remove \"%<template_title>s\"? Any published versions wi"
 "ll become unavailable to users."
 msgstr ""
 
@@ -4103,7 +4103,7 @@ msgstr ""
 #: ../../app/views/plans/_download_form.html.erb:119
 msgid ""
 "Download Plan <em class=\"sr-only\">(new window)</em><span class=\"new-window-pop"
-"up-info\">%{open_in_new_window_text}</span>"
+"up-info\">%<open_in_new_window_text>s</span>"
 msgstr ""
 
 #: ../../app/views/plans/_edit_details.html.erb:13
@@ -4113,7 +4113,7 @@ msgstr ""
 
 #: ../../app/views/plans/_guidance_selection.html.erb:6
 msgid ""
-"To help you write your plan, %{application_name} can show you guidance from a "
+"To help you write your plan, %<application_name>s can show you guidance from a "
 "variety of organisations."
 msgstr ""
 
@@ -4135,7 +4135,7 @@ msgstr ""
 
 #: ../../app/views/plans/_guidance_selection.html.erb:40
 msgid ""
-"To help you write your plan, %{application_name} can show you guidance from a "
+"To help you write your plan, %<application_name>s can show you guidance from a "
 "variety of organisations. Please choose up to 6 organisations of the following"
 " organisations who offer guidance relevant to your plan."
 msgstr ""
@@ -4162,16 +4162,16 @@ msgstr ""
 
 #: ../../app/views/plans/_overview_details.html.erb:9
 msgid ""
-"This plan is based on the \"%{template_title}\" template provided by %{org_name}"
+"This plan is based on the \"%<template_title>s\" template provided by %<org_name>s"
 "."
 msgstr ""
 
 #: ../../app/views/plans/_overview_details.html.erb:17
-msgid "Template version %{template_version}, published on %{published_date}"
+msgid "Template version %<template_version>s, published on %<published_date>s"
 msgstr ""
 
 #: ../../app/views/plans/_overview_details.html.erb:42
-msgid "%{phase_title} (%{sections_size} %{sections}, %{questions_size} %{questions})"
+msgid "%<phase_title>s (%<sections_size>s %<sections>s, %<questions_size>s %<questions>s)"
 msgstr ""
 
 #: ../../app/views/plans/_overview_details.html.erb:43
@@ -4275,7 +4275,7 @@ msgstr ""
 #: ../../app/views/plans/_share_form.html.erb:9
 msgid ""
 "Public or organisational visibility is intended for finished plans. You must a"
-"nswer at least %{percentage}%% of the questions to enable these options. Note:"
+"nswer at least %<percentage>s%% of the questions to enable these options. Note:"
 " test plans are set to private visibility by default."
 msgstr ""
 
@@ -4357,7 +4357,7 @@ msgid "Click the 'Create plan' button below to begin."
 msgstr ""
 
 #: ../../app/views/plans/index.html.erb:35
-msgid "%{org_title} Plans"
+msgid "%<org_title>s Plans"
 msgstr ""
 
 #: ../../app/views/plans/index.html.erb:36
@@ -4429,7 +4429,7 @@ msgstr ""
 
 #: ../../app/views/public_pages/plan_index.html.erb:8
 msgid ""
-"Public DMPs are plans created using the %{application_name} service and shared"
+"Public DMPs are plans created using the %<application_name>s service and shared"
 " publicly by their owners. They are not vetted for quality, completeness, or a"
 "dherence to funder guidelines."
 msgstr ""
@@ -4479,7 +4479,7 @@ msgid "terms and conditions"
 msgstr ""
 
 #: ../../app/views/shared/_create_plan_modal.html.erb:8
-msgid "Would you like to create a plan based on the \"%{name}\" template?"
+msgid "Would you like to create a plan based on the \"%<name>s\" template?"
 msgstr ""
 
 #: ../../app/views/shared/_links.html.erb:7
@@ -4533,7 +4533,7 @@ msgstr ""
 
 #: ../../app/views/shared/export/_plan_coversheet.erb:3
 #: ../../app/views/shared/export/_plan_txt.erb:65
-msgid "A Data Management Plan created using %{application_name}"
+msgid "A Data Management Plan created using %<application_name>s"
 msgstr ""
 
 #: ../../app/views/shared/export/_plan_coversheet.erb:10
@@ -4595,7 +4595,7 @@ msgstr ""
 
 #: ../../app/views/static_pages/about_us.html.erb:1
 #: ../../app/views/static_pages/about_us.html.erb:4
-msgid "About %{application_name}"
+msgid "About %<application_name>s"
 msgstr ""
 
 #: ../../app/views/static_pages/about_us.html.erb:11
@@ -4651,7 +4651,7 @@ msgstr ""
 #: ../../app/views/static_pages/about_us.html.erb:22
 msgid ""
 "get involved<em class=\"sr-only\"> (new window)</em><span class=\"new-window-popu"
-"p-info\">%{open_in_new_window_text}</span>"
+"p-info\">%<open_in_new_window_text>s</span>"
 msgstr ""
 
 #: ../../app/views/static_pages/about_us.html.erb:28
@@ -4671,7 +4671,7 @@ msgid "If you have an account please sign in and start creating or editing your
 msgstr ""
 
 #: ../../app/views/static_pages/about_us.html.erb:34
-msgid "If you do not have a %{application_name} account, click on"
+msgid "If you do not have a %<application_name>s account, click on"
 msgstr ""
 
 #: ../../app/views/static_pages/about_us.html.erb:34
@@ -4836,33 +4836,33 @@ msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:11
 msgid ""
-"The information you provide will be used by the %{org_name} to offer you acces"
-"s to and personalisation of the %{application_name} service."
+"The information you provide will be used by the %<org_name>s to offer you acces"
+"s to and personalisation of the %<application_name>s service."
 msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:13
 msgid ""
-"The %{org_name} processes the personal data of %{application_name} users in or"
-"der to deliver and improve the %{application_name} service in a customised man"
+"The %<org_name>s processes the personal data of %<application_name>s users in or"
+"der to deliver and improve the %<application_name>s service in a customised man"
 "ner and to ensure each user receives relevant information."
 msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:15
 msgid ""
-"The processing of your personal data by the %{org_name} is necessary for pursu"
+"The processing of your personal data by the %<org_name>s is necessary for pursu"
 "ing the following legitimate interests:"
 msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:18
 msgid ""
-"To provide access to the %{application_name} service and personalisation of yo"
+"To provide access to the %<application_name>s service and personalisation of yo"
 "ur user experience e.g. provision of relevant templates and guidance for your "
 "organisation."
 msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:20
 msgid ""
-"To keep you up to date with news about %{application_name} such as new feature"
+"To keep you up to date with news about %<application_name>s such as new feature"
 "s or improvements, or changes to our Privacy Policy."
 msgstr ""
 
@@ -4873,20 +4873,20 @@ msgstr ""
 #: ../../app/views/static_pages/privacy.html.erb:24
 msgid ""
 "We will hold the personal data you provided us for as long as you continue usi"
-"ng the %{application_name} service. Your personal data can be removed from thi"
-"s service upon request to the %{application_name} team within a period of 30 d"
+"ng the %<application_name>s service. Your personal data can be removed from thi"
+"s service upon request to the %<application_name>s team within a period of 30 d"
 "ays."
 msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:26
 msgid ""
-"If you have any questions, please contact the %{application_name} team at: <a "
-"href='mailto:%{helpdesk_email}'>%{helpdesk_email}</a>"
+"If you have any questions, please contact the %<application_name>s team at: <a "
+"href='mailto:%<helpdesk_email>s'>%<helpdesk_email>s</a>"
 msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:30
 msgid ""
-"This statement was last revised on %{revdate} and may be revised at any time w"
+"This statement was last revised on %<revdate>s and may be revised at any time w"
 "ith prior notice."
 msgstr ""
 
@@ -4954,7 +4954,7 @@ msgid ""
 "ookies and how we use them is available on the <a target='_blank' href='http:/"
 "/www.dcc.ac.uk/about-us/about-site/website-terms-use/cookies' class=\"has-new-w"
 "indow-popup-info\">main DCC website<em class=\"sr-only\"> (new window)</em><span "
-"class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>.</p>\n"
+"class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a>.</p>\n"
 "\n"
 "      <h3>Third party APIs</h3>\n"
 "\n"
@@ -4999,7 +4999,7 @@ msgid "Email credentials to contact"
 msgstr ""
 
 #: ../../app/views/super_admin/api_clients/_form.html.erb:81
-msgid "Are you sure you want to delete the API client: \"%{name}\""
+msgid "Are you sure you want to delete the API client: \"%<name>s\""
 msgstr ""
 
 #: ../../app/views/super_admin/api_clients/edit.html.erb:1
@@ -5016,7 +5016,7 @@ msgid "View all API clients"
 msgstr ""
 
 #: ../../app/views/super_admin/api_clients/email_credentials.js.erb:1
-msgid "The credentials have been sent to %{email}."
+msgid "The credentials have been sent to %<email>s."
 msgstr ""
 
 #: ../../app/views/super_admin/api_clients/index.html.erb:1
@@ -5061,7 +5061,7 @@ msgid "Body"
 msgstr ""
 
 #: ../../app/views/super_admin/notifications/_form.html.erb:71
-msgid "Are you sure you want to delete the notification \"%{title}\""
+msgid "Are you sure you want to delete the notification \"%<title>s\""
 msgstr ""
 
 #: ../../app/views/super_admin/notifications/edit.html.erb:1
@@ -5087,7 +5087,7 @@ msgid "New Notification"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:9
-msgid "Merging '%{from_org_name}' into '%{to_org_name}'"
+msgid "Merging '%<from_org_name>s' into '%<to_org_name>s'"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:11
@@ -5096,7 +5096,7 @@ msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:12
 msgid ""
-"Counts of '%{to_org_name}' records before and after a merge with %{from_org_na"
+"Counts of '%<to_org_name>s' records before and after a merge with %{from_org_na"
 "me}."
 msgstr ""
 
@@ -5106,11 +5106,11 @@ msgid "Record Type"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:18
-msgid "'%{to_org_name}' Count - before merge"
+msgid "'%<to_org_name>s' Count - before merge"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:19
-msgid "'%{to_org_name}' Count - after merge"
+msgid "'%<to_org_name>s' Count - after merge"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:38
@@ -5120,17 +5120,17 @@ msgstr ""
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:39
 msgid ""
 "The table below shows the specific changes that will occur during the merge pr"
-"ocess. Once the merge is complete, '%{from_org_name}' will be deleted. You can"
+"ocess. Once the merge is complete, '%<from_org_name>s' will be deleted. You can"
 " then consolidate/correct any merge issues (e.g. remove any departments that w"
 "ere duplicated)"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:45
-msgid "%{from_org_name} - Before"
+msgid "%<from_org_name>s - Before"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:46
-msgid "%{to_org_name} - Before"
+msgid "%<to_org_name>s - Before"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:61
@@ -5155,7 +5155,7 @@ msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:95
 msgid ""
-"Warning: '%{from_org_name}' has Plans that are currently in the review process"
+"Warning: '%<from_org_name>s' has Plans that are currently in the review process"
 ". The Org admins may not be able to see these plans after the merge!"
 msgstr ""
 
@@ -5178,7 +5178,7 @@ msgid "New organisation"
 msgstr ""
 
 #: ../../app/views/super_admin/themes/_form.html.erb:17
-msgid "Are you sure you want to delete the theme \"%{title}\"?"
+msgid "Are you sure you want to delete the theme \"%<title>s\"?"
 msgstr ""
 
 #: ../../app/views/super_admin/themes/edit.html.erb:3
@@ -5206,7 +5206,7 @@ msgstr ""
 
 #: ../../app/views/super_admin/users/edit.html.erb:64
 msgid ""
-"You are about to archive %{user_name}.  This will remove their personal inform"
+"You are about to archive %<user_name>s.  This will remove their personal inform"
 "ation, but retain their plans, answers, and comments.  They will be unable to "
 "sign-in. Are you sure?"
 msgstr ""
@@ -5306,75 +5306,75 @@ msgstr ""
 #: ../../app/views/user_mailer/permissions_change_notification.html.erb:2
 #: ../../app/views/user_mailer/plan_visibility.html.erb:2
 #: ../../app/views/user_mailer/sharing_notification.html.erb:2
-msgid "Hello %{username}"
+msgid "Hello %<username>s"
 msgstr ""
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:6
-msgid "You have been granted administrator privileges in %{tool_name}:"
+msgid "You have been granted administrator privileges in %<tool_name>s:"
 msgstr ""
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:13
-msgid "You have been revoked administrator privileges in %{tool_name}."
+msgid "You have been revoked administrator privileges in %<tool_name>s."
 msgstr ""
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:17
 msgid ""
-"More information about administering the %{tool_name} for users at your organi"
-"sation is available at the %{help_url}."
+"More information about administering the %<tool_name>s for users at your organi"
+"sation is available at the %<help_url>s."
 msgstr ""
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:2
-msgid "Hello %{name},"
+msgid "Hello %<name>s,"
 msgstr ""
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:8
-msgid "Please use the following credentials when accessing the %{tool_name} API."
+msgid "Please use the following credentials when accessing the %<tool_name>s API."
 msgstr ""
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:23
-msgid "Please refer to the API documentation at: %{api_documentation_url}"
+msgid "Please refer to the API documentation at: %<api_documentation_url>s"
 msgstr ""
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:29
 msgid ""
-"Do not share these credentials. They for use with the %{external_application} "
+"Do not share these credentials. They for use with the %<external_application>s "
 "application. If you do share your credentials with another application we rese"
 "rve the right to revoke your access to the API."
 msgstr ""
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:34
 msgid ""
-"If you did not request access to the %{tool_name} API or did not request for y"
-"our credentials to be renewed, please contact us at %{helpdesk_email}"
+"If you did not request access to the %<tool_name>s API or did not request for y"
+"our credentials to be renewed, please contact us at %<helpdesk_email>s"
 msgstr ""
 
 #: ../../app/views/user_mailer/feedback_complete.html.erb:2
-msgid "Hello %{recipient_name}"
+msgid "Hello %<recipient_name>s"
 msgstr ""
 
 #: ../../app/views/user_mailer/feedback_complete.html.erb:5
 msgid ""
-"%{commenter} has finished providing feedback on the plan  \"%{link_html}\". Comm"
+"%<commenter>s has finished providing feedback on the plan  \"%<link_html>s\". Comm"
 "ents can be found in the 'Write plan' tab on the right side of the page (Guida"
 "nce/Comments)."
 msgstr ""
 
 #: ../../app/views/user_mailer/feedback_notification.html.erb:2
-msgid "Hello %{user_name},"
+msgid "Hello %<user_name>s,"
 msgstr ""
 
 #: ../../app/views/user_mailer/feedback_notification.html.erb:5
 msgid ""
-"%{requestor} has requested feedback on a plan %{link_html}. To add comments, p"
-"lease visit the 'Plans' page under the Admin menu in %{tool_name} and open the"
+"%<requestor>s has requested feedback on a plan %<link_html>s. To add comments, p"
+"lease visit the 'Plans' page under the Admin menu in %<tool_name>s and open the"
 " plan."
 msgstr ""
 
 #: ../../app/views/user_mailer/new_comment.html.erb:5
 msgid ""
-"%{commenter_name} has commented on your plan %{plan_title}. To view the commen"
+"%<commenter_name>s has commented on your plan %<plan_title>s. To view the commen"
 "ts, follow the link to the DMP below, or navigate to the plan via My Dashboard"
-" page in %{tool_name}."
+" page in %<tool_name>s."
 msgstr ""
 
 #: ../../app/views/user_mailer/new_comment.html.erb:10
@@ -5388,21 +5388,21 @@ msgid ""
 msgstr ""
 
 #: ../../app/views/user_mailer/new_comment.html.erb:15
-msgid "DMP: %{phase_link}"
+msgid "DMP: %<phase_link>s"
 msgstr ""
 
 #: ../../app/views/user_mailer/new_comment.html.erb:18
-msgid "Section name: %{section_title}"
+msgid "Section name: %<section_title>s"
 msgstr ""
 
 #: ../../app/views/user_mailer/new_comment.html.erb:21
-msgid "Question: %{question_number}"
+msgid "Question: %<question_number>s"
 msgstr ""
 
 #: ../../app/views/user_mailer/permissions_change_notification.html.erb:5
 msgid ""
-"Your permissions relating to %{plan_title} have changed. You now have %{type} "
-"access. This means you can %{placeholder1} %{placeholder2}"
+"Your permissions relating to %<plan_title>s have changed. You now have %<type>s "
+"access. This means you can %<placeholder1>s %<placeholder2>s"
 msgstr ""
 
 #: ../../app/views/user_mailer/plan_access_removed.html.erb:2
@@ -5418,7 +5418,7 @@ msgid " has been removed by "
 msgstr ""
 
 #: ../../app/views/user_mailer/plan_visibility.html.erb:5
-msgid "The plan %{plan_title} had its visibility changed to %{plan_visibility}."
+msgid "The plan %<plan_title>s had its visibility changed to %<plan_visibility>s."
 msgstr ""
 
 #: ../../app/views/user_mailer/plan_visibility.html.erb:9
@@ -5436,11 +5436,11 @@ msgstr ""
 #: ../../app/views/user_mailer/plan_visibility.html.erb:17
 msgid ""
 "If you have questions pertaining to this action, please visit the My Dashboard"
-" page in %{tool_name}"
+" page in %<tool_name>s"
 msgstr ""
 
 #: ../../app/views/user_mailer/question_answered.html.erb:2
-msgid "Hello %{recipient_name},"
+msgid "Hello %<recipient_name>s,"
 msgstr ""
 
 #: ../../app/views/user_mailer/question_answered.html.erb:5
@@ -5461,18 +5461,19 @@ msgstr ""
 
 #: ../../app/views/user_mailer/sharing_notification.html.erb:5
 msgid ""
-"Your colleague %{inviter_name} has invited you to contribute to
\n"
+"Your colleague %<inviter_name>s has invited you to contribute to
+\n"%<tool_name>s
 "          their Data Management Plan in %{tool_name}"
 msgstr ""
 
-#: ../../app/views/user_mailer/welcome_notification.html.erb:2
+#: ../../app/views%<tool_name>s/w%<username>sfication.html.erb:2
 msgid "Welcome to %{tool_name}, %{username}"
 msgstr ""
 
 #: ../../app/views/user_mailer/welcome_notification.html.erb:5
-msgid ""
+m%<tool_name>s
 "%{tool_name} will help you to develop your Data Management Plan. If you have a"
-"ny queries or feedback as you use the tool, please contact us at %{helpdesk_em"
+"ny queries or %<contact_us>sou use the tool, please contact us at %{helpdesk_em"
 "ail} or visit %{contact_us}"
 msgstr ""
 
@@ -5480,7 +5481,7 @@ msgstr ""
 msgid "You may change your notification preferences on your profile page."
 msgstr ""
 
-#: ../../app/views/users/_admin_grant_permissions.html.erb:9
+#: ../../app/views/users/_admi%<username>smissions.html.erb:9
 msgid "Editing privileges for %{username}"
 msgstr ""
 
diff --git a/config/locale/en_GB/app.po b/config/locale/en_GB/app.po
index ad5ed8e4f3..eec706a1e5 100644
--- a/config/locale/en_GB/app.po
+++ b/config/locale/en_GB/app.po
@@ -20,12 +20,12 @@ msgstr ""
 
 #: ../../app/controllers/answers_controller.rb:24
 msgid ""
-"There is no question with id %{question_id} associated to plan id %{plan_id} f"
+"There is no question with id %<question_id>s associated to plan id %<plan_id>s f"
 "or which to create or update an answer"
 msgstr ""
 
 #: ../../app/controllers/answers_controller.rb:34
-msgid "There is no plan with id %{id} for which to create or update an answer"
+msgid "There is no plan with id %<id>s for which to create or update an answer"
 msgstr ""
 
 #: ../../app/controllers/api/v0/base_controller.rb:124
@@ -133,11 +133,11 @@ msgid "You need to sign in or sign up before continuing."
 msgstr "You need to sign in or sign up before continuing."
 
 #: ../../app/controllers/application_controller.rb:100
-msgid "Unable to %{action} the %{object}.%{errors}"
+msgid "Unable to %<action>s the %<object>s.%<errors>s"
 msgstr ""
 
 #: ../../app/controllers/application_controller.rb:108
-msgid "Successfully %{action} the %{object}."
+msgid "Successfully %<action>s the %<object>s."
 msgstr ""
 
 #: ../../app/controllers/application_controller.rb:123
@@ -201,7 +201,7 @@ msgid "Restricted access to View All the records"
 msgstr ""
 
 #: ../../app/controllers/concerns/paginable.rb:180
-msgid "Sort by %{sort_field}"
+msgid "Sort by %<sort_field>s"
 msgstr ""
 
 #: ../../app/controllers/concerns/template_methods.rb:10
@@ -403,11 +403,11 @@ msgid "Your guidance is no longer published and will not be available to users."
 msgstr ""
 
 #: ../../app/controllers/identifiers_controller.rb:18
-msgid "Successfully unlinked your account from %{is}."
+msgid "Successfully unlinked your account from %<is>s."
 msgstr ""
 
 #: ../../app/controllers/identifiers_controller.rb:22
-msgid "Unable to unlink your account from %{is}."
+msgid "Unable to unlink your account from %<is>s."
 msgstr ""
 
 #: ../../app/controllers/org_admin/phases_controller.rb:18
@@ -456,7 +456,7 @@ msgid "update"
 msgstr ""
 
 #: ../../app/controllers/org_admin/plans_controller.rb:32
-msgid "%{plan_owner} has been notified that you have finished providing feedback"
+msgid "%<plan_owner>s has been notified that you have finished providing feedback"
 msgstr ""
 
 #: ../../app/controllers/org_admin/plans_controller.rb:38
@@ -548,7 +548,7 @@ msgstr ""
 
 #: ../../app/controllers/org_admin/templates_controller.rb:48
 #: ../../app/views/org_admin/templates/index.html.erb:52
-msgid "%{org_name} Templates"
+msgid "%<org_name>s Templates"
 msgstr ""
 
 #: ../../app/controllers/org_admin/templates_controller.rb:50
@@ -561,12 +561,12 @@ msgid "Customizable Templates"
 msgstr "Customisable Templates"
 
 #: ../../app/controllers/org_admin/templates_controller.rb:214
-msgid "Error parsing links for a %{template}"
+msgid "Error parsing links for a %<template>s"
 msgstr ""
 
 #: ../../app/controllers/org_admin/templates_controller.rb:345
 #: ../../app/controllers/public_pages_controller.rb:68
-msgid "Template created using the %{application_name} service. Last modified %{date}"
+msgid "Template created using the %<application_name>s service. Last modified %<date>s"
 msgstr ""
 
 #: ../../app/controllers/org_admin/templates_controller.rb:360
@@ -587,7 +587,7 @@ msgid "Please choose an organisation"
 msgstr ""
 
 #: ../../app/controllers/plan_exports_controller.rb:85
-msgid "Created using %{application_name}. Last modified %{date}"
+msgid "Created using %<application_name>s. Last modified %<date>s"
 msgstr ""
 
 #: ../../app/controllers/plans_controller.rb:51
@@ -629,12 +629,12 @@ msgstr ""
 
 #: ../../app/controllers/plans_controller.rb:408
 msgid ""
-"Unable to change the plan's status since it is needed at least %{percentage} p"
+"Unable to change the plan's status since it is needed at least %<percentage>s p"
 "ercentage responded"
 msgstr ""
 
 #: ../../app/controllers/plans_controller.rb:416
-msgid "Unable to find plan id %{plan_id}"
+msgid "Unable to find plan id %<plan_id>s"
 msgstr ""
 
 #: ../../app/controllers/plans_controller.rb:433
@@ -650,13 +650,13 @@ msgid "Unable to change the plan's test status"
 msgstr ""
 
 #: ../../app/controllers/plans_controller.rb:451
-msgid "There is no plan associated with id %{id}"
+msgid "There is no plan associated with id %<id>s"
 msgstr ""
 
 #: ../../app/controllers/registrations_controller.rb:35
 msgid ""
 "Please make a choice below. After linking your\n"
-"                       details to a %{application_name} account,\n"
+"                       details to a %<application_name>s account,\n"
 "                       you will be able to sign in directly with your\n"
 "                       institutional credentials."
 msgstr ""
@@ -730,12 +730,12 @@ msgstr ""
 
 #: ../../app/controllers/roles_controller.rb:26
 msgid ""
-"Cannot share plan with %{email} since that email matches with the owner of the"
+"Cannot share plan with %<email>s since that email matches with the owner of the"
 " plan."
 msgstr ""
 
 #: ../../app/controllers/roles_controller.rb:37
-msgid "Plan is already shared with %{email}."
+msgid "Plan is already shared with %<email>s."
 msgstr ""
 
 #: ../../app/controllers/roles_controller.rb:44
@@ -748,11 +748,11 @@ msgid "Surname"
 msgstr ""
 
 #: ../../app/controllers/roles_controller.rb:48
-msgid "Invitation to %{email} issued successfully."
+msgid "Invitation to %<email>s issued successfully."
 msgstr ""
 
 #: ../../app/controllers/roles_controller.rb:53
-msgid "Plan shared with %{email}."
+msgid "Plan shared with %<email>s."
 msgstr ""
 
 #: ../../app/controllers/roles_controller.rb:68
@@ -765,7 +765,7 @@ msgstr ""
 
 #: ../../app/controllers/roles_controller.rb:93
 msgid ""
-"Successfully changed the permissions for %{email}. They have been notified via"
+"Successfully changed the permissions for %<email>s. They have been notified via"
 " email."
 msgstr ""
 
@@ -796,7 +796,7 @@ msgid "An error has occurred while saving/resetting your export settings."
 msgstr ""
 
 #: ../../app/controllers/super_admin/api_clients_controller.rb:45
-msgid ". The API credentials have been emailed to %{email}"
+msgid ". The API credentials have been emailed to %<email>s"
 msgstr ""
 
 #: ../../app/controllers/super_admin/notifications_controller.rb:69
@@ -812,13 +812,13 @@ msgid "Unable to change the notification's active status"
 msgstr ""
 
 #: ../../app/controllers/super_admin/notifications_controller.rb:104
-msgid "There is no notification associated with id  %{id}"
+msgid "There is no notification associated with id  %<id>s"
 msgstr ""
 
 #: ../../app/controllers/super_admin/org_swaps_controller.rb:22
 msgid ""
 "Your organisation affiliation has been changed. You may now edit templates for"
-" %{org_name}."
+" %<org_name>s."
 msgstr ""
 
 #: ../../app/controllers/super_admin/org_swaps_controller.rb:25
@@ -878,15 +878,15 @@ msgid "Successfully signed in"
 msgstr ""
 
 #: ../../app/controllers/users/omniauth_callbacks_controller.rb:56
-msgid "Your account has been successfully linked to %{scheme}."
+msgid "Your account has been successfully linked to %<scheme>s."
 msgstr ""
 
 #: ../../app/controllers/users/omniauth_callbacks_controller.rb:61
-msgid "Unable to link your account to %{scheme}."
+msgid "Unable to link your account to %<scheme>s."
 msgstr ""
 
 #: ../../app/controllers/users_controller.rb:141
-msgid "Successfully %{action} %{username}'s account."
+msgid "Successfully %<action>s %<username>s's account."
 msgstr ""
 
 #: ../../app/controllers/users_controller.rb:142
@@ -898,7 +898,7 @@ msgid "deactivated"
 msgstr ""
 
 #: ../../app/controllers/users_controller.rb:149
-msgid "Unable to %{action} %{username}"
+msgid "Unable to %<action>s %<username>s"
 msgstr ""
 
 #: ../../app/controllers/users_controller.rb:150
@@ -965,16 +965,16 @@ msgid "Creator:"
 msgstr ""
 
 #: ../../app/helpers/feedbacks_helper.rb:6
-msgid "%{application_name}: Your plan has been submitted for feedback"
+msgid "%<application_name>s: Your plan has been submitted for feedback"
 msgstr ""
 
 #: ../../app/helpers/feedbacks_helper.rb:10
 msgid ""
-"<p>Hello %{user_name}.</p><p>Your plan \"%{plan_name}\" has been submitted for f"
+"<p>Hello %<user_name>s.</p><p>Your plan \"%<plan_name>s\" has been submitted for f"
 "eedback from an\n"
 "      administrator at your organisation. If you have questions pertaining to "
 "this action, please contact us\n"
-"      at %{organisation_email}.</p>"
+"      at %<organisation_email>s.</p>"
 msgstr ""
 
 #: ../../app/helpers/identifier_helper.rb:6
@@ -1008,10 +1008,10 @@ msgstr ""
 
 #: ../../app/helpers/orgs_helper.rb:14
 msgid ""
-"<p>A data librarian from %{org_name} will respond to your request within 48\n"
+"<p>A data librarian from %<org_name>s will respond to your request within 48\n"
 "       hours. If you have questions pertaining to this action please contact u"
 "s\n"
-"       at %{organisation_email}.</p>"
+"       at %<organisation_email>s.</p>"
 msgstr ""
 
 #: ../../app/helpers/perms_helper.rb:9
@@ -1145,7 +1145,7 @@ msgid "None"
 msgstr ""
 
 #: ../../app/helpers/super_admin/orgs/merge_helper.rb:31
-msgid "Guidance for: %{themes}"
+msgid "Guidance for: %<themes>s"
 msgstr ""
 
 #: ../../app/helpers/super_admin/orgs/merge_helper.rb:53
@@ -1153,7 +1153,7 @@ msgid "Nothing to merge"
 msgstr ""
 
 #: ../../app/helpers/super_admin/orgs/merge_helper.rb:55
-msgid "<p>The following %{object_types} will be moved over to '%{org_name}':</p>"
+msgid "<p>The following %<object_types>s will be moved over to '%<org_name>s':</p>"
 msgstr ""
 
 #: ../../app/helpers/template_helper.rb:46
@@ -1189,47 +1189,47 @@ msgstr ""
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:6
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:5
 #: ../../app/views/user_mailer/_email_signature.html.erb:2
-msgid "Query or feedback related to %{tool_name}"
+msgid "Query or feedback related to %<tool_name>s"
 msgstr ""
 
 #: ../../app/mailers/user_mailer.rb:23
-msgid "Welcome to %{tool_name}"
+msgid "Welcome to %<tool_name>s"
 msgstr ""
 
 #: ../../app/mailers/user_mailer.rb:58
-msgid "A Data Management Plan in %{tool_name} has been shared with you"
+msgid "A Data Management Plan in %<tool_name>s has been shared with you"
 msgstr ""
 
 #: ../../app/mailers/user_mailer.rb:76
-msgid "Changed permissions on a Data Management Plan in %{tool_name}"
+msgid "Changed permissions on a Data Management Plan in %<tool_name>s"
 msgstr ""
 
 #: ../../app/mailers/user_mailer.rb:92
-msgid "Permissions removed on a DMP in %{tool_name}"
+msgid "Permissions removed on a DMP in %<tool_name>s"
 msgstr ""
 
 #: ../../app/mailers/user_mailer.rb:111
-msgid "%{user_name} has requested feedback on a %{tool_name} plan"
+msgid "%<user_name>s has requested feedback on a %<tool_name>s plan"
 msgstr ""
 
 #: ../../app/mailers/user_mailer.rb:134
-msgid "%{tool_name}: Expert feedback has been provided for %{plan_title}"
+msgid "%<tool_name>s: Expert feedback has been provided for %<plan_title>s"
 msgstr ""
 
 #: ../../app/mailers/user_mailer.rb:169
-msgid "DMP Visibility Changed: %{plan_title}"
+msgid "DMP Visibility Changed: %<plan_title>s"
 msgstr ""
 
 #: ../../app/mailers/user_mailer.rb:200
-msgid "%{tool_name}: A new comment was added to %{plan_title}"
+msgid "%<tool_name>s: A new comment was added to %<plan_title>s"
 msgstr ""
 
 #: ../../app/mailers/user_mailer.rb:218
-msgid "Administrator privileges granted in %{tool_name}"
+msgid "Administrator privileges granted in %<tool_name>s"
 msgstr ""
 
 #: ../../app/mailers/user_mailer.rb:235
-msgid "%{tool_name} API changes"
+msgid "%<tool_name>s API changes"
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:26
@@ -1262,11 +1262,11 @@ msgid "Creators: "
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:134
-msgid "%{authors}"
+msgid "%<authors>s"
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:135
-msgid "%{affiliation}"
+msgid "%<affiliation>s"
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:137
@@ -1278,11 +1278,11 @@ msgid "Template: "
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:137
-msgid "%{funder}"
+msgid "%<funder>s"
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:139
-msgid "%{template}"
+msgid "%<template>s"
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:142
@@ -1291,7 +1291,7 @@ msgid "Grant number: "
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:142
-msgid "%{grant_number}"
+msgid "%<grant_number>s"
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:145
@@ -1301,7 +1301,7 @@ msgid "Project abstract: "
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:145
-msgid "%{description}"
+msgid "%<description>s"
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:148
@@ -1311,7 +1311,7 @@ msgid "Last modified: "
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:148
-msgid "%{date}"
+msgid "%<date>s"
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:149
@@ -1483,7 +1483,7 @@ msgid "generate_copy! requires an organisation target"
 msgstr ""
 
 #: ../../app/models/template.rb:380
-msgid "Copy of %{template}"
+msgid "Copy of %<template>s"
 msgstr ""
 
 #: ../../app/models/template.rb:388
@@ -1523,7 +1523,7 @@ msgid "Conditions in the template refer backwards"
 msgstr ""
 
 #: ../../app/models/user.rb:379
-msgid "A Data Management Plan in %{application_name} has been shared with you"
+msgid "A Data Management Plan in %<application_name>s has been shared with you"
 msgstr ""
 
 #: ../../app/policies/api/v0/departments_policy.rb:12
@@ -1633,7 +1633,7 @@ msgid ""
 msgstr ""
 
 #: ../../app/validators/after_validator.rb:5
-msgid "must be after %{date}"
+msgid "must be after %<date>s"
 msgstr ""
 
 #: ../../app/validators/org_links_validator.rb:10
@@ -1646,11 +1646,11 @@ msgid "A hash is expected for links"
 msgstr ""
 
 #: ../../app/validators/template_links_validator.rb:12
-msgid "A key %{key} is expected for links hash"
+msgid "A key %<key>s is expected for links hash"
 msgstr ""
 
 #: ../../app/validators/template_links_validator.rb:15
-msgid "The key %{key} does not have a valid set of object links"
+msgid "The key %<key>s does not have a valid set of object links"
 msgstr ""
 
 #: ../../app/views/answers/_locking.html.erb:5
@@ -1659,7 +1659,7 @@ msgstr ""
 
 #: ../../app/views/answers/_locking.html.erb:8
 msgid ""
-"since %{name} saved the answer below while you were editing. Please, combine y"
+"since %<name>s saved the answer below while you were editing. Please, combine y"
 "our changes and then save the answer again."
 msgstr ""
 
@@ -1734,7 +1734,7 @@ msgid "Answered"
 msgstr ""
 
 #: ../../app/views/answers/_status.html.erb:10
-msgid " by %{user_name}"
+msgid " by %<user_name>s"
 msgstr ""
 
 #: ../../app/views/answers/_status.html.erb:15
@@ -1812,11 +1812,11 @@ msgstr "Contact Us"
 
 #: ../../app/views/contact_us/contacts/new.html.erb:6
 msgid ""
-"%{application_name} is provided by the %{organisation_name}.<br /> You can fin"
-"d out more about us on our <a href=\"%{organisation_url}\" class=\"has-new-window"
+"%<application_name>s is provided by the %<organisation_name>s.<br /> You can fin"
+"d out more about us on our <a href=\"%<organisation_url>s\" class=\"has-new-window"
 "-popup-info\" target=\"_blank\">website <em class=\"sr-only\">(new window)</em><spa"
-"n class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>. If you "
-"would like to contact us about %{application_name}, please fill out the form b"
+"n class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a>. If you "
+"would like to contact us about %<application_name>s, please fill out the form b"
 "elow."
 msgstr ""
 
@@ -1978,7 +1978,7 @@ msgid "Create account"
 msgstr ""
 
 #: ../../app/views/devise/mailer/confirmation_instructions.html.erb:2
-msgid "Welcome to %{application_name}"
+msgid "Welcome to %<application_name>s"
 msgstr ""
 
 #: ../../app/views/devise/mailer/confirmation_instructions.html.erb:4
@@ -1999,19 +1999,19 @@ msgstr ""
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:12
 #: ../../app/views/user_mailer/new_comment.html.erb:2
-msgid "Hello %{user_name}"
+msgid "Hello %<user_name>s"
 msgstr ""
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:15
 msgid ""
-"Your colleague %{inviter_name} has invited you to contribute to  their Data Ma"
-"nagement Plan in %{tool_name}"
+"Your colleague %<inviter_name>s has invited you to contribute to  their Data Ma"
+"nagement Plan in %<tool_name>s"
 msgstr ""
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:22
 #: ../../app/views/user_mailer/sharing_notification.html.erb:11
 msgid ""
-"%{click_here} to accept the invitation, (or copy %{link} into your browser). I"
+"%<click_here>s to accept the invitation, (or copy %<link>s into your browser). I"
 "f you don't want to accept the invitation, please ignore this email."
 msgstr ""
 
@@ -2031,7 +2031,7 @@ msgstr ""
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:19
 #: ../../app/views/user_mailer/_email_signature.html.erb:12
 #: ../../app/views/user_mailer/welcome_notification.html.erb:10
-msgid "The %{tool_name} team"
+msgid "The %<tool_name>s team"
 msgstr ""
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:32
@@ -2043,17 +2043,17 @@ msgstr ""
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:33
 msgid ""
-"If you have any questions or need help, please contact us at %{helpdesk_email}"
-" or visit %{contact_us_url}"
+"If you have any questions or need help, please contact us at %<helpdesk_email>s"
+" or visit %<contact_us_url>s"
 msgstr ""
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:9
-msgid "Hello %{user_email}"
+msgid "Hello %<user_email>s"
 msgstr ""
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:12
 msgid ""
-"Someone has requested a link to change your %{tool_name} password. You can do "
+"Someone has requested a link to change your %<tool_name>s password. You can do "
 "this through the link below."
 msgstr ""
 
@@ -2068,8 +2068,8 @@ msgstr ""
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:22
 #: ../../app/views/user_mailer/_email_signature.html.erb:19
 msgid ""
-"If you have any questions or need help, please contact us at %{helpdesk_email}"
-" or visit %{contact_us}"
+"If you have any questions or need help, please contact us at %<helpdesk_email>s"
+" or visit %<contact_us>s"
 msgstr ""
 
 #: ../../app/views/devise/mailer/unlock_instructions.html.erb:2
@@ -2138,15 +2138,15 @@ msgstr ""
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:16
 msgid ""
-"See the <a href=\"%{api_v0_wiki}\">documentation for v0</a> for more details on "
+"See the <a href=\"%<api_v0_wiki>s\">documentation for v0</a> for more details on "
 "the original API which includes access to statistics, the full text of plans a"
 "nd the ability to connect users with departments."
 msgstr ""
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:18
 msgid ""
-"See the <a href=\"%{api_v1_wiki}\">documentation for v1</a> for more details on "
-"the API that supports the <a href=\"%{rda_standard_url}\">RDA Common metadata st"
+"See the <a href=\"%<api_v1_wiki>s\">documentation for v1</a> for more details on "
+"the API that supports the <a href=\"%<rda_standard_url>s\">RDA Common metadata st"
 "andard for DMPs.</a>"
 msgstr ""
 
@@ -2305,7 +2305,7 @@ msgid "Sign in or Create account"
 msgstr ""
 
 #: ../../app/views/devise/registrations/new.html.erb:15
-msgid "Do you have a %{application_name} account?"
+msgid "Do you have a %<application_name>s account?"
 msgstr ""
 
 #: ../../app/views/devise/registrations/new.html.erb:22
@@ -2321,7 +2321,7 @@ msgid "This will link your existing account to your credentials."
 msgstr ""
 
 #: ../../app/views/devise/registrations/new.html.erb:34
-msgid "No %{application_name} account?"
+msgid "No %<application_name>s account?"
 msgstr ""
 
 #: ../../app/views/devise/registrations/new.html.erb:46
@@ -2473,7 +2473,7 @@ msgstr ""
 
 #: ../../app/views/home/_welcome.html.erb:5
 msgid ""
-"<p>%{application_name} has been developed by the <strong>%{organisation_name}<"
+"<p>%<application_name>s has been developed by the <strong>%<organisation_name>s<"
 "/strong> to help you write data management plans.</p>"
 msgstr ""
 
@@ -2660,7 +2660,7 @@ msgid "Logout"
 msgstr ""
 
 #: ../../app/views/layouts/application.html.erb:32
-msgid "%{application_name}"
+msgid "%<application_name>s"
 msgstr ""
 
 #: ../../app/views/layouts/application.html.erb:91
@@ -2734,7 +2734,7 @@ msgstr ""
 
 #: ../../app/views/layouts/application.html.erb:142
 msgid ""
-"%{n} results are available, use up and down arrows to navigate suggestions. Us"
+"%<n>s results are available, use up and down arrows to navigate suggestions. Us"
 "e the Enter key to select a suggestion or the Escape key to close the suggesti"
 "ons."
 msgstr ""
@@ -2787,7 +2787,7 @@ msgid "Example answer"
 msgstr ""
 
 #: ../../app/views/org_admin/annotations/_show.html.erb:4
-msgid "%{org} Example Answer"
+msgid "%<org>s Example Answer"
 msgstr ""
 
 #: ../../app/views/org_admin/conditions/_add.html.erb:3
@@ -2934,7 +2934,7 @@ msgstr ""
 
 #: ../../app/views/org_admin/phases/_phase.html.erb:17
 msgid ""
-"You are about to delete the '%{phase_title}' phase. This will remove all of th"
+"You are about to delete the '%<phase_title>s' phase. This will remove all of th"
 "e sections and questions listed below. Are you sure?"
 msgstr ""
 
@@ -2994,7 +2994,7 @@ msgid "Write plan"
 msgstr ""
 
 #: ../../app/views/org_admin/plans/index.html.erb:4
-msgid "%{org_name} Plans"
+msgid "%<org_name>s Plans"
 msgstr ""
 
 #: ../../app/views/org_admin/plans/index.html.erb:16
@@ -3046,7 +3046,7 @@ msgstr ""
 #: ../../app/views/org_admin/plans/index.html.erb:39
 msgid ""
 "Download plans <em class=\"sr-only\">(new window)</em><span class=\"new-window-po"
-"pup-info\">%{open_in_new_window_text}</span>"
+"pup-info\">%<open_in_new_window_text>s</span>"
 msgstr ""
 
 #: ../../app/views/org_admin/question_options/_option_fields.html.erb:3
@@ -3074,7 +3074,7 @@ msgid ""
 msgstr ""
 
 #: ../../app/views/org_admin/questions/_form.html.erb:4
-msgid "Question %{number}:"
+msgid "Question %<number>s:"
 msgstr ""
 
 #: ../../app/views/org_admin/questions/_form.html.erb:4
@@ -3139,7 +3139,7 @@ msgid "Delete"
 msgstr ""
 
 #: ../../app/views/org_admin/questions/_form.html.erb:102
-msgid "You are about to delete question #%{question_number}. Are you sure?"
+msgid "You are about to delete question #%<question_number>s. Are you sure?"
 msgstr ""
 
 #: ../../app/views/org_admin/questions/_index.html.erb:14
@@ -3229,7 +3229,7 @@ msgstr ""
 
 #: ../../app/views/org_admin/sections/_form.html.erb:20
 msgid ""
-"You are about to delete '%{section_title}'. This will affect questions linked "
+"You are about to delete '%<section_title>s'. This will affect questions linked "
 "to this section. Are you sure?"
 msgstr ""
 
@@ -3255,7 +3255,7 @@ msgstr ""
 
 #: ../../app/views/org_admin/templates/_form.html.erb:25
 #: ../../app/views/org_admin/templates/_show.html.erb:35
-msgid "for internal %{org_name} use only"
+msgid "for internal %<org_name>s use only"
 msgstr ""
 
 #: ../../app/views/org_admin/templates/_form.html.erb:32
@@ -3413,21 +3413,21 @@ msgstr ""
 
 #: ../../app/views/org_admin/templates/index.html.erb:80
 #: ../../app/views/org_admin/templates/index.html.erb:93
-msgid "All (%{count})"
+msgid "All (%<count>s)"
 msgstr ""
 
 #: ../../app/views/org_admin/templates/index.html.erb:83
 #: ../../app/views/org_admin/templates/index.html.erb:96
-msgid "Published (%{count})"
+msgid "Published (%<count>s)"
 msgstr ""
 
 #: ../../app/views/org_admin/templates/index.html.erb:86
 #: ../../app/views/org_admin/templates/index.html.erb:99
-msgid "Unpublished (%{count})"
+msgid "Unpublished (%<count>s)"
 msgstr ""
 
 #: ../../app/views/org_admin/templates/index.html.erb:89
-msgid "Not customised (%{count})"
+msgid "Not customised (%<count>s)"
 msgstr ""
 
 #: ../../app/views/org_admin/templates/index.html.erb:118
@@ -3437,7 +3437,7 @@ msgstr ""
 #: ../../app/views/org_admin/users/edit.html.erb:4
 #: ../../app/views/super_admin/users/edit.html.erb:1
 #: ../../app/views/super_admin/users/edit.html.erb:5
-msgid "Editing profile for %{username}"
+msgid "Editing profile for %<username>s"
 msgstr ""
 
 #: ../../app/views/org_admin/users/edit.html.erb:5
@@ -3446,7 +3446,7 @@ msgid "View all users"
 msgstr ""
 
 #: ../../app/views/org_admin/users/plans.html.erb:3
-msgid "Plans of %{username}"
+msgid "Plans of %<username>s"
 msgstr ""
 
 #: ../../app/views/orgs/_departments.html.erb:1
@@ -3505,7 +3505,7 @@ msgstr ""
 #: ../../app/views/orgs/_merge_form.html.erb:7
 msgid ""
 "Please select the Organisation that will replace the current organisation: '<s"
-"trong>%{org_name}</strong>'."
+"trong>%<org_name>s</strong>'."
 msgstr ""
 
 #: ../../app/views/orgs/_merge_form.html.erb:8
@@ -3680,12 +3680,12 @@ msgstr ""
 
 #: ../../app/views/paginable/api_clients/_index.html.erb:44
 msgid ""
-"You are about to delete '%{client_name}'. They will no longer be able to acces"
+"You are about to delete '%<client_name>s'. They will no longer be able to acces"
 "s the API. Are you sure?"
 msgstr ""
 
 #: ../../app/views/paginable/contributors/_index.html.erb:57
-msgid "You are about to delete '%{contributor_name}'. Are you sure?"
+msgid "You are about to delete '%<contributor_name>s'. Are you sure?"
 msgstr ""
 
 #: ../../app/views/paginable/departments/_index.html.erb:5
@@ -3699,7 +3699,7 @@ msgstr ""
 
 #: ../../app/views/paginable/departments/_index.html.erb:28
 msgid ""
-"You are about to delete '%{department_name}'. This will affect guidance. Are y"
+"You are about to delete '%<department_name>s'. This will affect guidance. Are y"
 "ou sure?"
 msgstr ""
 
@@ -3741,12 +3741,12 @@ msgstr ""
 
 #: ../../app/views/paginable/guidance_groups/_index.html.erb:50
 msgid ""
-"You are about to delete '%{guidance_group_name}'. This will affect guidance. A"
+"You are about to delete '%<guidance_group_name>s'. This will affect guidance. A"
 "re you sure?"
 msgstr ""
 
 #: ../../app/views/paginable/guidances/_index.html.erb:62
-msgid "You are about to delete '%{guidance_summary}'. Are you sure?"
+msgid "You are about to delete '%<guidance_summary>s'. Are you sure?"
 msgstr ""
 
 #: ../../app/views/paginable/notifications/_index.html.erb:5
@@ -3783,7 +3783,7 @@ msgid "Managed"
 msgstr ""
 
 #: ../../app/views/paginable/orgs/_index.html.erb:35
-msgid "You are about to delete '%{org_name}'. Are you sure?"
+msgid "You are about to delete '%<org_name>s'. Are you sure?"
 msgstr ""
 
 #: ../../app/views/paginable/plans/_org_admin.html.erb:3
@@ -3933,10 +3933,10 @@ msgstr ""
 
 #: ../../app/views/paginable/templates/_customisable.html.erb:69
 msgid ""
-"Are you sure you want to remove your customization of \"%{template_title}\"? Any"
+"Are you sure you want to remove your customization of \"%<template_title>s\"? Any"
 " published versions will become unavailable to users."
 msgstr ""
-"Are you sure you want to remove your customisation of \"%{template_title}\"? Any"
+"Are you sure you want to remove your customisation of \"%<template_title>s\"? Any"
 " published versions will become unavailable to users."
 
 #: ../../app/views/paginable/templates/_history.html.erb:7
@@ -3953,7 +3953,7 @@ msgstr "View customisations"
 
 #: ../../app/views/paginable/templates/_organisational.html.erb:76
 msgid ""
-"Are you sure you want to remove \"%{template_title}\"? Any published versions wi"
+"Are you sure you want to remove \"%<template_title>s\"? Any published versions wi"
 "ll become unavailable to users."
 msgstr ""
 
@@ -4105,7 +4105,7 @@ msgstr ""
 #: ../../app/views/plans/_download_form.html.erb:119
 msgid ""
 "Download Plan <em class=\"sr-only\">(new window)</em><span class=\"new-window-pop"
-"up-info\">%{open_in_new_window_text}</span>"
+"up-info\">%<open_in_new_window_text>s</span>"
 msgstr ""
 
 #: ../../app/views/plans/_edit_details.html.erb:13
@@ -4115,7 +4115,7 @@ msgstr ""
 
 #: ../../app/views/plans/_guidance_selection.html.erb:6
 msgid ""
-"To help you write your plan, %{application_name} can show you guidance from a "
+"To help you write your plan, %<application_name>s can show you guidance from a "
 "variety of organisations."
 msgstr ""
 
@@ -4137,7 +4137,7 @@ msgstr ""
 
 #: ../../app/views/plans/_guidance_selection.html.erb:40
 msgid ""
-"To help you write your plan, %{application_name} can show you guidance from a "
+"To help you write your plan, %<application_name>s can show you guidance from a "
 "variety of organisations. Please choose up to 6 organisations of the following"
 " organisations who offer guidance relevant to your plan."
 msgstr ""
@@ -4164,16 +4164,16 @@ msgstr ""
 
 #: ../../app/views/plans/_overview_details.html.erb:9
 msgid ""
-"This plan is based on the \"%{template_title}\" template provided by %{org_name}"
+"This plan is based on the \"%<template_title>s\" template provided by %<org_name>s"
 "."
 msgstr ""
 
 #: ../../app/views/plans/_overview_details.html.erb:17
-msgid "Template version %{template_version}, published on %{published_date}"
+msgid "Template version %<template_version>s, published on %<published_date>s"
 msgstr ""
 
 #: ../../app/views/plans/_overview_details.html.erb:42
-msgid "%{phase_title} (%{sections_size} %{sections}, %{questions_size} %{questions})"
+msgid "%<phase_title>s (%<sections_size>s %<sections>s, %<questions_size>s %<questions>s)"
 msgstr ""
 
 #: ../../app/views/plans/_overview_details.html.erb:43
@@ -4277,7 +4277,7 @@ msgstr ""
 #: ../../app/views/plans/_share_form.html.erb:9
 msgid ""
 "Public or organisational visibility is intended for finished plans. You must a"
-"nswer at least %{percentage}%% of the questions to enable these options. Note:"
+"nswer at least %<percentage>s%% of the questions to enable these options. Note:"
 " test plans are set to private visibility by default."
 msgstr ""
 
@@ -4359,8 +4359,8 @@ msgid "Click the 'Create plan' button below to begin."
 msgstr ""
 
 #: ../../app/views/plans/index.html.erb:35
-msgid "%{org_title} Plans"
-msgstr "%{org_title}'s Plans"
+msgid "%<org_title>s Plans"
+msgstr "%<org_title>s's Plans"
 
 #: ../../app/views/plans/index.html.erb:36
 msgid ""
@@ -4431,7 +4431,7 @@ msgstr ""
 
 #: ../../app/views/public_pages/plan_index.html.erb:8
 msgid ""
-"Public DMPs are plans created using the %{application_name} service and shared"
+"Public DMPs are plans created using the %<application_name>s service and shared"
 " publicly by their owners. They are not vetted for quality, completeness, or a"
 "dherence to funder guidelines."
 msgstr ""
@@ -4481,7 +4481,7 @@ msgid "terms and conditions"
 msgstr ""
 
 #: ../../app/views/shared/_create_plan_modal.html.erb:8
-msgid "Would you like to create a plan based on the \"%{name}\" template?"
+msgid "Would you like to create a plan based on the \"%<name>s\" template?"
 msgstr ""
 
 #: ../../app/views/shared/_links.html.erb:7
@@ -4535,7 +4535,7 @@ msgstr ""
 
 #: ../../app/views/shared/export/_plan_coversheet.erb:3
 #: ../../app/views/shared/export/_plan_txt.erb:65
-msgid "A Data Management Plan created using %{application_name}"
+msgid "A Data Management Plan created using %<application_name>s"
 msgstr ""
 
 #: ../../app/views/shared/export/_plan_coversheet.erb:10
@@ -4597,7 +4597,7 @@ msgstr ""
 
 #: ../../app/views/static_pages/about_us.html.erb:1
 #: ../../app/views/static_pages/about_us.html.erb:4
-msgid "About %{application_name}"
+msgid "About %<application_name>s"
 msgstr ""
 
 #: ../../app/views/static_pages/about_us.html.erb:11
@@ -4653,7 +4653,7 @@ msgstr ""
 #: ../../app/views/static_pages/about_us.html.erb:22
 msgid ""
 "get involved<em class=\"sr-only\"> (new window)</em><span class=\"new-window-popu"
-"p-info\">%{open_in_new_window_text}</span>"
+"p-info\">%<open_in_new_window_text>s</span>"
 msgstr ""
 
 #: ../../app/views/static_pages/about_us.html.erb:28
@@ -4673,7 +4673,7 @@ msgid "If you have an account please sign in and start creating or editing your
 msgstr ""
 
 #: ../../app/views/static_pages/about_us.html.erb:34
-msgid "If you do not have a %{application_name} account, click on"
+msgid "If you do not have a %<application_name>s account, click on"
 msgstr ""
 
 #: ../../app/views/static_pages/about_us.html.erb:34
@@ -4838,33 +4838,33 @@ msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:11
 msgid ""
-"The information you provide will be used by the %{org_name} to offer you acces"
-"s to and personalisation of the %{application_name} service."
+"The information you provide will be used by the %<org_name>s to offer you acces"
+"s to and personalisation of the %<application_name>s service."
 msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:13
 msgid ""
-"The %{org_name} processes the personal data of %{application_name} users in or"
-"der to deliver and improve the %{application_name} service in a customised man"
+"The %<org_name>s processes the personal data of %<application_name>s users in or"
+"der to deliver and improve the %<application_name>s service in a customised man"
 "ner and to ensure each user receives relevant information."
 msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:15
 msgid ""
-"The processing of your personal data by the %{org_name} is necessary for pursu"
+"The processing of your personal data by the %<org_name>s is necessary for pursu"
 "ing the following legitimate interests:"
 msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:18
 msgid ""
-"To provide access to the %{application_name} service and personalisation of yo"
+"To provide access to the %<application_name>s service and personalisation of yo"
 "ur user experience e.g. provision of relevant templates and guidance for your "
 "organisation."
 msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:20
 msgid ""
-"To keep you up to date with news about %{application_name} such as new feature"
+"To keep you up to date with news about %<application_name>s such as new feature"
 "s or improvements, or changes to our Privacy Policy."
 msgstr ""
 
@@ -4875,20 +4875,20 @@ msgstr ""
 #: ../../app/views/static_pages/privacy.html.erb:24
 msgid ""
 "We will hold the personal data you provided us for as long as you continue usi"
-"ng the %{application_name} service. Your personal data can be removed from thi"
-"s service upon request to the %{application_name} team within a period of 30 d"
+"ng the %<application_name>s service. Your personal data can be removed from thi"
+"s service upon request to the %<application_name>s team within a period of 30 d"
 "ays."
 msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:26
 msgid ""
-"If you have any questions, please contact the %{application_name} team at: <a "
-"href='mailto:%{helpdesk_email}'>%{helpdesk_email}</a>"
+"If you have any questions, please contact the %<application_name>s team at: <a "
+"href='mailto:%<helpdesk_email>s'>%<helpdesk_email>s</a>"
 msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:30
 msgid ""
-"This statement was last revised on %{revdate} and may be revised at any time w"
+"This statement was last revised on %<revdate>s and may be revised at any time w"
 "ith prior notice."
 msgstr ""
 
@@ -4956,7 +4956,7 @@ msgid ""
 "ookies and how we use them is available on the <a target='_blank' href='http:/"
 "/www.dcc.ac.uk/about-us/about-site/website-terms-use/cookies' class=\"has-new-w"
 "indow-popup-info\">main DCC website<em class=\"sr-only\"> (new window)</em><span "
-"class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>.</p>\n"
+"class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a>.</p>\n"
 "\n"
 "      <h3>Third party APIs</h3>\n"
 "\n"
@@ -5001,7 +5001,7 @@ msgid "Email credentials to contact"
 msgstr ""
 
 #: ../../app/views/super_admin/api_clients/_form.html.erb:81
-msgid "Are you sure you want to delete the API client: \"%{name}\""
+msgid "Are you sure you want to delete the API client: \"%<name>s\""
 msgstr ""
 
 #: ../../app/views/super_admin/api_clients/edit.html.erb:1
@@ -5018,7 +5018,7 @@ msgid "View all API clients"
 msgstr ""
 
 #: ../../app/views/super_admin/api_clients/email_credentials.js.erb:1
-msgid "The credentials have been sent to %{email}."
+msgid "The credentials have been sent to %<email>s."
 msgstr ""
 
 #: ../../app/views/super_admin/api_clients/index.html.erb:1
@@ -5063,7 +5063,7 @@ msgid "Body"
 msgstr ""
 
 #: ../../app/views/super_admin/notifications/_form.html.erb:71
-msgid "Are you sure you want to delete the notification \"%{title}\""
+msgid "Are you sure you want to delete the notification \"%<title>s\""
 msgstr ""
 
 #: ../../app/views/super_admin/notifications/edit.html.erb:1
@@ -5089,7 +5089,7 @@ msgid "New Notification"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:9
-msgid "Merging '%{from_org_name}' into '%{to_org_name}'"
+msgid "Merging '%<from_org_name>s' into '%<to_org_name>s'"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:11
@@ -5098,7 +5098,7 @@ msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:12
 msgid ""
-"Counts of '%{to_org_name}' records before and after a merge with %{from_org_na"
+"Counts of '%<to_org_name>s' records before and after a merge with %{from_org_na"
 "me}."
 msgstr ""
 
@@ -5108,11 +5108,11 @@ msgid "Record Type"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:18
-msgid "'%{to_org_name}' Count - before merge"
+msgid "'%<to_org_name>s' Count - before merge"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:19
-msgid "'%{to_org_name}' Count - after merge"
+msgid "'%<to_org_name>s' Count - after merge"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:38
@@ -5122,17 +5122,17 @@ msgstr ""
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:39
 msgid ""
 "The table below shows the specific changes that will occur during the merge pr"
-"ocess. Once the merge is complete, '%{from_org_name}' will be deleted. You can"
+"ocess. Once the merge is complete, '%<from_org_name>s' will be deleted. You can"
 " then consolidate/correct any merge issues (e.g. remove any departments that w"
 "ere duplicated)"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:45
-msgid "%{from_org_name} - Before"
+msgid "%<from_org_name>s - Before"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:46
-msgid "%{to_org_name} - Before"
+msgid "%<to_org_name>s - Before"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:61
@@ -5157,7 +5157,7 @@ msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:95
 msgid ""
-"Warning: '%{from_org_name}' has Plans that are currently in the review process"
+"Warning: '%<from_org_name>s' has Plans that are currently in the review process"
 ". The Org admins may not be able to see these plans after the merge!"
 msgstr ""
 
@@ -5180,7 +5180,7 @@ msgid "New organisation"
 msgstr ""
 
 #: ../../app/views/super_admin/themes/_form.html.erb:17
-msgid "Are you sure you want to delete the theme \"%{title}\"?"
+msgid "Are you sure you want to delete the theme \"%<title>s\"?"
 msgstr ""
 
 #: ../../app/views/super_admin/themes/edit.html.erb:3
@@ -5208,7 +5208,7 @@ msgstr ""
 
 #: ../../app/views/super_admin/users/edit.html.erb:64
 msgid ""
-"You are about to archive %{user_name}.  This will remove their personal inform"
+"You are about to archive %<user_name>s.  This will remove their personal inform"
 "ation, but retain their plans, answers, and comments.  They will be unable to "
 "sign-in. Are you sure?"
 msgstr ""
@@ -5308,75 +5308,75 @@ msgstr ""
 #: ../../app/views/user_mailer/permissions_change_notification.html.erb:2
 #: ../../app/views/user_mailer/plan_visibility.html.erb:2
 #: ../../app/views/user_mailer/sharing_notification.html.erb:2
-msgid "Hello %{username}"
+msgid "Hello %<username>s"
 msgstr ""
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:6
-msgid "You have been granted administrator privileges in %{tool_name}:"
+msgid "You have been granted administrator privileges in %<tool_name>s:"
 msgstr ""
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:13
-msgid "You have been revoked administrator privileges in %{tool_name}."
+msgid "You have been revoked administrator privileges in %<tool_name>s."
 msgstr ""
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:17
 msgid ""
-"More information about administering the %{tool_name} for users at your organi"
-"sation is available at the %{help_url}."
+"More information about administering the %<tool_name>s for users at your organi"
+"sation is available at the %<help_url>s."
 msgstr ""
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:2
-msgid "Hello %{name},"
+msgid "Hello %<name>s,"
 msgstr ""
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:8
-msgid "Please use the following credentials when accessing the %{tool_name} API."
+msgid "Please use the following credentials when accessing the %<tool_name>s API."
 msgstr ""
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:23
-msgid "Please refer to the API documentation at: %{api_documentation_url}"
+msgid "Please refer to the API documentation at: %<api_documentation_url>s"
 msgstr ""
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:29
 msgid ""
-"Do not share these credentials. They for use with the %{external_application} "
+"Do not share these credentials. They for use with the %<external_application>s "
 "application. If you do share your credentials with another application we rese"
 "rve the right to revoke your access to the API."
 msgstr ""
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:34
 msgid ""
-"If you did not request access to the %{tool_name} API or did not request for y"
-"our credentials to be renewed, please contact us at %{helpdesk_email}"
+"If you did not request access to the %<tool_name>s API or did not request for y"
+"our credentials to be renewed, please contact us at %<helpdesk_email>s"
 msgstr ""
 
 #: ../../app/views/user_mailer/feedback_complete.html.erb:2
-msgid "Hello %{recipient_name}"
+msgid "Hello %<recipient_name>s"
 msgstr ""
 
 #: ../../app/views/user_mailer/feedback_complete.html.erb:5
 msgid ""
-"%{commenter} has finished providing feedback on the plan  \"%{link_html}\". Comm"
+"%<commenter>s has finished providing feedback on the plan  \"%<link_html>s\". Comm"
 "ents can be found in the 'Write plan' tab on the right side of the page (Guida"
 "nce/Comments)."
 msgstr ""
 
 #: ../../app/views/user_mailer/feedback_notification.html.erb:2
-msgid "Hello %{user_name},"
+msgid "Hello %<user_name>s,"
 msgstr ""
 
 #: ../../app/views/user_mailer/feedback_notification.html.erb:5
 msgid ""
-"%{requestor} has requested feedback on a plan %{link_html}. To add comments, p"
-"lease visit the 'Plans' page under the Admin menu in %{tool_name} and open the"
+"%<requestor>s has requested feedback on a plan %<link_html>s. To add comments, p"
+"lease visit the 'Plans' page under the Admin menu in %<tool_name>s and open the"
 " plan."
 msgstr ""
 
 #: ../../app/views/user_mailer/new_comment.html.erb:5
 msgid ""
-"%{commenter_name} has commented on your plan %{plan_title}. To view the commen"
+"%<commenter_name>s has commented on your plan %<plan_title>s. To view the commen"
 "ts, follow the link to the DMP below, or navigate to the plan via My Dashboard"
-" page in %{tool_name}."
+" page in %<tool_name>s."
 msgstr ""
 
 #: ../../app/views/user_mailer/new_comment.html.erb:10
@@ -5390,21 +5390,21 @@ msgid ""
 msgstr ""
 
 #: ../../app/views/user_mailer/new_comment.html.erb:15
-msgid "DMP: %{phase_link}"
+msgid "DMP: %<phase_link>s"
 msgstr ""
 
 #: ../../app/views/user_mailer/new_comment.html.erb:18
-msgid "Section name: %{section_title}"
+msgid "Section name: %<section_title>s"
 msgstr ""
 
 #: ../../app/views/user_mailer/new_comment.html.erb:21
-msgid "Question: %{question_number}"
+msgid "Question: %<question_number>s"
 msgstr ""
 
 #: ../../app/views/user_mailer/permissions_change_notification.html.erb:5
 msgid ""
-"Your permissions relating to %{plan_title} have changed. You now have %{type} "
-"access. This means you can %{placeholder1} %{placeholder2}"
+"Your permissions relating to %<plan_title>s have changed. You now have %<type>s "
+"access. This means you can %<placeholder1>s %<placeholder2>s"
 msgstr ""
 
 #: ../../app/views/user_mailer/plan_access_removed.html.erb:2
@@ -5420,7 +5420,7 @@ msgid " has been removed by "
 msgstr ""
 
 #: ../../app/views/user_mailer/plan_visibility.html.erb:5
-msgid "The plan %{plan_title} had its visibility changed to %{plan_visibility}."
+msgid "The plan %<plan_title>s had its visibility changed to %<plan_visibility>s."
 msgstr ""
 
 #: ../../app/views/user_mailer/plan_visibility.html.erb:9
@@ -5438,11 +5438,11 @@ msgstr ""
 #: ../../app/views/user_mailer/plan_visibility.html.erb:17
 msgid ""
 "If you have questions pertaining to this action, please visit the My Dashboard"
-" page in %{tool_name}"
+" page in %<tool_name>s"
 msgstr ""
 
 #: ../../app/views/user_mailer/question_answered.html.erb:2
-msgid "Hello %{recipient_name},"
+msgid "Hello %<recipient_name>s,"
 msgstr ""
 
 #: ../../app/views/user_mailer/question_answered.html.erb:5
@@ -5463,18 +5463,19 @@ msgstr ""
 
 #: ../../app/views/user_mailer/sharing_notification.html.erb:5
 msgid ""
-"Your colleague %{inviter_name} has invited you to contribute to
\n"
+"Your colleague %<inviter_name>s has invited you to contribute to
+\n"%<tool_name>s
 "          their Data Management Plan in %{tool_name}"
 msgstr ""
 
-#: ../../app/views/user_mailer/welcome_notification.html.erb:2
+#: ../../app/views%<tool_name>s/w%<username>sfication.html.erb:2
 msgid "Welcome to %{tool_name}, %{username}"
 msgstr ""
 
 #: ../../app/views/user_mailer/welcome_notification.html.erb:5
-msgid ""
+m%<tool_name>s
 "%{tool_name} will help you to develop your Data Management Plan. If you have a"
-"ny queries or feedback as you use the tool, please contact us at %{helpdesk_em"
+"ny queries or %<contact_us>sou use the tool, please contact us at %{helpdesk_em"
 "ail} or visit %{contact_us}"
 msgstr ""
 
@@ -5482,7 +5483,7 @@ msgstr ""
 msgid "You may change your notification preferences on your profile page."
 msgstr ""
 
-#: ../../app/views/users/_admin_grant_permissions.html.erb:9
+#: ../../app/views/users/_admi%<username>smissions.html.erb:9
 msgid "Editing privileges for %{username}"
 msgstr ""
 
diff --git a/config/locale/en_US/app.po b/config/locale/en_US/app.po
index ab3642bbba..7b51b62882 100644
--- a/config/locale/en_US/app.po
+++ b/config/locale/en_US/app.po
@@ -20,12 +20,12 @@ msgstr ""
 
 #: ../../app/controllers/answers_controller.rb:24
 msgid ""
-"There is no question with id %{question_id} associated to plan id %{plan_id} f"
+"There is no question with id %<question_id>s associated to plan id %<plan_id>s f"
 "or which to create or update an answer"
 msgstr ""
 
 #: ../../app/controllers/answers_controller.rb:34
-msgid "There is no plan with id %{id} for which to create or update an answer"
+msgid "There is no plan with id %<id>s for which to create or update an answer"
 msgstr ""
 
 #: ../../app/controllers/api/v0/base_controller.rb:124
@@ -133,11 +133,11 @@ msgid "You need to sign in or sign up before continuing."
 msgstr "You need to sign in or sign up before continuing."
 
 #: ../../app/controllers/application_controller.rb:100
-msgid "Unable to %{action} the %{object}.%{errors}"
+msgid "Unable to %<action>s the %<object>s.%<errors>s"
 msgstr ""
 
 #: ../../app/controllers/application_controller.rb:108
-msgid "Successfully %{action} the %{object}."
+msgid "Successfully %<action>s the %<object>s."
 msgstr ""
 
 #: ../../app/controllers/application_controller.rb:123
@@ -201,7 +201,7 @@ msgid "Restricted access to View All the records"
 msgstr ""
 
 #: ../../app/controllers/concerns/paginable.rb:180
-msgid "Sort by %{sort_field}"
+msgid "Sort by %<sort_field>s"
 msgstr ""
 
 #: ../../app/controllers/concerns/template_methods.rb:10
@@ -403,11 +403,11 @@ msgid "Your guidance is no longer published and will not be available to users."
 msgstr ""
 
 #: ../../app/controllers/identifiers_controller.rb:18
-msgid "Successfully unlinked your account from %{is}."
+msgid "Successfully unlinked your account from %<is>s."
 msgstr ""
 
 #: ../../app/controllers/identifiers_controller.rb:22
-msgid "Unable to unlink your account from %{is}."
+msgid "Unable to unlink your account from %<is>s."
 msgstr ""
 
 #: ../../app/controllers/org_admin/phases_controller.rb:18
@@ -456,7 +456,7 @@ msgid "update"
 msgstr ""
 
 #: ../../app/controllers/org_admin/plans_controller.rb:32
-msgid "%{plan_owner} has been notified that you have finished providing feedback"
+msgid "%<plan_owner>s has been notified that you have finished providing feedback"
 msgstr ""
 
 #: ../../app/controllers/org_admin/plans_controller.rb:38
@@ -548,7 +548,7 @@ msgstr ""
 
 #: ../../app/controllers/org_admin/templates_controller.rb:48
 #: ../../app/views/org_admin/templates/index.html.erb:52
-msgid "%{org_name} Templates"
+msgid "%<org_name>s Templates"
 msgstr ""
 
 #: ../../app/controllers/org_admin/templates_controller.rb:50
@@ -561,12 +561,12 @@ msgid "Customizable Templates"
 msgstr "Customizable Templates"
 
 #: ../../app/controllers/org_admin/templates_controller.rb:214
-msgid "Error parsing links for a %{template}"
+msgid "Error parsing links for a %<template>s"
 msgstr ""
 
 #: ../../app/controllers/org_admin/templates_controller.rb:345
 #: ../../app/controllers/public_pages_controller.rb:68
-msgid "Template created using the %{application_name} service. Last modified %{date}"
+msgid "Template created using the %<application_name>s service. Last modified %<date>s"
 msgstr ""
 
 #: ../../app/controllers/org_admin/templates_controller.rb:360
@@ -587,7 +587,7 @@ msgid "Please choose an organisation"
 msgstr "Please choose an organization"
 
 #: ../../app/controllers/plan_exports_controller.rb:85
-msgid "Created using %{application_name}. Last modified %{date}"
+msgid "Created using %<application_name>s. Last modified %<date>s"
 msgstr ""
 
 #: ../../app/controllers/plans_controller.rb:51
@@ -629,12 +629,12 @@ msgstr ""
 
 #: ../../app/controllers/plans_controller.rb:408
 msgid ""
-"Unable to change the plan's status since it is needed at least %{percentage} p"
+"Unable to change the plan's status since it is needed at least %<percentage>s p"
 "ercentage responded"
 msgstr ""
 
 #: ../../app/controllers/plans_controller.rb:416
-msgid "Unable to find plan id %{plan_id}"
+msgid "Unable to find plan id %<plan_id>s"
 msgstr ""
 
 #: ../../app/controllers/plans_controller.rb:433
@@ -650,13 +650,13 @@ msgid "Unable to change the plan's test status"
 msgstr ""
 
 #: ../../app/controllers/plans_controller.rb:451
-msgid "There is no plan associated with id %{id}"
+msgid "There is no plan associated with id %<id>s"
 msgstr ""
 
 #: ../../app/controllers/registrations_controller.rb:35
 msgid ""
 "Please make a choice below. After linking your\n"
-"                       details to a %{application_name} account,\n"
+"                       details to a %<application_name>s account,\n"
 "                       you will be able to sign in directly with your\n"
 "                       institutional credentials."
 msgstr ""
@@ -732,12 +732,12 @@ msgstr ""
 
 #: ../../app/controllers/roles_controller.rb:26
 msgid ""
-"Cannot share plan with %{email} since that email matches with the owner of the"
+"Cannot share plan with %<email>s since that email matches with the owner of the"
 " plan."
 msgstr ""
 
 #: ../../app/controllers/roles_controller.rb:37
-msgid "Plan is already shared with %{email}."
+msgid "Plan is already shared with %<email>s."
 msgstr ""
 
 #: ../../app/controllers/roles_controller.rb:44
@@ -750,11 +750,11 @@ msgid "Surname"
 msgstr ""
 
 #: ../../app/controllers/roles_controller.rb:48
-msgid "Invitation to %{email} issued successfully."
+msgid "Invitation to %<email>s issued successfully."
 msgstr ""
 
 #: ../../app/controllers/roles_controller.rb:53
-msgid "Plan shared with %{email}."
+msgid "Plan shared with %<email>s."
 msgstr ""
 
 #: ../../app/controllers/roles_controller.rb:68
@@ -767,7 +767,7 @@ msgstr ""
 
 #: ../../app/controllers/roles_controller.rb:93
 msgid ""
-"Successfully changed the permissions for %{email}. They have been notified via"
+"Successfully changed the permissions for %<email>s. They have been notified via"
 " email."
 msgstr ""
 
@@ -798,7 +798,7 @@ msgid "An error has occurred while saving/resetting your export settings."
 msgstr ""
 
 #: ../../app/controllers/super_admin/api_clients_controller.rb:45
-msgid ". The API credentials have been emailed to %{email}"
+msgid ". The API credentials have been emailed to %<email>s"
 msgstr ""
 
 #: ../../app/controllers/super_admin/notifications_controller.rb:69
@@ -814,16 +814,16 @@ msgid "Unable to change the notification's active status"
 msgstr ""
 
 #: ../../app/controllers/super_admin/notifications_controller.rb:104
-msgid "There is no notification associated with id  %{id}"
+msgid "There is no notification associated with id  %<id>s"
 msgstr ""
 
 #: ../../app/controllers/super_admin/org_swaps_controller.rb:22
 msgid ""
 "Your organisation affiliation has been changed. You may now edit templates for"
-" %{org_name}."
+" %<org_name>s."
 msgstr ""
 "Your organization affiliation has been changed. You may now edit templates for"
-" %{org_name}."
+" %<org_name>s."
 
 #: ../../app/controllers/super_admin/org_swaps_controller.rb:25
 msgid "Unable to change your organisation affiliation at this time."
@@ -882,15 +882,15 @@ msgid "Successfully signed in"
 msgstr ""
 
 #: ../../app/controllers/users/omniauth_callbacks_controller.rb:56
-msgid "Your account has been successfully linked to %{scheme}."
+msgid "Your account has been successfully linked to %<scheme>s."
 msgstr ""
 
 #: ../../app/controllers/users/omniauth_callbacks_controller.rb:61
-msgid "Unable to link your account to %{scheme}."
+msgid "Unable to link your account to %<scheme>s."
 msgstr ""
 
 #: ../../app/controllers/users_controller.rb:141
-msgid "Successfully %{action} %{username}'s account."
+msgid "Successfully %<action>s %<username>s's account."
 msgstr ""
 
 #: ../../app/controllers/users_controller.rb:142
@@ -902,7 +902,7 @@ msgid "deactivated"
 msgstr ""
 
 #: ../../app/controllers/users_controller.rb:149
-msgid "Unable to %{action} %{username}"
+msgid "Unable to %<action>s %<username>s"
 msgstr ""
 
 #: ../../app/controllers/users_controller.rb:150
@@ -969,16 +969,16 @@ msgid "Creator:"
 msgstr ""
 
 #: ../../app/helpers/feedbacks_helper.rb:6
-msgid "%{application_name}: Your plan has been submitted for feedback"
+msgid "%<application_name>s: Your plan has been submitted for feedback"
 msgstr ""
 
 #: ../../app/helpers/feedbacks_helper.rb:10
 msgid ""
-"<p>Hello %{user_name}.</p><p>Your plan \"%{plan_name}\" has been submitted for f"
+"<p>Hello %<user_name>s.</p><p>Your plan \"%<plan_name>s\" has been submitted for f"
 "eedback from an\n"
 "      administrator at your organisation. If you have questions pertaining to "
 "this action, please contact us\n"
-"      at %{organisation_email}.</p>"
+"      at %<organisation_email>s.</p>"
 msgstr ""
 
 #: ../../app/helpers/identifier_helper.rb:6
@@ -1012,10 +1012,10 @@ msgstr ""
 
 #: ../../app/helpers/orgs_helper.rb:14
 msgid ""
-"<p>A data librarian from %{org_name} will respond to your request within 48\n"
+"<p>A data librarian from %<org_name>s will respond to your request within 48\n"
 "       hours. If you have questions pertaining to this action please contact u"
 "s\n"
-"       at %{organisation_email}.</p>"
+"       at %<organisation_email>s.</p>"
 msgstr ""
 
 #: ../../app/helpers/perms_helper.rb:9
@@ -1149,7 +1149,7 @@ msgid "None"
 msgstr ""
 
 #: ../../app/helpers/super_admin/orgs/merge_helper.rb:31
-msgid "Guidance for: %{themes}"
+msgid "Guidance for: %<themes>s"
 msgstr ""
 
 #: ../../app/helpers/super_admin/orgs/merge_helper.rb:53
@@ -1157,7 +1157,7 @@ msgid "Nothing to merge"
 msgstr ""
 
 #: ../../app/helpers/super_admin/orgs/merge_helper.rb:55
-msgid "<p>The following %{object_types} will be moved over to '%{org_name}':</p>"
+msgid "<p>The following %<object_types>s will be moved over to '%<org_name>s':</p>"
 msgstr ""
 
 #: ../../app/helpers/template_helper.rb:46
@@ -1193,47 +1193,47 @@ msgstr ""
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:6
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:5
 #: ../../app/views/user_mailer/_email_signature.html.erb:2
-msgid "Query or feedback related to %{tool_name}"
+msgid "Query or feedback related to %<tool_name>s"
 msgstr ""
 
 #: ../../app/mailers/user_mailer.rb:23
-msgid "Welcome to %{tool_name}"
+msgid "Welcome to %<tool_name>s"
 msgstr ""
 
 #: ../../app/mailers/user_mailer.rb:58
-msgid "A Data Management Plan in %{tool_name} has been shared with you"
+msgid "A Data Management Plan in %<tool_name>s has been shared with you"
 msgstr ""
 
 #: ../../app/mailers/user_mailer.rb:76
-msgid "Changed permissions on a Data Management Plan in %{tool_name}"
+msgid "Changed permissions on a Data Management Plan in %<tool_name>s"
 msgstr ""
 
 #: ../../app/mailers/user_mailer.rb:92
-msgid "Permissions removed on a DMP in %{tool_name}"
+msgid "Permissions removed on a DMP in %<tool_name>s"
 msgstr ""
 
 #: ../../app/mailers/user_mailer.rb:111
-msgid "%{user_name} has requested feedback on a %{tool_name} plan"
+msgid "%<user_name>s has requested feedback on a %<tool_name>s plan"
 msgstr ""
 
 #: ../../app/mailers/user_mailer.rb:134
-msgid "%{tool_name}: Expert feedback has been provided for %{plan_title}"
+msgid "%<tool_name>s: Expert feedback has been provided for %<plan_title>s"
 msgstr ""
 
 #: ../../app/mailers/user_mailer.rb:169
-msgid "DMP Visibility Changed: %{plan_title}"
+msgid "DMP Visibility Changed: %<plan_title>s"
 msgstr ""
 
 #: ../../app/mailers/user_mailer.rb:200
-msgid "%{tool_name}: A new comment was added to %{plan_title}"
+msgid "%<tool_name>s: A new comment was added to %<plan_title>s"
 msgstr ""
 
 #: ../../app/mailers/user_mailer.rb:218
-msgid "Administrator privileges granted in %{tool_name}"
+msgid "Administrator privileges granted in %<tool_name>s"
 msgstr ""
 
 #: ../../app/mailers/user_mailer.rb:235
-msgid "%{tool_name} API changes"
+msgid "%<tool_name>s API changes"
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:26
@@ -1266,11 +1266,11 @@ msgid "Creators: "
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:134
-msgid "%{authors}"
+msgid "%<authors>s"
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:135
-msgid "%{affiliation}"
+msgid "%<affiliation>s"
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:137
@@ -1282,11 +1282,11 @@ msgid "Template: "
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:137
-msgid "%{funder}"
+msgid "%<funder>s"
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:139
-msgid "%{template}"
+msgid "%<template>s"
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:142
@@ -1295,7 +1295,7 @@ msgid "Grant number: "
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:142
-msgid "%{grant_number}"
+msgid "%<grant_number>s"
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:145
@@ -1305,7 +1305,7 @@ msgid "Project abstract: "
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:145
-msgid "%{description}"
+msgid "%<description>s"
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:148
@@ -1315,7 +1315,7 @@ msgid "Last modified: "
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:148
-msgid "%{date}"
+msgid "%<date>s"
 msgstr ""
 
 #: ../../app/models/concerns/exportable_plan.rb:149
@@ -1487,7 +1487,7 @@ msgid "generate_copy! requires an organisation target"
 msgstr "generate_copy! requires an organization target"
 
 #: ../../app/models/template.rb:380
-msgid "Copy of %{template}"
+msgid "Copy of %<template>s"
 msgstr ""
 
 #: ../../app/models/template.rb:388
@@ -1527,7 +1527,7 @@ msgid "Conditions in the template refer backwards"
 msgstr ""
 
 #: ../../app/models/user.rb:379
-msgid "A Data Management Plan in %{application_name} has been shared with you"
+msgid "A Data Management Plan in %<application_name>s has been shared with you"
 msgstr ""
 
 #: ../../app/policies/api/v0/departments_policy.rb:12
@@ -1637,7 +1637,7 @@ msgid ""
 msgstr ""
 
 #: ../../app/validators/after_validator.rb:5
-msgid "must be after %{date}"
+msgid "must be after %<date>s"
 msgstr ""
 
 #: ../../app/validators/org_links_validator.rb:10
@@ -1650,11 +1650,11 @@ msgid "A hash is expected for links"
 msgstr ""
 
 #: ../../app/validators/template_links_validator.rb:12
-msgid "A key %{key} is expected for links hash"
+msgid "A key %<key>s is expected for links hash"
 msgstr ""
 
 #: ../../app/validators/template_links_validator.rb:15
-msgid "The key %{key} does not have a valid set of object links"
+msgid "The key %<key>s does not have a valid set of object links"
 msgstr ""
 
 #: ../../app/views/answers/_locking.html.erb:5
@@ -1663,7 +1663,7 @@ msgstr ""
 
 #: ../../app/views/answers/_locking.html.erb:8
 msgid ""
-"since %{name} saved the answer below while you were editing. Please, combine y"
+"since %<name>s saved the answer below while you were editing. Please, combine y"
 "our changes and then save the answer again."
 msgstr ""
 
@@ -1738,7 +1738,7 @@ msgid "Answered"
 msgstr ""
 
 #: ../../app/views/answers/_status.html.erb:10
-msgid " by %{user_name}"
+msgid " by %<user_name>s"
 msgstr ""
 
 #: ../../app/views/answers/_status.html.erb:15
@@ -1816,11 +1816,11 @@ msgstr "Contact Us"
 
 #: ../../app/views/contact_us/contacts/new.html.erb:6
 msgid ""
-"%{application_name} is provided by the %{organisation_name}.<br /> You can fin"
-"d out more about us on our <a href=\"%{organisation_url}\" class=\"has-new-window"
+"%<application_name>s is provided by the %<organisation_name>s.<br /> You can fin"
+"d out more about us on our <a href=\"%<organisation_url>s\" class=\"has-new-window"
 "-popup-info\" target=\"_blank\">website <em class=\"sr-only\">(new window)</em><spa"
-"n class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>. If you "
-"would like to contact us about %{application_name}, please fill out the form b"
+"n class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a>. If you "
+"would like to contact us about %<application_name>s, please fill out the form b"
 "elow."
 msgstr ""
 
@@ -1982,7 +1982,7 @@ msgid "Create account"
 msgstr ""
 
 #: ../../app/views/devise/mailer/confirmation_instructions.html.erb:2
-msgid "Welcome to %{application_name}"
+msgid "Welcome to %<application_name>s"
 msgstr ""
 
 #: ../../app/views/devise/mailer/confirmation_instructions.html.erb:4
@@ -2003,19 +2003,19 @@ msgstr ""
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:12
 #: ../../app/views/user_mailer/new_comment.html.erb:2
-msgid "Hello %{user_name}"
+msgid "Hello %<user_name>s"
 msgstr ""
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:15
 msgid ""
-"Your colleague %{inviter_name} has invited you to contribute to  their Data Ma"
-"nagement Plan in %{tool_name}"
+"Your colleague %<inviter_name>s has invited you to contribute to  their Data Ma"
+"nagement Plan in %<tool_name>s"
 msgstr ""
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:22
 #: ../../app/views/user_mailer/sharing_notification.html.erb:11
 msgid ""
-"%{click_here} to accept the invitation, (or copy %{link} into your browser). I"
+"%<click_here>s to accept the invitation, (or copy %<link>s into your browser). I"
 "f you don't want to accept the invitation, please ignore this email."
 msgstr ""
 
@@ -2035,7 +2035,7 @@ msgstr ""
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:19
 #: ../../app/views/user_mailer/_email_signature.html.erb:12
 #: ../../app/views/user_mailer/welcome_notification.html.erb:10
-msgid "The %{tool_name} team"
+msgid "The %<tool_name>s team"
 msgstr ""
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:32
@@ -2047,17 +2047,17 @@ msgstr ""
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:33
 msgid ""
-"If you have any questions or need help, please contact us at %{helpdesk_email}"
-" or visit %{contact_us_url}"
+"If you have any questions or need help, please contact us at %<helpdesk_email>s"
+" or visit %<contact_us_url>s"
 msgstr ""
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:9
-msgid "Hello %{user_email}"
+msgid "Hello %<user_email>s"
 msgstr ""
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:12
 msgid ""
-"Someone has requested a link to change your %{tool_name} password. You can do "
+"Someone has requested a link to change your %<tool_name>s password. You can do "
 "this through the link below."
 msgstr ""
 
@@ -2072,8 +2072,8 @@ msgstr ""
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:22
 #: ../../app/views/user_mailer/_email_signature.html.erb:19
 msgid ""
-"If you have any questions or need help, please contact us at %{helpdesk_email}"
-" or visit %{contact_us}"
+"If you have any questions or need help, please contact us at %<helpdesk_email>s"
+" or visit %<contact_us>s"
 msgstr ""
 
 #: ../../app/views/devise/mailer/unlock_instructions.html.erb:2
@@ -2142,15 +2142,15 @@ msgstr ""
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:16
 msgid ""
-"See the <a href=\"%{api_v0_wiki}\">documentation for v0</a> for more details on "
+"See the <a href=\"%<api_v0_wiki>s\">documentation for v0</a> for more details on "
 "the original API which includes access to statistics, the full text of plans a"
 "nd the ability to connect users with departments."
 msgstr ""
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:18
 msgid ""
-"See the <a href=\"%{api_v1_wiki}\">documentation for v1</a> for more details on "
-"the API that supports the <a href=\"%{rda_standard_url}\">RDA Common metadata st"
+"See the <a href=\"%<api_v1_wiki>s\">documentation for v1</a> for more details on "
+"the API that supports the <a href=\"%<rda_standard_url>s\">RDA Common metadata st"
 "andard for DMPs.</a>"
 msgstr ""
 
@@ -2313,7 +2313,7 @@ msgid "Sign in or Create account"
 msgstr ""
 
 #: ../../app/views/devise/registrations/new.html.erb:15
-msgid "Do you have a %{application_name} account?"
+msgid "Do you have a %<application_name>s account?"
 msgstr ""
 
 #: ../../app/views/devise/registrations/new.html.erb:22
@@ -2329,7 +2329,7 @@ msgid "This will link your existing account to your credentials."
 msgstr ""
 
 #: ../../app/views/devise/registrations/new.html.erb:34
-msgid "No %{application_name} account?"
+msgid "No %<application_name>s account?"
 msgstr ""
 
 #: ../../app/views/devise/registrations/new.html.erb:46
@@ -2491,7 +2491,7 @@ msgstr ""
 
 #: ../../app/views/home/_welcome.html.erb:5
 msgid ""
-"<p>%{application_name} has been developed by the <strong>%{organisation_name}<"
+"<p>%<application_name>s has been developed by the <strong>%<organisation_name>s<"
 "/strong> to help you write data management plans.</p>"
 msgstr ""
 
@@ -2678,7 +2678,7 @@ msgid "Logout"
 msgstr ""
 
 #: ../../app/views/layouts/application.html.erb:32
-msgid "%{application_name}"
+msgid "%<application_name>s"
 msgstr ""
 
 #: ../../app/views/layouts/application.html.erb:91
@@ -2754,7 +2754,7 @@ msgstr ""
 
 #: ../../app/views/layouts/application.html.erb:142
 msgid ""
-"%{n} results are available, use up and down arrows to navigate suggestions. Us"
+"%<n>s results are available, use up and down arrows to navigate suggestions. Us"
 "e the Enter key to select a suggestion or the Escape key to close the suggesti"
 "ons."
 msgstr ""
@@ -2807,7 +2807,7 @@ msgid "Example answer"
 msgstr ""
 
 #: ../../app/views/org_admin/annotations/_show.html.erb:4
-msgid "%{org} Example Answer"
+msgid "%<org>s Example Answer"
 msgstr ""
 
 #: ../../app/views/org_admin/conditions/_add.html.erb:3
@@ -2954,7 +2954,7 @@ msgstr ""
 
 #: ../../app/views/org_admin/phases/_phase.html.erb:17
 msgid ""
-"You are about to delete the '%{phase_title}' phase. This will remove all of th"
+"You are about to delete the '%<phase_title>s' phase. This will remove all of th"
 "e sections and questions listed below. Are you sure?"
 msgstr ""
 
@@ -3014,7 +3014,7 @@ msgid "Write plan"
 msgstr ""
 
 #: ../../app/views/org_admin/plans/index.html.erb:4
-msgid "%{org_name} Plans"
+msgid "%<org_name>s Plans"
 msgstr ""
 
 #: ../../app/views/org_admin/plans/index.html.erb:16
@@ -3066,7 +3066,7 @@ msgstr ""
 #: ../../app/views/org_admin/plans/index.html.erb:39
 msgid ""
 "Download plans <em class=\"sr-only\">(new window)</em><span class=\"new-window-po"
-"pup-info\">%{open_in_new_window_text}</span>"
+"pup-info\">%<open_in_new_window_text>s</span>"
 msgstr ""
 
 #: ../../app/views/org_admin/question_options/_option_fields.html.erb:3
@@ -3094,7 +3094,7 @@ msgid ""
 msgstr ""
 
 #: ../../app/views/org_admin/questions/_form.html.erb:4
-msgid "Question %{number}:"
+msgid "Question %<number>s:"
 msgstr ""
 
 #: ../../app/views/org_admin/questions/_form.html.erb:4
@@ -3162,7 +3162,7 @@ msgid "Delete"
 msgstr ""
 
 #: ../../app/views/org_admin/questions/_form.html.erb:102
-msgid "You are about to delete question #%{question_number}. Are you sure?"
+msgid "You are about to delete question #%<question_number>s. Are you sure?"
 msgstr ""
 
 #: ../../app/views/org_admin/questions/_index.html.erb:14
@@ -3255,7 +3255,7 @@ msgstr ""
 
 #: ../../app/views/org_admin/sections/_form.html.erb:20
 msgid ""
-"You are about to delete '%{section_title}'. This will affect questions linked "
+"You are about to delete '%<section_title>s'. This will affect questions linked "
 "to this section. Are you sure?"
 msgstr ""
 
@@ -3281,7 +3281,7 @@ msgstr ""
 
 #: ../../app/views/org_admin/templates/_form.html.erb:25
 #: ../../app/views/org_admin/templates/_show.html.erb:35
-msgid "for internal %{org_name} use only"
+msgid "for internal %<org_name>s use only"
 msgstr ""
 
 #: ../../app/views/org_admin/templates/_form.html.erb:32
@@ -3447,22 +3447,22 @@ msgstr "Customizable Templates"
 
 #: ../../app/views/org_admin/templates/index.html.erb:80
 #: ../../app/views/org_admin/templates/index.html.erb:93
-msgid "All (%{count})"
+msgid "All (%<count>s)"
 msgstr ""
 
 #: ../../app/views/org_admin/templates/index.html.erb:83
 #: ../../app/views/org_admin/templates/index.html.erb:96
-msgid "Published (%{count})"
+msgid "Published (%<count>s)"
 msgstr ""
 
 #: ../../app/views/org_admin/templates/index.html.erb:86
 #: ../../app/views/org_admin/templates/index.html.erb:99
-msgid "Unpublished (%{count})"
+msgid "Unpublished (%<count>s)"
 msgstr ""
 
 #: ../../app/views/org_admin/templates/index.html.erb:89
-msgid "Not customised (%{count})"
-msgstr "Not customized (%{count})"
+msgid "Not customised (%<count>s)"
+msgstr "Not customized (%<count>s)"
 
 #: ../../app/views/org_admin/templates/index.html.erb:118
 msgid "Create a template"
@@ -3471,7 +3471,7 @@ msgstr ""
 #: ../../app/views/org_admin/users/edit.html.erb:4
 #: ../../app/views/super_admin/users/edit.html.erb:1
 #: ../../app/views/super_admin/users/edit.html.erb:5
-msgid "Editing profile for %{username}"
+msgid "Editing profile for %<username>s"
 msgstr ""
 
 #: ../../app/views/org_admin/users/edit.html.erb:5
@@ -3480,7 +3480,7 @@ msgid "View all users"
 msgstr ""
 
 #: ../../app/views/org_admin/users/plans.html.erb:3
-msgid "Plans of %{username}"
+msgid "Plans of %<username>s"
 msgstr ""
 
 #: ../../app/views/orgs/_departments.html.erb:1
@@ -3539,7 +3539,7 @@ msgstr ""
 #: ../../app/views/orgs/_merge_form.html.erb:7
 msgid ""
 "Please select the Organisation that will replace the current organisation: '<s"
-"trong>%{org_name}</strong>'."
+"trong>%<org_name>s</strong>'."
 msgstr ""
 
 #: ../../app/views/orgs/_merge_form.html.erb:8
@@ -3714,12 +3714,12 @@ msgstr ""
 
 #: ../../app/views/paginable/api_clients/_index.html.erb:44
 msgid ""
-"You are about to delete '%{client_name}'. They will no longer be able to acces"
+"You are about to delete '%<client_name>s'. They will no longer be able to acces"
 "s the API. Are you sure?"
 msgstr ""
 
 #: ../../app/views/paginable/contributors/_index.html.erb:57
-msgid "You are about to delete '%{contributor_name}'. Are you sure?"
+msgid "You are about to delete '%<contributor_name>s'. Are you sure?"
 msgstr ""
 
 #: ../../app/views/paginable/departments/_index.html.erb:5
@@ -3733,7 +3733,7 @@ msgstr ""
 
 #: ../../app/views/paginable/departments/_index.html.erb:28
 msgid ""
-"You are about to delete '%{department_name}'. This will affect guidance. Are y"
+"You are about to delete '%<department_name>s'. This will affect guidance. Are y"
 "ou sure?"
 msgstr ""
 
@@ -3775,12 +3775,12 @@ msgstr ""
 
 #: ../../app/views/paginable/guidance_groups/_index.html.erb:50
 msgid ""
-"You are about to delete '%{guidance_group_name}'. This will affect guidance. A"
+"You are about to delete '%<guidance_group_name>s'. This will affect guidance. A"
 "re you sure?"
 msgstr ""
 
 #: ../../app/views/paginable/guidances/_index.html.erb:62
-msgid "You are about to delete '%{guidance_summary}'. Are you sure?"
+msgid "You are about to delete '%<guidance_summary>s'. Are you sure?"
 msgstr ""
 
 #: ../../app/views/paginable/notifications/_index.html.erb:5
@@ -3817,7 +3817,7 @@ msgid "Managed"
 msgstr ""
 
 #: ../../app/views/paginable/orgs/_index.html.erb:35
-msgid "You are about to delete '%{org_name}'. Are you sure?"
+msgid "You are about to delete '%<org_name>s'. Are you sure?"
 msgstr ""
 
 #: ../../app/views/paginable/plans/_org_admin.html.erb:3
@@ -3970,7 +3970,7 @@ msgstr ""
 
 #: ../../app/views/paginable/templates/_customisable.html.erb:69
 msgid ""
-"Are you sure you want to remove your customization of \"%{template_title}\"? Any"
+"Are you sure you want to remove your customization of \"%<template_title>s\"? Any"
 " published versions will become unavailable to users."
 msgstr ""
 
@@ -3988,7 +3988,7 @@ msgstr "View customizations"
 
 #: ../../app/views/paginable/templates/_organisational.html.erb:76
 msgid ""
-"Are you sure you want to remove \"%{template_title}\"? Any published versions wi"
+"Are you sure you want to remove \"%<template_title>s\"? Any published versions wi"
 "ll become unavailable to users."
 msgstr ""
 
@@ -4140,7 +4140,7 @@ msgstr ""
 #: ../../app/views/plans/_download_form.html.erb:119
 msgid ""
 "Download Plan <em class=\"sr-only\">(new window)</em><span class=\"new-window-pop"
-"up-info\">%{open_in_new_window_text}</span>"
+"up-info\">%<open_in_new_window_text>s</span>"
 msgstr ""
 
 #: ../../app/views/plans/_edit_details.html.erb:13
@@ -4150,10 +4150,10 @@ msgstr ""
 
 #: ../../app/views/plans/_guidance_selection.html.erb:6
 msgid ""
-"To help you write your plan, %{application_name} can show you guidance from a "
+"To help you write your plan, %<application_name>s can show you guidance from a "
 "variety of organisations."
 msgstr ""
-"To help you write your plan, %{application_name} can show you guidance from a "
+"To help you write your plan, %<application_name>s can show you guidance from a "
 "variety of organizations."
 
 #: ../../app/views/plans/_guidance_selection.html.erb:9
@@ -4174,11 +4174,11 @@ msgstr ""
 
 #: ../../app/views/plans/_guidance_selection.html.erb:40
 msgid ""
-"To help you write your plan, %{application_name} can show you guidance from a "
+"To help you write your plan, %<application_name>s can show you guidance from a "
 "variety of organisations. Please choose up to 6 organisations of the following"
 " organisations who offer guidance relevant to your plan."
 msgstr ""
-"To help you write your plan, %{application_name} can show you guidance from a "
+"To help you write your plan, %<application_name>s can show you guidance from a "
 "variety of organizations. Please choose up to 6 organizations of the following"
 " organizations who offer guidance relevant to your plan."
 
@@ -4204,16 +4204,16 @@ msgstr ""
 
 #: ../../app/views/plans/_overview_details.html.erb:9
 msgid ""
-"This plan is based on the \"%{template_title}\" template provided by %{org_name}"
+"This plan is based on the \"%<template_title>s\" template provided by %<org_name>s"
 "."
 msgstr ""
 
 #: ../../app/views/plans/_overview_details.html.erb:17
-msgid "Template version %{template_version}, published on %{published_date}"
+msgid "Template version %<template_version>s, published on %<published_date>s"
 msgstr ""
 
 #: ../../app/views/plans/_overview_details.html.erb:42
-msgid "%{phase_title} (%{sections_size} %{sections}, %{questions_size} %{questions})"
+msgid "%<phase_title>s (%<sections_size>s %<sections>s, %<questions_size>s %<questions>s)"
 msgstr ""
 
 #: ../../app/views/plans/_overview_details.html.erb:43
@@ -4319,11 +4319,11 @@ msgstr ""
 #: ../../app/views/plans/_share_form.html.erb:9
 msgid ""
 "Public or organisational visibility is intended for finished plans. You must a"
-"nswer at least %{percentage}%% of the questions to enable these options. Note:"
+"nswer at least %<percentage>s%% of the questions to enable these options. Note:"
 " test plans are set to private visibility by default."
 msgstr ""
 "Public or organizational visibility is intended for finished plans. You must a"
-"nswer at least %{percentage}%% of the questions to enable these options. Note:"
+"nswer at least %<percentage>s%% of the questions to enable these options. Note:"
 " test plans are set to private visibility by default."
 
 #: ../../app/views/plans/_share_form.html.erb:19
@@ -4406,7 +4406,7 @@ msgid "Click the 'Create plan' button below to begin."
 msgstr ""
 
 #: ../../app/views/plans/index.html.erb:35
-msgid "%{org_title} Plans"
+msgid "%<org_title>s Plans"
 msgstr ""
 
 #: ../../app/views/plans/index.html.erb:36
@@ -4483,7 +4483,7 @@ msgstr ""
 
 #: ../../app/views/public_pages/plan_index.html.erb:8
 msgid ""
-"Public DMPs are plans created using the %{application_name} service and shared"
+"Public DMPs are plans created using the %<application_name>s service and shared"
 " publicly by their owners. They are not vetted for quality, completeness, or a"
 "dherence to funder guidelines."
 msgstr ""
@@ -4533,7 +4533,7 @@ msgid "terms and conditions"
 msgstr ""
 
 #: ../../app/views/shared/_create_plan_modal.html.erb:8
-msgid "Would you like to create a plan based on the \"%{name}\" template?"
+msgid "Would you like to create a plan based on the \"%<name>s\" template?"
 msgstr ""
 
 #: ../../app/views/shared/_links.html.erb:7
@@ -4587,7 +4587,7 @@ msgstr ""
 
 #: ../../app/views/shared/export/_plan_coversheet.erb:3
 #: ../../app/views/shared/export/_plan_txt.erb:65
-msgid "A Data Management Plan created using %{application_name}"
+msgid "A Data Management Plan created using %<application_name>s"
 msgstr ""
 
 #: ../../app/views/shared/export/_plan_coversheet.erb:10
@@ -4654,7 +4654,7 @@ msgstr ""
 
 #: ../../app/views/static_pages/about_us.html.erb:1
 #: ../../app/views/static_pages/about_us.html.erb:4
-msgid "About %{application_name}"
+msgid "About %<application_name>s"
 msgstr ""
 
 #: ../../app/views/static_pages/about_us.html.erb:11
@@ -4718,7 +4718,7 @@ msgstr ""
 #: ../../app/views/static_pages/about_us.html.erb:22
 msgid ""
 "get involved<em class=\"sr-only\"> (new window)</em><span class=\"new-window-popu"
-"p-info\">%{open_in_new_window_text}</span>"
+"p-info\">%<open_in_new_window_text>s</span>"
 msgstr ""
 
 #: ../../app/views/static_pages/about_us.html.erb:28
@@ -4738,7 +4738,7 @@ msgid "If you have an account please sign in and start creating or editing your
 msgstr ""
 
 #: ../../app/views/static_pages/about_us.html.erb:34
-msgid "If you do not have a %{application_name} account, click on"
+msgid "If you do not have a %<application_name>s account, click on"
 msgstr ""
 
 #: ../../app/views/static_pages/about_us.html.erb:34
@@ -4917,41 +4917,41 @@ msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:11
 msgid ""
-"The information you provide will be used by the %{org_name} to offer you acces"
-"s to and personalisation of the %{application_name} service."
+"The information you provide will be used by the %<org_name>s to offer you acces"
+"s to and personalisation of the %<application_name>s service."
 msgstr ""
-"The information you provide will be used by the %{org_name} to offer you acces"
-"s to and personalization of the %{application_name} service."
+"The information you provide will be used by the %<org_name>s to offer you acces"
+"s to and personalization of the %<application_name>s service."
 
 #: ../../app/views/static_pages/privacy.html.erb:13
 msgid ""
-"The %{org_name} processes the personal data of %{application_name} users in or"
-"der to deliver and improve the %{application_name} service in a customised man"
+"The %<org_name>s processes the personal data of %<application_name>s users in or"
+"der to deliver and improve the %<application_name>s service in a customised man"
 "ner and to ensure each user receives relevant information."
 msgstr ""
-"The %{org_name} processes the personal data of %{application_name} users in or"
-"der to deliver and improve the %{application_name} service in a customized man"
+"The %<org_name>s processes the personal data of %<application_name>s users in or"
+"der to deliver and improve the %<application_name>s service in a customized man"
 "ner and to ensure each user receives relevant information."
 
 #: ../../app/views/static_pages/privacy.html.erb:15
 msgid ""
-"The processing of your personal data by the %{org_name} is necessary for pursu"
+"The processing of your personal data by the %<org_name>s is necessary for pursu"
 "ing the following legitimate interests:"
 msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:18
 msgid ""
-"To provide access to the %{application_name} service and personalisation of yo"
+"To provide access to the %<application_name>s service and personalisation of yo"
 "ur user experience e.g. provision of relevant templates and guidance for your "
 "organisation."
 msgstr ""
-"To provide access to the %{application_name} service and personalization of yo"
+"To provide access to the %<application_name>s service and personalization of yo"
 "ur user experience e.g. provision of relevant templates and guidance for your "
 "organization."
 
 #: ../../app/views/static_pages/privacy.html.erb:20
 msgid ""
-"To keep you up to date with news about %{application_name} such as new feature"
+"To keep you up to date with news about %<application_name>s such as new feature"
 "s or improvements, or changes to our Privacy Policy."
 msgstr ""
 
@@ -4962,20 +4962,20 @@ msgstr ""
 #: ../../app/views/static_pages/privacy.html.erb:24
 msgid ""
 "We will hold the personal data you provided us for as long as you continue usi"
-"ng the %{application_name} service. Your personal data can be removed from thi"
-"s service upon request to the %{application_name} team within a period of 30 d"
+"ng the %<application_name>s service. Your personal data can be removed from thi"
+"s service upon request to the %<application_name>s team within a period of 30 d"
 "ays."
 msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:26
 msgid ""
-"If you have any questions, please contact the %{application_name} team at: <a "
-"href='mailto:%{helpdesk_email}'>%{helpdesk_email}</a>"
+"If you have any questions, please contact the %<application_name>s team at: <a "
+"href='mailto:%<helpdesk_email>s'>%<helpdesk_email>s</a>"
 msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:30
 msgid ""
-"This statement was last revised on %{revdate} and may be revised at any time w"
+"This statement was last revised on %<revdate>s and may be revised at any time w"
 "ith prior notice."
 msgstr ""
 
@@ -5043,7 +5043,7 @@ msgid ""
 "ookies and how we use them is available on the <a target='_blank' href='http:/"
 "/www.dcc.ac.uk/about-us/about-site/website-terms-use/cookies' class=\"has-new-w"
 "indow-popup-info\">main DCC website<em class=\"sr-only\"> (new window)</em><span "
-"class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>.</p>\n"
+"class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a>.</p>\n"
 "\n"
 "      <h3>Third party APIs</h3>\n"
 "\n"
@@ -5088,7 +5088,7 @@ msgid "Email credentials to contact"
 msgstr ""
 
 #: ../../app/views/super_admin/api_clients/_form.html.erb:81
-msgid "Are you sure you want to delete the API client: \"%{name}\""
+msgid "Are you sure you want to delete the API client: \"%<name>s\""
 msgstr ""
 
 #: ../../app/views/super_admin/api_clients/edit.html.erb:1
@@ -5105,7 +5105,7 @@ msgid "View all API clients"
 msgstr ""
 
 #: ../../app/views/super_admin/api_clients/email_credentials.js.erb:1
-msgid "The credentials have been sent to %{email}."
+msgid "The credentials have been sent to %<email>s."
 msgstr ""
 
 #: ../../app/views/super_admin/api_clients/index.html.erb:1
@@ -5150,7 +5150,7 @@ msgid "Body"
 msgstr ""
 
 #: ../../app/views/super_admin/notifications/_form.html.erb:71
-msgid "Are you sure you want to delete the notification \"%{title}\""
+msgid "Are you sure you want to delete the notification \"%<title>s\""
 msgstr ""
 
 #: ../../app/views/super_admin/notifications/edit.html.erb:1
@@ -5176,7 +5176,7 @@ msgid "New Notification"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:9
-msgid "Merging '%{from_org_name}' into '%{to_org_name}'"
+msgid "Merging '%<from_org_name>s' into '%<to_org_name>s'"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:11
@@ -5185,7 +5185,7 @@ msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:12
 msgid ""
-"Counts of '%{to_org_name}' records before and after a merge with %{from_org_na"
+"Counts of '%<to_org_name>s' records before and after a merge with %{from_org_na"
 "me}."
 msgstr ""
 
@@ -5195,11 +5195,11 @@ msgid "Record Type"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:18
-msgid "'%{to_org_name}' Count - before merge"
+msgid "'%<to_org_name>s' Count - before merge"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:19
-msgid "'%{to_org_name}' Count - after merge"
+msgid "'%<to_org_name>s' Count - after merge"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:38
@@ -5209,17 +5209,17 @@ msgstr ""
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:39
 msgid ""
 "The table below shows the specific changes that will occur during the merge pr"
-"ocess. Once the merge is complete, '%{from_org_name}' will be deleted. You can"
+"ocess. Once the merge is complete, '%<from_org_name>s' will be deleted. You can"
 " then consolidate/correct any merge issues (e.g. remove any departments that w"
 "ere duplicated)"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:45
-msgid "%{from_org_name} - Before"
+msgid "%<from_org_name>s - Before"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:46
-msgid "%{to_org_name} - Before"
+msgid "%<to_org_name>s - Before"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:61
@@ -5244,7 +5244,7 @@ msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:95
 msgid ""
-"Warning: '%{from_org_name}' has Plans that are currently in the review process"
+"Warning: '%<from_org_name>s' has Plans that are currently in the review process"
 ". The Org admins may not be able to see these plans after the merge!"
 msgstr ""
 
@@ -5267,7 +5267,7 @@ msgid "New organisation"
 msgstr "New organization"
 
 #: ../../app/views/super_admin/themes/_form.html.erb:17
-msgid "Are you sure you want to delete the theme \"%{title}\"?"
+msgid "Are you sure you want to delete the theme \"%<title>s\"?"
 msgstr ""
 
 #: ../../app/views/super_admin/themes/edit.html.erb:3
@@ -5295,7 +5295,7 @@ msgstr ""
 
 #: ../../app/views/super_admin/users/edit.html.erb:64
 msgid ""
-"You are about to archive %{user_name}.  This will remove their personal inform"
+"You are about to archive %<user_name>s.  This will remove their personal inform"
 "ation, but retain their plans, answers, and comments.  They will be unable to "
 "sign-in. Are you sure?"
 msgstr ""
@@ -5395,77 +5395,77 @@ msgstr ""
 #: ../../app/views/user_mailer/permissions_change_notification.html.erb:2
 #: ../../app/views/user_mailer/plan_visibility.html.erb:2
 #: ../../app/views/user_mailer/sharing_notification.html.erb:2
-msgid "Hello %{username}"
+msgid "Hello %<username>s"
 msgstr ""
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:6
-msgid "You have been granted administrator privileges in %{tool_name}:"
+msgid "You have been granted administrator privileges in %<tool_name>s:"
 msgstr ""
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:13
-msgid "You have been revoked administrator privileges in %{tool_name}."
+msgid "You have been revoked administrator privileges in %<tool_name>s."
 msgstr ""
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:17
 msgid ""
-"More information about administering the %{tool_name} for users at your organi"
-"sation is available at the %{help_url}."
+"More information about administering the %<tool_name>s for users at your organi"
+"sation is available at the %<help_url>s."
 msgstr ""
-"More information about administering the %{tool_name} for users at your organi"
-"zation is available at the %{help_url}."
+"More information about administering the %<tool_name>s for users at your organi"
+"zation is available at the %<help_url>s."
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:2
-msgid "Hello %{name},"
+msgid "Hello %<name>s,"
 msgstr ""
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:8
-msgid "Please use the following credentials when accessing the %{tool_name} API."
+msgid "Please use the following credentials when accessing the %<tool_name>s API."
 msgstr ""
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:23
-msgid "Please refer to the API documentation at: %{api_documentation_url}"
+msgid "Please refer to the API documentation at: %<api_documentation_url>s"
 msgstr ""
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:29
 msgid ""
-"Do not share these credentials. They for use with the %{external_application} "
+"Do not share these credentials. They for use with the %<external_application>s "
 "application. If you do share your credentials with another application we rese"
 "rve the right to revoke your access to the API."
 msgstr ""
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:34
 msgid ""
-"If you did not request access to the %{tool_name} API or did not request for y"
-"our credentials to be renewed, please contact us at %{helpdesk_email}"
+"If you did not request access to the %<tool_name>s API or did not request for y"
+"our credentials to be renewed, please contact us at %<helpdesk_email>s"
 msgstr ""
 
 #: ../../app/views/user_mailer/feedback_complete.html.erb:2
-msgid "Hello %{recipient_name}"
+msgid "Hello %<recipient_name>s"
 msgstr ""
 
 #: ../../app/views/user_mailer/feedback_complete.html.erb:5
 msgid ""
-"%{commenter} has finished providing feedback on the plan  \"%{link_html}\". Comm"
+"%<commenter>s has finished providing feedback on the plan  \"%<link_html>s\". Comm"
 "ents can be found in the 'Write plan' tab on the right side of the page (Guida"
 "nce/Comments)."
 msgstr ""
 
 #: ../../app/views/user_mailer/feedback_notification.html.erb:2
-msgid "Hello %{user_name},"
+msgid "Hello %<user_name>s,"
 msgstr ""
 
 #: ../../app/views/user_mailer/feedback_notification.html.erb:5
 msgid ""
-"%{requestor} has requested feedback on a plan %{link_html}. To add comments, p"
-"lease visit the 'Plans' page under the Admin menu in %{tool_name} and open the"
+"%<requestor>s has requested feedback on a plan %<link_html>s. To add comments, p"
+"lease visit the 'Plans' page under the Admin menu in %<tool_name>s and open the"
 " plan."
 msgstr ""
 
 #: ../../app/views/user_mailer/new_comment.html.erb:5
 msgid ""
-"%{commenter_name} has commented on your plan %{plan_title}. To view the commen"
+"%<commenter_name>s has commented on your plan %<plan_title>s. To view the commen"
 "ts, follow the link to the DMP below, or navigate to the plan via My Dashboard"
-" page in %{tool_name}."
+" page in %<tool_name>s."
 msgstr ""
 
 #: ../../app/views/user_mailer/new_comment.html.erb:10
@@ -5479,21 +5479,21 @@ msgid ""
 msgstr ""
 
 #: ../../app/views/user_mailer/new_comment.html.erb:15
-msgid "DMP: %{phase_link}"
+msgid "DMP: %<phase_link>s"
 msgstr ""
 
 #: ../../app/views/user_mailer/new_comment.html.erb:18
-msgid "Section name: %{section_title}"
+msgid "Section name: %<section_title>s"
 msgstr ""
 
 #: ../../app/views/user_mailer/new_comment.html.erb:21
-msgid "Question: %{question_number}"
+msgid "Question: %<question_number>s"
 msgstr ""
 
 #: ../../app/views/user_mailer/permissions_change_notification.html.erb:5
 msgid ""
-"Your permissions relating to %{plan_title} have changed. You now have %{type} "
-"access. This means you can %{placeholder1} %{placeholder2}"
+"Your permissions relating to %<plan_title>s have changed. You now have %<type>s "
+"access. This means you can %<placeholder1>s %<placeholder2>s"
 msgstr ""
 
 #: ../../app/views/user_mailer/plan_access_removed.html.erb:2
@@ -5509,7 +5509,7 @@ msgid " has been removed by "
 msgstr ""
 
 #: ../../app/views/user_mailer/plan_visibility.html.erb:5
-msgid "The plan %{plan_title} had its visibility changed to %{plan_visibility}."
+msgid "The plan %<plan_title>s had its visibility changed to %<plan_visibility>s."
 msgstr ""
 
 #: ../../app/views/user_mailer/plan_visibility.html.erb:9
@@ -5527,11 +5527,11 @@ msgstr ""
 #: ../../app/views/user_mailer/plan_visibility.html.erb:17
 msgid ""
 "If you have questions pertaining to this action, please visit the My Dashboard"
-" page in %{tool_name}"
+" page in %<tool_name>s"
 msgstr ""
 
 #: ../../app/views/user_mailer/question_answered.html.erb:2
-msgid "Hello %{recipient_name},"
+msgid "Hello %<recipient_name>s,"
 msgstr ""
 
 #: ../../app/views/user_mailer/question_answered.html.erb:5
@@ -5552,18 +5552,19 @@ msgstr ""
 
 #: ../../app/views/user_mailer/sharing_notification.html.erb:5
 msgid ""
-"Your colleague %{inviter_name} has invited you to contribute to
\n"
+"Your colleague %<inviter_name>s has invited you to contribute to
+\n"%<tool_name>s
 "          their Data Management Plan in %{tool_name}"
 msgstr ""
 
-#: ../../app/views/user_mailer/welcome_notification.html.erb:2
+#: ../../app/views%<tool_name>s/w%<username>sfication.html.erb:2
 msgid "Welcome to %{tool_name}, %{username}"
 msgstr ""
 
 #: ../../app/views/user_mailer/welcome_notification.html.erb:5
-msgid ""
+m%<tool_name>s
 "%{tool_name} will help you to develop your Data Management Plan. If you have a"
-"ny queries or feedback as you use the tool, please contact us at %{helpdesk_em"
+"ny queries or %<contact_us>sou use the tool, please contact us at %{helpdesk_em"
 "ail} or visit %{contact_us}"
 msgstr ""
 
@@ -5571,7 +5572,7 @@ msgstr ""
 msgid "You may change your notification preferences on your profile page."
 msgstr ""
 
-#: ../../app/views/users/_admin_grant_permissions.html.erb:9
+#: ../../app/views/users/_admi%<username>smissions.html.erb:9
 msgid "Editing privileges for %{username}"
 msgstr ""
 
diff --git a/config/locale/es/app.po b/config/locale/es/app.po
index cd1fb9ad9d..d4bea332c4 100644
--- a/config/locale/es/app.po
+++ b/config/locale/es/app.po
@@ -20,15 +20,15 @@ msgstr ""
 
 #: ../../app/controllers/answers_controller.rb:24
 msgid ""
-"There is no question with id %{question_id} associated to plan id %{plan_id} f"
+"There is no question with id %<question_id>s associated to plan id %<plan_id>s f"
 "or which to create or update an answer"
 msgstr ""
-"No hay preguntas con la identificación %{question_id} asociada a la identifica"
-"ción del plan %{plan_id} para la cual crear o actualizar una respuesta"
+"No hay preguntas con la identificación %<question_id>s asociada a la identifica"
+"ción del plan %<plan_id>s para la cual crear o actualizar una respuesta"
 
 #: ../../app/controllers/answers_controller.rb:34
-msgid "There is no plan with id %{id} for which to create or update an answer"
-msgstr "No hay un plan con id %{id} para el cual crear o actualizar una respuesta"
+msgid "There is no plan with id %<id>s for which to create or update an answer"
+msgstr "No hay un plan con id %<id>s para el cual crear o actualizar una respuesta"
 
 #: ../../app/controllers/api/v0/base_controller.rb:124
 msgid "Bad Credentials"
@@ -137,12 +137,12 @@ msgid "You need to sign in or sign up before continuing."
 msgstr "Necesita iniciar sesión o registrarse para continuar."
 
 #: ../../app/controllers/application_controller.rb:100
-msgid "Unable to %{action} the %{object}.%{errors}"
-msgstr "No se puede %{action} el %{object}. %{errors}"
+msgid "Unable to %<action>s the %<object>s.%<errors>s"
+msgstr "No se puede %<action>s el %<object>s. %<errors>s"
 
 #: ../../app/controllers/application_controller.rb:108
-msgid "Successfully %{action} the %{object}."
-msgstr "Con éxito %{action} el %{object}."
+msgid "Successfully %<action>s the %<object>s."
+msgstr "Con éxito %<action>s el %<object>s."
 
 #: ../../app/controllers/application_controller.rb:123
 msgid "API client"
@@ -205,8 +205,8 @@ msgid "Restricted access to View All the records"
 msgstr "Acceso restringido a Ver todos los registros."
 
 #: ../../app/controllers/concerns/paginable.rb:180
-msgid "Sort by %{sort_field}"
-msgstr "Ordenar por %{sort_field}"
+msgid "Sort by %<sort_field>s"
+msgstr "Ordenar por %<sort_field>s"
 
 #: ../../app/controllers/concerns/template_methods.rb:10
 msgid "customisation"
@@ -411,12 +411,12 @@ msgid "Your guidance is no longer published and will not be available to users."
 msgstr "Su guía ya no se publica y no estará disponible para los usuarios."
 
 #: ../../app/controllers/identifiers_controller.rb:18
-msgid "Successfully unlinked your account from %{is}."
-msgstr "Desenlazó con éxito su cuenta de %{is}."
+msgid "Successfully unlinked your account from %<is>s."
+msgstr "Desenlazó con éxito su cuenta de %<is>s."
 
 #: ../../app/controllers/identifiers_controller.rb:22
-msgid "Unable to unlink your account from %{is}."
-msgstr "No se puede desvincular su cuenta de %{is}."
+msgid "Unable to unlink your account from %<is>s."
+msgstr "No se puede desvincular su cuenta de %<is>s."
 
 #: ../../app/controllers/org_admin/phases_controller.rb:18
 #: ../../app/controllers/org_admin/templates_controller.rb:114
@@ -464,9 +464,9 @@ msgid "update"
 msgstr "Actualización"
 
 #: ../../app/controllers/org_admin/plans_controller.rb:32
-msgid "%{plan_owner} has been notified that you have finished providing feedback"
+msgid "%<plan_owner>s has been notified that you have finished providing feedback"
 msgstr ""
-"%{plan_owner} ha sido notificado de que ha terminado de proporcionar comentari"
+"%<plan_owner>s ha sido notificado de que ha terminado de proporcionar comentari"
 "os"
 
 #: ../../app/controllers/org_admin/plans_controller.rb:38
@@ -558,8 +558,8 @@ msgstr "Todas las plantillas"
 
 #: ../../app/controllers/org_admin/templates_controller.rb:48
 #: ../../app/views/org_admin/templates/index.html.erb:52
-msgid "%{org_name} Templates"
-msgstr "%{org_name} Plantillas"
+msgid "%<org_name>s Templates"
+msgstr "%<org_name>s Plantillas"
 
 #: ../../app/controllers/org_admin/templates_controller.rb:50
 #: ../../app/views/org_admin/templates/index.html.erb:54
@@ -571,15 +571,15 @@ msgid "Customizable Templates"
 msgstr "Plantillas personalizables"
 
 #: ../../app/controllers/org_admin/templates_controller.rb:214
-msgid "Error parsing links for a %{template}"
-msgstr "Error al analizar los enlaces para un %{template}"
+msgid "Error parsing links for a %<template>s"
+msgstr "Error al analizar los enlaces para un %<template>s"
 
 #: ../../app/controllers/org_admin/templates_controller.rb:345
 #: ../../app/controllers/public_pages_controller.rb:68
-msgid "Template created using the %{application_name} service. Last modified %{date}"
+msgid "Template created using the %<application_name>s service. Last modified %<date>s"
 msgstr ""
-"Plantilla creada utilizando el servicio %{application_name}. Última modificaci"
-"ón %{date}"
+"Plantilla creada utilizando el servicio %<application_name>s. Última modificaci"
+"ón %<date>s"
 
 #: ../../app/controllers/org_admin/templates_controller.rb:360
 #: ../../app/controllers/public_pages_controller.rb:83
@@ -599,8 +599,8 @@ msgid "Please choose an organisation"
 msgstr "Por favor elige una organización"
 
 #: ../../app/controllers/plan_exports_controller.rb:85
-msgid "Created using %{application_name}. Last modified %{date}"
-msgstr "Creado usando %{application_name}. Última modificación %{date}"
+msgid "Created using %<application_name>s. Last modified %<date>s"
+msgstr "Creado usando %<application_name>s. Última modificación %<date>s"
 
 #: ../../app/controllers/plans_controller.rb:51
 msgid "This is a"
@@ -641,15 +641,15 @@ msgstr "copiado"
 
 #: ../../app/controllers/plans_controller.rb:408
 msgid ""
-"Unable to change the plan's status since it is needed at least %{percentage} p"
+"Unable to change the plan's status since it is needed at least %<percentage>s p"
 "ercentage responded"
 msgstr ""
 "No se puede cambiar el estado del plan ya que se necesita al menos el porcenta"
-"je %{percentage} respondido"
+"je %<percentage>s respondido"
 
 #: ../../app/controllers/plans_controller.rb:416
-msgid "Unable to find plan id %{plan_id}"
-msgstr "No se puede encontrar la identificación del plan %{plan_id}"
+msgid "Unable to find plan id %<plan_id>s"
+msgstr "No se puede encontrar la identificación del plan %<plan_id>s"
 
 #: ../../app/controllers/plans_controller.rb:433
 msgid "Your project is now a test."
@@ -664,18 +664,18 @@ msgid "Unable to change the plan's test status"
 msgstr "No se puede cambiar el estado de prueba del plan"
 
 #: ../../app/controllers/plans_controller.rb:451
-msgid "There is no plan associated with id %{id}"
-msgstr "No hay un plan asociado con la identificación %{id}"
+msgid "There is no plan associated with id %<id>s"
+msgstr "No hay un plan asociado con la identificación %<id>s"
 
 #: ../../app/controllers/registrations_controller.rb:35
 msgid ""
 "Please make a choice below. After linking your\n"
-"                       details to a %{application_name} account,\n"
+"                       details to a %<application_name>s account,\n"
 "                       you will be able to sign in directly with your\n"
 "                       institutional credentials."
 msgstr ""
 "Por favor, elija a continuación. Después de vincular su\n"
-"                       detalles a una cuenta %{application_name},\n"
+"                       detalles a una cuenta %<application_name>s,\n"
 "                       podrá iniciar sesión directamente con su\n"
 "                       credenciales institucionales."
 
@@ -757,15 +757,15 @@ msgstr "La contraseña y la confirmación deben coincidir"
 
 #: ../../app/controllers/roles_controller.rb:26
 msgid ""
-"Cannot share plan with %{email} since that email matches with the owner of the"
+"Cannot share plan with %<email>s since that email matches with the owner of the"
 " plan."
 msgstr ""
-"No se puede compartir el plan con %{email} ya que ese correo electrónico coinc"
+"No se puede compartir el plan con %<email>s ya que ese correo electrónico coinc"
 "ide con el propietario del plan."
 
 #: ../../app/controllers/roles_controller.rb:37
-msgid "Plan is already shared with %{email}."
-msgstr "El plan ya está compartido con %{email}."
+msgid "Plan is already shared with %<email>s."
+msgstr "El plan ya está compartido con %<email>s."
 
 #: ../../app/controllers/roles_controller.rb:44
 #: ../../app/views/shared/_create_account_form.html.erb:4
@@ -777,12 +777,12 @@ msgid "Surname"
 msgstr "Apellido"
 
 #: ../../app/controllers/roles_controller.rb:48
-msgid "Invitation to %{email} issued successfully."
-msgstr "Invitación a %{email} emitida con éxito."
+msgid "Invitation to %<email>s issued successfully."
+msgstr "Invitación a %<email>s emitida con éxito."
 
 #: ../../app/controllers/roles_controller.rb:53
-msgid "Plan shared with %{email}."
-msgstr "Plan compartido con %{email}."
+msgid "Plan shared with %<email>s."
+msgstr "Plan compartido con %<email>s."
 
 #: ../../app/controllers/roles_controller.rb:68
 msgid "You must provide a valid email address and select a permission level."
@@ -796,10 +796,10 @@ msgstr "Por favor introduzca una dirección de correo eléctronico"
 
 #: ../../app/controllers/roles_controller.rb:93
 msgid ""
-"Successfully changed the permissions for %{email}. They have been notified via"
+"Successfully changed the permissions for %<email>s. They have been notified via"
 " email."
 msgstr ""
-"Cambió exitosamente los permisos para %{email}. Han sido notificados por corre"
+"Cambió exitosamente los permisos para %<email>s. Han sido notificados por corre"
 "o electrónico."
 
 #: ../../app/controllers/roles_controller.rb:108
@@ -833,8 +833,8 @@ msgstr ""
 "ión."
 
 #: ../../app/controllers/super_admin/api_clients_controller.rb:45
-msgid ". The API credentials have been emailed to %{email}"
-msgstr ". Las credenciales de API se han enviado por correo electrónico a %{email}"
+msgid ". The API credentials have been emailed to %<email>s"
+msgstr ". Las credenciales de API se han enviado por correo electrónico a %<email>s"
 
 #: ../../app/controllers/super_admin/notifications_controller.rb:69
 msgid "Your notification is now active."
@@ -849,16 +849,16 @@ msgid "Unable to change the notification's active status"
 msgstr "No se puede cambiar el estado activo de la notificación"
 
 #: ../../app/controllers/super_admin/notifications_controller.rb:104
-msgid "There is no notification associated with id  %{id}"
-msgstr "No hay ninguna notificación asociada con la identificación %{id}"
+msgid "There is no notification associated with id  %<id>s"
+msgstr "No hay ninguna notificación asociada con la identificación %<id>s"
 
 #: ../../app/controllers/super_admin/org_swaps_controller.rb:22
 msgid ""
 "Your organisation affiliation has been changed. You may now edit templates for"
-" %{org_name}."
+" %<org_name>s."
 msgstr ""
 "La afiliación de su organización ha sido cambiada. Ahora puede editar plantill"
-"as para %{org_name}."
+"as para %<org_name>s."
 
 #: ../../app/controllers/super_admin/org_swaps_controller.rb:25
 msgid "Unable to change your organisation affiliation at this time."
@@ -921,16 +921,16 @@ msgid "Successfully signed in"
 msgstr "Ha iniciado sesión correctamente"
 
 #: ../../app/controllers/users/omniauth_callbacks_controller.rb:56
-msgid "Your account has been successfully linked to %{scheme}."
-msgstr "Su cuenta se ha vinculado con éxito a %{scheme}."
+msgid "Your account has been successfully linked to %<scheme>s."
+msgstr "Su cuenta se ha vinculado con éxito a %<scheme>s."
 
 #: ../../app/controllers/users/omniauth_callbacks_controller.rb:61
-msgid "Unable to link your account to %{scheme}."
-msgstr "No se puede vincular su cuenta a %{scheme}."
+msgid "Unable to link your account to %<scheme>s."
+msgstr "No se puede vincular su cuenta a %<scheme>s."
 
 #: ../../app/controllers/users_controller.rb:141
-msgid "Successfully %{action} %{username}'s account."
-msgstr "Con éxito la cuenta de %{action} %{username}."
+msgid "Successfully %<action>s %<username>s's account."
+msgstr "Con éxito la cuenta de %<action>s %<username>s."
 
 #: ../../app/controllers/users_controller.rb:142
 msgid "activated"
@@ -941,8 +941,8 @@ msgid "deactivated"
 msgstr "Desactivado"
 
 #: ../../app/controllers/users_controller.rb:149
-msgid "Unable to %{action} %{username}"
-msgstr "No se puede %{action} %{username}"
+msgid "Unable to %<action>s %<username>s"
+msgstr "No se puede %<action>s %<username>s"
 
 #: ../../app/controllers/users_controller.rb:150
 msgid "activate"
@@ -1014,20 +1014,20 @@ msgid "Creator:"
 msgstr "Creador:"
 
 #: ../../app/helpers/feedbacks_helper.rb:6
-msgid "%{application_name}: Your plan has been submitted for feedback"
-msgstr "%{application_name}: su plan ha sido enviado para recibir comentarios"
+msgid "%<application_name>s: Your plan has been submitted for feedback"
+msgstr "%<application_name>s: su plan ha sido enviado para recibir comentarios"
 
 #: ../../app/helpers/feedbacks_helper.rb:10
 msgid ""
-"<p>Hello %{user_name}.</p><p>Your plan \"%{plan_name}\" has been submitted for f"
+"<p>Hello %<user_name>s.</p><p>Your plan \"%<plan_name>s\" has been submitted for f"
 "eedback from an\n"
 "      administrator at your organisation. If you have questions pertaining to "
 "this action, please contact us\n"
-"      at %{organisation_email}.</p>"
+"      at %<organisation_email>s.</p>"
 msgstr ""
-"<p> Hola %{user_name}. </p><p> Su plan \"%{plan_name}\" se ha enviado para recib"
+"<p> Hola %<user_name>s. </p><p> Su plan \"%<plan_name>s\" se ha enviado para recib"
 "ir comentarios de un administrador de su organización. Si tiene preguntas rela"
-"cionadas con esta acción, comuníquese con nosotros al %{organisation_email}. <"
+"cionadas con esta acción, comuníquese con nosotros al %<organisation_email>s. <"
 "/p>"
 
 #: ../../app/helpers/identifier_helper.rb:6
@@ -1061,14 +1061,14 @@ msgstr "Lee el plan y deja comentarios."
 
 #: ../../app/helpers/orgs_helper.rb:14
 msgid ""
-"<p>A data librarian from %{org_name} will respond to your request within 48\n"
+"<p>A data librarian from %<org_name>s will respond to your request within 48\n"
 "       hours. If you have questions pertaining to this action please contact u"
 "s\n"
-"       at %{organisation_email}.</p>"
+"       at %<organisation_email>s.</p>"
 msgstr ""
-"<p> Un bibliotecario de datos de %{org_name} responderá a su solicitud dentro "
+"<p> Un bibliotecario de datos de %<org_name>s responderá a su solicitud dentro "
 "de las 48 horas. Si tiene preguntas relacionadas con esta acción, comuníquese "
-"con nosotros al %{organisation_email}. </p>"
+"con nosotros al %<organisation_email>s. </p>"
 
 #: ../../app/helpers/perms_helper.rb:9
 msgid "Add organisations"
@@ -1201,16 +1201,16 @@ msgid "None"
 msgstr "Ninguna"
 
 #: ../../app/helpers/super_admin/orgs/merge_helper.rb:31
-msgid "Guidance for: %{themes}"
-msgstr "Orientación para: %{themes}"
+msgid "Guidance for: %<themes>s"
+msgstr "Orientación para: %<themes>s"
 
 #: ../../app/helpers/super_admin/orgs/merge_helper.rb:53
 msgid "Nothing to merge"
 msgstr "Nada para fusionar"
 
 #: ../../app/helpers/super_admin/orgs/merge_helper.rb:55
-msgid "<p>The following %{object_types} will be moved over to '%{org_name}':</p>"
-msgstr "<p>El siguiente %{object_types} se moverá a '%{org_name}':</p>"
+msgid "<p>The following %<object_types>s will be moved over to '%<org_name>s':</p>"
+msgstr "<p>El siguiente %<object_types>s se moverá a '%<org_name>s':</p>"
 
 #: ../../app/helpers/template_helper.rb:46
 #: ../../app/views/plans/index.html.erb:29
@@ -1245,48 +1245,48 @@ msgstr "Últimos 12 meses"
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:6
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:5
 #: ../../app/views/user_mailer/_email_signature.html.erb:2
-msgid "Query or feedback related to %{tool_name}"
-msgstr "Consulta o feedback relacionado con %{tool_name}"
+msgid "Query or feedback related to %<tool_name>s"
+msgstr "Consulta o feedback relacionado con %<tool_name>s"
 
 #: ../../app/mailers/user_mailer.rb:23
-msgid "Welcome to %{tool_name}"
-msgstr "Bienvenido a %{tool_name}"
+msgid "Welcome to %<tool_name>s"
+msgstr "Bienvenido a %<tool_name>s"
 
 #: ../../app/mailers/user_mailer.rb:58
-msgid "A Data Management Plan in %{tool_name} has been shared with you"
-msgstr "Se ha compartido con usted un Plan de gestión de datos en %{tool_name}"
+msgid "A Data Management Plan in %<tool_name>s has been shared with you"
+msgstr "Se ha compartido con usted un Plan de gestión de datos en %<tool_name>s"
 
 #: ../../app/mailers/user_mailer.rb:76
-msgid "Changed permissions on a Data Management Plan in %{tool_name}"
-msgstr "Cambios de permisos en un plan de gestión de datos en %{tool_name}"
+msgid "Changed permissions on a Data Management Plan in %<tool_name>s"
+msgstr "Cambios de permisos en un plan de gestión de datos en %<tool_name>s"
 
 #: ../../app/mailers/user_mailer.rb:92
-msgid "Permissions removed on a DMP in %{tool_name}"
-msgstr "Permisos eliminados en un DMP en %{tool_name}"
+msgid "Permissions removed on a DMP in %<tool_name>s"
+msgstr "Permisos eliminados en un DMP en %<tool_name>s"
 
 #: ../../app/mailers/user_mailer.rb:111
-msgid "%{user_name} has requested feedback on a %{tool_name} plan"
-msgstr "%{user_name} ha solicitado comentarios sobre un plan %{tool_name}"
+msgid "%<user_name>s has requested feedback on a %<tool_name>s plan"
+msgstr "%<user_name>s ha solicitado comentarios sobre un plan %<tool_name>s"
 
 #: ../../app/mailers/user_mailer.rb:134
-msgid "%{tool_name}: Expert feedback has been provided for %{plan_title}"
-msgstr "%{tool_name}: Se han proporcionado comentarios de expertos para %{plan_title}"
+msgid "%<tool_name>s: Expert feedback has been provided for %<plan_title>s"
+msgstr "%<tool_name>s: Se han proporcionado comentarios de expertos para %<plan_title>s"
 
 #: ../../app/mailers/user_mailer.rb:169
-msgid "DMP Visibility Changed: %{plan_title}"
-msgstr "Se modificó la visibilidad de DMP: %{plan_title}"
+msgid "DMP Visibility Changed: %<plan_title>s"
+msgstr "Se modificó la visibilidad de DMP: %<plan_title>s"
 
 #: ../../app/mailers/user_mailer.rb:200
-msgid "%{tool_name}: A new comment was added to %{plan_title}"
-msgstr "%{tool_name}: Se agregó un nuevo comentario a %{plan_title}"
+msgid "%<tool_name>s: A new comment was added to %<plan_title>s"
+msgstr "%<tool_name>s: Se agregó un nuevo comentario a %<plan_title>s"
 
 #: ../../app/mailers/user_mailer.rb:218
-msgid "Administrator privileges granted in %{tool_name}"
-msgstr "Privilegios de administrador otorgados en %{tool_name}"
+msgid "Administrator privileges granted in %<tool_name>s"
+msgstr "Privilegios de administrador otorgados en %<tool_name>s"
 
 #: ../../app/mailers/user_mailer.rb:235
-msgid "%{tool_name} API changes"
-msgstr "%{tool_name} Cambios de API"
+msgid "%<tool_name>s API changes"
+msgstr "%<tool_name>s Cambios de API"
 
 #: ../../app/models/concerns/exportable_plan.rb:26
 msgid "Phase"
@@ -1318,12 +1318,12 @@ msgid "Creators: "
 msgstr "Creadores:"
 
 #: ../../app/models/concerns/exportable_plan.rb:134
-msgid "%{authors}"
-msgstr "%{authors}"
+msgid "%<authors>s"
+msgstr "%<authors>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:135
-msgid "%{affiliation}"
-msgstr "%{affiliation}"
+msgid "%<affiliation>s"
+msgstr "%<affiliation>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:137
 #: ../../app/models/concerns/exportable_plan.rb:139
@@ -1334,12 +1334,12 @@ msgid "Template: "
 msgstr "Modelo:"
 
 #: ../../app/models/concerns/exportable_plan.rb:137
-msgid "%{funder}"
-msgstr "%{funder}"
+msgid "%<funder>s"
+msgstr "%<funder>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:139
-msgid "%{template}"
-msgstr "%{template}"
+msgid "%<template>s"
+msgstr "%<template>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:142
 #: ../../app/views/shared/export/_plan_txt.erb:12
@@ -1347,8 +1347,8 @@ msgid "Grant number: "
 msgstr "Conceder número:"
 
 #: ../../app/models/concerns/exportable_plan.rb:142
-msgid "%{grant_number}"
-msgstr "%{grant_number}"
+msgid "%<grant_number>s"
+msgstr "%<grant_number>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:145
 #: ../../app/views/shared/export/_plan_coversheet.erb:26
@@ -1357,8 +1357,8 @@ msgid "Project abstract: "
 msgstr "Resumen del proyecto:"
 
 #: ../../app/models/concerns/exportable_plan.rb:145
-msgid "%{description}"
-msgstr "%{description}"
+msgid "%<description>s"
+msgstr "%<description>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:148
 #: ../../app/views/shared/export/_plan_coversheet.erb:42
@@ -1367,8 +1367,8 @@ msgid "Last modified: "
 msgstr "Última modificación:"
 
 #: ../../app/models/concerns/exportable_plan.rb:148
-msgid "%{date}"
-msgstr "%{date}"
+msgid "%<date>s"
+msgstr "%<date>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:149
 #: ../../app/views/shared/export/_plan_coversheet.erb:49
@@ -1551,8 +1551,8 @@ msgid "generate_copy! requires an organisation target"
 msgstr "generar_copia! requiere un objetivo de organización"
 
 #: ../../app/models/template.rb:380
-msgid "Copy of %{template}"
-msgstr "Copia de %{template}"
+msgid "Copy of %<template>s"
+msgstr "Copia de %<template>s"
 
 #: ../../app/models/template.rb:388
 msgid "generate_version! requires a published template"
@@ -1591,8 +1591,8 @@ msgid "Conditions in the template refer backwards"
 msgstr "Las condiciones en la plantilla se refieren al revés"
 
 #: ../../app/models/user.rb:379
-msgid "A Data Management Plan in %{application_name} has been shared with you"
-msgstr "Se ha compartido un plan de gestión de datos en %{application_name} con usted"
+msgid "A Data Management Plan in %<application_name>s has been shared with you"
+msgstr "Se ha compartido un plan de gestión de datos en %<application_name>s con usted"
 
 #: ../../app/policies/api/v0/departments_policy.rb:12
 #: ../../app/policies/api/v0/guidance_group_policy.rb:12
@@ -1713,8 +1713,8 @@ msgstr ""
 " su financiador actual"
 
 #: ../../app/validators/after_validator.rb:5
-msgid "must be after %{date}"
-msgstr "debe ser después de %{date}"
+msgid "must be after %<date>s"
+msgstr "debe ser después de %<date>s"
 
 #: ../../app/validators/org_links_validator.rb:10
 msgid "A key \"org\" is expected for links hash"
@@ -1726,12 +1726,12 @@ msgid "A hash is expected for links"
 msgstr "Se espera un hash para enlaces."
 
 #: ../../app/validators/template_links_validator.rb:12
-msgid "A key %{key} is expected for links hash"
-msgstr "Se espera una clave %{key} para el hash de enlaces"
+msgid "A key %<key>s is expected for links hash"
+msgstr "Se espera una clave %<key>s para el hash de enlaces"
 
 #: ../../app/validators/template_links_validator.rb:15
-msgid "The key %{key} does not have a valid set of object links"
-msgstr "La clave %{key} no tiene un conjunto válido de enlaces de objetos"
+msgid "The key %<key>s does not have a valid set of object links"
+msgstr "La clave %<key>s no tiene un conjunto válido de enlaces de objetos"
 
 #: ../../app/views/answers/_locking.html.erb:5
 msgid "The following answer cannot be saved"
@@ -1739,10 +1739,10 @@ msgstr "La siguiente respuesta no puede ser guardada"
 
 #: ../../app/views/answers/_locking.html.erb:8
 msgid ""
-"since %{name} saved the answer below while you were editing. Please, combine y"
+"since %<name>s saved the answer below while you were editing. Please, combine y"
 "our changes and then save the answer again."
 msgstr ""
-"ya que %{name} guardó la respuesta a continuación mientras estaba editando. Po"
+"ya que %<name>s guardó la respuesta a continuación mientras estaba editando. Po"
 "r favor, combine sus cambios y luego vuelva a guardar la respuesta."
 
 #: ../../app/views/answers/_new_edit.html.erb:15
@@ -1816,8 +1816,8 @@ msgid "Answered"
 msgstr "Contestada"
 
 #: ../../app/views/answers/_status.html.erb:10
-msgid " by %{user_name}"
-msgstr " por %{user_name}"
+msgid " by %<user_name>s"
+msgstr " por %<user_name>s"
 
 #: ../../app/views/answers/_status.html.erb:15
 msgid "This answer removes "
@@ -1894,15 +1894,15 @@ msgstr "Contactanos"
 
 #: ../../app/views/contact_us/contacts/new.html.erb:6
 msgid ""
-"%{application_name} is provided by the %{organisation_name}.<br /> You can fin"
-"d out more about us on our <a href=\"%{organisation_url}\" class=\"has-new-window"
+"%<application_name>s is provided by the %<organisation_name>s.<br /> You can fin"
+"d out more about us on our <a href=\"%<organisation_url>s\" class=\"has-new-window"
 "-popup-info\" target=\"_blank\">website <em class=\"sr-only\">(new window)</em><spa"
-"n class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>. If you "
-"would like to contact us about %{application_name}, please fill out the form b"
+"n class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a>. If you "
+"would like to contact us about %<application_name>s, please fill out the form b"
 "elow."
 msgstr ""
-"%{application_name} es proporcionado por %{organisation_name}. <br /> Puede en"
-"contrar más información sobre nosotros en nuestro <a href=\"%{organisation_url}"
+"%<application_name>s es proporcionado por %<organisation_name>s. <br /> Puede en"
+"contrar más información sobre nosotros en nuestro <a href=\"%<organisation_url>s"
 "\" class=\"has-new-window-popup-info\" target=\"_blank\">sitio web <em class=\"sr-on"
 "ly\">(nueva ventana)</em> <span class=\"new-window-popup-info\">%{open_in_new_win"
 "dow_text}</span></a> . Si desea ponerse en contacto con nosotros acerca de %{a"
@@ -2070,8 +2070,8 @@ msgid "Create account"
 msgstr "Registrarse"
 
 #: ../../app/views/devise/mailer/confirmation_instructions.html.erb:2
-msgid "Welcome to %{application_name}"
-msgstr "Bienvenido a %{application_name}"
+msgid "Welcome to %<application_name>s"
+msgstr "Bienvenido a %<application_name>s"
 
 #: ../../app/views/devise/mailer/confirmation_instructions.html.erb:4
 msgid "Thank you for registering. Please confirm your email address"
@@ -2091,24 +2091,24 @@ msgstr "en tu navegador"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:12
 #: ../../app/views/user_mailer/new_comment.html.erb:2
-msgid "Hello %{user_name}"
-msgstr "Hola %{user_name}"
+msgid "Hello %<user_name>s"
+msgstr "Hola %<user_name>s"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:15
 msgid ""
-"Your colleague %{inviter_name} has invited you to contribute to  their Data Ma"
-"nagement Plan in %{tool_name}"
+"Your colleague %<inviter_name>s has invited you to contribute to  their Data Ma"
+"nagement Plan in %<tool_name>s"
 msgstr ""
-"Su colega %{inviter_name} lo invitó a contribuir a su Plan de gestión de datos"
-" en %{tool_name}"
+"Su colega %<inviter_name>s lo invitó a contribuir a su Plan de gestión de datos"
+" en %<tool_name>s"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:22
 #: ../../app/views/user_mailer/sharing_notification.html.erb:11
 msgid ""
-"%{click_here} to accept the invitation, (or copy %{link} into your browser). I"
+"%<click_here>s to accept the invitation, (or copy %<link>s into your browser). I"
 "f you don't want to accept the invitation, please ignore this email."
 msgstr ""
-"%{click_here} para aceptar la invitación, (o copiar %{link} en su navegador). "
+"%<click_here>s para aceptar la invitación, (o copiar %<link>s en su navegador). "
 "Si no desea aceptar la invitación, ignore este correo electrónico."
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:23
@@ -2127,8 +2127,8 @@ msgstr "Todo lo mejor"
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:19
 #: ../../app/views/user_mailer/_email_signature.html.erb:12
 #: ../../app/views/user_mailer/welcome_notification.html.erb:10
-msgid "The %{tool_name} team"
-msgstr "El equipo %{tool_name}"
+msgid "The %<tool_name>s team"
+msgstr "El equipo %<tool_name>s"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:32
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:22
@@ -2139,22 +2139,22 @@ msgstr "Por favor no responder a este email."
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:33
 msgid ""
-"If you have any questions or need help, please contact us at %{helpdesk_email}"
-" or visit %{contact_us_url}"
+"If you have any questions or need help, please contact us at %<helpdesk_email>s"
+" or visit %<contact_us_url>s"
 msgstr ""
-"Si tiene alguna pregunta o necesita ayuda, contáctenos en %{helpdesk_email} o "
-"visite %{contact_us_url}"
+"Si tiene alguna pregunta o necesita ayuda, contáctenos en %<helpdesk_email>s o "
+"visite %<contact_us_url>s"
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:9
-msgid "Hello %{user_email}"
-msgstr "Hola %{user_email}"
+msgid "Hello %<user_email>s"
+msgstr "Hola %<user_email>s"
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:12
 msgid ""
-"Someone has requested a link to change your %{tool_name} password. You can do "
+"Someone has requested a link to change your %<tool_name>s password. You can do "
 "this through the link below."
 msgstr ""
-"Alguien ha solicitado un enlace para cambiar su contraseña %{tool_name}. Puede"
+"Alguien ha solicitado un enlace para cambiar su contraseña %<tool_name>s. Puede"
 " hacerlo a través del siguiente enlace."
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:14
@@ -2168,11 +2168,11 @@ msgstr "Si usted no ha solicitado este, por favor, ignora este mensaje."
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:22
 #: ../../app/views/user_mailer/_email_signature.html.erb:19
 msgid ""
-"If you have any questions or need help, please contact us at %{helpdesk_email}"
-" or visit %{contact_us}"
+"If you have any questions or need help, please contact us at %<helpdesk_email>s"
+" or visit %<contact_us>s"
 msgstr ""
-"Si tiene alguna pregunta o necesita ayuda, contáctenos en %{helpdesk_email} o "
-"visite %{contact_us}"
+"Si tiene alguna pregunta o necesita ayuda, contáctenos en %<helpdesk_email>s o "
+"visite %<contact_us>s"
 
 #: ../../app/views/devise/mailer/unlock_instructions.html.erb:2
 msgid "Hello"
@@ -2244,23 +2244,23 @@ msgstr "Documentación"
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:16
 msgid ""
-"See the <a href=\"%{api_v0_wiki}\">documentation for v0</a> for more details on "
+"See the <a href=\"%<api_v0_wiki>s\">documentation for v0</a> for more details on "
 "the original API which includes access to statistics, the full text of plans a"
 "nd the ability to connect users with departments."
 msgstr ""
-"Consulte la <a href=\"%{api_v0_wiki}\">documentación de v0</a> para obtener más "
+"Consulte la <a href=\"%<api_v0_wiki>s\">documentación de v0</a> para obtener más "
 "detalles sobre la API original, que incluye acceso a estadísticas, el texto co"
 "mpleto de los planes y la capacidad de conectar a los usuarios con los departa"
 "mentos."
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:18
 msgid ""
-"See the <a href=\"%{api_v1_wiki}\">documentation for v1</a> for more details on "
-"the API that supports the <a href=\"%{rda_standard_url}\">RDA Common metadata st"
+"See the <a href=\"%<api_v1_wiki>s\">documentation for v1</a> for more details on "
+"the API that supports the <a href=\"%<rda_standard_url>s\">RDA Common metadata st"
 "andard for DMPs.</a>"
 msgstr ""
-"Consulte la <a href=\"%{api_v1_wiki}\">documentación de v1</a> para obtener más "
-"detalles sobre la API que admite el <a href=\"%{rda_standard_url}\">estándar de "
+"Consulte la <a href=\"%<api_v1_wiki>s\">documentación de v1</a> para obtener más "
+"detalles sobre la API que admite el <a href=\"%<rda_standard_url>s\">estándar de "
 "metadatos común RDA para DMP.</a>"
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:21
@@ -2434,8 +2434,8 @@ msgid "Sign in or Create account"
 msgstr "Iniciar sesión o crear cuenta"
 
 #: ../../app/views/devise/registrations/new.html.erb:15
-msgid "Do you have a %{application_name} account?"
-msgstr "¿Tienes una cuenta %{application_name}?"
+msgid "Do you have a %<application_name>s account?"
+msgstr "¿Tienes una cuenta %<application_name>s?"
 
 #: ../../app/views/devise/registrations/new.html.erb:22
 #: ../../app/views/layouts/_navigation.html.erb:63
@@ -2450,8 +2450,8 @@ msgid "This will link your existing account to your credentials."
 msgstr "Esto vinculará su cuenta existente a sus credenciales."
 
 #: ../../app/views/devise/registrations/new.html.erb:34
-msgid "No %{application_name} account?"
-msgstr "No cuenta %{application_name}?"
+msgid "No %<application_name>s account?"
+msgstr "No cuenta %<application_name>s?"
 
 #: ../../app/views/devise/registrations/new.html.erb:46
 msgid "This will create an account and link it to your credentials."
@@ -2630,10 +2630,10 @@ msgstr "¿Publicado?"
 
 #: ../../app/views/home/_welcome.html.erb:5
 msgid ""
-"<p>%{application_name} has been developed by the <strong>%{organisation_name}<"
+"<p>%<application_name>s has been developed by the <strong>%<organisation_name>s<"
 "/strong> to help you write data management plans.</p>"
 msgstr ""
-"<p> %{application_name} ha sido desarrollado por <strong>%{organisation_name}<"
+"<p> %<application_name>s ha sido desarrollado por <strong>%<organisation_name>s<"
 "/strong> para ayudarlo a escribir planes de administración de datos. </p>"
 
 #: ../../app/views/home/_welcome.html.erb:11
@@ -2819,7 +2819,7 @@ msgid "Logout"
 msgstr "Cerrar Sesión"
 
 #: ../../app/views/layouts/application.html.erb:32
-msgid "%{application_name}"
+msgid "%<application_name>s"
 msgstr "DMPonline"
 
 #: ../../app/views/layouts/application.html.erb:91
@@ -2897,11 +2897,11 @@ msgstr "Se abre en una nueva ventana"
 
 #: ../../app/views/layouts/application.html.erb:142
 msgid ""
-"%{n} results are available, use up and down arrows to navigate suggestions. Us"
+"%<n>s results are available, use up and down arrows to navigate suggestions. Us"
 "e the Enter key to select a suggestion or the Escape key to close the suggesti"
 "ons."
 msgstr ""
-"Los resultados de %{n} están disponibles, use las flechas hacia arriba y hacia"
+"Los resultados de %<n>s están disponibles, use las flechas hacia arriba y hacia"
 " abajo para navegar por las sugerencias. Use la tecla Intro para seleccionar u"
 "na sugerencia o la tecla Escape para cerrar las sugerencias."
 
@@ -2953,8 +2953,8 @@ msgid "Example answer"
 msgstr "Ejemplo de respuesta"
 
 #: ../../app/views/org_admin/annotations/_show.html.erb:4
-msgid "%{org} Example Answer"
-msgstr "%{org} Ejemplo de respuesta"
+msgid "%<org>s Example Answer"
+msgstr "%<org>s Ejemplo de respuesta"
 
 #: ../../app/views/org_admin/conditions/_add.html.erb:3
 msgid "Add condition"
@@ -3108,10 +3108,10 @@ msgstr "Eliminar fase"
 
 #: ../../app/views/org_admin/phases/_phase.html.erb:17
 msgid ""
-"You are about to delete the '%{phase_title}' phase. This will remove all of th"
+"You are about to delete the '%<phase_title>s' phase. This will remove all of th"
 "e sections and questions listed below. Are you sure?"
 msgstr ""
-"Está a punto de eliminar la fase '%{phase_title}'. Esto eliminará todas las se"
+"Está a punto de eliminar la fase '%<phase_title>s'. Esto eliminará todas las se"
 "cciones y preguntas enumeradas a continuación. ¿Estás seguro?"
 
 #: ../../app/views/org_admin/phases/_phase.html.erb:18
@@ -3170,8 +3170,8 @@ msgid "Write plan"
 msgstr "Escribir plan"
 
 #: ../../app/views/org_admin/plans/index.html.erb:4
-msgid "%{org_name} Plans"
-msgstr "%{org_name} Planes"
+msgid "%<org_name>s Plans"
+msgstr "%<org_name>s Planes"
 
 #: ../../app/views/org_admin/plans/index.html.erb:16
 msgid "Plan"
@@ -3222,10 +3222,10 @@ msgstr "Notificar al propietario del plan que he terminado de proporcionar comen
 #: ../../app/views/org_admin/plans/index.html.erb:39
 msgid ""
 "Download plans <em class=\"sr-only\">(new window)</em><span class=\"new-window-po"
-"pup-info\">%{open_in_new_window_text}</span>"
+"pup-info\">%<open_in_new_window_text>s</span>"
 msgstr ""
 "Descargar planes <em class=\"sr-only\">(nueva ventana)</em> <span class=\"new-win"
-"dow-popup-info\">%{open_in_new_window_text}</span>"
+"dow-popup-info\">%<open_in_new_window_text>s</span>"
 
 #: ../../app/views/org_admin/question_options/_option_fields.html.erb:3
 msgid "Order"
@@ -3255,8 +3255,8 @@ msgstr ""
 " aquí."
 
 #: ../../app/views/org_admin/questions/_form.html.erb:4
-msgid "Question %{number}:"
-msgstr "Pregunta %{number}:"
+msgid "Question %<number>s:"
+msgstr "Pregunta %<number>s:"
 
 #: ../../app/views/org_admin/questions/_form.html.erb:4
 msgid "New question:"
@@ -3331,8 +3331,8 @@ msgid "Delete"
 msgstr "Borrar"
 
 #: ../../app/views/org_admin/questions/_form.html.erb:102
-msgid "You are about to delete question #%{question_number}. Are you sure?"
-msgstr "Está a punto de eliminar la pregunta # %{question_number}. ¿Estás seguro?"
+msgid "You are about to delete question #%<question_number>s. Are you sure?"
+msgstr "Está a punto de eliminar la pregunta # %<question_number>s. ¿Estás seguro?"
 
 #: ../../app/views/org_admin/questions/_index.html.erb:14
 msgid "Add Question"
@@ -3431,10 +3431,10 @@ msgstr "Introduce un título para la sección."
 
 #: ../../app/views/org_admin/sections/_form.html.erb:20
 msgid ""
-"You are about to delete '%{section_title}'. This will affect questions linked "
+"You are about to delete '%<section_title>s'. This will affect questions linked "
 "to this section. Are you sure?"
 msgstr ""
-"Va a borrar '%{section_title}'. Esta acción afectará las preguntas enlazadas c"
+"Va a borrar '%<section_title>s'. Esta acción afectará las preguntas enlazadas c"
 "on esta sección. ¿Está seguro?"
 
 #: ../../app/views/org_admin/sections/_index.html.erb:61
@@ -3465,8 +3465,8 @@ msgstr ""
 
 #: ../../app/views/org_admin/templates/_form.html.erb:25
 #: ../../app/views/org_admin/templates/_show.html.erb:35
-msgid "for internal %{org_name} use only"
-msgstr "solo para uso interno %{org_name}"
+msgid "for internal %<org_name>s use only"
+msgstr "solo para uso interno %<org_name>s"
 
 #: ../../app/views/org_admin/templates/_form.html.erb:32
 #: ../../app/views/org_admin/templates/_show.html.erb:13
@@ -3638,22 +3638,22 @@ msgstr "Plantillas personalizables"
 
 #: ../../app/views/org_admin/templates/index.html.erb:80
 #: ../../app/views/org_admin/templates/index.html.erb:93
-msgid "All (%{count})"
-msgstr "Todos (%{count})"
+msgid "All (%<count>s)"
+msgstr "Todos (%<count>s)"
 
 #: ../../app/views/org_admin/templates/index.html.erb:83
 #: ../../app/views/org_admin/templates/index.html.erb:96
-msgid "Published (%{count})"
-msgstr "Publicado (%{count})"
+msgid "Published (%<count>s)"
+msgstr "Publicado (%<count>s)"
 
 #: ../../app/views/org_admin/templates/index.html.erb:86
 #: ../../app/views/org_admin/templates/index.html.erb:99
-msgid "Unpublished (%{count})"
-msgstr "No publicado (%{count})"
+msgid "Unpublished (%<count>s)"
+msgstr "No publicado (%<count>s)"
 
 #: ../../app/views/org_admin/templates/index.html.erb:89
-msgid "Not customised (%{count})"
-msgstr "No personalizado (%{count})"
+msgid "Not customised (%<count>s)"
+msgstr "No personalizado (%<count>s)"
 
 #: ../../app/views/org_admin/templates/index.html.erb:118
 msgid "Create a template"
@@ -3662,8 +3662,8 @@ msgstr "Crear una plantilla"
 #: ../../app/views/org_admin/users/edit.html.erb:4
 #: ../../app/views/super_admin/users/edit.html.erb:1
 #: ../../app/views/super_admin/users/edit.html.erb:5
-msgid "Editing profile for %{username}"
-msgstr "Perfil de edición para %{username}"
+msgid "Editing profile for %<username>s"
+msgstr "Perfil de edición para %<username>s"
 
 #: ../../app/views/org_admin/users/edit.html.erb:5
 #: ../../app/views/super_admin/users/edit.html.erb:6
@@ -3671,8 +3671,8 @@ msgid "View all users"
 msgstr "Ver todos los usuarios"
 
 #: ../../app/views/org_admin/users/plans.html.erb:3
-msgid "Plans of %{username}"
-msgstr "Planes de %{username}"
+msgid "Plans of %<username>s"
+msgstr "Planes de %<username>s"
 
 #: ../../app/views/orgs/_departments.html.erb:1
 #: ../../app/views/orgs/admin_edit.html.erb:26
@@ -3734,10 +3734,10 @@ msgstr "Fusionar organizaciones"
 #: ../../app/views/orgs/_merge_form.html.erb:7
 msgid ""
 "Please select the Organisation that will replace the current organisation: '<s"
-"trong>%{org_name}</strong>'."
+"trong>%<org_name>s</strong>'."
 msgstr ""
 "Seleccione la organización que reemplazará a la organización actual: ' <strong"
-">%{org_name}</strong> '."
+">%<org_name>s</strong> '."
 
 #: ../../app/views/orgs/_merge_form.html.erb:8
 msgid ""
@@ -3922,15 +3922,15 @@ msgstr "Nunca"
 
 #: ../../app/views/paginable/api_clients/_index.html.erb:44
 msgid ""
-"You are about to delete '%{client_name}'. They will no longer be able to acces"
+"You are about to delete '%<client_name>s'. They will no longer be able to acces"
 "s the API. Are you sure?"
 msgstr ""
-"Está a punto de eliminar '%{client_name}'. Ya no podrán acceder a la API. ¿Est"
+"Está a punto de eliminar '%<client_name>s'. Ya no podrán acceder a la API. ¿Est"
 "ás seguro?"
 
 #: ../../app/views/paginable/contributors/_index.html.erb:57
-msgid "You are about to delete '%{contributor_name}'. Are you sure?"
-msgstr "Está a punto de eliminar '%{contributor_name}'. ¿Estás seguro?"
+msgid "You are about to delete '%<contributor_name>s'. Are you sure?"
+msgstr "Está a punto de eliminar '%<contributor_name>s'. ¿Estás seguro?"
 
 #: ../../app/views/paginable/departments/_index.html.erb:5
 #: ../../app/views/paginable/users/_index.html.erb:22
@@ -3943,10 +3943,10 @@ msgstr "Nombre o código abreviado"
 
 #: ../../app/views/paginable/departments/_index.html.erb:28
 msgid ""
-"You are about to delete '%{department_name}'. This will affect guidance. Are y"
+"You are about to delete '%<department_name>s'. This will affect guidance. Are y"
 "ou sure?"
 msgstr ""
-"Está a punto de eliminar '%{department_name}'. Esto afectará la orientación. ¿"
+"Está a punto de eliminar '%<department_name>s'. Esto afectará la orientación. ¿"
 "Estás seguro?"
 
 #: ../../app/views/paginable/guidance_groups/_index.html.erb:8
@@ -3987,15 +3987,15 @@ msgstr "Publicar"
 
 #: ../../app/views/paginable/guidance_groups/_index.html.erb:50
 msgid ""
-"You are about to delete '%{guidance_group_name}'. This will affect guidance. A"
+"You are about to delete '%<guidance_group_name>s'. This will affect guidance. A"
 "re you sure?"
 msgstr ""
-"Está a punto de borrar el grupo '%{guidance_group_name}'. Esto afectará a la o"
+"Está a punto de borrar el grupo '%<guidance_group_name>s'. Esto afectará a la o"
 "rientación. ¿Está seguro?"
 
 #: ../../app/views/paginable/guidances/_index.html.erb:62
-msgid "You are about to delete '%{guidance_summary}'. Are you sure?"
-msgstr "Está a punto de borrar '%{guidance_summary}'. ¿Está seguro?"
+msgid "You are about to delete '%<guidance_summary>s'. Are you sure?"
+msgstr "Está a punto de borrar '%<guidance_summary>s'. ¿Está seguro?"
 
 #: ../../app/views/paginable/notifications/_index.html.erb:5
 #: ../../app/views/super_admin/notifications/_form.html.erb:15
@@ -4031,8 +4031,8 @@ msgid "Managed"
 msgstr "Gestionado"
 
 #: ../../app/views/paginable/orgs/_index.html.erb:35
-msgid "You are about to delete '%{org_name}'. Are you sure?"
-msgstr "Está a punto de eliminar '%{org_name}'. ¿Estás seguro?"
+msgid "You are about to delete '%<org_name>s'. Are you sure?"
+msgstr "Está a punto de eliminar '%<org_name>s'. ¿Estás seguro?"
 
 #: ../../app/views/paginable/plans/_org_admin.html.erb:3
 msgid ""
@@ -4198,10 +4198,10 @@ msgstr "Publicar cambios"
 
 #: ../../app/views/paginable/templates/_customisable.html.erb:69
 msgid ""
-"Are you sure you want to remove your customization of \"%{template_title}\"? Any"
+"Are you sure you want to remove your customization of \"%<template_title>s\"? Any"
 " published versions will become unavailable to users."
 msgstr ""
-"¿Está seguro de que desea eliminar su personalización de \"%{template_title}\"? "
+"¿Está seguro de que desea eliminar su personalización de \"%<template_title>s\"? "
 "Cualquier versión publicada no estará disponible para los usuarios."
 
 #: ../../app/views/paginable/templates/_history.html.erb:7
@@ -4218,10 +4218,10 @@ msgstr "Ver personalizaciones"
 
 #: ../../app/views/paginable/templates/_organisational.html.erb:76
 msgid ""
-"Are you sure you want to remove \"%{template_title}\"? Any published versions wi"
+"Are you sure you want to remove \"%<template_title>s\"? Any published versions wi"
 "ll become unavailable to users."
 msgstr ""
-"¿Estás seguro de que deseas eliminar \"%{template_title}\"? Cualquier versión pu"
+"¿Estás seguro de que deseas eliminar \"%<template_title>s\"? Cualquier versión pu"
 "blicada no estará disponible para los usuarios."
 
 #: ../../app/views/paginable/templates/_organisational.html.erb:90
@@ -4385,10 +4385,10 @@ msgstr "Derecho"
 #: ../../app/views/plans/_download_form.html.erb:119
 msgid ""
 "Download Plan <em class=\"sr-only\">(new window)</em><span class=\"new-window-pop"
-"up-info\">%{open_in_new_window_text}</span>"
+"up-info\">%<open_in_new_window_text>s</span>"
 msgstr ""
 "Descargar Plan <em class=\"sr-only\">(nueva ventana)</em> <span class=\"new-windo"
-"w-popup-info\">%{open_in_new_window_text}</span>"
+"w-popup-info\">%<open_in_new_window_text>s</span>"
 
 #: ../../app/views/plans/_edit_details.html.erb:13
 #: ../../app/views/plans/_guidance_selection.html.erb:38
@@ -4397,10 +4397,10 @@ msgstr "Seleccione Orientación"
 
 #: ../../app/views/plans/_guidance_selection.html.erb:6
 msgid ""
-"To help you write your plan, %{application_name} can show you guidance from a "
+"To help you write your plan, %<application_name>s can show you guidance from a "
 "variety of organisations."
 msgstr ""
-"Para ayudarlo a escribir su plan, %{application_name} puede mostrarle la orien"
+"Para ayudarlo a escribir su plan, %<application_name>s puede mostrarle la orien"
 "tación de una variedad de organizaciones."
 
 #: ../../app/views/plans/_guidance_selection.html.erb:9
@@ -4421,11 +4421,11 @@ msgstr "No hay una guía adicional para esta plantilla."
 
 #: ../../app/views/plans/_guidance_selection.html.erb:40
 msgid ""
-"To help you write your plan, %{application_name} can show you guidance from a "
+"To help you write your plan, %<application_name>s can show you guidance from a "
 "variety of organisations. Please choose up to 6 organisations of the following"
 " organisations who offer guidance relevant to your plan."
 msgstr ""
-"Para ayudarlo a escribir su plan, %{application_name} puede mostrarle la orien"
+"Para ayudarlo a escribir su plan, %<application_name>s puede mostrarle la orien"
 "tación de una variedad de organizaciones. Elija hasta 6 organizaciones de las "
 "siguientes organizaciones que ofrezcan orientación relevante para su plan."
 
@@ -4451,19 +4451,19 @@ msgstr "Escribir plan"
 
 #: ../../app/views/plans/_overview_details.html.erb:9
 msgid ""
-"This plan is based on the \"%{template_title}\" template provided by %{org_name}"
+"This plan is based on the \"%<template_title>s\" template provided by %<org_name>s"
 "."
 msgstr ""
-"Este plan se basa en la plantilla \"%{template_title}\" proporcionada por %{org_"
+"Este plan se basa en la plantilla \"%<template_title>s\" proporcionada por %{org_"
 "name}."
 
 #: ../../app/views/plans/_overview_details.html.erb:17
-msgid "Template version %{template_version}, published on %{published_date}"
-msgstr "Versión de la plantilla %{template_version}, publicada en %{published_date}"
+msgid "Template version %<template_version>s, published on %<published_date>s"
+msgstr "Versión de la plantilla %<template_version>s, publicada en %<published_date>s"
 
 #: ../../app/views/plans/_overview_details.html.erb:42
-msgid "%{phase_title} (%{sections_size} %{sections}, %{questions_size} %{questions})"
-msgstr "%{phase_title} (%{sections_size} %{sections}, %{questions_size} %{questions})"
+msgid "%<phase_title>s (%<sections_size>s %<sections>s, %<questions_size>s %<questions>s)"
+msgstr "%<phase_title>s (%<sections_size>s %<sections>s, %<questions_size>s %<questions>s)"
 
 #: ../../app/views/plans/_overview_details.html.erb:43
 msgid "section"
@@ -4579,11 +4579,11 @@ msgstr "Establecer visibilidad del plan"
 #: ../../app/views/plans/_share_form.html.erb:9
 msgid ""
 "Public or organisational visibility is intended for finished plans. You must a"
-"nswer at least %{percentage}%% of the questions to enable these options. Note:"
+"nswer at least %<percentage>s%% of the questions to enable these options. Note:"
 " test plans are set to private visibility by default."
 msgstr ""
 "La visibilidad pública u organizativa está destinada a los planes terminados. "
-"Debe responder al menos %{percentage} %% de las preguntas para habilitar estas"
+"Debe responder al menos %<percentage>s %% de las preguntas para habilitar estas"
 " opciones. Nota: los planes de prueba se establecen en visibilidad privada de "
 "forma predeterminada."
 
@@ -4673,8 +4673,8 @@ msgid "Click the 'Create plan' button below to begin."
 msgstr "Haga clic en el botón 'Crear plan' a continuación para comenzar."
 
 #: ../../app/views/plans/index.html.erb:35
-msgid "%{org_title} Plans"
-msgstr "%{org_title} Planes"
+msgid "%<org_title>s Plans"
+msgstr "%<org_title>s Planes"
 
 #: ../../app/views/plans/index.html.erb:36
 msgid ""
@@ -4758,11 +4758,11 @@ msgstr "Encontramos varias plantillas DMP correspondientes a su patrocinador."
 
 #: ../../app/views/public_pages/plan_index.html.erb:8
 msgid ""
-"Public DMPs are plans created using the %{application_name} service and shared"
+"Public DMPs are plans created using the %<application_name>s service and shared"
 " publicly by their owners. They are not vetted for quality, completeness, or a"
 "dherence to funder guidelines."
 msgstr ""
-"Los DMP públicos son planes creados con el servicio %{application_name} y comp"
+"Los DMP públicos son planes creados con el servicio %<application_name>s y comp"
 "artidos públicamente por sus propietarios. No se examinan por calidad, integri"
 "dad o cumplimiento de las pautas de los financiadores."
 
@@ -4813,8 +4813,8 @@ msgid "terms and conditions"
 msgstr "Términos y condiciones"
 
 #: ../../app/views/shared/_create_plan_modal.html.erb:8
-msgid "Would you like to create a plan based on the \"%{name}\" template?"
-msgstr "¿Desea crear un plan basado en la plantilla \"%{name}\"?"
+msgid "Would you like to create a plan based on the \"%<name>s\" template?"
+msgstr "¿Desea crear un plan basado en la plantilla \"%<name>s\"?"
 
 #: ../../app/views/shared/_links.html.erb:7
 msgid "Links"
@@ -4867,8 +4867,8 @@ msgstr "Filtro de planes"
 
 #: ../../app/views/shared/export/_plan_coversheet.erb:3
 #: ../../app/views/shared/export/_plan_txt.erb:65
-msgid "A Data Management Plan created using %{application_name}"
-msgstr "Un plan de manejo de datos creado usando %{application_name}"
+msgid "A Data Management Plan created using %<application_name>s"
+msgstr "Un plan de manejo de datos creado usando %<application_name>s"
 
 #: ../../app/views/shared/export/_plan_coversheet.erb:10
 #: ../../app/views/shared/export/_plan_txt.erb:5
@@ -4938,8 +4938,8 @@ msgstr "¡El nombre que ingresó no era una de las sugerencias enumeradas!"
 
 #: ../../app/views/static_pages/about_us.html.erb:1
 #: ../../app/views/static_pages/about_us.html.erb:4
-msgid "About %{application_name}"
-msgstr "Acerca de %{application_name}"
+msgid "About %<application_name>s"
+msgstr "Acerca de %<application_name>s"
 
 #: ../../app/views/static_pages/about_us.html.erb:11
 msgid ""
@@ -5023,10 +5023,10 @@ msgstr ""
 #: ../../app/views/static_pages/about_us.html.erb:22
 msgid ""
 "get involved<em class=\"sr-only\"> (new window)</em><span class=\"new-window-popu"
-"p-info\">%{open_in_new_window_text}</span>"
+"p-info\">%<open_in_new_window_text>s</span>"
 msgstr ""
 "involucrarse <em class=\"sr-only\">(nueva ventana)</em> <span class=\"new-window-"
-"popup-info\">%{open_in_new_window_text}</span>"
+"popup-info\">%<open_in_new_window_text>s</span>"
 
 #: ../../app/views/static_pages/about_us.html.erb:28
 msgid " in the project. You can also report bugs and request new features via "
@@ -5047,8 +5047,8 @@ msgid "If you have an account please sign in and start creating or editing your
 msgstr "Si tiene una cuenta, inicie sesión y comience a crear o editar su DMP."
 
 #: ../../app/views/static_pages/about_us.html.erb:34
-msgid "If you do not have a %{application_name} account, click on"
-msgstr "Si no tiene una cuenta %{application_name}, haga clic en"
+msgid "If you do not have a %<application_name>s account, click on"
+msgstr "Si no tiene una cuenta %<application_name>s, haga clic en"
 
 #: ../../app/views/static_pages/about_us.html.erb:34
 msgid "Sign up"
@@ -5264,46 +5264,46 @@ msgstr "Información sobre usted: cómo la usamos y con quién la compartimos."
 
 #: ../../app/views/static_pages/privacy.html.erb:11
 msgid ""
-"The information you provide will be used by the %{org_name} to offer you acces"
-"s to and personalisation of the %{application_name} service."
+"The information you provide will be used by the %<org_name>s to offer you acces"
+"s to and personalisation of the %<application_name>s service."
 msgstr ""
-"La información que usted proporcione será utilizada por %{org_name} para ofrec"
-"erle acceso y personalización del servicio %{application_name}."
+"La información que usted proporcione será utilizada por %<org_name>s para ofrec"
+"erle acceso y personalización del servicio %<application_name>s."
 
 #: ../../app/views/static_pages/privacy.html.erb:13
 msgid ""
-"The %{org_name} processes the personal data of %{application_name} users in or"
-"der to deliver and improve the %{application_name} service in a customised man"
+"The %<org_name>s processes the personal data of %<application_name>s users in or"
+"der to deliver and improve the %<application_name>s service in a customised man"
 "ner and to ensure each user receives relevant information."
 msgstr ""
-"El %{org_name} procesa los datos personales de los usuarios de %{application_n"
-"ame} para entregar y mejorar el servicio %{application_name} de una manera per"
+"El %<org_name>s procesa los datos personales de los usuarios de %{application_n"
+"ame} para entregar y mejorar el servicio %<application_name>s de una manera per"
 "sonalizada y para garantizar que cada usuario reciba la información relevante."
 
 #: ../../app/views/static_pages/privacy.html.erb:15
 msgid ""
-"The processing of your personal data by the %{org_name} is necessary for pursu"
+"The processing of your personal data by the %<org_name>s is necessary for pursu"
 "ing the following legitimate interests:"
 msgstr ""
-"El procesamiento de sus datos personales por %{org_name} es necesario para per"
+"El procesamiento de sus datos personales por %<org_name>s es necesario para per"
 "seguir los siguientes intereses legítimos:"
 
 #: ../../app/views/static_pages/privacy.html.erb:18
 msgid ""
-"To provide access to the %{application_name} service and personalisation of yo"
+"To provide access to the %<application_name>s service and personalisation of yo"
 "ur user experience e.g. provision of relevant templates and guidance for your "
 "organisation."
 msgstr ""
-"Para proporcionar acceso al servicio %{application_name} y personalización de "
+"Para proporcionar acceso al servicio %<application_name>s y personalización de "
 "su experiencia de usuario, por ejemplo. provisión de plantillas relevantes y o"
 "rientación para su organización."
 
 #: ../../app/views/static_pages/privacy.html.erb:20
 msgid ""
-"To keep you up to date with news about %{application_name} such as new feature"
+"To keep you up to date with news about %<application_name>s such as new feature"
 "s or improvements, or changes to our Privacy Policy."
 msgstr ""
-"Para mantenerse al día con noticias sobre %{application_name}, como nuevas fun"
+"Para mantenerse al día con noticias sobre %<application_name>s, como nuevas fun"
 "ciones o mejoras, o cambios en nuestra Política de privacidad."
 
 #: ../../app/views/static_pages/privacy.html.erb:22
@@ -5313,29 +5313,29 @@ msgstr "Para fines de seguridad de la red y de la información."
 #: ../../app/views/static_pages/privacy.html.erb:24
 msgid ""
 "We will hold the personal data you provided us for as long as you continue usi"
-"ng the %{application_name} service. Your personal data can be removed from thi"
-"s service upon request to the %{application_name} team within a period of 30 d"
+"ng the %<application_name>s service. Your personal data can be removed from thi"
+"s service upon request to the %<application_name>s team within a period of 30 d"
 "ays."
 msgstr ""
 "Retendremos los datos personales que nos haya proporcionado durante el tiempo "
-"que continúe utilizando el servicio %{application_name}. Sus datos personales "
+"que continúe utilizando el servicio %<application_name>s. Sus datos personales "
 "pueden eliminarse de este servicio si lo solicita al equipo %{application_name"
 "} en un plazo de 30 días."
 
 #: ../../app/views/static_pages/privacy.html.erb:26
 msgid ""
-"If you have any questions, please contact the %{application_name} team at: <a "
-"href='mailto:%{helpdesk_email}'>%{helpdesk_email}</a>"
+"If you have any questions, please contact the %<application_name>s team at: <a "
+"href='mailto:%<helpdesk_email>s'>%<helpdesk_email>s</a>"
 msgstr ""
-"Si tiene alguna pregunta, comuníquese con el equipo de %{application_name} al:"
-" <a href='mailto:%{helpdesk_email}'>%{helpdesk_email}</a>"
+"Si tiene alguna pregunta, comuníquese con el equipo de %<application_name>s al:"
+" <a href='mailto:%<helpdesk_email>s'>%<helpdesk_email>s</a>"
 
 #: ../../app/views/static_pages/privacy.html.erb:30
 msgid ""
-"This statement was last revised on %{revdate} and may be revised at any time w"
+"This statement was last revised on %<revdate>s and may be revised at any time w"
 "ith prior notice."
 msgstr ""
-"Esta declaración se revisó por última vez en %{revdate} y se puede revisar en "
+"Esta declaración se revisó por última vez en %<revdate>s y se puede revisar en "
 "cualquier momento con previo aviso."
 
 #: ../../app/views/static_pages/termsuse.html.erb:12
@@ -5409,7 +5409,7 @@ msgid ""
 "ookies and how we use them is available on the <a target='_blank' href='http:/"
 "/www.dcc.ac.uk/about-us/about-site/website-terms-use/cookies' class=\"has-new-w"
 "indow-popup-info\">main DCC website<em class=\"sr-only\"> (new window)</em><span "
-"class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>.</p>\n"
+"class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a>.</p>\n"
 "\n"
 "      <h3>Third party APIs</h3>\n"
 "\n"
@@ -5454,7 +5454,7 @@ msgstr ""
 " usamos en el <a target='_blank' href='http://www.dcc.ac.uk/about-us/about-sit"
 "e/website-terms-use/cookies' class=\"has-new-window-popup-info\">sitio web princ"
 "ipal de DCC <em class=\"sr-only\">(nueva ventana)</em> <span class=\"new-window-p"
-"opup-info\">%{open_in_new_window_text}</span></a> . </p><h3> API de terceros </"
+"opup-info\">%<open_in_new_window_text>s</span></a> . </p><h3> API de terceros </"
 "h3><p> Ciertas características de este sitio web utilizan API y servicios de t"
 "erceros, como InCommon / Shibboleth o el alojamiento de terceros de biblioteca"
 "s JavaScript comunes o fuentes web. La información utilizada por un servicio e"
@@ -5492,8 +5492,8 @@ msgid "Email credentials to contact"
 msgstr "Credenciales de correo electrónico para contactar"
 
 #: ../../app/views/super_admin/api_clients/_form.html.erb:81
-msgid "Are you sure you want to delete the API client: \"%{name}\""
-msgstr "¿Está seguro de que desea eliminar el cliente API: \"%{name}\""
+msgid "Are you sure you want to delete the API client: \"%<name>s\""
+msgstr "¿Está seguro de que desea eliminar el cliente API: \"%<name>s\""
 
 #: ../../app/views/super_admin/api_clients/edit.html.erb:1
 msgid "Editing API client"
@@ -5509,8 +5509,8 @@ msgid "View all API clients"
 msgstr "Ver todos los clientes API"
 
 #: ../../app/views/super_admin/api_clients/email_credentials.js.erb:1
-msgid "The credentials have been sent to %{email}."
-msgstr "Las credenciales se han enviado a %{email}."
+msgid "The credentials have been sent to %<email>s."
+msgstr "Las credenciales se han enviado a %<email>s."
 
 #: ../../app/views/super_admin/api_clients/index.html.erb:1
 #: ../../app/views/super_admin/api_clients/index.html.erb:6
@@ -5558,8 +5558,8 @@ msgid "Body"
 msgstr "Cuerpo"
 
 #: ../../app/views/super_admin/notifications/_form.html.erb:71
-msgid "Are you sure you want to delete the notification \"%{title}\""
-msgstr "¿Está seguro de que desea eliminar la notificación \"%{title}\""
+msgid "Are you sure you want to delete the notification \"%<title>s\""
+msgstr "¿Está seguro de que desea eliminar la notificación \"%<title>s\""
 
 #: ../../app/views/super_admin/notifications/edit.html.erb:1
 #: ../../app/views/super_admin/notifications/edit.html.erb:5
@@ -5584,8 +5584,8 @@ msgid "New Notification"
 msgstr "Nueva notificación"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:9
-msgid "Merging '%{from_org_name}' into '%{to_org_name}'"
-msgstr "Fusionando '%{from_org_name}' en '%{to_org_name}'"
+msgid "Merging '%<from_org_name>s' into '%<to_org_name>s'"
+msgstr "Fusionando '%<from_org_name>s' en '%<to_org_name>s'"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:11
 msgid "Summary:"
@@ -5593,10 +5593,10 @@ msgstr "Resumen:"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:12
 msgid ""
-"Counts of '%{to_org_name}' records before and after a merge with %{from_org_na"
+"Counts of '%<to_org_name>s' records before and after a merge with %{from_org_na"
 "me}."
 msgstr ""
-"Recuentos de registros '%{to_org_name}' antes y después de una fusión con %{fr"
+"Recuentos de registros '%<to_org_name>s' antes y después de una fusión con %{fr"
 "om_org_name}."
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:17
@@ -5605,12 +5605,12 @@ msgid "Record Type"
 msgstr "Tipo de registro"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:18
-msgid "'%{to_org_name}' Count - before merge"
-msgstr "Recuento de '%{to_org_name}': antes de la combinación"
+msgid "'%<to_org_name>s' Count - before merge"
+msgstr "Recuento de '%<to_org_name>s': antes de la combinación"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:19
-msgid "'%{to_org_name}' Count - after merge"
-msgstr "'%{to_org_name}' Recuento: después de la combinación"
+msgid "'%<to_org_name>s' Count - after merge"
+msgstr "'%<to_org_name>s' Recuento: después de la combinación"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:38
 msgid "Details:"
@@ -5619,7 +5619,7 @@ msgstr "Detalles:"
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:39
 msgid ""
 "The table below shows the specific changes that will occur during the merge pr"
-"ocess. Once the merge is complete, '%{from_org_name}' will be deleted. You can"
+"ocess. Once the merge is complete, '%<from_org_name>s' will be deleted. You can"
 " then consolidate/correct any merge issues (e.g. remove any departments that w"
 "ere duplicated)"
 msgstr ""
@@ -5629,12 +5629,12 @@ msgstr ""
 "mplo, eliminar los departamentos que se duplicaron)"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:45
-msgid "%{from_org_name} - Before"
-msgstr "%{from_org_name} - Antes"
+msgid "%<from_org_name>s - Before"
+msgstr "%<from_org_name>s - Antes"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:46
-msgid "%{to_org_name} - Before"
-msgstr "%{to_org_name} - Antes"
+msgid "%<to_org_name>s - Before"
+msgstr "%<to_org_name>s - Antes"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:61
 msgid "The following attributes will be updated"
@@ -5646,7 +5646,7 @@ msgid ""
 "name}' will then be deleted."
 msgstr ""
 "Advertencia: Los cambios propuestos anteriormente se confirmarán en la base de"
-" datos. A continuación, se eliminará '%{org_name}'."
+" datos. A continuación, se eliminará '%<org_name>s'."
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:92
 msgid "These changes cannot be undone! Do not proceed unless you are certain."
@@ -5662,10 +5662,10 @@ msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:95
 msgid ""
-"Warning: '%{from_org_name}' has Plans that are currently in the review process"
+"Warning: '%<from_org_name>s' has Plans that are currently in the review process"
 ". The Org admins may not be able to see these plans after the merge!"
 msgstr ""
-"Advertencia: '%{from_org_name}' tiene planes que se encuentran actualmente en "
+"Advertencia: '%<from_org_name>s' tiene planes que se encuentran actualmente en "
 "proceso de revisión. Es posible que los administradores de la organización no "
 "puedan ver estos planes después de la fusión."
 
@@ -5690,8 +5690,8 @@ msgid "New organisation"
 msgstr "Nueva organizacion"
 
 #: ../../app/views/super_admin/themes/_form.html.erb:17
-msgid "Are you sure you want to delete the theme \"%{title}\"?"
-msgstr "¿Está seguro de que desea eliminar el tema \"%{title}\"?"
+msgid "Are you sure you want to delete the theme \"%<title>s\"?"
+msgstr "¿Está seguro de que desea eliminar el tema \"%<title>s\"?"
 
 #: ../../app/views/super_admin/themes/edit.html.erb:3
 #: ../../app/views/super_admin/themes/new.html.erb:3
@@ -5720,11 +5720,11 @@ msgstr "Archivo"
 
 #: ../../app/views/super_admin/users/edit.html.erb:64
 msgid ""
-"You are about to archive %{user_name}.  This will remove their personal inform"
+"You are about to archive %<user_name>s.  This will remove their personal inform"
 "ation, but retain their plans, answers, and comments.  They will be unable to "
 "sign-in. Are you sure?"
 msgstr ""
-"Está a punto de archivar %{user_name}. Esto eliminará su información personal,"
+"Está a punto de archivar %<user_name>s. Esto eliminará su información personal,"
 " pero conservará sus planes, respuestas y comentarios. No podrán iniciar sesió"
 "n. ¿Estás seguro?"
 
@@ -5830,40 +5830,40 @@ msgstr "Puede cambiar sus preferencias de notificación en su página de perfil.
 #: ../../app/views/user_mailer/permissions_change_notification.html.erb:2
 #: ../../app/views/user_mailer/plan_visibility.html.erb:2
 #: ../../app/views/user_mailer/sharing_notification.html.erb:2
-msgid "Hello %{username}"
-msgstr "Hola %{username}"
+msgid "Hello %<username>s"
+msgstr "Hola %<username>s"
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:6
-msgid "You have been granted administrator privileges in %{tool_name}:"
-msgstr "Se le han otorgado privilegios de administrador en %{tool_name}:"
+msgid "You have been granted administrator privileges in %<tool_name>s:"
+msgstr "Se le han otorgado privilegios de administrador en %<tool_name>s:"
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:13
-msgid "You have been revoked administrator privileges in %{tool_name}."
-msgstr "Se le han revocado los privilegios de administrador en %{tool_name}."
+msgid "You have been revoked administrator privileges in %<tool_name>s."
+msgstr "Se le han revocado los privilegios de administrador en %<tool_name>s."
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:17
 msgid ""
-"More information about administering the %{tool_name} for users at your organi"
-"sation is available at the %{help_url}."
+"More information about administering the %<tool_name>s for users at your organi"
+"sation is available at the %<help_url>s."
 msgstr ""
-"Más información sobre la administración de %{tool_name} para los usuarios de s"
-"u organización está disponible en %{help_url}."
+"Más información sobre la administración de %<tool_name>s para los usuarios de s"
+"u organización está disponible en %<help_url>s."
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:2
-msgid "Hello %{name},"
-msgstr "Hola %{name}"
+msgid "Hello %<name>s,"
+msgstr "Hola %<name>s"
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:8
-msgid "Please use the following credentials when accessing the %{tool_name} API."
-msgstr "Utilice las siguientes credenciales al acceder a la API %{tool_name}."
+msgid "Please use the following credentials when accessing the %<tool_name>s API."
+msgstr "Utilice las siguientes credenciales al acceder a la API %<tool_name>s."
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:23
-msgid "Please refer to the API documentation at: %{api_documentation_url}"
-msgstr "Consulte la documentación de la API en: %{api_documentation_url}"
+msgid "Please refer to the API documentation at: %<api_documentation_url>s"
+msgstr "Consulte la documentación de la API en: %<api_documentation_url>s"
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:29
 msgid ""
-"Do not share these credentials. They for use with the %{external_application} "
+"Do not share these credentials. They for use with the %<external_application>s "
 "application. If you do share your credentials with another application we rese"
 "rve the right to revoke your access to the API."
 msgstr ""
@@ -5873,49 +5873,49 @@ msgstr ""
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:34
 msgid ""
-"If you did not request access to the %{tool_name} API or did not request for y"
-"our credentials to be renewed, please contact us at %{helpdesk_email}"
+"If you did not request access to the %<tool_name>s API or did not request for y"
+"our credentials to be renewed, please contact us at %<helpdesk_email>s"
 msgstr ""
-"Si no solicitó acceso a la API %{tool_name} o no solicitó la renovación de sus"
-" credenciales, contáctenos en %{helpdesk_email}"
+"Si no solicitó acceso a la API %<tool_name>s o no solicitó la renovación de sus"
+" credenciales, contáctenos en %<helpdesk_email>s"
 
 #: ../../app/views/user_mailer/feedback_complete.html.erb:2
-msgid "Hello %{recipient_name}"
-msgstr "Hola %{recipient_name}"
+msgid "Hello %<recipient_name>s"
+msgstr "Hola %<recipient_name>s"
 
 #: ../../app/views/user_mailer/feedback_complete.html.erb:5
 msgid ""
-"%{commenter} has finished providing feedback on the plan  \"%{link_html}\". Comm"
+"%<commenter>s has finished providing feedback on the plan  \"%<link_html>s\". Comm"
 "ents can be found in the 'Write plan' tab on the right side of the page (Guida"
 "nce/Comments)."
 msgstr ""
-"%{commenter} ha terminado de proporcionar comentarios sobre el plan \"%{link_ht"
+"%<commenter>s ha terminado de proporcionar comentarios sobre el plan \"%{link_ht"
 "ml}\". Los comentarios se pueden encontrar en la pestaña 'Escribir plan' en el "
 "lado derecho de la página (Guía / Comentarios)."
 
 #: ../../app/views/user_mailer/feedback_notification.html.erb:2
-msgid "Hello %{user_name},"
-msgstr "Hola %{user_name},"
+msgid "Hello %<user_name>s,"
+msgstr "Hola %<user_name>s,"
 
 #: ../../app/views/user_mailer/feedback_notification.html.erb:5
 msgid ""
-"%{requestor} has requested feedback on a plan %{link_html}. To add comments, p"
-"lease visit the 'Plans' page under the Admin menu in %{tool_name} and open the"
+"%<requestor>s has requested feedback on a plan %<link_html>s. To add comments, p"
+"lease visit the 'Plans' page under the Admin menu in %<tool_name>s and open the"
 " plan."
 msgstr ""
-"%{requestor} ha solicitado comentarios sobre un plan %{link_html}. Para agrega"
-"r comentarios, visite la página 'Planes' en el menú Admin en %{tool_name} y ab"
+"%<requestor>s ha solicitado comentarios sobre un plan %<link_html>s. Para agrega"
+"r comentarios, visite la página 'Planes' en el menú Admin en %<tool_name>s y ab"
 "ra el plan."
 
 #: ../../app/views/user_mailer/new_comment.html.erb:5
 msgid ""
-"%{commenter_name} has commented on your plan %{plan_title}. To view the commen"
+"%<commenter_name>s has commented on your plan %<plan_title>s. To view the commen"
 "ts, follow the link to the DMP below, or navigate to the plan via My Dashboard"
-" page in %{tool_name}."
+" page in %<tool_name>s."
 msgstr ""
-"%{commenter_name} ha comentado sobre su plan %{plan_title}. Para ver los comen"
+"%<commenter_name>s ha comentado sobre su plan %<plan_title>s. Para ver los comen"
 "tarios, siga el enlace al DMP a continuación, o navegue hasta el plan a través"
-" de la página de Mi Tablero en %{tool_name}."
+" de la página de Mi Tablero en %<tool_name>s."
 
 #: ../../app/views/user_mailer/new_comment.html.erb:10
 msgid "Below is a summary of the sections and questions which have comments."
@@ -5932,24 +5932,24 @@ msgstr ""
 " pregunta."
 
 #: ../../app/views/user_mailer/new_comment.html.erb:15
-msgid "DMP: %{phase_link}"
-msgstr "DMP: %{phase_link}"
+msgid "DMP: %<phase_link>s"
+msgstr "DMP: %<phase_link>s"
 
 #: ../../app/views/user_mailer/new_comment.html.erb:18
-msgid "Section name: %{section_title}"
-msgstr "Nombre de la sección: %{section_title}"
+msgid "Section name: %<section_title>s"
+msgstr "Nombre de la sección: %<section_title>s"
 
 #: ../../app/views/user_mailer/new_comment.html.erb:21
-msgid "Question: %{question_number}"
-msgstr "Pregunta: %{question_number}"
+msgid "Question: %<question_number>s"
+msgstr "Pregunta: %<question_number>s"
 
 #: ../../app/views/user_mailer/permissions_change_notification.html.erb:5
 msgid ""
-"Your permissions relating to %{plan_title} have changed. You now have %{type} "
-"access. This means you can %{placeholder1} %{placeholder2}"
+"Your permissions relating to %<plan_title>s have changed. You now have %<type>s "
+"access. This means you can %<placeholder1>s %<placeholder2>s"
 msgstr ""
-"Sus permisos relacionados con %{plan_title} han cambiado. Ahora tiene acceso %"
-"{type}. Esto significa que puedes %{placeholder1} %{placeholder2}"
+"Sus permisos relacionados con %<plan_title>s han cambiado. Ahora tiene acceso %"
+"{type}. Esto significa que puedes %<placeholder1>s %<placeholder2>s"
 
 #: ../../app/views/user_mailer/plan_access_removed.html.erb:2
 msgid "Hello "
@@ -5964,8 +5964,8 @@ msgid " has been removed by "
 msgstr " ha sido eliminado por"
 
 #: ../../app/views/user_mailer/plan_visibility.html.erb:5
-msgid "The plan %{plan_title} had its visibility changed to %{plan_visibility}."
-msgstr "El plan %{plan_title} cambió su visibilidad a %{plan_visibility}."
+msgid "The plan %<plan_title>s had its visibility changed to %<plan_visibility>s."
+msgstr "El plan %<plan_title>s cambió su visibilidad a %<plan_visibility>s."
 
 #: ../../app/views/user_mailer/plan_visibility.html.erb:9
 msgid "Visibility definitions:"
@@ -5982,14 +5982,14 @@ msgstr "Público: cualquiera puede ver en la web."
 #: ../../app/views/user_mailer/plan_visibility.html.erb:17
 msgid ""
 "If you have questions pertaining to this action, please visit the My Dashboard"
-" page in %{tool_name}"
+" page in %<tool_name>s"
 msgstr ""
 "Si tiene preguntas relacionadas con esta acción, visite la página Mi panel en "
-"%{tool_name}"
+"%<tool_name>s"
 
 #: ../../app/views/user_mailer/question_answered.html.erb:2
-msgid "Hello %{recipient_name},"
-msgstr "Hola %{recipient_name}"
+msgid "Hello %<recipient_name>s,"
+msgstr "Hola %<recipient_name>s"
 
 #: ../../app/views/user_mailer/question_answered.html.erb:5
 msgid " is creating a Data Management Plan and has answered "
@@ -6009,31 +6009,33 @@ msgstr " basado en la plantilla"
 
 #: ../../app/views/user_mailer/sharing_notification.html.erb:5
 msgid ""
-"Your colleague %{inviter_name} has invited you to contribute to
\n"
+"Your colleague %<inviter_name>s has invited you to contribute to
+\n"%<tool_name>s
 "          their Data Management Plan in %{tool_name}"
-msgstr ""
-"Tu colega %{inviter_name} te ha invitado a contribuir a
\n"
+msgstr ""%<inviter_name>s
+"Tu colega %{inviter_name} te ha invitado %<tool_name>s a
+\n"
 "          su plan de gestión de datos en %{tool_name}"
-
-#: ../../app/views/user_mailer/welcome_notification.html.erb:2
+%<tool_name>s%<username>s
+#: ../../app/views/us%<tool_name>slc%<username>sation.html.erb:2
 msgid "Welcome to %{tool_name}, %{username}"
 msgstr "Bienvenido a %{tool_name}, %{username}"
 
-#: ../../app/views/user_mailer/welcome_notification.html.erb:5
+#%<tool_name>sviews/user_mailer/welcome_notification.html.erb:5
 msgid ""
-"%{tool_name} will help you to develop your Data Management Plan. If you have a"
+"%{tool_name} w%<contact_us>sto develop your Data Management Plan. If you have a"
 "ny queries or feedback as you use the tool, please contact us at %{helpdesk_em"
-"ail} or visit %{contact_us}"
+"%<tool_name>st %{contact_us}"
 msgstr ""
-"%{tool_name} lo ayudará a desarrollar su plan de gestión de datos. Si tiene al"
+"%{tool_name} lo ayud%<contact_us>sllar su plan de gestión de datos. Si tiene al"
 "guna pregunta o comentario mientras usa la herramienta, contáctenos en %{helpd"
 "esk_email} o visite %{contact_us}"
 
 #: ../../app/views/user_mailer/welcome_notification.html.erb:13
 msgid "You may change your notification preferences on your profile page."
 msgstr "Puede cambiar sus preferencias de notificación en su página de perfil."
-
-#: ../../app/views/users/_admin_grant_permissions.html.erb:9
+%<username>s
+#: ../../app/views/users/_admin_gran%<username>sns.html.erb:9
 msgid "Editing privileges for %{username}"
 msgstr "Privilegios de edición para %{username}"
 
diff --git a/config/locale/fi/app.po b/config/locale/fi/app.po
index f82ab3e951..63398a50ee 100644
--- a/config/locale/fi/app.po
+++ b/config/locale/fi/app.po
@@ -20,16 +20,16 @@ msgstr ""
 
 #: ../../app/controllers/answers_controller.rb:24
 msgid ""
-"There is no question with id %{question_id} associated to plan id %{plan_id} f"
+"There is no question with id %<question_id>s associated to plan id %<plan_id>s f"
 "or which to create or update an answer"
 msgstr ""
-"Suunnitelman tunnisteeseen %{plan_id} ei liity kysymyksen tunnistetta %{questi"
+"Suunnitelman tunnisteeseen %<plan_id>s ei liity kysymyksen tunnistetta %{questi"
 "on_id}, johon voisi luoda tai päivittää vastauksen"
 
 #: ../../app/controllers/answers_controller.rb:34
-msgid "There is no plan with id %{id} for which to create or update an answer"
+msgid "There is no plan with id %<id>s for which to create or update an answer"
 msgstr ""
-"Tunnisteeseen %{id} ei liity suunnitelmaa, johon voisi luoda tai päivittää vas"
+"Tunnisteeseen %<id>s ei liity suunnitelmaa, johon voisi luoda tai päivittää vas"
 "tauksia"
 
 #: ../../app/controllers/api/v0/base_controller.rb:124
@@ -139,12 +139,12 @@ msgid "You need to sign in or sign up before continuing."
 msgstr "Kirjaudu sisään tai rekisteröidy jatkaaksesi."
 
 #: ../../app/controllers/application_controller.rb:100
-msgid "Unable to %{action} the %{object}.%{errors}"
-msgstr "%{object}:n %{action} ei onnistu. %{errors}"
+msgid "Unable to %<action>s the %<object>s.%<errors>s"
+msgstr "%<object>s:n %<action>s ei onnistu. %<errors>s"
 
 #: ../../app/controllers/application_controller.rb:108
-msgid "Successfully %{action} the %{object}."
-msgstr "%{object}:n %{action} onnistui."
+msgid "Successfully %<action>s the %<object>s."
+msgstr "%<object>s:n %<action>s onnistui."
 
 #: ../../app/controllers/application_controller.rb:123
 msgid "API client"
@@ -207,8 +207,8 @@ msgid "Restricted access to View All the records"
 msgstr "Kaikkien tietojen tarkastelu on rajoitettu"
 
 #: ../../app/controllers/concerns/paginable.rb:180
-msgid "Sort by %{sort_field}"
-msgstr "Järjestä %{sort_field}"
+msgid "Sort by %<sort_field>s"
+msgstr "Järjestä %<sort_field>s"
 
 #: ../../app/controllers/concerns/template_methods.rb:10
 msgid "customisation"
@@ -409,12 +409,12 @@ msgid "Your guidance is no longer published and will not be available to users."
 msgstr "Ohjeesi ei ole enää julkinen ja se ei siis ole käytettävissä."
 
 #: ../../app/controllers/identifiers_controller.rb:18
-msgid "Successfully unlinked your account from %{is}."
-msgstr "Tilin poistaminen %{is}:sta onnistui."
+msgid "Successfully unlinked your account from %<is>s."
+msgstr "Tilin poistaminen %<is>s:sta onnistui."
 
 #: ../../app/controllers/identifiers_controller.rb:22
-msgid "Unable to unlink your account from %{is}."
-msgstr "Tilisi poistaminen %{is}:sta ei onnistu."
+msgid "Unable to unlink your account from %<is>s."
+msgstr "Tilisi poistaminen %<is>s:sta ei onnistu."
 
 #: ../../app/controllers/org_admin/phases_controller.rb:18
 #: ../../app/controllers/org_admin/templates_controller.rb:114
@@ -464,8 +464,8 @@ msgid "update"
 msgstr "päivitä"
 
 #: ../../app/controllers/org_admin/plans_controller.rb:32
-msgid "%{plan_owner} has been notified that you have finished providing feedback"
-msgstr "%{plan_owner} on saanut tiedon, että olet antanut palautetta"
+msgid "%<plan_owner>s has been notified that you have finished providing feedback"
+msgstr "%<plan_owner>s on saanut tiedon, että olet antanut palautetta"
 
 #: ../../app/controllers/org_admin/plans_controller.rb:38
 msgid "Unable to notify user that you have finished providing feedback."
@@ -556,8 +556,8 @@ msgstr "Kaikki suunnitelmapohjat"
 
 #: ../../app/controllers/org_admin/templates_controller.rb:48
 #: ../../app/views/org_admin/templates/index.html.erb:52
-msgid "%{org_name} Templates"
-msgstr "%{org_name}:n suunnitelmapohja"
+msgid "%<org_name>s Templates"
+msgstr "%<org_name>s:n suunnitelmapohja"
 
 #: ../../app/controllers/org_admin/templates_controller.rb:50
 #: ../../app/views/org_admin/templates/index.html.erb:54
@@ -569,15 +569,15 @@ msgid "Customizable Templates"
 msgstr "Mukautettavissa olevat suunnitelmapohjat"
 
 #: ../../app/controllers/org_admin/templates_controller.rb:214
-msgid "Error parsing links for a %{template}"
-msgstr "Virhe linkkien jäsentämisessä %{template}:ssa"
+msgid "Error parsing links for a %<template>s"
+msgstr "Virhe linkkien jäsentämisessä %<template>s:ssa"
 
 #: ../../app/controllers/org_admin/templates_controller.rb:345
 #: ../../app/controllers/public_pages_controller.rb:68
-msgid "Template created using the %{application_name} service. Last modified %{date}"
+msgid "Template created using the %<application_name>s service. Last modified %<date>s"
 msgstr ""
-"Suunnitelmapohjan tekemiseen on käytetty %{application_name}:a. Viimeksi muoka"
-"ttu %{date}"
+"Suunnitelmapohjan tekemiseen on käytetty %<application_name>s:a. Viimeksi muoka"
+"ttu %<date>s"
 
 #: ../../app/controllers/org_admin/templates_controller.rb:360
 #: ../../app/controllers/public_pages_controller.rb:83
@@ -597,7 +597,7 @@ msgid "Please choose an organisation"
 msgstr "Valitse organisaatio"
 
 #: ../../app/controllers/plan_exports_controller.rb:85
-msgid "Created using %{application_name}. Last modified %{date}"
+msgid "Created using %<application_name>s. Last modified %<date>s"
 msgstr "Luotu käyttäen DMPTuulia. "
 
 #: ../../app/controllers/plans_controller.rb:51
@@ -639,15 +639,15 @@ msgstr "kopionti"
 
 #: ../../app/controllers/plans_controller.rb:408
 msgid ""
-"Unable to change the plan's status since it is needed at least %{percentage} p"
+"Unable to change the plan's status since it is needed at least %<percentage>s p"
 "ercentage responded"
 msgstr ""
-"Suunnitelman tilan muuttaminen ei onnistunut, koska vähintään %{percentage}:a "
+"Suunnitelman tilan muuttaminen ei onnistunut, koska vähintään %<percentage>s:a "
 "vastauksista pitää olla vastattuna"
 
 #: ../../app/controllers/plans_controller.rb:416
-msgid "Unable to find plan id %{plan_id}"
-msgstr "Suunnitelman tunnistetta %{plan_id} ei löydy"
+msgid "Unable to find plan id %<plan_id>s"
+msgstr "Suunnitelman tunnistetta %<plan_id>s ei löydy"
 
 #: ../../app/controllers/plans_controller.rb:433
 msgid "Your project is now a test."
@@ -662,18 +662,18 @@ msgid "Unable to change the plan's test status"
 msgstr "Suunnitelman testistatuksen muuttaminen ei onnistu"
 
 #: ../../app/controllers/plans_controller.rb:451
-msgid "There is no plan associated with id %{id}"
-msgstr "Tunnisteeseen %{id} ei vielä liity suunnitelmaa"
+msgid "There is no plan associated with id %<id>s"
+msgstr "Tunnisteeseen %<id>s ei vielä liity suunnitelmaa"
 
 #: ../../app/controllers/registrations_controller.rb:35
 msgid ""
 "Please make a choice below. After linking your\n"
-"                       details to a %{application_name} account,\n"
+"                       details to a %<application_name>s account,\n"
 "                       you will be able to sign in directly with your\n"
 "                       institutional credentials."
 msgstr ""
 "Tee valinta alla. Kun olet linkittänyt\n"
-"                       tiedot %{application_name} -tilille,\n"
+"                       tiedot %<application_name>s -tilille,\n"
 "                       voit kirjautua suoraan sisään\n"
 "                       institutionaaliset valtakirjat."
 
@@ -751,15 +751,15 @@ msgstr "Salasanan ja sen vahvistuksen on oltava samoja"
 
 #: ../../app/controllers/roles_controller.rb:26
 msgid ""
-"Cannot share plan with %{email} since that email matches with the owner of the"
+"Cannot share plan with %<email>s since that email matches with the owner of the"
 " plan."
 msgstr ""
-"Suunnitelmaa ei voi jakaa %{email}:n kanssa, koska sähköposti on sama kuin suu"
+"Suunnitelmaa ei voi jakaa %<email>s:n kanssa, koska sähköposti on sama kuin suu"
 "nnitelman omistajalla."
 
 #: ../../app/controllers/roles_controller.rb:37
-msgid "Plan is already shared with %{email}."
-msgstr "Suunnitelma on jo jaettu %{email}:n kanssa."
+msgid "Plan is already shared with %<email>s."
+msgstr "Suunnitelma on jo jaettu %<email>s:n kanssa."
 
 #: ../../app/controllers/roles_controller.rb:44
 #: ../../app/views/shared/_create_account_form.html.erb:4
@@ -771,12 +771,12 @@ msgid "Surname"
 msgstr "Sukunimi"
 
 #: ../../app/controllers/roles_controller.rb:48
-msgid "Invitation to %{email} issued successfully."
-msgstr "Kutsun lähettäminen %{email}:lle onnistui."
+msgid "Invitation to %<email>s issued successfully."
+msgstr "Kutsun lähettäminen %<email>s:lle onnistui."
 
 #: ../../app/controllers/roles_controller.rb:53
-msgid "Plan shared with %{email}."
-msgstr "Suunnitelma on jaettu %{email}:n kanssa."
+msgid "Plan shared with %<email>s."
+msgstr "Suunnitelma on jaettu %<email>s:n kanssa."
 
 #: ../../app/controllers/roles_controller.rb:68
 msgid "You must provide a valid email address and select a permission level."
@@ -788,10 +788,10 @@ msgstr "Anna sähköpostiosoite"
 
 #: ../../app/controllers/roles_controller.rb:93
 msgid ""
-"Successfully changed the permissions for %{email}. They have been notified via"
+"Successfully changed the permissions for %<email>s. They have been notified via"
 " email."
 msgstr ""
-"Vaihdettiin %{email} -oikeuksien onnistuminen. Heille on ilmoitettu sähköposti"
+"Vaihdettiin %<email>s -oikeuksien onnistuminen. Heille on ilmoitettu sähköposti"
 "tse."
 
 #: ../../app/controllers/roles_controller.rb:108
@@ -823,8 +823,8 @@ msgid "An error has occurred while saving/resetting your export settings."
 msgstr "Tapahtui virhe vientiasetuksia tallennettaessa/säädettäessä."
 
 #: ../../app/controllers/super_admin/api_clients_controller.rb:45
-msgid ". The API credentials have been emailed to %{email}"
-msgstr ". API-käyttöoikeustiedot on lähetetty sähköpostitse osoitteeseen %{email}"
+msgid ". The API credentials have been emailed to %<email>s"
+msgstr ". API-käyttöoikeustiedot on lähetetty sähköpostitse osoitteeseen %<email>s"
 
 #: ../../app/controllers/super_admin/notifications_controller.rb:69
 msgid "Your notification is now active."
@@ -839,15 +839,15 @@ msgid "Unable to change the notification's active status"
 msgstr "Ilmoituksen aktiivista tilaa ei voi muuttaa"
 
 #: ../../app/controllers/super_admin/notifications_controller.rb:104
-msgid "There is no notification associated with id  %{id}"
-msgstr "Tunnisteeseen %{id} ei liity ilmoituksia"
+msgid "There is no notification associated with id  %<id>s"
+msgstr "Tunnisteeseen %<id>s ei liity ilmoituksia"
 
 #: ../../app/controllers/super_admin/org_swaps_controller.rb:22
 msgid ""
 "Your organisation affiliation has been changed. You may now edit templates for"
-" %{org_name}."
+" %<org_name>s."
 msgstr ""
-"Affiliaatiosi organisaatioon ovat muuttuneet. Nyt voit muokata %{org_name}:n m"
+"Affiliaatiosi organisaatioon ovat muuttuneet. Nyt voit muokata %<org_name>s:n m"
 "allipohjia."
 
 #: ../../app/controllers/super_admin/org_swaps_controller.rb:25
@@ -911,16 +911,16 @@ msgid "Successfully signed in"
 msgstr "Sisäänkirjautuminen onnistui"
 
 #: ../../app/controllers/users/omniauth_callbacks_controller.rb:56
-msgid "Your account has been successfully linked to %{scheme}."
-msgstr "Tilisi liitettiin onnistuneesti %{scheme}:n."
+msgid "Your account has been successfully linked to %<scheme>s."
+msgstr "Tilisi liitettiin onnistuneesti %<scheme>s:n."
 
 #: ../../app/controllers/users/omniauth_callbacks_controller.rb:61
-msgid "Unable to link your account to %{scheme}."
-msgstr "Tilisi liittäminen %{scheme}:hin ei onnistunut."
+msgid "Unable to link your account to %<scheme>s."
+msgstr "Tilisi liittäminen %<scheme>s:hin ei onnistunut."
 
 #: ../../app/controllers/users_controller.rb:141
-msgid "Successfully %{action} %{username}'s account."
-msgstr "%{username}n tilin %{action} onnistui."
+msgid "Successfully %<action>s %<username>s's account."
+msgstr "%<username>sn tilin %<action>s onnistui."
 
 #: ../../app/controllers/users_controller.rb:142
 msgid "activated"
@@ -931,8 +931,8 @@ msgid "deactivated"
 msgstr "pois käytöstä"
 
 #: ../../app/controllers/users_controller.rb:149
-msgid "Unable to %{action} %{username}"
-msgstr "%{username}:n %{action} ei onnistunut"
+msgid "Unable to %<action>s %<username>s"
+msgstr "%<username>s:n %<action>s ei onnistunut"
 
 #: ../../app/controllers/users_controller.rb:150
 msgid "activate"
@@ -1003,20 +1003,20 @@ msgid "Creator:"
 msgstr "Tekijä:"
 
 #: ../../app/helpers/feedbacks_helper.rb:6
-msgid "%{application_name}: Your plan has been submitted for feedback"
-msgstr "%{application_name}: Suunnitelmasi on lähetetty kommentoitavaksi"
+msgid "%<application_name>s: Your plan has been submitted for feedback"
+msgstr "%<application_name>s: Suunnitelmasi on lähetetty kommentoitavaksi"
 
 #: ../../app/helpers/feedbacks_helper.rb:10
 msgid ""
-"<p>Hello %{user_name}.</p><p>Your plan \"%{plan_name}\" has been submitted for f"
+"<p>Hello %<user_name>s.</p><p>Your plan \"%<plan_name>s\" has been submitted for f"
 "eedback from an\n"
 "      administrator at your organisation. If you have questions pertaining to "
 "this action, please contact us\n"
-"      at %{organisation_email}.</p>"
+"      at %<organisation_email>s.</p>"
 msgstr ""
-"<p> Hei %{user_name}. </p><p> Suunnitelmasi \"%{plan_name}\" on toimitettu organ"
+"<p> Hei %<user_name>s. </p><p> Suunnitelmasi \"%<plan_name>s\" on toimitettu organ"
 "isaation ylläpitäjän palautetta varten. Jos sinulla on tähän toimintaan liitty"
-"viä kysymyksiä, ota meihin yhteyttä osoitteessa %{organisation_email}. </p>"
+"viä kysymyksiä, ota meihin yhteyttä osoitteessa %<organisation_email>s. </p>"
 
 #: ../../app/helpers/identifier_helper.rb:6
 #: ../../spec/helpers/identifier_helper_spec.rb:14
@@ -1049,14 +1049,14 @@ msgstr "lue suunnitelma ja kommentoi."
 
 #: ../../app/helpers/orgs_helper.rb:14
 msgid ""
-"<p>A data librarian from %{org_name} will respond to your request within 48\n"
+"<p>A data librarian from %<org_name>s will respond to your request within 48\n"
 "       hours. If you have questions pertaining to this action please contact u"
 "s\n"
-"       at %{organisation_email}.</p>"
+"       at %<organisation_email>s.</p>"
 msgstr ""
-"<p> %{org_name}: n tietokirjastonhoitaja vastaa pyyntöönne 48 tunnin kuluessa."
+"<p> %<org_name>s: n tietokirjastonhoitaja vastaa pyyntöönne 48 tunnin kuluessa."
 " Jos sinulla on tähän toimintaan liittyviä kysymyksiä, ota meihin yhteyttä oso"
-"itteessa %{organisation_email}. </p>"
+"itteessa %<organisation_email>s. </p>"
 
 #: ../../app/helpers/perms_helper.rb:9
 msgid "Add organisations"
@@ -1190,16 +1190,16 @@ msgid "None"
 msgstr "Ei mitään"
 
 #: ../../app/helpers/super_admin/orgs/merge_helper.rb:31
-msgid "Guidance for: %{themes}"
-msgstr "Ohjeita: %{themes}"
+msgid "Guidance for: %<themes>s"
+msgstr "Ohjeita: %<themes>s"
 
 #: ../../app/helpers/super_admin/orgs/merge_helper.rb:53
 msgid "Nothing to merge"
 msgstr "Ei mitään yhdistettävää"
 
 #: ../../app/helpers/super_admin/orgs/merge_helper.rb:55
-msgid "<p>The following %{object_types} will be moved over to '%{org_name}':</p>"
-msgstr "<p>Seuraava %{object_types} siirretään kohtaan %{org_name}:</p>"
+msgid "<p>The following %<object_types>s will be moved over to '%<org_name>s':</p>"
+msgstr "<p>Seuraava %<object_types>s siirretään kohtaan %<org_name>s:</p>"
 
 #: ../../app/helpers/template_helper.rb:46
 #: ../../app/views/plans/index.html.erb:29
@@ -1234,50 +1234,50 @@ msgstr "Viimeiset 12 kuukautta"
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:6
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:5
 #: ../../app/views/user_mailer/_email_signature.html.erb:2
-msgid "Query or feedback related to %{tool_name}"
-msgstr "%{tool_name}:n liittyvä kysymys tai palaute"
+msgid "Query or feedback related to %<tool_name>s"
+msgstr "%<tool_name>s:n liittyvä kysymys tai palaute"
 
 #: ../../app/mailers/user_mailer.rb:23
-msgid "Welcome to %{tool_name}"
-msgstr "Tervetuloa %{tool_name}:n käyttäjäksi"
+msgid "Welcome to %<tool_name>s"
+msgstr "Tervetuloa %<tool_name>s:n käyttäjäksi"
 
 #: ../../app/mailers/user_mailer.rb:58
-msgid "A Data Management Plan in %{tool_name} has been shared with you"
-msgstr "Tiedonhallintasuunnitelma %{tool_name} -palvelussa on jaettu kanssasi"
+msgid "A Data Management Plan in %<tool_name>s has been shared with you"
+msgstr "Tiedonhallintasuunnitelma %<tool_name>s -palvelussa on jaettu kanssasi"
 
 #: ../../app/mailers/user_mailer.rb:76
-msgid "Changed permissions on a Data Management Plan in %{tool_name}"
+msgid "Changed permissions on a Data Management Plan in %<tool_name>s"
 msgstr ""
-"%{tool_name}:ssa olevan aineistonhallintasuunnitelman käyttöoikeuksia on muute"
+"%<tool_name>s:ssa olevan aineistonhallintasuunnitelman käyttöoikeuksia on muute"
 "ttu"
 
 #: ../../app/mailers/user_mailer.rb:92
-msgid "Permissions removed on a DMP in %{tool_name}"
-msgstr "DMP: ltä poistetut käyttöoikeudet %{tool_name}"
+msgid "Permissions removed on a DMP in %<tool_name>s"
+msgstr "DMP: ltä poistetut käyttöoikeudet %<tool_name>s"
 
 #: ../../app/mailers/user_mailer.rb:111
-msgid "%{user_name} has requested feedback on a %{tool_name} plan"
-msgstr "%{user_name} on pyytänyt palautetta %{tool_name} -suunnitelmasta"
+msgid "%<user_name>s has requested feedback on a %<tool_name>s plan"
+msgstr "%<user_name>s on pyytänyt palautetta %<tool_name>s -suunnitelmasta"
 
 #: ../../app/mailers/user_mailer.rb:134
-msgid "%{tool_name}: Expert feedback has been provided for %{plan_title}"
-msgstr "%{tool_name}: %{plan_title}: lle on annettu asiantuntijapalautetta"
+msgid "%<tool_name>s: Expert feedback has been provided for %<plan_title>s"
+msgstr "%<tool_name>s: %<plan_title>s: lle on annettu asiantuntijapalautetta"
 
 #: ../../app/mailers/user_mailer.rb:169
-msgid "DMP Visibility Changed: %{plan_title}"
-msgstr "Suunnitelman näkyvyys on muuttunut: %{plan_title}"
+msgid "DMP Visibility Changed: %<plan_title>s"
+msgstr "Suunnitelman näkyvyys on muuttunut: %<plan_title>s"
 
 #: ../../app/mailers/user_mailer.rb:200
-msgid "%{tool_name}: A new comment was added to %{plan_title}"
-msgstr "%{tool_name}: Uusi kommentti lisättiin suunnitelmaasi %{plan_title}"
+msgid "%<tool_name>s: A new comment was added to %<plan_title>s"
+msgstr "%<tool_name>s: Uusi kommentti lisättiin suunnitelmaasi %<plan_title>s"
 
 #: ../../app/mailers/user_mailer.rb:218
-msgid "Administrator privileges granted in %{tool_name}"
-msgstr "Minulle myönnetyt ylläpito-oikeudet %{tool_name}:ssa"
+msgid "Administrator privileges granted in %<tool_name>s"
+msgstr "Minulle myönnetyt ylläpito-oikeudet %<tool_name>s:ssa"
 
 #: ../../app/mailers/user_mailer.rb:235
-msgid "%{tool_name} API changes"
-msgstr "%{tool_name} API-muutokset"
+msgid "%<tool_name>s API changes"
+msgstr "%<tool_name>s API-muutokset"
 
 #: ../../app/models/concerns/exportable_plan.rb:26
 msgid "Phase"
@@ -1309,12 +1309,12 @@ msgid "Creators: "
 msgstr "Tekijät:"
 
 #: ../../app/models/concerns/exportable_plan.rb:134
-msgid "%{authors}"
-msgstr "%{authors}"
+msgid "%<authors>s"
+msgstr "%<authors>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:135
-msgid "%{affiliation}"
-msgstr "%{affiliation}"
+msgid "%<affiliation>s"
+msgstr "%<affiliation>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:137
 #: ../../app/models/concerns/exportable_plan.rb:139
@@ -1325,12 +1325,12 @@ msgid "Template: "
 msgstr "Suunnitelmapohja:"
 
 #: ../../app/models/concerns/exportable_plan.rb:137
-msgid "%{funder}"
-msgstr "%{funder}"
+msgid "%<funder>s"
+msgstr "%<funder>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:139
-msgid "%{template}"
-msgstr "%{template}"
+msgid "%<template>s"
+msgstr "%<template>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:142
 #: ../../app/views/shared/export/_plan_txt.erb:12
@@ -1339,8 +1339,8 @@ msgstr ""
 "Rahoitusnumero:\n"
 
 #: ../../app/models/concerns/exportable_plan.rb:142
-msgid "%{grant_number}"
-msgstr "%{grant_number}"
+msgid "%<grant_number>s"
+msgstr "%<grant_number>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:145
 #: ../../app/views/shared/export/_plan_coversheet.erb:26
@@ -1349,8 +1349,8 @@ msgid "Project abstract: "
 msgstr "Projektin tiivistelmä:"
 
 #: ../../app/models/concerns/exportable_plan.rb:145
-msgid "%{description}"
-msgstr "%{description}"
+msgid "%<description>s"
+msgstr "%<description>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:148
 #: ../../app/views/shared/export/_plan_coversheet.erb:42
@@ -1359,8 +1359,8 @@ msgid "Last modified: "
 msgstr "Viimeksi muokattu:"
 
 #: ../../app/models/concerns/exportable_plan.rb:148
-msgid "%{date}"
-msgstr "%{date}"
+msgid "%<date>s"
+msgstr "%<date>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:149
 #: ../../app/views/shared/export/_plan_coversheet.erb:49
@@ -1536,8 +1536,8 @@ msgid "generate_copy! requires an organisation target"
 msgstr "kopion_tuottaminen! vaatii organisaatiokohteen."
 
 #: ../../app/models/template.rb:380
-msgid "Copy of %{template}"
-msgstr "%{template}:n kopio"
+msgid "Copy of %<template>s"
+msgstr "%<template>s:n kopio"
 
 #: ../../app/models/template.rb:388
 msgid "generate_version! requires a published template"
@@ -1576,9 +1576,9 @@ msgid "Conditions in the template refer backwards"
 msgstr "Mallin ehdot viittaavat taaksepäin"
 
 #: ../../app/models/user.rb:379
-msgid "A Data Management Plan in %{application_name} has been shared with you"
+msgid "A Data Management Plan in %<application_name>s has been shared with you"
 msgstr ""
-"%{application_name}lla kirjoitettu aineistonhallintasuunnitelma on jaettu kans"
+"%<application_name>slla kirjoitettu aineistonhallintasuunnitelma on jaettu kans"
 "sasi"
 
 #: ../../app/policies/api/v0/departments_policy.rb:12
@@ -1698,8 +1698,8 @@ msgstr ""
 "tua mallipohjaa"
 
 #: ../../app/validators/after_validator.rb:5
-msgid "must be after %{date}"
-msgstr "on oltava myöhempi kuin %{date}"
+msgid "must be after %<date>s"
+msgstr "on oltava myöhempi kuin %<date>s"
 
 #: ../../app/validators/org_links_validator.rb:10
 msgid "A key \"org\" is expected for links hash"
@@ -1711,12 +1711,12 @@ msgid "A hash is expected for links"
 msgstr "Linkeissä on oltava hash"
 
 #: ../../app/validators/template_links_validator.rb:12
-msgid "A key %{key} is expected for links hash"
-msgstr "Linkki hashit tarvitsevat avaimen %{key}"
+msgid "A key %<key>s is expected for links hash"
+msgstr "Linkki hashit tarvitsevat avaimen %<key>s"
 
 #: ../../app/validators/template_links_validator.rb:15
-msgid "The key %{key} does not have a valid set of object links"
-msgstr "Avaimessa %{key} ei ole sopivia kohdelinkkejä"
+msgid "The key %<key>s does not have a valid set of object links"
+msgstr "Avaimessa %<key>s ei ole sopivia kohdelinkkejä"
 
 #: ../../app/views/answers/_locking.html.erb:5
 msgid "The following answer cannot be saved"
@@ -1724,10 +1724,10 @@ msgstr "Seuraavaa vastausta ei voida tallentaa"
 
 #: ../../app/views/answers/_locking.html.erb:8
 msgid ""
-"since %{name} saved the answer below while you were editing. Please, combine y"
+"since %<name>s saved the answer below while you were editing. Please, combine y"
 "our changes and then save the answer again."
 msgstr ""
-"koska %{name} tallensi vastauksen sillä aikaa, kun muokkasit suunnitelmaa. Yhd"
+"koska %<name>s tallensi vastauksen sillä aikaa, kun muokkasit suunnitelmaa. Yhd"
 "istä tekemäsi muutokset ja tallenna vastaus uudestaan."
 
 #: ../../app/views/answers/_new_edit.html.erb:15
@@ -1801,8 +1801,8 @@ msgid "Answered"
 msgstr "Vastattu"
 
 #: ../../app/views/answers/_status.html.erb:10
-msgid " by %{user_name}"
-msgstr "%{user_name}"
+msgid " by %<user_name>s"
+msgstr "%<user_name>s"
 
 #: ../../app/views/answers/_status.html.erb:15
 msgid "This answer removes "
@@ -1879,18 +1879,18 @@ msgstr "Ota yhteyttä"
 
 #: ../../app/views/contact_us/contacts/new.html.erb:6
 msgid ""
-"%{application_name} is provided by the %{organisation_name}.<br /> You can fin"
-"d out more about us on our <a href=\"%{organisation_url}\" class=\"has-new-window"
+"%<application_name>s is provided by the %<organisation_name>s.<br /> You can fin"
+"d out more about us on our <a href=\"%<organisation_url>s\" class=\"has-new-window"
 "-popup-info\" target=\"_blank\">website <em class=\"sr-only\">(new window)</em><spa"
-"n class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>. If you "
-"would like to contact us about %{application_name}, please fill out the form b"
+"n class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a>. If you "
+"would like to contact us about %<application_name>s, please fill out the form b"
 "elow."
 msgstr ""
-"%{application_name} tarjoaa %{organisation_name}. <br /> Lisätietoja meistä <a"
-" href=\"%{organisation_url}\" class=\"has-new-window-popup-info\" target=\"_blank\">"
+"%<application_name>s tarjoaa %<organisation_name>s. <br /> Lisätietoja meistä <a"
+" href=\"%<organisation_url>s\" class=\"has-new-window-popup-info\" target=\"_blank\">"
 "verkkosivuillamme <em class=\"sr-only\">(uusi ikkuna)</em> <span class=\"new-wind"
-"ow-popup-info\">%{open_in_new_window_text}</span></a> . Jos haluat ottaa yhteyt"
-"tä meihin %{application_name} liittyen, täytä alla oleva lomake."
+"ow-popup-info\">%<open_in_new_window_text>s</span></a> . Jos haluat ottaa yhteyt"
+"tä meihin %<application_name>s liittyen, täytä alla oleva lomake."
 
 #: ../../app/views/contact_us/contacts/new.html.erb:10
 #: ../../app/views/layouts/_branding.html.erb:37
@@ -2054,8 +2054,8 @@ msgid "Create account"
 msgstr "Rekisteröidy"
 
 #: ../../app/views/devise/mailer/confirmation_instructions.html.erb:2
-msgid "Welcome to %{application_name}"
-msgstr "Tervetuloa %{application_name}:n käyttäjäksi"
+msgid "Welcome to %<application_name>s"
+msgstr "Tervetuloa %<application_name>s:n käyttäjäksi"
 
 #: ../../app/views/devise/mailer/confirmation_instructions.html.erb:4
 msgid "Thank you for registering. Please confirm your email address"
@@ -2075,24 +2075,24 @@ msgstr "selaimeesi"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:12
 #: ../../app/views/user_mailer/new_comment.html.erb:2
-msgid "Hello %{user_name}"
-msgstr "Hei %{user_name}"
+msgid "Hello %<user_name>s"
+msgstr "Hei %<user_name>s"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:15
 msgid ""
-"Your colleague %{inviter_name} has invited you to contribute to  their Data Ma"
-"nagement Plan in %{tool_name}"
+"Your colleague %<inviter_name>s has invited you to contribute to  their Data Ma"
+"nagement Plan in %<tool_name>s"
 msgstr ""
-"Kollegasi %{inviter_name} on kutsunut sinut osallistumaan heidän tiedonhallint"
-"asuunnitelmaansa %{tool_name}"
+"Kollegasi %<inviter_name>s on kutsunut sinut osallistumaan heidän tiedonhallint"
+"asuunnitelmaansa %<tool_name>s"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:22
 #: ../../app/views/user_mailer/sharing_notification.html.erb:11
 msgid ""
-"%{click_here} to accept the invitation, (or copy %{link} into your browser). I"
+"%<click_here>s to accept the invitation, (or copy %<link>s into your browser). I"
 "f you don't want to accept the invitation, please ignore this email."
 msgstr ""
-"%{click_here} hyväksyäksesi kutsun, (tai kopioi %{link} selaimeesi). Jos et hy"
+"%<click_here>s hyväksyäksesi kutsun, (tai kopioi %<link>s selaimeesi). Jos et hy"
 "väksy kutsua, voit jättää tämän sähköpostin huomiotta."
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:23
@@ -2111,8 +2111,8 @@ msgstr "Ystävällisin terveisin"
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:19
 #: ../../app/views/user_mailer/_email_signature.html.erb:12
 #: ../../app/views/user_mailer/welcome_notification.html.erb:10
-msgid "The %{tool_name} team"
-msgstr "%{tool_name}n tiimi"
+msgid "The %<tool_name>s team"
+msgstr "%<tool_name>sn tiimi"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:32
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:22
@@ -2123,22 +2123,22 @@ msgstr "Älä vastaa tähän sähköpostiin."
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:33
 msgid ""
-"If you have any questions or need help, please contact us at %{helpdesk_email}"
-" or visit %{contact_us_url}"
+"If you have any questions or need help, please contact us at %<helpdesk_email>s"
+" or visit %<contact_us_url>s"
 msgstr ""
 "Jos sinulla on kysyttävää tai tarvitset apua, ota meihin yhteyttä: %{helpdesk_"
-"email} tai käy osoitteessa %{contact_us_url}"
+"email} tai käy osoitteessa %<contact_us_url>s"
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:9
-msgid "Hello %{user_email}"
-msgstr "Hei %{user_email}"
+msgid "Hello %<user_email>s"
+msgstr "Hei %<user_email>s"
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:12
 msgid ""
-"Someone has requested a link to change your %{tool_name} password. You can do "
+"Someone has requested a link to change your %<tool_name>s password. You can do "
 "this through the link below."
 msgstr ""
-"Joku on pyytänyt %{tool_name}:n salasanan vaihtoa. Voit tehdä sen alla olevall"
+"Joku on pyytänyt %<tool_name>s:n salasanan vaihtoa. Voit tehdä sen alla olevall"
 "a linkillä."
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:14
@@ -2152,10 +2152,10 @@ msgstr "Jos et pyytänyt tätä, voit jätttää tämän sähköpostin huomiotta
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:22
 #: ../../app/views/user_mailer/_email_signature.html.erb:19
 msgid ""
-"If you have any questions or need help, please contact us at %{helpdesk_email}"
-" or visit %{contact_us}"
+"If you have any questions or need help, please contact us at %<helpdesk_email>s"
+" or visit %<contact_us>s"
 msgstr ""
-"Jos tarvitset apua, voit ottaa yhteyttä: %{helpdesk_email} tai käy sivulla: %{"
+"Jos tarvitset apua, voit ottaa yhteyttä: %<helpdesk_email>s tai käy sivulla: %{"
 "contact_us}"
 
 #: ../../app/views/devise/mailer/unlock_instructions.html.erb:2
@@ -2226,22 +2226,22 @@ msgstr "Dokumentointi"
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:16
 msgid ""
-"See the <a href=\"%{api_v0_wiki}\">documentation for v0</a> for more details on "
+"See the <a href=\"%<api_v0_wiki>s\">documentation for v0</a> for more details on "
 "the original API which includes access to statistics, the full text of plans a"
 "nd the ability to connect users with departments."
 msgstr ""
-"Katso <a href=\"%{api_v0_wiki}\">v0</a> : n <a href=\"%{api_v0_wiki}\">dokumentaat"
+"Katso <a href=\"%<api_v0_wiki>s\">v0</a> : n <a href=\"%<api_v0_wiki>s\">dokumentaat"
 "iosta</a> lisätietoja alkuperäisestä sovellusliittymästä, joka sisältää pääsyn"
 " tilastoihin, suunnitelmien koko tekstin ja mahdollisuuden yhdistää käyttäjät "
 "osastoihin."
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:18
 msgid ""
-"See the <a href=\"%{api_v1_wiki}\">documentation for v1</a> for more details on "
-"the API that supports the <a href=\"%{rda_standard_url}\">RDA Common metadata st"
+"See the <a href=\"%<api_v1_wiki>s\">documentation for v1</a> for more details on "
+"the API that supports the <a href=\"%<rda_standard_url>s\">RDA Common metadata st"
 "andard for DMPs.</a>"
 msgstr ""
-"Katso <a href=\"%{api_v1_wiki}\">v1</a> <a href=\"%{rda_standard_url}\">: n ohjeis"
+"Katso <a href=\"%<api_v1_wiki>s\">v1</a> <a href=\"%<rda_standard_url>s\">: n ohjeis"
 "ta</a> lisätietoja sovellusliittymästä, joka tukee <a href=\"%{rda_standard_url"
 "}\">RDA: n yleistä metatietostandardia DMP: lle.</a>"
 
@@ -2417,8 +2417,8 @@ msgid "Sign in or Create account"
 msgstr "Kirjaudu sisään tai luo tili"
 
 #: ../../app/views/devise/registrations/new.html.erb:15
-msgid "Do you have a %{application_name} account?"
-msgstr "Onko sinulla jo %{application_name} -tili?"
+msgid "Do you have a %<application_name>s account?"
+msgstr "Onko sinulla jo %<application_name>s -tili?"
 
 #: ../../app/views/devise/registrations/new.html.erb:22
 #: ../../app/views/layouts/_navigation.html.erb:63
@@ -2433,8 +2433,8 @@ msgid "This will link your existing account to your credentials."
 msgstr "Tämä linkittää tilisi tunnistetietoihisi."
 
 #: ../../app/views/devise/registrations/new.html.erb:34
-msgid "No %{application_name} account?"
-msgstr "Eikö sinulla ole %{application_name} -tiliä?"
+msgid "No %<application_name>s account?"
+msgstr "Eikö sinulla ole %<application_name>s -tiliä?"
 
 #: ../../app/views/devise/registrations/new.html.erb:46
 msgid "This will create an account and link it to your credentials."
@@ -2608,10 +2608,10 @@ msgstr "Julkaistu?"
 
 #: ../../app/views/home/_welcome.html.erb:5
 msgid ""
-"<p>%{application_name} has been developed by the <strong>%{organisation_name}<"
+"<p>%<application_name>s has been developed by the <strong>%<organisation_name>s<"
 "/strong> to help you write data management plans.</p>"
 msgstr ""
-"<p> %{organisation_name} on kehittänyt <strong>%{application_name}</strong> , "
+"<p> %<organisation_name>s on kehittänyt <strong>%<application_name>s</strong> , "
 "jonka avulla voit kirjoittaa tietohallintasuunnitelmia. </p>"
 
 #: ../../app/views/home/_welcome.html.erb:11
@@ -2797,8 +2797,8 @@ msgid "Logout"
 msgstr "Kirjaudu ulos"
 
 #: ../../app/views/layouts/application.html.erb:32
-msgid "%{application_name}"
-msgstr "%{application_name}"
+msgid "%<application_name>s"
+msgstr "%<application_name>s"
 
 #: ../../app/views/layouts/application.html.erb:91
 msgid "Error:"
@@ -2873,11 +2873,11 @@ msgstr "Avautuu uuteen ikkunaan"
 
 #: ../../app/views/layouts/application.html.erb:142
 msgid ""
-"%{n} results are available, use up and down arrows to navigate suggestions. Us"
+"%<n>s results are available, use up and down arrows to navigate suggestions. Us"
 "e the Enter key to select a suggestion or the Escape key to close the suggesti"
 "ons."
 msgstr ""
-"%{n} tulokset ovat saatavilla. Käytä ylös ja alas nuolia navigoidaksesi ehdotu"
+"%<n>s tulokset ovat saatavilla. Käytä ylös ja alas nuolia navigoidaksesi ehdotu"
 "ksiin. Käytä Enter-näppäintä valitaksesi ehdotuksen tai Escape-näppäintä sulke"
 "aksesi ehdotukset."
 
@@ -2929,8 +2929,8 @@ msgid "Example answer"
 msgstr "Esimerkki Vastaus"
 
 #: ../../app/views/org_admin/annotations/_show.html.erb:4
-msgid "%{org} Example Answer"
-msgstr "%{org} Esimerkkivastaus"
+msgid "%<org>s Example Answer"
+msgstr "%<org>s Esimerkkivastaus"
 
 #: ../../app/views/org_admin/conditions/_add.html.erb:3
 msgid "Add condition"
@@ -3083,10 +3083,10 @@ msgstr "Poista vaihe"
 
 #: ../../app/views/org_admin/phases/_phase.html.erb:17
 msgid ""
-"You are about to delete the '%{phase_title}' phase. This will remove all of th"
+"You are about to delete the '%<phase_title>s' phase. This will remove all of th"
 "e sections and questions listed below. Are you sure?"
 msgstr ""
-"Olet poistamassa %{phase_title} -vaihetta. Se poistaa myös alla listatut osiot"
+"Olet poistamassa %<phase_title>s -vaihetta. Se poistaa myös alla listatut osiot"
 " ja kysymykset. Oletko varma?"
 
 #: ../../app/views/org_admin/phases/_phase.html.erb:18
@@ -3145,8 +3145,8 @@ msgid "Write plan"
 msgstr "Kirjoita suunnitelma"
 
 #: ../../app/views/org_admin/plans/index.html.erb:4
-msgid "%{org_name} Plans"
-msgstr "Suunnitelmat: %{org_name} "
+msgid "%<org_name>s Plans"
+msgstr "Suunnitelmat: %<org_name>s "
 
 #: ../../app/views/org_admin/plans/index.html.erb:16
 msgid "Plan"
@@ -3197,10 +3197,10 @@ msgstr "Ilmoita suunnitelman omistajalle, että olen antanut loppupalautteen"
 #: ../../app/views/org_admin/plans/index.html.erb:39
 msgid ""
 "Download plans <em class=\"sr-only\">(new window)</em><span class=\"new-window-po"
-"pup-info\">%{open_in_new_window_text}</span>"
+"pup-info\">%<open_in_new_window_text>s</span>"
 msgstr ""
 "Lataa suunnitelmat <em class=\"sr-only\">(uusi ikkuna)</em> <span class=\"new-win"
-"dow-popup-info\">%{open_in_new_window_text}</span>"
+"dow-popup-info\">%<open_in_new_window_text>s</span>"
 
 #: ../../app/views/org_admin/question_options/_option_fields.html.erb:3
 msgid "Order"
@@ -3230,8 +3230,8 @@ msgstr ""
 "än."
 
 #: ../../app/views/org_admin/questions/_form.html.erb:4
-msgid "Question %{number}:"
-msgstr "Kysymyksen %{number}:"
+msgid "Question %<number>s:"
+msgstr "Kysymyksen %<number>s:"
 
 #: ../../app/views/org_admin/questions/_form.html.erb:4
 msgid "New question:"
@@ -3304,8 +3304,8 @@ msgid "Delete"
 msgstr "Poista"
 
 #: ../../app/views/org_admin/questions/_form.html.erb:102
-msgid "You are about to delete question #%{question_number}. Are you sure?"
-msgstr "Olet poistamassa kysymystä #%{question_number}? Oletko varma?"
+msgid "You are about to delete question #%<question_number>s. Are you sure?"
+msgstr "Olet poistamassa kysymystä #%<question_number>s? Oletko varma?"
 
 #: ../../app/views/org_admin/questions/_index.html.erb:14
 msgid "Add Question"
@@ -3404,10 +3404,10 @@ msgstr "Anna osiolle otsikko "
 
 #: ../../app/views/org_admin/sections/_form.html.erb:20
 msgid ""
-"You are about to delete '%{section_title}'. This will affect questions linked "
+"You are about to delete '%<section_title>s'. This will affect questions linked "
 "to this section. Are you sure?"
 msgstr ""
-"Olet poistmassa %{section_title}:a. Sillä on vaikutusta kysymyksiin, jotka on "
+"Olet poistmassa %<section_title>s:a. Sillä on vaikutusta kysymyksiin, jotka on "
 "liitetty tähän osioon. Oletko varma?"
 
 #: ../../app/views/org_admin/sections/_index.html.erb:61
@@ -3437,8 +3437,8 @@ msgstr ""
 
 #: ../../app/views/org_admin/templates/_form.html.erb:25
 #: ../../app/views/org_admin/templates/_show.html.erb:35
-msgid "for internal %{org_name} use only"
-msgstr "ainoastaan %{org_name}:n sisäiseen käyttöön"
+msgid "for internal %<org_name>s use only"
+msgstr "ainoastaan %<org_name>s:n sisäiseen käyttöön"
 
 #: ../../app/views/org_admin/templates/_form.html.erb:32
 #: ../../app/views/org_admin/templates/_show.html.erb:13
@@ -3611,22 +3611,22 @@ msgstr "Mukautettavissa olevat suunnitelmapohjat"
 
 #: ../../app/views/org_admin/templates/index.html.erb:80
 #: ../../app/views/org_admin/templates/index.html.erb:93
-msgid "All (%{count})"
-msgstr "Kaikki (%{count})"
+msgid "All (%<count>s)"
+msgstr "Kaikki (%<count>s)"
 
 #: ../../app/views/org_admin/templates/index.html.erb:83
 #: ../../app/views/org_admin/templates/index.html.erb:96
-msgid "Published (%{count})"
-msgstr "Julkaistu (%{count})"
+msgid "Published (%<count>s)"
+msgstr "Julkaistu (%<count>s)"
 
 #: ../../app/views/org_admin/templates/index.html.erb:86
 #: ../../app/views/org_admin/templates/index.html.erb:99
-msgid "Unpublished (%{count})"
-msgstr "Julkaisematta (%{count})"
+msgid "Unpublished (%<count>s)"
+msgstr "Julkaisematta (%<count>s)"
 
 #: ../../app/views/org_admin/templates/index.html.erb:89
-msgid "Not customised (%{count})"
-msgstr "Ei mukautettu (%{count})"
+msgid "Not customised (%<count>s)"
+msgstr "Ei mukautettu (%<count>s)"
 
 #: ../../app/views/org_admin/templates/index.html.erb:118
 msgid "Create a template"
@@ -3635,8 +3635,8 @@ msgstr "Luo suunnitelmapohja"
 #: ../../app/views/org_admin/users/edit.html.erb:4
 #: ../../app/views/super_admin/users/edit.html.erb:1
 #: ../../app/views/super_admin/users/edit.html.erb:5
-msgid "Editing profile for %{username}"
-msgstr "%{username}:n muokkausprofiili"
+msgid "Editing profile for %<username>s"
+msgstr "%<username>s:n muokkausprofiili"
 
 #: ../../app/views/org_admin/users/edit.html.erb:5
 #: ../../app/views/super_admin/users/edit.html.erb:6
@@ -3644,8 +3644,8 @@ msgid "View all users"
 msgstr "Näytä kaikki käyttäjät"
 
 #: ../../app/views/org_admin/users/plans.html.erb:3
-msgid "Plans of %{username}"
-msgstr "Suunnitelmat %{username}"
+msgid "Plans of %<username>s"
+msgstr "Suunnitelmat %<username>s"
 
 #: ../../app/views/orgs/_departments.html.erb:1
 #: ../../app/views/orgs/admin_edit.html.erb:26
@@ -3705,7 +3705,7 @@ msgstr "Yhdistä organisaatiot"
 #: ../../app/views/orgs/_merge_form.html.erb:7
 msgid ""
 "Please select the Organisation that will replace the current organisation: '<s"
-"trong>%{org_name}</strong>'."
+"trong>%<org_name>s</strong>'."
 msgstr ""
 "Valitse organisaatio, joka korvaa nykyisen organisaation: ' <strong>%{org_name"
 "}</strong> '."
@@ -3891,15 +3891,15 @@ msgstr "Ei ikinä"
 
 #: ../../app/views/paginable/api_clients/_index.html.erb:44
 msgid ""
-"You are about to delete '%{client_name}'. They will no longer be able to acces"
+"You are about to delete '%<client_name>s'. They will no longer be able to acces"
 "s the API. Are you sure?"
 msgstr ""
-"Olet poistamassa tiedostoa %{client_name}. He eivät voi enää käyttää sovellusl"
+"Olet poistamassa tiedostoa %<client_name>s. He eivät voi enää käyttää sovellusl"
 "iittymää. Oletko varma?"
 
 #: ../../app/views/paginable/contributors/_index.html.erb:57
-msgid "You are about to delete '%{contributor_name}'. Are you sure?"
-msgstr "Olet poistamassa '%{contributor_name}'. Oletko varma?"
+msgid "You are about to delete '%<contributor_name>s'. Are you sure?"
+msgstr "Olet poistamassa '%<contributor_name>s'. Oletko varma?"
 
 #: ../../app/views/paginable/departments/_index.html.erb:5
 #: ../../app/views/paginable/users/_index.html.erb:22
@@ -3912,10 +3912,10 @@ msgstr "Lyhennetty nimi tai koodi"
 
 #: ../../app/views/paginable/departments/_index.html.erb:28
 msgid ""
-"You are about to delete '%{department_name}'. This will affect guidance. Are y"
+"You are about to delete '%<department_name>s'. This will affect guidance. Are y"
 "ou sure?"
 msgstr ""
-"Olet poistamassa '%{department_name}'. Tämä vaikuttaa ohjaukseen. Oletko varma"
+"Olet poistamassa '%<department_name>s'. Tämä vaikuttaa ohjaukseen. Oletko varma"
 "?"
 
 #: ../../app/views/paginable/guidance_groups/_index.html.erb:8
@@ -3956,15 +3956,15 @@ msgstr "Julkaise"
 
 #: ../../app/views/paginable/guidance_groups/_index.html.erb:50
 msgid ""
-"You are about to delete '%{guidance_group_name}'. This will affect guidance. A"
+"You are about to delete '%<guidance_group_name>s'. This will affect guidance. A"
 "re you sure?"
 msgstr ""
-"Olet aikeissa poistaa '%{guidance_group_name}':n. Tämä vaikuttaa ohjeistukseen"
+"Olet aikeissa poistaa '%<guidance_group_name>s':n. Tämä vaikuttaa ohjeistukseen"
 ". Haluatko varmasti tehdä niin?"
 
 #: ../../app/views/paginable/guidances/_index.html.erb:62
-msgid "You are about to delete '%{guidance_summary}'. Are you sure?"
-msgstr "Olet poistamassa '%{guidance_summary}':a. Haluatko varmasti tehdä niin?"
+msgid "You are about to delete '%<guidance_summary>s'. Are you sure?"
+msgstr "Olet poistamassa '%<guidance_summary>s':a. Haluatko varmasti tehdä niin?"
 
 #: ../../app/views/paginable/notifications/_index.html.erb:5
 #: ../../app/views/super_admin/notifications/_form.html.erb:15
@@ -4000,8 +4000,8 @@ msgid "Managed"
 msgstr "Ylläpito"
 
 #: ../../app/views/paginable/orgs/_index.html.erb:35
-msgid "You are about to delete '%{org_name}'. Are you sure?"
-msgstr "Olet poistamassa '%{org_name}':ta. Oletko aivan varma?"
+msgid "You are about to delete '%<org_name>s'. Are you sure?"
+msgstr "Olet poistamassa '%<org_name>s':ta. Oletko aivan varma?"
 
 #: ../../app/views/paginable/plans/_org_admin.html.erb:3
 msgid ""
@@ -4168,10 +4168,10 @@ msgstr "Julkaise muutokset"
 
 #: ../../app/views/paginable/templates/_customisable.html.erb:69
 msgid ""
-"Are you sure you want to remove your customization of \"%{template_title}\"? Any"
+"Are you sure you want to remove your customization of \"%<template_title>s\"? Any"
 " published versions will become unavailable to users."
 msgstr ""
-"Haluatko varmasti poistaa \"%{template_title}\":n muokkaukset? Käyttäjät eivät v"
+"Haluatko varmasti poistaa \"%<template_title>s\":n muokkaukset? Käyttäjät eivät v"
 "oi enää käyttää myöskään julkaistuja versioita."
 
 #: ../../app/views/paginable/templates/_history.html.erb:7
@@ -4188,10 +4188,10 @@ msgstr "Tarkastele mukautuksia"
 
 #: ../../app/views/paginable/templates/_organisational.html.erb:76
 msgid ""
-"Are you sure you want to remove \"%{template_title}\"? Any published versions wi"
+"Are you sure you want to remove \"%<template_title>s\"? Any published versions wi"
 "ll become unavailable to users."
 msgstr ""
-"Haluatko varmasti poistaa \"%{template_title}\"? Käyttäjät eivät voi enää käyttä"
+"Haluatko varmasti poistaa \"%<template_title>s\"? Käyttäjät eivät voi enää käyttä"
 "ä myöskään julkaistuja versioita."
 
 #: ../../app/views/paginable/templates/_organisational.html.erb:90
@@ -4353,10 +4353,10 @@ msgstr "Oikea"
 #: ../../app/views/plans/_download_form.html.erb:119
 msgid ""
 "Download Plan <em class=\"sr-only\">(new window)</em><span class=\"new-window-pop"
-"up-info\">%{open_in_new_window_text}</span>"
+"up-info\">%<open_in_new_window_text>s</span>"
 msgstr ""
 "Lataa suunnitelma <em class=\"sr-only\">(uusi ikkuna)</em> <span class=\"new-wind"
-"ow-popup-info\">%{open_in_new_window_text}</span>"
+"ow-popup-info\">%<open_in_new_window_text>s</span>"
 
 #: ../../app/views/plans/_edit_details.html.erb:13
 #: ../../app/views/plans/_guidance_selection.html.erb:38
@@ -4365,10 +4365,10 @@ msgstr "Valitse ohje"
 
 #: ../../app/views/plans/_guidance_selection.html.erb:6
 msgid ""
-"To help you write your plan, %{application_name} can show you guidance from a "
+"To help you write your plan, %<application_name>s can show you guidance from a "
 "variety of organisations."
 msgstr ""
-"%{application_name}:ssa on ohjeita, jotka auttavat sinua aineistonhallintasuun"
+"%<application_name>s:ssa on ohjeita, jotka auttavat sinua aineistonhallintasuun"
 "nitelman kirjoittamisessa."
 
 #: ../../app/views/plans/_guidance_selection.html.erb:9
@@ -4389,11 +4389,11 @@ msgstr "Tätä suunnitelmapohjaa varten ei ole muita ohjeita."
 
 #: ../../app/views/plans/_guidance_selection.html.erb:40
 msgid ""
-"To help you write your plan, %{application_name} can show you guidance from a "
+"To help you write your plan, %<application_name>s can show you guidance from a "
 "variety of organisations. Please choose up to 6 organisations of the following"
 " organisations who offer guidance relevant to your plan."
 msgstr ""
-"Kun kirjoitat suunnitelmaa, %{application_name} voi näyttää monen eri organisa"
+"Kun kirjoitat suunnitelmaa, %<application_name>s voi näyttää monen eri organisa"
 "ation ohjeet. Voit valita korkeintaan kuusi ohjetta."
 
 #: ../../app/views/plans/_guidance_selection.html.erb:42
@@ -4418,19 +4418,19 @@ msgstr "Kirjoita suunnitelma"
 
 #: ../../app/views/plans/_overview_details.html.erb:9
 msgid ""
-"This plan is based on the \"%{template_title}\" template provided by %{org_name}"
+"This plan is based on the \"%<template_title>s\" template provided by %<org_name>s"
 "."
 msgstr ""
-"Tämä suunnitelma pohjautuu \"%{template_title}\":iin, jonka on luonut %{org_name"
+"Tämä suunnitelma pohjautuu \"%<template_title>s\":iin, jonka on luonut %{org_name"
 "}."
 
 #: ../../app/views/plans/_overview_details.html.erb:17
-msgid "Template version %{template_version}, published on %{published_date}"
+msgid "Template version %<template_version>s, published on %<published_date>s"
 msgstr ""
 
 #: ../../app/views/plans/_overview_details.html.erb:42
-msgid "%{phase_title} (%{sections_size} %{sections}, %{questions_size} %{questions})"
-msgstr "%{phase_title} (%{sections_size} %{sections}, %{questions_size} %{questions})"
+msgid "%<phase_title>s (%<sections_size>s %<sections>s, %<questions_size>s %<questions>s)"
+msgstr "%<phase_title>s (%<sections_size>s %<sections>s, %<questions_size>s %<questions>s)"
 
 #: ../../app/views/plans/_overview_details.html.erb:43
 msgid "section"
@@ -4544,10 +4544,10 @@ msgstr "Suunnitelman näkyvyys"
 #: ../../app/views/plans/_share_form.html.erb:9
 msgid ""
 "Public or organisational visibility is intended for finished plans. You must a"
-"nswer at least %{percentage}%% of the questions to enable these options. Note:"
+"nswer at least %<percentage>s%% of the questions to enable these options. Note:"
 " test plans are set to private visibility by default."
 msgstr ""
-"Voit jakaa vain suunnitelmia, joissa on vastattu vähintään %{percentage}%%:iin"
+"Voit jakaa vain suunnitelmia, joissa on vastattu vähintään %<percentage>s%%:iin"
 " kysymyksistä. Huomaa, että testisuunnitelmia ei voi jakaa."
 
 #: ../../app/views/plans/_share_form.html.erb:19
@@ -4635,8 +4635,8 @@ msgid "Click the 'Create plan' button below to begin."
 msgstr "Pääset alkuu klikkaamalla 'Tee suunnitelma' -painiketta."
 
 #: ../../app/views/plans/index.html.erb:35
-msgid "%{org_title} Plans"
-msgstr "Suunnitelmat: %{org_title}"
+msgid "%<org_title>s Plans"
+msgstr "Suunnitelmat: %<org_title>s"
 
 #: ../../app/views/plans/index.html.erb:36
 msgid ""
@@ -4722,7 +4722,7 @@ msgstr ""
 
 #: ../../app/views/public_pages/plan_index.html.erb:8
 msgid ""
-"Public DMPs are plans created using the %{application_name} service and shared"
+"Public DMPs are plans created using the %<application_name>s service and shared"
 " publicly by their owners. They are not vetted for quality, completeness, or a"
 "dherence to funder guidelines."
 msgstr ""
@@ -4776,8 +4776,8 @@ msgid "terms and conditions"
 msgstr "käyttöehdot"
 
 #: ../../app/views/shared/_create_plan_modal.html.erb:8
-msgid "Would you like to create a plan based on the \"%{name}\" template?"
-msgstr "Haluatko luoda suunnitelman, joka perustuu %{name} -malliin?"
+msgid "Would you like to create a plan based on the \"%<name>s\" template?"
+msgstr "Haluatko luoda suunnitelman, joka perustuu %<name>s -malliin?"
 
 #: ../../app/views/shared/_links.html.erb:7
 msgid "Links"
@@ -4830,9 +4830,9 @@ msgstr "Suodata suunnitelmia"
 
 #: ../../app/views/shared/export/_plan_coversheet.erb:3
 #: ../../app/views/shared/export/_plan_txt.erb:65
-msgid "A Data Management Plan created using %{application_name}"
+msgid "A Data Management Plan created using %<application_name>s"
 msgstr ""
-"Aineistonhallintasuunnitelman kirjoittamisessa on käytetty %{application_name}"
+"Aineistonhallintasuunnitelman kirjoittamisessa on käytetty %<application_name>s"
 ":a"
 
 #: ../../app/views/shared/export/_plan_coversheet.erb:10
@@ -4901,8 +4901,8 @@ msgstr "Antamasi nimi ei ollut yksi luetelluista ehdotuksista!"
 
 #: ../../app/views/static_pages/about_us.html.erb:1
 #: ../../app/views/static_pages/about_us.html.erb:4
-msgid "About %{application_name}"
-msgstr "Tietoa %{application_name} -työkalusta"
+msgid "About %<application_name>s"
+msgstr "Tietoa %<application_name>s -työkalusta"
 
 #: ../../app/views/static_pages/about_us.html.erb:11
 msgid ""
@@ -4980,10 +4980,10 @@ msgstr "Tutkiskele DMPRoadmap GitHubin wikiä ja opit kuinka"
 #: ../../app/views/static_pages/about_us.html.erb:22
 msgid ""
 "get involved<em class=\"sr-only\"> (new window)</em><span class=\"new-window-popu"
-"p-info\">%{open_in_new_window_text}</span>"
+"p-info\">%<open_in_new_window_text>s</span>"
 msgstr ""
 "osallistua <em class=\"sr-only\">(uusi ikkuna)</em> <span class=\"new-window-popu"
-"p-info\">%{open_in_new_window_text}</span>"
+"p-info\">%<open_in_new_window_text>s</span>"
 
 #: ../../app/views/static_pages/about_us.html.erb:28
 msgid " in the project. You can also report bugs and request new features via "
@@ -5006,8 +5006,8 @@ msgstr ""
 "ntasuunnitelman kirjoittamisen tai vanhan muokkaamisen."
 
 #: ../../app/views/static_pages/about_us.html.erb:34
-msgid "If you do not have a %{application_name} account, click on"
-msgstr "Jos sinulla ei ole %{application_name} -tiliä, klikkaa"
+msgid "If you do not have a %<application_name>s account, click on"
+msgstr "Jos sinulla ei ole %<application_name>s -tiliä, klikkaa"
 
 #: ../../app/views/static_pages/about_us.html.erb:34
 msgid "Sign up"
@@ -5219,46 +5219,46 @@ msgstr "Tietomme sinusta: kuinka käytämme niitä ja kenen kanssa jaamme ne"
 
 #: ../../app/views/static_pages/privacy.html.erb:11
 msgid ""
-"The information you provide will be used by the %{org_name} to offer you acces"
-"s to and personalisation of the %{application_name} service."
+"The information you provide will be used by the %<org_name>s to offer you acces"
+"s to and personalisation of the %<application_name>s service."
 msgstr ""
-"%{org_name} käyttää antamiasi tietoja tarjotaakseen sinulle pääsyn %{applicati"
+"%<org_name>s käyttää antamiasi tietoja tarjotaakseen sinulle pääsyn %{applicati"
 "on_name} -palveluun ja sen yksilöllistämiseen."
 
 #: ../../app/views/static_pages/privacy.html.erb:13
 msgid ""
-"The %{org_name} processes the personal data of %{application_name} users in or"
-"der to deliver and improve the %{application_name} service in a customised man"
+"The %<org_name>s processes the personal data of %<application_name>s users in or"
+"der to deliver and improve the %<application_name>s service in a customised man"
 "ner and to ensure each user receives relevant information."
 msgstr ""
-"%{org_name} käsittelee %{application_name}n käyttäjien henkilötietoja tuottaak"
-"seen ja parantaakseen %{application_name}n palvelua ja varmistaakseen, että kä"
+"%<org_name>s käsittelee %<application_name>sn käyttäjien henkilötietoja tuottaak"
+"seen ja parantaakseen %<application_name>sn palvelua ja varmistaakseen, että kä"
 "yttäjä saa tarpeelliset tiedot."
 
 #: ../../app/views/static_pages/privacy.html.erb:15
 msgid ""
-"The processing of your personal data by the %{org_name} is necessary for pursu"
+"The processing of your personal data by the %<org_name>s is necessary for pursu"
 "ing the following legitimate interests:"
 msgstr ""
-"%{org_name}:n on tarpeellista käsitellä henkilötietoja seuraavien lainmukaiste"
+"%<org_name>s:n on tarpeellista käsitellä henkilötietoja seuraavien lainmukaiste"
 "n seikkojen vuoksi:"
 
 #: ../../app/views/static_pages/privacy.html.erb:18
 msgid ""
-"To provide access to the %{application_name} service and personalisation of yo"
+"To provide access to the %<application_name>s service and personalisation of yo"
 "ur user experience e.g. provision of relevant templates and guidance for your "
 "organisation."
 msgstr ""
-"Tarjotakseen pääsyn %{application_name}n ja käyttäjäkokemuksen mukauttamiseksi"
+"Tarjotakseen pääsyn %<application_name>sn ja käyttäjäkokemuksen mukauttamiseksi"
 " esim. saadaksesi tarvittasemasi mallipohjat ja organisaatiokohtaisen ohjeistu"
 "ksen."
 
 #: ../../app/views/static_pages/privacy.html.erb:20
 msgid ""
-"To keep you up to date with news about %{application_name} such as new feature"
+"To keep you up to date with news about %<application_name>s such as new feature"
 "s or improvements, or changes to our Privacy Policy."
 msgstr ""
-"Saat tiedotteita %{application_name} -työkalun uusista ominaisuuksista ja tiet"
+"Saat tiedotteita %<application_name>s -työkalun uusista ominaisuuksista ja tiet"
 "osuojamuutoksista."
 
 #: ../../app/views/static_pages/privacy.html.erb:22
@@ -5268,28 +5268,28 @@ msgstr "Käsittely verkko- ja tietoturvatarkoituksissa."
 #: ../../app/views/static_pages/privacy.html.erb:24
 msgid ""
 "We will hold the personal data you provided us for as long as you continue usi"
-"ng the %{application_name} service. Your personal data can be removed from thi"
-"s service upon request to the %{application_name} team within a period of 30 d"
+"ng the %<application_name>s service. Your personal data can be removed from thi"
+"s service upon request to the %<application_name>s team within a period of 30 d"
 "ays."
 msgstr ""
-"Säilytämme henkilötietojasi niin kauan kuin käytät %{application_name} -työkal"
-"ua. Pyynnöstä %{application_name} -tiimi voi poistaa tietosi 30 päivän sisällä"
+"Säilytämme henkilötietojasi niin kauan kuin käytät %<application_name>s -työkal"
+"ua. Pyynnöstä %<application_name>s -tiimi voi poistaa tietosi 30 päivän sisällä"
 "."
 
 #: ../../app/views/static_pages/privacy.html.erb:26
 msgid ""
-"If you have any questions, please contact the %{application_name} team at: <a "
-"href='mailto:%{helpdesk_email}'>%{helpdesk_email}</a>"
+"If you have any questions, please contact the %<application_name>s team at: <a "
+"href='mailto:%<helpdesk_email>s'>%<helpdesk_email>s</a>"
 msgstr ""
-"Jos sinulla on kysyttävää, ota yhteyttä %{application_name} -tiimiin: <a href="
-"'mailto:%{helpdesk_email}'>%{helpdesk_email}</a>"
+"Jos sinulla on kysyttävää, ota yhteyttä %<application_name>s -tiimiin: <a href="
+"'mailto:%<helpdesk_email>s'>%<helpdesk_email>s</a>"
 
 #: ../../app/views/static_pages/privacy.html.erb:30
 msgid ""
-"This statement was last revised on %{revdate} and may be revised at any time w"
+"This statement was last revised on %<revdate>s and may be revised at any time w"
 "ith prior notice."
 msgstr ""
-"Näitä tietoja on tarkistettu viimeksi %{revdate} ja ne voidaan tarkistaa koska"
+"Näitä tietoja on tarkistettu viimeksi %<revdate>s ja ne voidaan tarkistaa koska"
 " tahansa ilman etukäteisilmoitusta."
 
 #: ../../app/views/static_pages/termsuse.html.erb:12
@@ -5362,7 +5362,7 @@ msgid ""
 "ookies and how we use them is available on the <a target='_blank' href='http:/"
 "/www.dcc.ac.uk/about-us/about-site/website-terms-use/cookies' class=\"has-new-w"
 "indow-popup-info\">main DCC website<em class=\"sr-only\"> (new window)</em><span "
-"class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>.</p>\n"
+"class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a>.</p>\n"
 "\n"
 "      <h3>Third party APIs</h3>\n"
 "\n"
@@ -5407,7 +5407,7 @@ msgstr ""
 "nfo\">evästeistä</span></a> ja niiden käytöstä on saatavana <a target='_blank' "
 "href='http://www.dcc.ac.uk/about-us/about-site/website-terms-use/cookies' clas"
 "s=\"has-new-window-popup-info\">DCC: n pääsivustolla <em class=\"sr-only\">(uusi i"
-"kkuna)</em> <span class=\"new-window-popup-info\">%{open_in_new_window_text}</sp"
+"kkuna)</em> <span class=\"new-window-popup-info\">%<open_in_new_window_text>s</sp"
 "an></a> . </p><h3> Kolmannen osapuolen sovellusliittymät </h3><p> Tietyt tämän"
 " verkkosivuston ominaisuudet hyödyntävät kolmansien osapuolien palveluita ja s"
 "ovellusliittymiä, kuten InCommon / Shibboleth tai kolmansien osapuolten ylläpi"
@@ -5446,8 +5446,8 @@ msgid "Email credentials to contact"
 msgstr "Lähetä valtuustiedot sähköpostitse"
 
 #: ../../app/views/super_admin/api_clients/_form.html.erb:81
-msgid "Are you sure you want to delete the API client: \"%{name}\""
-msgstr "Haluatko varmasti poistaa sovellusliittymäohjelman: \"%{name}\""
+msgid "Are you sure you want to delete the API client: \"%<name>s\""
+msgstr "Haluatko varmasti poistaa sovellusliittymäohjelman: \"%<name>s\""
 
 #: ../../app/views/super_admin/api_clients/edit.html.erb:1
 msgid "Editing API client"
@@ -5463,8 +5463,8 @@ msgid "View all API clients"
 msgstr "Näytä kaikki API-asiakkaat"
 
 #: ../../app/views/super_admin/api_clients/email_credentials.js.erb:1
-msgid "The credentials have been sent to %{email}."
-msgstr "Valtakirjat on lähetetty %{email}."
+msgid "The credentials have been sent to %<email>s."
+msgstr "Valtakirjat on lähetetty %<email>s."
 
 #: ../../app/views/super_admin/api_clients/index.html.erb:1
 #: ../../app/views/super_admin/api_clients/index.html.erb:6
@@ -5512,8 +5512,8 @@ msgid "Body"
 msgstr "Leipäteksti"
 
 #: ../../app/views/super_admin/notifications/_form.html.erb:71
-msgid "Are you sure you want to delete the notification \"%{title}\""
-msgstr "Haluatko varmasti poistaa \"%{title}\":n ilmoituksen?"
+msgid "Are you sure you want to delete the notification \"%<title>s\""
+msgstr "Haluatko varmasti poistaa \"%<title>s\":n ilmoituksen?"
 
 #: ../../app/views/super_admin/notifications/edit.html.erb:1
 #: ../../app/views/super_admin/notifications/edit.html.erb:5
@@ -5538,8 +5538,8 @@ msgid "New Notification"
 msgstr "Uusi ilmoitus"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:9
-msgid "Merging '%{from_org_name}' into '%{to_org_name}'"
-msgstr "Yhdistetään %{from_org_name} osaksi %{to_org_name}"
+msgid "Merging '%<from_org_name>s' into '%<to_org_name>s'"
+msgstr "Yhdistetään %<from_org_name>s osaksi %<to_org_name>s"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:11
 msgid "Summary:"
@@ -5547,10 +5547,10 @@ msgstr "Yhteenveto:"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:12
 msgid ""
-"Counts of '%{to_org_name}' records before and after a merge with %{from_org_na"
+"Counts of '%<to_org_name>s' records before and after a merge with %{from_org_na"
 "me}."
 msgstr ""
-"%{to_org_name} -tietueiden lukumäärä ennen ja jälkeen sulautumisen %{from_org_"
+"%<to_org_name>s -tietueiden lukumäärä ennen ja jälkeen sulautumisen %{from_org_"
 "name} -tietoon."
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:17
@@ -5559,12 +5559,12 @@ msgid "Record Type"
 msgstr "Tietueen tyyppi"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:18
-msgid "'%{to_org_name}' Count - before merge"
-msgstr "'%{to_org_name}' Count - ennen yhdistämistä"
+msgid "'%<to_org_name>s' Count - before merge"
+msgstr "'%<to_org_name>s' Count - ennen yhdistämistä"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:19
-msgid "'%{to_org_name}' Count - after merge"
-msgstr "'%{to_org_name}' Count - yhdistämisen jälkeen"
+msgid "'%<to_org_name>s' Count - after merge"
+msgstr "'%<to_org_name>s' Count - yhdistämisen jälkeen"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:38
 msgid "Details:"
@@ -5573,22 +5573,22 @@ msgstr "Yksityiskohdat:"
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:39
 msgid ""
 "The table below shows the specific changes that will occur during the merge pr"
-"ocess. Once the merge is complete, '%{from_org_name}' will be deleted. You can"
+"ocess. Once the merge is complete, '%<from_org_name>s' will be deleted. You can"
 " then consolidate/correct any merge issues (e.g. remove any departments that w"
 "ere duplicated)"
 msgstr ""
 "Alla olevassa taulukossa esitetään sulautumisprosessin aikana tapahtuvat muuto"
-"kset. Kun yhdistäminen on valmis, %{from_org_name} poistetaan. Voit sitten yhd"
+"kset. Kun yhdistäminen on valmis, %<from_org_name>s poistetaan. Voit sitten yhd"
 "istää / korjata kaikki yhdistämisongelmat (esim. Poistaa kaikki päällekkäiset "
 "osastot)"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:45
-msgid "%{from_org_name} - Before"
-msgstr "%{from_org_name} - Ennen"
+msgid "%<from_org_name>s - Before"
+msgstr "%<from_org_name>s - Ennen"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:46
-msgid "%{to_org_name} - Before"
-msgstr "%{to_org_name} - Ennen"
+msgid "%<to_org_name>s - Before"
+msgstr "%<to_org_name>s - Ennen"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:61
 msgid "The following attributes will be updated"
@@ -5599,7 +5599,7 @@ msgid ""
 "Warning: The changes proposed above will be committed to the database. '%{org_"
 "name}' will then be deleted."
 msgstr ""
-"Varoitus: Edellä ehdotetut muutokset sitoutuvat tietokantaan. '%{org_name}' po"
+"Varoitus: Edellä ehdotetut muutokset sitoutuvat tietokantaan. '%<org_name>s' po"
 "istetaan sitten."
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:92
@@ -5616,10 +5616,10 @@ msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:95
 msgid ""
-"Warning: '%{from_org_name}' has Plans that are currently in the review process"
+"Warning: '%<from_org_name>s' has Plans that are currently in the review process"
 ". The Org admins may not be able to see these plans after the merge!"
 msgstr ""
-"Varoitus: Kohteella %{from_org_name} on suunnitelmia, jotka ovat parhaillaan t"
+"Varoitus: Kohteella %<from_org_name>s on suunnitelmia, jotka ovat parhaillaan t"
 "arkistusprosessissa. Organisaation järjestelmänvalvojat eivät ehkä näe näitä s"
 "uunnitelmia yhdistämisen jälkeen!"
 
@@ -5644,8 +5644,8 @@ msgid "New organisation"
 msgstr "Uusi organisaatio"
 
 #: ../../app/views/super_admin/themes/_form.html.erb:17
-msgid "Are you sure you want to delete the theme \"%{title}\"?"
-msgstr "Haluatko varmasti poistaa \"%{title}\":n teeman?"
+msgid "Are you sure you want to delete the theme \"%<title>s\"?"
+msgstr "Haluatko varmasti poistaa \"%<title>s\":n teeman?"
 
 #: ../../app/views/super_admin/themes/edit.html.erb:3
 #: ../../app/views/super_admin/themes/new.html.erb:3
@@ -5665,7 +5665,7 @@ msgid ""
 "<br>The selected user's content will be merged into the account for %{user_ema"
 "il}. <br> The selected account will then be removed"
 msgstr ""
-"<br> Valitun käyttäjän sisältö yhdistetään tilille %{user_email}. <br> Valittu"
+"<br> Valitun käyttäjän sisältö yhdistetään tilille %<user_email>s. <br> Valittu"
 " tili poistetaan sitten"
 
 #: ../../app/views/super_admin/users/edit.html.erb:63
@@ -5674,11 +5674,11 @@ msgstr "Archive"
 
 #: ../../app/views/super_admin/users/edit.html.erb:64
 msgid ""
-"You are about to archive %{user_name}.  This will remove their personal inform"
+"You are about to archive %<user_name>s.  This will remove their personal inform"
 "ation, but retain their plans, answers, and comments.  They will be unable to "
 "sign-in. Are you sure?"
 msgstr ""
-"Olet arkistoimasta %{user_name}. Tämä poistaa heidän henkilökohtaiset tiedot, "
+"Olet arkistoimasta %<user_name>s. Tämä poistaa heidän henkilökohtaiset tiedot, "
 "mutta säilyttää suunnitelmat, vastaukset ja kommentit. He eivät voi kirjautua "
 "sisään. Oletko varma?"
 
@@ -5783,90 +5783,90 @@ msgstr "Voit muuttaa ilmoitusasetuksiasi käyttäjätiedot -kohdassa."
 #: ../../app/views/user_mailer/permissions_change_notification.html.erb:2
 #: ../../app/views/user_mailer/plan_visibility.html.erb:2
 #: ../../app/views/user_mailer/sharing_notification.html.erb:2
-msgid "Hello %{username}"
-msgstr "Hei %{username}"
+msgid "Hello %<username>s"
+msgstr "Hei %<username>s"
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:6
-msgid "You have been granted administrator privileges in %{tool_name}:"
-msgstr "Sinulle on myönnetty ylläpito-oikeudet %{tool_name}:ssa:"
+msgid "You have been granted administrator privileges in %<tool_name>s:"
+msgstr "Sinulle on myönnetty ylläpito-oikeudet %<tool_name>s:ssa:"
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:13
-msgid "You have been revoked administrator privileges in %{tool_name}."
-msgstr "Ylläpito-oikeutesi %{tool_name}:ssa on poistettu."
+msgid "You have been revoked administrator privileges in %<tool_name>s."
+msgstr "Ylläpito-oikeutesi %<tool_name>s:ssa on poistettu."
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:17
 msgid ""
-"More information about administering the %{tool_name} for users at your organi"
-"sation is available at the %{help_url}."
-msgstr "Lisätietoa %{tool_name}:n hallinnoinnista löytyy kohdasta: %{help_url}."
+"More information about administering the %<tool_name>s for users at your organi"
+"sation is available at the %<help_url>s."
+msgstr "Lisätietoa %<tool_name>s:n hallinnoinnista löytyy kohdasta: %<help_url>s."
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:2
-msgid "Hello %{name},"
-msgstr "Hei %{name},"
+msgid "Hello %<name>s,"
+msgstr "Hei %<name>s,"
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:8
-msgid "Please use the following credentials when accessing the %{tool_name} API."
-msgstr "Käytä seuraavia valtuustietoja, kun käytät %{tool_name} -sovellusliittymää."
+msgid "Please use the following credentials when accessing the %<tool_name>s API."
+msgstr "Käytä seuraavia valtuustietoja, kun käytät %<tool_name>s -sovellusliittymää."
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:23
-msgid "Please refer to the API documentation at: %{api_documentation_url}"
-msgstr "Katso API-dokumentaatio osoitteessa %{api_documentation_url}"
+msgid "Please refer to the API documentation at: %<api_documentation_url>s"
+msgstr "Katso API-dokumentaatio osoitteessa %<api_documentation_url>s"
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:29
 msgid ""
-"Do not share these credentials. They for use with the %{external_application} "
+"Do not share these credentials. They for use with the %<external_application>s "
 "application. If you do share your credentials with another application we rese"
 "rve the right to revoke your access to the API."
 msgstr ""
-"Älä jaa näitä käyttöoikeustietoja. Ne käytettäväksi %{external_application} -s"
+"Älä jaa näitä käyttöoikeustietoja. Ne käytettäväksi %<external_application>s -s"
 "ovelluksen kanssa. Jos jaat käyttöoikeustietosi toisen sovelluksen kanssa, pid"
 "ätämme oikeuden peruuttaa käyttöoikeutesi sovellusliittymään."
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:34
 msgid ""
-"If you did not request access to the %{tool_name} API or did not request for y"
-"our credentials to be renewed, please contact us at %{helpdesk_email}"
+"If you did not request access to the %<tool_name>s API or did not request for y"
+"our credentials to be renewed, please contact us at %<helpdesk_email>s"
 msgstr ""
-"Jos et pyytänyt pääsyä %{tool_name} -sovellusliittymään tai et pyytänyt käyttö"
-"oikeustietojesi uusimista, ota meihin yhteyttä %{helpdesk_email}"
+"Jos et pyytänyt pääsyä %<tool_name>s -sovellusliittymään tai et pyytänyt käyttö"
+"oikeustietojesi uusimista, ota meihin yhteyttä %<helpdesk_email>s"
 
 #: ../../app/views/user_mailer/feedback_complete.html.erb:2
-msgid "Hello %{recipient_name}"
-msgstr "Hei %{recipient_name}"
+msgid "Hello %<recipient_name>s"
+msgstr "Hei %<recipient_name>s"
 
 #: ../../app/views/user_mailer/feedback_complete.html.erb:5
 msgid ""
-"%{commenter} has finished providing feedback on the plan  \"%{link_html}\". Comm"
+"%<commenter>s has finished providing feedback on the plan  \"%<link_html>s\". Comm"
 "ents can be found in the 'Write plan' tab on the right side of the page (Guida"
 "nce/Comments)."
 msgstr ""
-"%{commenter} on antanut palautteen suunnitelmasta \"%{link_html}\". Kommentit lö"
+"%<commenter>s on antanut palautteen suunnitelmasta \"%<link_html>s\". Kommentit lö"
 "ytyvät sivun oikeassa reunassa olevasta Kirjoita suunnitelma -välilehdestä (Oh"
 "je / kommentit)."
 
 #: ../../app/views/user_mailer/feedback_notification.html.erb:2
-msgid "Hello %{user_name},"
-msgstr "Hei %{user_name},"
+msgid "Hello %<user_name>s,"
+msgstr "Hei %<user_name>s,"
 
 #: ../../app/views/user_mailer/feedback_notification.html.erb:5
 msgid ""
-"%{requestor} has requested feedback on a plan %{link_html}. To add comments, p"
-"lease visit the 'Plans' page under the Admin menu in %{tool_name} and open the"
+"%<requestor>s has requested feedback on a plan %<link_html>s. To add comments, p"
+"lease visit the 'Plans' page under the Admin menu in %<tool_name>s and open the"
 " plan."
 msgstr ""
-"%{requestor} on pyytänyt palautetta suunnitelmasta %{link_html}. Voit lisätä k"
-"ommentteja valitsemalla %{tool_name} Admin-valikon alla olevat suunnitelmat-si"
+"%<requestor>s on pyytänyt palautetta suunnitelmasta %<link_html>s. Voit lisätä k"
+"ommentteja valitsemalla %<tool_name>s Admin-valikon alla olevat suunnitelmat-si"
 "vun ja avaamalla suunnitelman."
 
 #: ../../app/views/user_mailer/new_comment.html.erb:5
 msgid ""
-"%{commenter_name} has commented on your plan %{plan_title}. To view the commen"
+"%<commenter_name>s has commented on your plan %<plan_title>s. To view the commen"
 "ts, follow the link to the DMP below, or navigate to the plan via My Dashboard"
-" page in %{tool_name}."
+" page in %<tool_name>s."
 msgstr ""
-"%{commenter_name} on kommentoinut suunnitelmaa %{plan_title}. Voit tarkastella"
+"%<commenter_name>s on kommentoinut suunnitelmaa %<plan_title>s. Voit tarkastella"
 " kommentteja seuraamalla alla olevaa DMP-linkkiä tai siirtymällä suunnitelmaan"
-" My Dashboard -sivun kautta %{tool_name}."
+" My Dashboard -sivun kautta %<tool_name>s."
 
 #: ../../app/views/user_mailer/new_comment.html.erb:10
 msgid "Below is a summary of the sections and questions which have comments."
@@ -5881,24 +5881,24 @@ msgstr ""
 "vieressä."
 
 #: ../../app/views/user_mailer/new_comment.html.erb:15
-msgid "DMP: %{phase_link}"
-msgstr "DMP: %{phase_link}"
+msgid "DMP: %<phase_link>s"
+msgstr "DMP: %<phase_link>s"
 
 #: ../../app/views/user_mailer/new_comment.html.erb:18
-msgid "Section name: %{section_title}"
-msgstr "Kohteen nimi: %{section_title}"
+msgid "Section name: %<section_title>s"
+msgstr "Kohteen nimi: %<section_title>s"
 
 #: ../../app/views/user_mailer/new_comment.html.erb:21
-msgid "Question: %{question_number}"
-msgstr "Kysymys: %{question_number}"
+msgid "Question: %<question_number>s"
+msgstr "Kysymys: %<question_number>s"
 
 #: ../../app/views/user_mailer/permissions_change_notification.html.erb:5
 msgid ""
-"Your permissions relating to %{plan_title} have changed. You now have %{type} "
-"access. This means you can %{placeholder1} %{placeholder2}"
+"Your permissions relating to %<plan_title>s have changed. You now have %<type>s "
+"access. This means you can %<placeholder1>s %<placeholder2>s"
 msgstr ""
-"Oikeutesi %{plan_title}:n ovat muuttuneet. Sinulla on nyt %{type} pääsy. Voit "
-"siis %{placeholder1} %{placeholder2}"
+"Oikeutesi %<plan_title>s:n ovat muuttuneet. Sinulla on nyt %<type>s pääsy. Voit "
+"siis %<placeholder1>s %<placeholder2>s"
 
 #: ../../app/views/user_mailer/plan_access_removed.html.erb:2
 msgid "Hello "
@@ -5913,8 +5913,8 @@ msgid " has been removed by "
 msgstr "on poistanut"
 
 #: ../../app/views/user_mailer/plan_visibility.html.erb:5
-msgid "The plan %{plan_title} had its visibility changed to %{plan_visibility}."
-msgstr "%{plan_title} -suunnitelman näkyvyys on muuttunut %{plan_visibility}:ksi."
+msgid "The plan %<plan_title>s had its visibility changed to %<plan_visibility>s."
+msgstr "%<plan_title>s -suunnitelman näkyvyys on muuttunut %<plan_visibility>s:ksi."
 
 #: ../../app/views/user_mailer/plan_visibility.html.erb:9
 msgid "Visibility definitions:"
@@ -5931,14 +5931,14 @@ msgstr "Julkinen: kuka vaan voi tarkastella suunnitelmaa"
 #: ../../app/views/user_mailer/plan_visibility.html.erb:17
 msgid ""
 "If you have questions pertaining to this action, please visit the My Dashboard"
-" page in %{tool_name}"
+" page in %<tool_name>s"
 msgstr ""
 "Jos sinulla on tähän toimintoon liittyviä kysymyksiä, mene Suunnitelmasi-välil"
-"ehdelle %{tool_name}:ssa"
+"ehdelle %<tool_name>s:ssa"
 
 #: ../../app/views/user_mailer/question_answered.html.erb:2
-msgid "Hello %{recipient_name},"
-msgstr "Hei %{recipient_name},"
+msgid "Hello %<recipient_name>s,"
+msgstr "Hei %<recipient_name>s,"
 
 #: ../../app/views/user_mailer/question_answered.html.erb:5
 msgid " is creating a Data Management Plan and has answered "
@@ -5958,32 +5958,34 @@ msgstr " perustuu malliin"
 
 #: ../../app/views/user_mailer/sharing_notification.html.erb:5
 msgid ""
-"Your colleague %{inviter_name} has invited you to contribute to
\n"
+"Your colleague %<inviter_name>s has invited you to contribute to
+\n"%<tool_name>s
 "          their Data Management Plan in %{tool_name}"
-msgstr ""
-"Kollegasi %{inviter_name} on kutsunut sinut osallistumaan
\n"
+msgstr ""%<inviter_name>s
+"Kollegasi %{inviter_name} on kutsunut sinut os%<tool_name>s
+\n"
 "          heidän tiedonhallintasuunnitelmansa %{tool_name}"
-
-#: ../../app/views/user_mailer/welcome_notification.html.erb:2
+%<tool_name>s%<username>s
+#: ../../app/views/%<tool_name>swelcome_notifica%<username>srb:2
 msgid "Welcome to %{tool_name}, %{username}"
 msgstr "Tervetuloa %{tool_name}:n käyttäjäksi, %{username}"
 
-#: ../../app/views/user_mailer/welcome_notification.html.erb:5
+#%<tool_name>sviews/user_mailer/welcome_notification.html.erb:5
 msgid ""
-"%{tool_name} will help you to develop your Data Management Plan. If you have a"
+"%{tool_name} w%<contact_us>sto develop your Data Management Plan. If you have a"
 "ny queries or feedback as you use the tool, please contact us at %{helpdesk_em"
-"ail} or visit %{contact_us}"
+"%<tool_name>st %{contact_us}"
 msgstr ""
-"%{tool_name} auttaa sinua aineistonhallintasuunnitelman kirjoittamisessa. Jos "
-"sinulla on jotain kysyttävää tai haluat antaa palautetta työkalusta, voit tehd"
+"%{tool_name} auttaa sinua aineistonhallintasu%<helpdesk_email>sttamisessa. Jos "
+"s%<contact_us>sain kysyttävää tai haluat antaa palautetta työkalusta, voit tehd"
 "ä sen lähettämällä sähköpostia osoitteeseen: %{helpdesk_email} tai käy sivulla"
 " %{contact_us}"
 
 #: ../../app/views/user_mailer/welcome_notification.html.erb:13
 msgid "You may change your notification preferences on your profile page."
 msgstr "Voit muuttaa ilmoitusasetuksiasi käyttäjätiedot -kohdassa."
-
-#: ../../app/views/users/_admin_grant_permissions.html.erb:9
+%<username>s
+#: ../..%<username>susers/_admin_grant_permissions.html.erb:9
 msgid "Editing privileges for %{username}"
 msgstr "%{username}:n muokkausoikeudet"
 
diff --git a/config/locale/fr_CA/app.po b/config/locale/fr_CA/app.po
index 54baecc671..8206af9062 100644
--- a/config/locale/fr_CA/app.po
+++ b/config/locale/fr_CA/app.po
@@ -20,16 +20,16 @@ msgstr ""
 
 #: ../../app/controllers/answers_controller.rb:24
 msgid ""
-"There is no question with id %{question_id} associated to plan id %{plan_id} f"
+"There is no question with id %<question_id>s associated to plan id %<plan_id>s f"
 "or which to create or update an answer"
 msgstr ""
-"L’ID %{question_id} associée à l’ID de plan %{plan_id} ne présente aucune ques"
+"L’ID %<question_id>s associée à l’ID de plan %<plan_id>s ne présente aucune ques"
 "tion nécessitant la création ou la mise à jour d’une réponse"
 
 #: ../../app/controllers/answers_controller.rb:34
-msgid "There is no plan with id %{id} for which to create or update an answer"
+msgid "There is no plan with id %<id>s for which to create or update an answer"
 msgstr ""
-"Il n’existe aucun plan portant l’ID %{id} nécessitant la création ou la mise à"
+"Il n’existe aucun plan portant l’ID %<id>s nécessitant la création ou la mise à"
 " jour d’une réponse"
 
 #: ../../app/controllers/api/v0/base_controller.rb:124
@@ -137,12 +137,12 @@ msgid "You need to sign in or sign up before continuing."
 msgstr "Vous devez vous connecter ou vous inscrire pour continuer."
 
 #: ../../app/controllers/application_controller.rb:100
-msgid "Unable to %{action} the %{object}.%{errors}"
-msgstr "Il est impossible de %{action} les %{object}. %{errors}"
+msgid "Unable to %<action>s the %<object>s.%<errors>s"
+msgstr "Il est impossible de %<action>s les %<object>s. %<errors>s"
 
 #: ../../app/controllers/application_controller.rb:108
-msgid "Successfully %{action} the %{object}."
-msgstr "La mesure %{action} pour %{object} a été effectuée avec succès."
+msgid "Successfully %<action>s the %<object>s."
+msgstr "La mesure %<action>s pour %<object>s a été effectuée avec succès."
 
 #: ../../app/controllers/application_controller.rb:123
 msgid "API client"
@@ -205,8 +205,8 @@ msgid "Restricted access to View All the records"
 msgstr "Accès restreint à Voir Tous les enregistrements"
 
 #: ../../app/controllers/concerns/paginable.rb:180
-msgid "Sort by %{sort_field}"
-msgstr "Trier par %{sort_field}"
+msgid "Sort by %<sort_field>s"
+msgstr "Trier par %<sort_field>s"
 
 #: ../../app/controllers/concerns/template_methods.rb:10
 msgid "customisation"
@@ -417,12 +417,12 @@ msgstr ""
 "urs."
 
 #: ../../app/controllers/identifiers_controller.rb:18
-msgid "Successfully unlinked your account from %{is}."
-msgstr "Votre compte a bien été dissocié de l’identifiant %{is}."
+msgid "Successfully unlinked your account from %<is>s."
+msgstr "Votre compte a bien été dissocié de l’identifiant %<is>s."
 
 #: ../../app/controllers/identifiers_controller.rb:22
-msgid "Unable to unlink your account from %{is}."
-msgstr "Il est impossible de dissocier votre compte de %{is}."
+msgid "Unable to unlink your account from %<is>s."
+msgstr "Il est impossible de dissocier votre compte de %<is>s."
 
 #: ../../app/controllers/org_admin/phases_controller.rb:18
 #: ../../app/controllers/org_admin/templates_controller.rb:114
@@ -472,8 +472,8 @@ msgid "update"
 msgstr "mettre à jour"
 
 #: ../../app/controllers/org_admin/plans_controller.rb:32
-msgid "%{plan_owner} has been notified that you have finished providing feedback"
-msgstr "%{plan_owner} a été informé que vous avez terminé de formuler vos commentaires"
+msgid "%<plan_owner>s has been notified that you have finished providing feedback"
+msgstr "%<plan_owner>s a été informé que vous avez terminé de formuler vos commentaires"
 
 #: ../../app/controllers/org_admin/plans_controller.rb:38
 msgid "Unable to notify user that you have finished providing feedback."
@@ -568,8 +568,8 @@ msgstr "Tous les modèles"
 
 #: ../../app/controllers/org_admin/templates_controller.rb:48
 #: ../../app/views/org_admin/templates/index.html.erb:52
-msgid "%{org_name} Templates"
-msgstr "Modèles de %{org_name}"
+msgid "%<org_name>s Templates"
+msgstr "Modèles de %<org_name>s"
 
 #: ../../app/controllers/org_admin/templates_controller.rb:50
 #: ../../app/views/org_admin/templates/index.html.erb:54
@@ -581,14 +581,14 @@ msgid "Customizable Templates"
 msgstr "Modèles personnalisables"
 
 #: ../../app/controllers/org_admin/templates_controller.rb:214
-msgid "Error parsing links for a %{template}"
-msgstr "Erreur d’analyse des liens pour un %{template}"
+msgid "Error parsing links for a %<template>s"
+msgstr "Erreur d’analyse des liens pour un %<template>s"
 
 #: ../../app/controllers/org_admin/templates_controller.rb:345
 #: ../../app/controllers/public_pages_controller.rb:68
-msgid "Template created using the %{application_name} service. Last modified %{date}"
+msgid "Template created using the %<application_name>s service. Last modified %<date>s"
 msgstr ""
-"Modèle créé à l’aide du service %{application_name}. Dernière modification : %"
+"Modèle créé à l’aide du service %<application_name>s. Dernière modification : %"
 "{date}"
 
 #: ../../app/controllers/org_admin/templates_controller.rb:360
@@ -609,8 +609,8 @@ msgid "Please choose an organisation"
 msgstr "Veuillez choisir un organisme"
 
 #: ../../app/controllers/plan_exports_controller.rb:85
-msgid "Created using %{application_name}. Last modified %{date}"
-msgstr "Créé(e) avec %{application_name}. Dernière modification : %{date}"
+msgid "Created using %<application_name>s. Last modified %<date>s"
+msgstr "Créé(e) avec %<application_name>s. Dernière modification : %<date>s"
 
 #: ../../app/controllers/plans_controller.rb:51
 msgid "This is a"
@@ -651,15 +651,15 @@ msgstr "copié"
 
 #: ../../app/controllers/plans_controller.rb:408
 msgid ""
-"Unable to change the plan's status since it is needed at least %{percentage} p"
+"Unable to change the plan's status since it is needed at least %<percentage>s p"
 "ercentage responded"
 msgstr ""
 "Il est impossible de modifier l’état du plan, car il est nécessaire d’obtenir "
-"un taux de réponse d’au moins %{percentage}"
+"un taux de réponse d’au moins %<percentage>s"
 
 #: ../../app/controllers/plans_controller.rb:416
-msgid "Unable to find plan id %{plan_id}"
-msgstr "Il est impossible de trouver l’ID du plan %{plan_id}"
+msgid "Unable to find plan id %<plan_id>s"
+msgstr "Il est impossible de trouver l’ID du plan %<plan_id>s"
 
 #: ../../app/controllers/plans_controller.rb:433
 msgid "Your project is now a test."
@@ -674,13 +674,13 @@ msgid "Unable to change the plan's test status"
 msgstr "Il est impossible de modifier l’état d’essai du plan"
 
 #: ../../app/controllers/plans_controller.rb:451
-msgid "There is no plan associated with id %{id}"
-msgstr "Aucun plan n’est associé à l’identifiant %{id}"
+msgid "There is no plan associated with id %<id>s"
+msgstr "Aucun plan n’est associé à l’identifiant %<id>s"
 
 #: ../../app/controllers/registrations_controller.rb:35
 msgid ""
 "Please make a choice below. After linking your\n"
-"                       details to a %{application_name} account,\n"
+"                       details to a %<application_name>s account,\n"
 "                       you will be able to sign in directly with your\n"
 "                       institutional credentials."
 msgstr ""
@@ -761,15 +761,15 @@ msgstr "Le mot de passe et la confirmation doivent être identiques"
 
 #: ../../app/controllers/roles_controller.rb:26
 msgid ""
-"Cannot share plan with %{email} since that email matches with the owner of the"
+"Cannot share plan with %<email>s since that email matches with the owner of the"
 " plan."
 msgstr ""
-"Il est impossible de transmettre ce plan à %{email}, car cette adresse courrie"
+"Il est impossible de transmettre ce plan à %<email>s, car cette adresse courrie"
 "l est celle du propriétaire du plan."
 
 #: ../../app/controllers/roles_controller.rb:37
-msgid "Plan is already shared with %{email}."
-msgstr "Le plan est déjà partagé avec %{email}."
+msgid "Plan is already shared with %<email>s."
+msgstr "Le plan est déjà partagé avec %<email>s."
 
 #: ../../app/controllers/roles_controller.rb:44
 #: ../../app/views/shared/_create_account_form.html.erb:4
@@ -781,12 +781,12 @@ msgid "Surname"
 msgstr "Nom de famille"
 
 #: ../../app/controllers/roles_controller.rb:48
-msgid "Invitation to %{email} issued successfully."
-msgstr "Invitation à %{email} envoyée avec succès."
+msgid "Invitation to %<email>s issued successfully."
+msgstr "Invitation à %<email>s envoyée avec succès."
 
 #: ../../app/controllers/roles_controller.rb:53
-msgid "Plan shared with %{email}."
-msgstr "Plan partagé avec %{email}."
+msgid "Plan shared with %<email>s."
+msgstr "Plan partagé avec %<email>s."
 
 #: ../../app/controllers/roles_controller.rb:68
 msgid "You must provide a valid email address and select a permission level."
@@ -800,10 +800,10 @@ msgstr "Veuillez saisir une adresse courriel"
 
 #: ../../app/controllers/roles_controller.rb:93
 msgid ""
-"Successfully changed the permissions for %{email}. They have been notified via"
+"Successfully changed the permissions for %<email>s. They have been notified via"
 " email."
 msgstr ""
-"Les autorisations pour %{email} ont été modifiées avec succès. Un avis a été e"
+"Les autorisations pour %<email>s ont été modifiées avec succès. Un avis a été e"
 "nvoyée par courriel."
 
 #: ../../app/controllers/roles_controller.rb:108
@@ -837,10 +837,10 @@ msgstr ""
 "e vos paramètres d’exportation."
 
 #: ../../app/controllers/super_admin/api_clients_controller.rb:45
-msgid ". The API credentials have been emailed to %{email}"
+msgid ". The API credentials have been emailed to %<email>s"
 msgstr ""
 ". Les renseignements d’identification de l’API ont été envoyés à l’adresse cou"
-"rriel %{email}"
+"rriel %<email>s"
 
 #: ../../app/controllers/super_admin/notifications_controller.rb:69
 msgid "Your notification is now active."
@@ -855,16 +855,16 @@ msgid "Unable to change the notification's active status"
 msgstr "Il est impossible de modifier l’état actif de l’avis"
 
 #: ../../app/controllers/super_admin/notifications_controller.rb:104
-msgid "There is no notification associated with id  %{id}"
-msgstr "Aucun avis n’est associé à l’ID %{id}"
+msgid "There is no notification associated with id  %<id>s"
+msgstr "Aucun avis n’est associé à l’ID %<id>s"
 
 #: ../../app/controllers/super_admin/org_swaps_controller.rb:22
 msgid ""
 "Your organisation affiliation has been changed. You may now edit templates for"
-" %{org_name}."
+" %<org_name>s."
 msgstr ""
 "Votre affiliation organisationnelle a été modifiée. Vous pouvez maintenant mod"
-"ifier les modèles pour %{org_name}."
+"ifier les modèles pour %<org_name>s."
 
 #: ../../app/controllers/super_admin/org_swaps_controller.rb:25
 msgid "Unable to change your organisation affiliation at this time."
@@ -925,16 +925,16 @@ msgid "Successfully signed in"
 msgstr "Connexion réussie"
 
 #: ../../app/controllers/users/omniauth_callbacks_controller.rb:56
-msgid "Your account has been successfully linked to %{scheme}."
-msgstr "Votre compte a bien été associé à %{scheme}."
+msgid "Your account has been successfully linked to %<scheme>s."
+msgstr "Votre compte a bien été associé à %<scheme>s."
 
 #: ../../app/controllers/users/omniauth_callbacks_controller.rb:61
-msgid "Unable to link your account to %{scheme}."
-msgstr "Il est impossible d’associer votre compte à %{scheme}."
+msgid "Unable to link your account to %<scheme>s."
+msgstr "Il est impossible d’associer votre compte à %<scheme>s."
 
 #: ../../app/controllers/users_controller.rb:141
-msgid "Successfully %{action} %{username}'s account."
-msgstr "La mesure %{action} pour %{username} a été effectuée avec succès."
+msgid "Successfully %<action>s %<username>s's account."
+msgstr "La mesure %<action>s pour %<username>s a été effectuée avec succès."
 
 #: ../../app/controllers/users_controller.rb:142
 msgid "activated"
@@ -945,8 +945,8 @@ msgid "deactivated"
 msgstr "désactivé"
 
 #: ../../app/controllers/users_controller.rb:149
-msgid "Unable to %{action} %{username}"
-msgstr "Il est impossible de %{action} %{username}"
+msgid "Unable to %<action>s %<username>s"
+msgstr "Il est impossible de %<action>s %<username>s"
 
 #: ../../app/controllers/users_controller.rb:150
 msgid "activate"
@@ -1019,18 +1019,18 @@ msgid "Creator:"
 msgstr "Créateur :"
 
 #: ../../app/helpers/feedbacks_helper.rb:6
-msgid "%{application_name}: Your plan has been submitted for feedback"
-msgstr "%{application_name}: votre plan a été soumis aux fins de rétroaction"
+msgid "%<application_name>s: Your plan has been submitted for feedback"
+msgstr "%<application_name>s: votre plan a été soumis aux fins de rétroaction"
 
 #: ../../app/helpers/feedbacks_helper.rb:10
 msgid ""
-"<p>Hello %{user_name}.</p><p>Your plan \"%{plan_name}\" has been submitted for f"
+"<p>Hello %<user_name>s.</p><p>Your plan \"%<plan_name>s\" has been submitted for f"
 "eedback from an\n"
 "      administrator at your organisation. If you have questions pertaining to "
 "this action, please contact us\n"
-"      at %{organisation_email}.</p>"
+"      at %<organisation_email>s.</p>"
 msgstr ""
-"<p>Bonjour %{user_name}. </p><p> Votre plan \"%{plan_name}\" a été soumis afin d"
+"<p>Bonjour %<user_name>s. </p><p> Votre plan \"%<plan_name>s\" a été soumis afin d"
 "e recueillir les commentaires d’un administrateur de votre organisme. Si vous "
 "avez des questions concernant cette action, veuillez nous écrire à %{organisat"
 "ion_email}.</p>"
@@ -1066,14 +1066,14 @@ msgstr "lire le plan et laisser des commentaires."
 
 #: ../../app/helpers/orgs_helper.rb:14
 msgid ""
-"<p>A data librarian from %{org_name} will respond to your request within 48\n"
+"<p>A data librarian from %<org_name>s will respond to your request within 48\n"
 "       hours. If you have questions pertaining to this action please contact u"
 "s\n"
-"       at %{organisation_email}.</p>"
+"       at %<organisation_email>s.</p>"
 msgstr ""
-"<p>Un(e) bibliothécaire de données de %{org_name} répondra à votre demande dan"
+"<p>Un(e) bibliothécaire de données de %<org_name>s répondra à votre demande dan"
 "s les 48 heures. Si vous avez des questions concernant cette action, veuillez "
-"nous écrire à %{organisation_email} </p>"
+"nous écrire à %<organisation_email>s </p>"
 
 #: ../../app/helpers/perms_helper.rb:9
 msgid "Add organisations"
@@ -1206,7 +1206,7 @@ msgid "None"
 msgstr ""
 
 #: ../../app/helpers/super_admin/orgs/merge_helper.rb:31
-msgid "Guidance for: %{themes}"
+msgid "Guidance for: %<themes>s"
 msgstr ""
 
 #: ../../app/helpers/super_admin/orgs/merge_helper.rb:53
@@ -1214,7 +1214,7 @@ msgid "Nothing to merge"
 msgstr ""
 
 #: ../../app/helpers/super_admin/orgs/merge_helper.rb:55
-msgid "<p>The following %{object_types} will be moved over to '%{org_name}':</p>"
+msgid "<p>The following %<object_types>s will be moved over to '%<org_name>s':</p>"
 msgstr ""
 
 #: ../../app/helpers/template_helper.rb:46
@@ -1250,52 +1250,52 @@ msgstr "Les 12 derniers mois"
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:6
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:5
 #: ../../app/views/user_mailer/_email_signature.html.erb:2
-msgid "Query or feedback related to %{tool_name}"
-msgstr "Requête ou commentaire associé à %{tool_name}"
+msgid "Query or feedback related to %<tool_name>s"
+msgstr "Requête ou commentaire associé à %<tool_name>s"
 
 #: ../../app/mailers/user_mailer.rb:23
-msgid "Welcome to %{tool_name}"
-msgstr "Bienvenue à %{tool_name}"
+msgid "Welcome to %<tool_name>s"
+msgstr "Bienvenue à %<tool_name>s"
 
 #: ../../app/mailers/user_mailer.rb:58
-msgid "A Data Management Plan in %{tool_name} has been shared with you"
-msgstr "Un plan de gestion des données dans %{tool_name} a été partagé avec vous"
+msgid "A Data Management Plan in %<tool_name>s has been shared with you"
+msgstr "Un plan de gestion des données dans %<tool_name>s a été partagé avec vous"
 
 #: ../../app/mailers/user_mailer.rb:76
-msgid "Changed permissions on a Data Management Plan in %{tool_name}"
+msgid "Changed permissions on a Data Management Plan in %<tool_name>s"
 msgstr ""
-"Les autorisations pour un plan de gestion des données dans %{tool_name} sont m"
+"Les autorisations pour un plan de gestion des données dans %<tool_name>s sont m"
 "odifiées"
 
 #: ../../app/mailers/user_mailer.rb:92
-msgid "Permissions removed on a DMP in %{tool_name}"
-msgstr "Autorisations relatives à PGD retirées dans %{tool_name}"
+msgid "Permissions removed on a DMP in %<tool_name>s"
+msgstr "Autorisations relatives à PGD retirées dans %<tool_name>s"
 
 #: ../../app/mailers/user_mailer.rb:111
-msgid "%{user_name} has requested feedback on a %{tool_name} plan"
+msgid "%<user_name>s has requested feedback on a %<tool_name>s plan"
 msgstr ""
 
 #: ../../app/mailers/user_mailer.rb:134
-msgid "%{tool_name}: Expert feedback has been provided for %{plan_title}"
+msgid "%<tool_name>s: Expert feedback has been provided for %<plan_title>s"
 msgstr ""
-"%{tool_name}: Les commentaires d’un spécialiste ont été fournis pour %{plan_ti"
+"%<tool_name>s: Les commentaires d’un spécialiste ont été fournis pour %{plan_ti"
 "tle}"
 
 #: ../../app/mailers/user_mailer.rb:169
-msgid "DMP Visibility Changed: %{plan_title}"
-msgstr "Visibilité du PGD modifiée : %{plan_title}"
+msgid "DMP Visibility Changed: %<plan_title>s"
+msgstr "Visibilité du PGD modifiée : %<plan_title>s"
 
 #: ../../app/mailers/user_mailer.rb:200
-msgid "%{tool_name}: A new comment was added to %{plan_title}"
-msgstr "%{tool_name}: un nouveau commentaire a été ajouté à %{plan_title}"
+msgid "%<tool_name>s: A new comment was added to %<plan_title>s"
+msgstr "%<tool_name>s: un nouveau commentaire a été ajouté à %<plan_title>s"
 
 #: ../../app/mailers/user_mailer.rb:218
-msgid "Administrator privileges granted in %{tool_name}"
-msgstr "Privilèges d’administrateur accordés dans %{tool_name}"
+msgid "Administrator privileges granted in %<tool_name>s"
+msgstr "Privilèges d’administrateur accordés dans %<tool_name>s"
 
 #: ../../app/mailers/user_mailer.rb:235
-msgid "%{tool_name} API changes"
-msgstr "Modifications de l'API pour %{tool_name}"
+msgid "%<tool_name>s API changes"
+msgstr "Modifications de l'API pour %<tool_name>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:26
 msgid "Phase"
@@ -1327,12 +1327,12 @@ msgid "Creators: "
 msgstr "Créateurs :"
 
 #: ../../app/models/concerns/exportable_plan.rb:134
-msgid "%{authors}"
-msgstr "%{authors}"
+msgid "%<authors>s"
+msgstr "%<authors>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:135
-msgid "%{affiliation}"
-msgstr "%{affiliation}"
+msgid "%<affiliation>s"
+msgstr "%<affiliation>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:137
 #: ../../app/models/concerns/exportable_plan.rb:139
@@ -1343,12 +1343,12 @@ msgid "Template: "
 msgstr "Modèle :"
 
 #: ../../app/models/concerns/exportable_plan.rb:137
-msgid "%{funder}"
-msgstr "%{funder}"
+msgid "%<funder>s"
+msgstr "%<funder>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:139
-msgid "%{template}"
-msgstr "%{template}"
+msgid "%<template>s"
+msgstr "%<template>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:142
 #: ../../app/views/shared/export/_plan_txt.erb:12
@@ -1356,8 +1356,8 @@ msgid "Grant number: "
 msgstr "Numéro de subvention :"
 
 #: ../../app/models/concerns/exportable_plan.rb:142
-msgid "%{grant_number}"
-msgstr "%{grant_number}"
+msgid "%<grant_number>s"
+msgstr "%<grant_number>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:145
 #: ../../app/views/shared/export/_plan_coversheet.erb:26
@@ -1366,8 +1366,8 @@ msgid "Project abstract: "
 msgstr "Résumé du projet :"
 
 #: ../../app/models/concerns/exportable_plan.rb:145
-msgid "%{description}"
-msgstr "%{description}"
+msgid "%<description>s"
+msgstr "%<description>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:148
 #: ../../app/views/shared/export/_plan_coversheet.erb:42
@@ -1376,8 +1376,8 @@ msgid "Last modified: "
 msgstr "Dernière modification :"
 
 #: ../../app/models/concerns/exportable_plan.rb:148
-msgid "%{date}"
-msgstr "%{date}"
+msgid "%<date>s"
+msgstr "%<date>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:149
 #: ../../app/views/shared/export/_plan_coversheet.erb:49
@@ -1556,8 +1556,8 @@ msgid "generate_copy! requires an organisation target"
 msgstr "un organisme cible est exigé pour generate_copy!"
 
 #: ../../app/models/template.rb:380
-msgid "Copy of %{template}"
-msgstr "Copie de %{template}"
+msgid "Copy of %<template>s"
+msgstr "Copie de %<template>s"
 
 #: ../../app/models/template.rb:388
 msgid "generate_version! requires a published template"
@@ -1600,9 +1600,9 @@ msgid "Conditions in the template refer backwards"
 msgstr "Les conditions du modèle sont associées à une référence antérieure"
 
 #: ../../app/models/user.rb:379
-msgid "A Data Management Plan in %{application_name} has been shared with you"
+msgid "A Data Management Plan in %<application_name>s has been shared with you"
 msgstr ""
-"Un plan de gestion des données dans %{application_name} a été partagé avec vou"
+"Un plan de gestion des données dans %<application_name>s a été partagé avec vou"
 "s"
 
 #: ../../app/policies/api/v0/departments_policy.rb:12
@@ -1722,8 +1722,8 @@ msgstr ""
 "ié du bailleur de fonds actuel"
 
 #: ../../app/validators/after_validator.rb:5
-msgid "must be after %{date}"
-msgstr "doit être après %{date}"
+msgid "must be after %<date>s"
+msgstr "doit être après %<date>s"
 
 #: ../../app/validators/org_links_validator.rb:10
 msgid "A key \"org\" is expected for links hash"
@@ -1735,12 +1735,12 @@ msgid "A hash is expected for links"
 msgstr "Un code hash est attendu pour les liens"
 
 #: ../../app/validators/template_links_validator.rb:12
-msgid "A key %{key} is expected for links hash"
-msgstr "Une clé %{key} est attendue pour le code hash des liens"
+msgid "A key %<key>s is expected for links hash"
+msgstr "Une clé %<key>s est attendue pour le code hash des liens"
 
 #: ../../app/validators/template_links_validator.rb:15
-msgid "The key %{key} does not have a valid set of object links"
-msgstr "La clé %{key} n’est pas associée à une série de liens entre les objets valide"
+msgid "The key %<key>s does not have a valid set of object links"
+msgstr "La clé %<key>s n’est pas associée à une série de liens entre les objets valide"
 
 #: ../../app/views/answers/_locking.html.erb:5
 msgid "The following answer cannot be saved"
@@ -1748,10 +1748,10 @@ msgstr "La réponse suivante ne peut pas être enregistrée"
 
 #: ../../app/views/answers/_locking.html.erb:8
 msgid ""
-"since %{name} saved the answer below while you were editing. Please, combine y"
+"since %<name>s saved the answer below while you were editing. Please, combine y"
 "our changes and then save the answer again."
 msgstr ""
-"puisque %{name} sauvegardait la réponse ci-dessous pendant que vous y apportie"
+"puisque %<name>s sauvegardait la réponse ci-dessous pendant que vous y apportie"
 "z une modification. Veuillez combiner vos modifications, puis sauvegarder de n"
 "ouveau la réponse."
 
@@ -1826,8 +1826,8 @@ msgid "Answered"
 msgstr "Répondu"
 
 #: ../../app/views/answers/_status.html.erb:10
-msgid " by %{user_name}"
-msgstr " par %{user_name}"
+msgid " by %<user_name>s"
+msgstr " par %<user_name>s"
 
 #: ../../app/views/answers/_status.html.erb:15
 msgid "This answer removes "
@@ -1904,17 +1904,17 @@ msgstr "Communiquez avec nous"
 
 #: ../../app/views/contact_us/contacts/new.html.erb:6
 msgid ""
-"%{application_name} is provided by the %{organisation_name}.<br /> You can fin"
-"d out more about us on our <a href=\"%{organisation_url}\" class=\"has-new-window"
+"%<application_name>s is provided by the %<organisation_name>s.<br /> You can fin"
+"d out more about us on our <a href=\"%<organisation_url>s\" class=\"has-new-window"
 "-popup-info\" target=\"_blank\">website <em class=\"sr-only\">(new window)</em><spa"
-"n class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>. If you "
-"would like to contact us about %{application_name}, please fill out the form b"
+"n class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a>. If you "
+"would like to contact us about %<application_name>s, please fill out the form b"
 "elow."
 msgstr ""
-"%{application_name} est fourni par %{organisation_name}.<br />Vous pouvez en s"
-"avoir plus sur nous sur notre <a href=\"%{organisation_url}\" class=\"has-new-win"
+"%<application_name>s est fourni par %<organisation_name>s.<br />Vous pouvez en s"
+"avoir plus sur nous sur notre <a href=\"%<organisation_url>s\" class=\"has-new-win"
 "dow-popup-info\" target=\"_blank\">site Internet <em class=\"sr-only\">(nouvelle fe"
-"nêtre)</em> <span class=\"new-window-popup-info\">%{open_in_new_window_text}</sp"
+"nêtre)</em> <span class=\"new-window-popup-info\">%<open_in_new_window_text>s</sp"
 "an></a> . Si vous souhaitez communiquer avec nous à propos de %{application_na"
 "me}, veuillez remplir le formulaire ci-dessous."
 
@@ -2080,8 +2080,8 @@ msgid "Create account"
 msgstr "Créer un compte"
 
 #: ../../app/views/devise/mailer/confirmation_instructions.html.erb:2
-msgid "Welcome to %{application_name}"
-msgstr "Bienvenue à %{application_name}"
+msgid "Welcome to %<application_name>s"
+msgstr "Bienvenue à %<application_name>s"
 
 #: ../../app/views/devise/mailer/confirmation_instructions.html.erb:4
 msgid "Thank you for registering. Please confirm your email address"
@@ -2101,24 +2101,24 @@ msgstr "dans votre navigateur"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:12
 #: ../../app/views/user_mailer/new_comment.html.erb:2
-msgid "Hello %{user_name}"
-msgstr "Bonjour %{user_name}"
+msgid "Hello %<user_name>s"
+msgstr "Bonjour %<user_name>s"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:15
 msgid ""
-"Your colleague %{inviter_name} has invited you to contribute to  their Data Ma"
-"nagement Plan in %{tool_name}"
+"Your colleague %<inviter_name>s has invited you to contribute to  their Data Ma"
+"nagement Plan in %<tool_name>s"
 msgstr ""
-"Votre collègue %{inviter_name} vous a invité(e) à contribuer à son plan de ges"
-"tion des données dans %{tool_name}"
+"Votre collègue %<inviter_name>s vous a invité(e) à contribuer à son plan de ges"
+"tion des données dans %<tool_name>s"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:22
 #: ../../app/views/user_mailer/sharing_notification.html.erb:11
 msgid ""
-"%{click_here} to accept the invitation, (or copy %{link} into your browser). I"
+"%<click_here>s to accept the invitation, (or copy %<link>s into your browser). I"
 "f you don't want to accept the invitation, please ignore this email."
 msgstr ""
-"%{click_here} pour accepter l’invitation (ou copiez %{link} dans votre navigat"
+"%<click_here>s pour accepter l’invitation (ou copiez %<link>s dans votre navigat"
 "eur). Si vous ne souhaitez pas accepter l’invitation, veuillez ne pas tenir co"
 "mpte de ce courriel."
 
@@ -2138,8 +2138,8 @@ msgstr "Sincèrement"
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:19
 #: ../../app/views/user_mailer/_email_signature.html.erb:12
 #: ../../app/views/user_mailer/welcome_notification.html.erb:10
-msgid "The %{tool_name} team"
-msgstr "Équipe chargée de l’outil %{tool_name}"
+msgid "The %<tool_name>s team"
+msgstr "Équipe chargée de l’outil %<tool_name>s"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:32
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:22
@@ -2150,22 +2150,22 @@ msgstr "Veuillez ne pas répondre à ce courriel."
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:33
 msgid ""
-"If you have any questions or need help, please contact us at %{helpdesk_email}"
-" or visit %{contact_us_url}"
+"If you have any questions or need help, please contact us at %<helpdesk_email>s"
+" or visit %<contact_us_url>s"
 msgstr ""
 "Si vous avez des questions ou souhaitez recevoir de l’aide, veuillez nous écri"
-"re à %{helpdesk_email} ou visiter la page %{contact_us_url}"
+"re à %<helpdesk_email>s ou visiter la page %<contact_us_url>s"
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:9
-msgid "Hello %{user_email}"
-msgstr "Bonjour %{user_email}"
+msgid "Hello %<user_email>s"
+msgstr "Bonjour %<user_email>s"
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:12
 msgid ""
-"Someone has requested a link to change your %{tool_name} password. You can do "
+"Someone has requested a link to change your %<tool_name>s password. You can do "
 "this through the link below."
 msgstr ""
-"Quelqu’un a demandé un lien pour changer votre mot de passe %{tool_name}. Vous"
+"Quelqu’un a demandé un lien pour changer votre mot de passe %<tool_name>s. Vous"
 " pouvez donner suite à cette demande à l’aide du lien ci-dessous."
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:14
@@ -2181,11 +2181,11 @@ msgstr ""
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:22
 #: ../../app/views/user_mailer/_email_signature.html.erb:19
 msgid ""
-"If you have any questions or need help, please contact us at %{helpdesk_email}"
-" or visit %{contact_us}"
+"If you have any questions or need help, please contact us at %<helpdesk_email>s"
+" or visit %<contact_us>s"
 msgstr ""
 "Si vous avez des questions ou avez besoin d’aide, veuillez nous écrire à %{hel"
-"pdesk_email} ou visiter la page %{contact_us}"
+"pdesk_email} ou visiter la page %<contact_us>s"
 
 #: ../../app/views/devise/mailer/unlock_instructions.html.erb:2
 msgid "Hello"
@@ -2257,15 +2257,15 @@ msgstr ""
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:16
 msgid ""
-"See the <a href=\"%{api_v0_wiki}\">documentation for v0</a> for more details on "
+"See the <a href=\"%<api_v0_wiki>s\">documentation for v0</a> for more details on "
 "the original API which includes access to statistics, the full text of plans a"
 "nd the ability to connect users with departments."
 msgstr ""
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:18
 msgid ""
-"See the <a href=\"%{api_v1_wiki}\">documentation for v1</a> for more details on "
-"the API that supports the <a href=\"%{rda_standard_url}\">RDA Common metadata st"
+"See the <a href=\"%<api_v1_wiki>s\">documentation for v1</a> for more details on "
+"the API that supports the <a href=\"%<rda_standard_url>s\">RDA Common metadata st"
 "andard for DMPs.</a>"
 msgstr ""
 
@@ -2445,8 +2445,8 @@ msgid "Sign in or Create account"
 msgstr "Se connecter ou créer un compte"
 
 #: ../../app/views/devise/registrations/new.html.erb:15
-msgid "Do you have a %{application_name} account?"
-msgstr "Avez-vous un compte %{application_name}?"
+msgid "Do you have a %<application_name>s account?"
+msgstr "Avez-vous un compte %<application_name>s?"
 
 #: ../../app/views/devise/registrations/new.html.erb:22
 #: ../../app/views/layouts/_navigation.html.erb:63
@@ -2461,8 +2461,8 @@ msgid "This will link your existing account to your credentials."
 msgstr "Votre compte actuel sera lié à vos renseignements d’identification."
 
 #: ../../app/views/devise/registrations/new.html.erb:34
-msgid "No %{application_name} account?"
-msgstr "Pas de compte %{application_name}?"
+msgid "No %<application_name>s account?"
+msgstr "Pas de compte %<application_name>s?"
 
 #: ../../app/views/devise/registrations/new.html.erb:46
 msgid "This will create an account and link it to your credentials."
@@ -2645,10 +2645,10 @@ msgstr "Publié?"
 
 #: ../../app/views/home/_welcome.html.erb:5
 msgid ""
-"<p>%{application_name} has been developed by the <strong>%{organisation_name}<"
+"<p>%<application_name>s has been developed by the <strong>%<organisation_name>s<"
 "/strong> to help you write data management plans.</p>"
 msgstr ""
-"<p>%{application_name} a été mis au popint par <strong>%{organisation_name}</s"
+"<p>%<application_name>s a été mis au popint par <strong>%<organisation_name>s</s"
 "trong> pour vous aider à rédiger des plans de gestion des données.</p>"
 
 #: ../../app/views/home/_welcome.html.erb:11
@@ -2834,8 +2834,8 @@ msgid "Logout"
 msgstr "Se déconnecter"
 
 #: ../../app/views/layouts/application.html.erb:32
-msgid "%{application_name}"
-msgstr "%{application_name}"
+msgid "%<application_name>s"
+msgstr "%<application_name>s"
 
 #: ../../app/views/layouts/application.html.erb:91
 msgid "Error:"
@@ -2912,11 +2912,11 @@ msgstr "S’ouvre dans une nouvelle fenêtre"
 
 #: ../../app/views/layouts/application.html.erb:142
 msgid ""
-"%{n} results are available, use up and down arrows to navigate suggestions. Us"
+"%<n>s results are available, use up and down arrows to navigate suggestions. Us"
 "e the Enter key to select a suggestion or the Escape key to close the suggesti"
 "ons."
 msgstr ""
-"%{n} résultats sont disponibles. Utilisez les flèches vers le haut et vers le "
+"%<n>s résultats sont disponibles. Utilisez les flèches vers le haut et vers le "
 "bas pour parcourir les suggestions. Utilisez la touche Entrée pour sélectionne"
 "r une suggestion ou la touche Échap pour fermer les suggestions."
 
@@ -2968,8 +2968,8 @@ msgid "Example answer"
 msgstr "Exemple de réponse"
 
 #: ../../app/views/org_admin/annotations/_show.html.erb:4
-msgid "%{org} Example Answer"
-msgstr " Exemple de réponse de %{org}"
+msgid "%<org>s Example Answer"
+msgstr " Exemple de réponse de %<org>s"
 
 #: ../../app/views/org_admin/conditions/_add.html.erb:3
 msgid "Add condition"
@@ -3125,10 +3125,10 @@ msgstr "Supprimer la phase"
 
 #: ../../app/views/org_admin/phases/_phase.html.erb:17
 msgid ""
-"You are about to delete the '%{phase_title}' phase. This will remove all of th"
+"You are about to delete the '%<phase_title>s' phase. This will remove all of th"
 "e sections and questions listed below. Are you sure?"
 msgstr ""
-"Vous êtes sur le point de supprimer la phase '%{phase_title}'. Cela entraînera"
+"Vous êtes sur le point de supprimer la phase '%<phase_title>s'. Cela entraînera"
 " le retrait de toutes les sections et de toutes les questions répertoriées ci-"
 "dessous. Êtes-vous sûr de vouloir continuer?"
 
@@ -3188,8 +3188,8 @@ msgid "Write plan"
 msgstr "Rédiger un plan"
 
 #: ../../app/views/org_admin/plans/index.html.erb:4
-msgid "%{org_name} Plans"
-msgstr "Plans de %{org_name}"
+msgid "%<org_name>s Plans"
+msgstr "Plans de %<org_name>s"
 
 #: ../../app/views/org_admin/plans/index.html.erb:16
 msgid "Plan"
@@ -3240,10 +3240,10 @@ msgstr "Aviser le propriétaire du plan que j’ai terminé de fournir des comme
 #: ../../app/views/org_admin/plans/index.html.erb:39
 msgid ""
 "Download plans <em class=\"sr-only\">(new window)</em><span class=\"new-window-po"
-"pup-info\">%{open_in_new_window_text}</span>"
+"pup-info\">%<open_in_new_window_text>s</span>"
 msgstr ""
 "Télécharger les plans <em class=\"sr-only\">(nouvelle fenêtre)</em> <span class="
-"\"new-window-popup-info\">%{open_in_new_window_text}</span>"
+"\"new-window-popup-info\">%<open_in_new_window_text>s</span>"
 
 #: ../../app/views/org_admin/question_options/_option_fields.html.erb:3
 msgid "Order"
@@ -3273,8 +3273,8 @@ msgstr ""
 "pouvez saisir ce style ici."
 
 #: ../../app/views/org_admin/questions/_form.html.erb:4
-msgid "Question %{number}:"
-msgstr "Question %{number}:"
+msgid "Question %<number>s:"
+msgstr "Question %<number>s:"
 
 #: ../../app/views/org_admin/questions/_form.html.erb:4
 msgid "New question:"
@@ -3350,9 +3350,9 @@ msgid "Delete"
 msgstr "Supprimer"
 
 #: ../../app/views/org_admin/questions/_form.html.erb:102
-msgid "You are about to delete question #%{question_number}. Are you sure?"
+msgid "You are about to delete question #%<question_number>s. Are you sure?"
 msgstr ""
-"Vous êtes sur le point de supprimer la question n° %{question_number}. Êtes-vo"
+"Vous êtes sur le point de supprimer la question n° %<question_number>s. Êtes-vo"
 "us sûr de vouloir continuer?"
 
 #: ../../app/views/org_admin/questions/_index.html.erb:14
@@ -3453,10 +3453,10 @@ msgstr "Saisissez un titre pour la section"
 
 #: ../../app/views/org_admin/sections/_form.html.erb:20
 msgid ""
-"You are about to delete '%{section_title}'. This will affect questions linked "
+"You are about to delete '%<section_title>s'. This will affect questions linked "
 "to this section. Are you sure?"
 msgstr ""
-"Vous êtes sur le point de supprimer '%{section_title}'. Cela aura une incidenc"
+"Vous êtes sur le point de supprimer '%<section_title>s'. Cela aura une incidenc"
 "e sur les questions liées à cette section. Êtes-vous sûr de vouloir continuer?"
 
 #: ../../app/views/org_admin/sections/_index.html.erb:61
@@ -3487,8 +3487,8 @@ msgstr ""
 
 #: ../../app/views/org_admin/templates/_form.html.erb:25
 #: ../../app/views/org_admin/templates/_show.html.erb:35
-msgid "for internal %{org_name} use only"
-msgstr "réservé à l’usage interne de %{org_name}"
+msgid "for internal %<org_name>s use only"
+msgstr "réservé à l’usage interne de %<org_name>s"
 
 #: ../../app/views/org_admin/templates/_form.html.erb:32
 #: ../../app/views/org_admin/templates/_show.html.erb:13
@@ -3667,22 +3667,22 @@ msgstr "Modèles personnalisables"
 
 #: ../../app/views/org_admin/templates/index.html.erb:80
 #: ../../app/views/org_admin/templates/index.html.erb:93
-msgid "All (%{count})"
-msgstr "Tous (%{count})"
+msgid "All (%<count>s)"
+msgstr "Tous (%<count>s)"
 
 #: ../../app/views/org_admin/templates/index.html.erb:83
 #: ../../app/views/org_admin/templates/index.html.erb:96
-msgid "Published (%{count})"
-msgstr "(%{count}) publié(s)"
+msgid "Published (%<count>s)"
+msgstr "(%<count>s) publié(s)"
 
 #: ../../app/views/org_admin/templates/index.html.erb:86
 #: ../../app/views/org_admin/templates/index.html.erb:99
-msgid "Unpublished (%{count})"
-msgstr "(%{count}) non publié"
+msgid "Unpublished (%<count>s)"
+msgstr "(%<count>s) non publié"
 
 #: ../../app/views/org_admin/templates/index.html.erb:89
-msgid "Not customised (%{count})"
-msgstr "(%{count}) non personnalisé"
+msgid "Not customised (%<count>s)"
+msgstr "(%<count>s) non personnalisé"
 
 #: ../../app/views/org_admin/templates/index.html.erb:118
 msgid "Create a template"
@@ -3691,8 +3691,8 @@ msgstr "Créer un modèle"
 #: ../../app/views/org_admin/users/edit.html.erb:4
 #: ../../app/views/super_admin/users/edit.html.erb:1
 #: ../../app/views/super_admin/users/edit.html.erb:5
-msgid "Editing profile for %{username}"
-msgstr "Modification du profil de %{username}"
+msgid "Editing profile for %<username>s"
+msgstr "Modification du profil de %<username>s"
 
 #: ../../app/views/org_admin/users/edit.html.erb:5
 #: ../../app/views/super_admin/users/edit.html.erb:6
@@ -3700,8 +3700,8 @@ msgid "View all users"
 msgstr "Voir tous les utilisateurs"
 
 #: ../../app/views/org_admin/users/plans.html.erb:3
-msgid "Plans of %{username}"
-msgstr "Plans de %{username}"
+msgid "Plans of %<username>s"
+msgstr "Plans de %<username>s"
 
 #: ../../app/views/orgs/_departments.html.erb:1
 #: ../../app/views/orgs/admin_edit.html.erb:26
@@ -3731,7 +3731,7 @@ msgid ""
 "ntact_us_url}\">contact us</a> to have them updated."
 msgstr ""
 "Si l’un des identifiants ci-dessus est incorrect ou manquant, veuillez <a href"
-"=\"%{contact_us_url}\">communiquer avec nous</a> pour le mettre à jour."
+"=\"%<contact_us_url>s\">communiquer avec nous</a> pour le mettre à jour."
 
 #: ../../app/views/orgs/_feedback_form.html.erb:3
 #: ../../app/views/orgs/_feedback_form.html.erb:7
@@ -3763,7 +3763,7 @@ msgstr ""
 #: ../../app/views/orgs/_merge_form.html.erb:7
 msgid ""
 "Please select the Organisation that will replace the current organisation: '<s"
-"trong>%{org_name}</strong>'."
+"trong>%<org_name>s</strong>'."
 msgstr ""
 
 #: ../../app/views/orgs/_merge_form.html.erb:8
@@ -3944,16 +3944,16 @@ msgstr "Jamais"
 
 #: ../../app/views/paginable/api_clients/_index.html.erb:44
 msgid ""
-"You are about to delete '%{client_name}'. They will no longer be able to acces"
+"You are about to delete '%<client_name>s'. They will no longer be able to acces"
 "s the API. Are you sure?"
 msgstr ""
-"Vous êtes sur le point de supprimer '%{client_name}'. Cette personne ne sera p"
+"Vous êtes sur le point de supprimer '%<client_name>s'. Cette personne ne sera p"
 "lus en mesure d’accéder à l’API. Êtes-vous sûr de vouloir continuer?"
 
 #: ../../app/views/paginable/contributors/_index.html.erb:57
-msgid "You are about to delete '%{contributor_name}'. Are you sure?"
+msgid "You are about to delete '%<contributor_name>s'. Are you sure?"
 msgstr ""
-"Vous êtes sur le point de supprimer '%{contributor_name}'. Êtes-vous sûr de vo"
+"Vous êtes sur le point de supprimer '%<contributor_name>s'. Êtes-vous sûr de vo"
 "uloir continuer?"
 
 #: ../../app/views/paginable/departments/_index.html.erb:5
@@ -3967,10 +3967,10 @@ msgstr "Nom ou code abrégé"
 
 #: ../../app/views/paginable/departments/_index.html.erb:28
 msgid ""
-"You are about to delete '%{department_name}'. This will affect guidance. Are y"
+"You are about to delete '%<department_name>s'. This will affect guidance. Are y"
 "ou sure?"
 msgstr ""
-"Vous êtes sur le point de supprimer '%{department_name}'. Cela aura une incide"
+"Vous êtes sur le point de supprimer '%<department_name>s'. Cela aura une incide"
 "nce sur les directives. Êtes-vous sûr de vouloir continuer?"
 
 #: ../../app/views/paginable/guidance_groups/_index.html.erb:8
@@ -4011,16 +4011,16 @@ msgstr "Publier"
 
 #: ../../app/views/paginable/guidance_groups/_index.html.erb:50
 msgid ""
-"You are about to delete '%{guidance_group_name}'. This will affect guidance. A"
+"You are about to delete '%<guidance_group_name>s'. This will affect guidance. A"
 "re you sure?"
 msgstr ""
-"Vous êtes sur le point de supprimer '%{guidance_group_name}'. Cela aura une in"
+"Vous êtes sur le point de supprimer '%<guidance_group_name>s'. Cela aura une in"
 "cidence sur les directives. Êtes-vous sûr de vouloir continuer?"
 
 #: ../../app/views/paginable/guidances/_index.html.erb:62
-msgid "You are about to delete '%{guidance_summary}'. Are you sure?"
+msgid "You are about to delete '%<guidance_summary>s'. Are you sure?"
 msgstr ""
-"Vous êtes sur le point de supprimer '%{guidance_summary}'. Êtes-vous sûr de vo"
+"Vous êtes sur le point de supprimer '%<guidance_summary>s'. Êtes-vous sûr de vo"
 "uloir continuer?"
 
 #: ../../app/views/paginable/notifications/_index.html.erb:5
@@ -4057,9 +4057,9 @@ msgid "Managed"
 msgstr "Géré"
 
 #: ../../app/views/paginable/orgs/_index.html.erb:35
-msgid "You are about to delete '%{org_name}'. Are you sure?"
+msgid "You are about to delete '%<org_name>s'. Are you sure?"
 msgstr ""
-"Vous êtes sur le point de supprimer '%{org_name}'. Êtes-vous sûr de vouloir co"
+"Vous êtes sur le point de supprimer '%<org_name>s'. Êtes-vous sûr de vouloir co"
 "ntinuer?"
 
 #: ../../app/views/paginable/plans/_org_admin.html.erb:3
@@ -4226,10 +4226,10 @@ msgstr "Publier les modifications"
 
 #: ../../app/views/paginable/templates/_customisable.html.erb:69
 msgid ""
-"Are you sure you want to remove your customization of \"%{template_title}\"? Any"
+"Are you sure you want to remove your customization of \"%<template_title>s\"? Any"
 " published versions will become unavailable to users."
 msgstr ""
-"Souhaitez-vous vraiment supprimer la personnalisation de \"%{template_title}\"? "
+"Souhaitez-vous vraiment supprimer la personnalisation de \"%<template_title>s\"? "
 "Les versions publiées ne seront plus accessibles par les utilisateurs."
 
 #: ../../app/views/paginable/templates/_history.html.erb:7
@@ -4246,10 +4246,10 @@ msgstr "Voir les personnalisations"
 
 #: ../../app/views/paginable/templates/_organisational.html.erb:76
 msgid ""
-"Are you sure you want to remove \"%{template_title}\"? Any published versions wi"
+"Are you sure you want to remove \"%<template_title>s\"? Any published versions wi"
 "ll become unavailable to users."
 msgstr ""
-"Souhaitez-vous vraiment supprimer \"%{template_title}\"? Les versions publiées n"
+"Souhaitez-vous vraiment supprimer \"%<template_title>s\"? Les versions publiées n"
 "e seront plus accessibles par les utilisateurs."
 
 #: ../../app/views/paginable/templates/_organisational.html.erb:90
@@ -4412,10 +4412,10 @@ msgstr "Droite"
 #: ../../app/views/plans/_download_form.html.erb:119
 msgid ""
 "Download Plan <em class=\"sr-only\">(new window)</em><span class=\"new-window-pop"
-"up-info\">%{open_in_new_window_text}</span>"
+"up-info\">%<open_in_new_window_text>s</span>"
 msgstr ""
 "Télécharger le plan <em class=\"sr-only\">(nouvelle fenêtre)</em> <span class=\"n"
-"ew-window-popup-info\">%{open_in_new_window_text}</span>"
+"ew-window-popup-info\">%<open_in_new_window_text>s</span>"
 
 #: ../../app/views/plans/_edit_details.html.erb:13
 #: ../../app/views/plans/_guidance_selection.html.erb:38
@@ -4424,10 +4424,10 @@ msgstr "Sélectionner les directives"
 
 #: ../../app/views/plans/_guidance_selection.html.erb:6
 msgid ""
-"To help you write your plan, %{application_name} can show you guidance from a "
+"To help you write your plan, %<application_name>s can show you guidance from a "
 "variety of organisations."
 msgstr ""
-"Pour vous aider à rédiger votre plan, %{application_name} peut vous montrer le"
+"Pour vous aider à rédiger votre plan, %<application_name>s peut vous montrer le"
 "s directives de divers organismes."
 
 #: ../../app/views/plans/_guidance_selection.html.erb:9
@@ -4448,11 +4448,11 @@ msgstr "Il n’y a pas de directives supplémentaires pour ce modèle."
 
 #: ../../app/views/plans/_guidance_selection.html.erb:40
 msgid ""
-"To help you write your plan, %{application_name} can show you guidance from a "
+"To help you write your plan, %<application_name>s can show you guidance from a "
 "variety of organisations. Please choose up to 6 organisations of the following"
 " organisations who offer guidance relevant to your plan."
 msgstr ""
-"Pour vous aider à rédiger votre plan, %{application_name} peut vous indiquer l"
+"Pour vous aider à rédiger votre plan, %<application_name>s peut vous indiquer l"
 "es directives de divers organismes. Veuillez choisir jusqu'à 6 organismes parm"
 "i  les suivants, qui offrent des directives pertinentes pour votre plan."
 
@@ -4480,17 +4480,17 @@ msgstr "Rédiger un plan"
 
 #: ../../app/views/plans/_overview_details.html.erb:9
 msgid ""
-"This plan is based on the \"%{template_title}\" template provided by %{org_name}"
+"This plan is based on the \"%<template_title>s\" template provided by %<org_name>s"
 "."
-msgstr "Ce plan est fondé sur le modèle \"%{template_title}\" fourni par %{org_name}."
+msgstr "Ce plan est fondé sur le modèle \"%<template_title>s\" fourni par %<org_name>s."
 
 #: ../../app/views/plans/_overview_details.html.erb:17
-msgid "Template version %{template_version}, published on %{published_date}"
-msgstr "Version du modèle %{template_version}, publiée le %{published_date}"
+msgid "Template version %<template_version>s, published on %<published_date>s"
+msgstr "Version du modèle %<template_version>s, publiée le %<published_date>s"
 
 #: ../../app/views/plans/_overview_details.html.erb:42
-msgid "%{phase_title} (%{sections_size} %{sections}, %{questions_size} %{questions})"
-msgstr "%{phase_title} (%{sections_size} %{sections}, %{questions_size} %{questions})"
+msgid "%<phase_title>s (%<sections_size>s %<sections>s, %<questions_size>s %<questions>s)"
+msgstr "%<phase_title>s (%<sections_size>s %<sections>s, %<questions_size>s %<questions>s)"
 
 #: ../../app/views/plans/_overview_details.html.erb:43
 msgid "section"
@@ -4606,11 +4606,11 @@ msgstr "Définir la visibilité du plan"
 #: ../../app/views/plans/_share_form.html.erb:9
 msgid ""
 "Public or organisational visibility is intended for finished plans. You must a"
-"nswer at least %{percentage}%% of the questions to enable these options. Note:"
+"nswer at least %<percentage>s%% of the questions to enable these options. Note:"
 " test plans are set to private visibility by default."
 msgstr ""
 "La visibilité publique ou organisationnelle est réservée aux plans finis. Vous"
-" devez répondre à au moins %{percentage} %% des questions pour activer ces opt"
+" devez répondre à au moins %<percentage>s %% des questions pour activer ces opt"
 "ions. Remarque : La visibilité privée est réglée par défaut pour les plans d’e"
 "ssai."
 
@@ -4700,8 +4700,8 @@ msgid "Click the 'Create plan' button below to begin."
 msgstr "Cliquez sur le bouton « Créer un plan » ci-dessous pour commencer."
 
 #: ../../app/views/plans/index.html.erb:35
-msgid "%{org_title} Plans"
-msgstr "Plans de %{org_title}"
+msgid "%<org_title>s Plans"
+msgstr "Plans de %<org_title>s"
 
 #: ../../app/views/plans/index.html.erb:36
 msgid ""
@@ -4790,11 +4790,11 @@ msgstr ""
 
 #: ../../app/views/public_pages/plan_index.html.erb:8
 msgid ""
-"Public DMPs are plans created using the %{application_name} service and shared"
+"Public DMPs are plans created using the %<application_name>s service and shared"
 " publicly by their owners. They are not vetted for quality, completeness, or a"
 "dherence to funder guidelines."
 msgstr ""
-"Les PGD publics sont des plans créés à l’aide du service %{application_name} e"
+"Les PGD publics sont des plans créés à l’aide du service %<application_name>s e"
 "t partagés publiquement par leur propriétaire. Leur qualité, leur degré d’achè"
 "vement et le respect des directives des bailleurs de fonds ne sont pas vérifié"
 "s."
@@ -4846,8 +4846,8 @@ msgid "terms and conditions"
 msgstr "Conditions"
 
 #: ../../app/views/shared/_create_plan_modal.html.erb:8
-msgid "Would you like to create a plan based on the \"%{name}\" template?"
-msgstr "Souhaitez-vous créer un plan fondé sur le modèle \"%{name}\"?"
+msgid "Would you like to create a plan based on the \"%<name>s\" template?"
+msgstr "Souhaitez-vous créer un plan fondé sur le modèle \"%<name>s\"?"
 
 #: ../../app/views/shared/_links.html.erb:7
 msgid "Links"
@@ -4900,8 +4900,8 @@ msgstr "Filtrer les plans"
 
 #: ../../app/views/shared/export/_plan_coversheet.erb:3
 #: ../../app/views/shared/export/_plan_txt.erb:65
-msgid "A Data Management Plan created using %{application_name}"
-msgstr "Un plan de gestion des données créé à l’aide de %{application_name}"
+msgid "A Data Management Plan created using %<application_name>s"
+msgstr "Un plan de gestion des données créé à l’aide de %<application_name>s"
 
 #: ../../app/views/shared/export/_plan_coversheet.erb:10
 #: ../../app/views/shared/export/_plan_txt.erb:5
@@ -4971,8 +4971,8 @@ msgstr "Le nom que vous avez entré ne faisait pas partie des suggestions réper
 
 #: ../../app/views/static_pages/about_us.html.erb:1
 #: ../../app/views/static_pages/about_us.html.erb:4
-msgid "About %{application_name}"
-msgstr "À propos de %{application_name}"
+msgid "About %<application_name>s"
+msgstr "À propos de %<application_name>s"
 
 #: ../../app/views/static_pages/about_us.html.erb:11
 msgid ""
@@ -5056,10 +5056,10 @@ msgstr ""
 #: ../../app/views/static_pages/about_us.html.erb:22
 msgid ""
 "get involved<em class=\"sr-only\"> (new window)</em><span class=\"new-window-popu"
-"p-info\">%{open_in_new_window_text}</span>"
+"p-info\">%<open_in_new_window_text>s</span>"
 msgstr ""
 "participer<em class=\"sr-only\"> (nouvelle fenêtre)</em><span class=\"new-window-"
-"popup-info\">%{open_in_new_window_text}</span>"
+"popup-info\">%<open_in_new_window_text>s</span>"
 
 #: ../../app/views/static_pages/about_us.html.erb:28
 msgid " in the project. You can also report bugs and request new features via "
@@ -5080,8 +5080,8 @@ msgid "If you have an account please sign in and start creating or editing your
 msgstr "Si vous avez un compte, connectez-vous pour créer ou modifier votre PGD."
 
 #: ../../app/views/static_pages/about_us.html.erb:34
-msgid "If you do not have a %{application_name} account, click on"
-msgstr "Si vous n’avez pas de compte %{application_name}, cliquez sur"
+msgid "If you do not have a %<application_name>s account, click on"
+msgstr "Si vous n’avez pas de compte %<application_name>s, cliquez sur"
 
 #: ../../app/views/static_pages/about_us.html.erb:34
 msgid "Sign up"
@@ -5310,48 +5310,48 @@ msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:11
 msgid ""
-"The information you provide will be used by the %{org_name} to offer you acces"
-"s to and personalisation of the %{application_name} service."
+"The information you provide will be used by the %<org_name>s to offer you acces"
+"s to and personalisation of the %<application_name>s service."
 msgstr ""
-"Les renseignements que vous fournissez seront utilisés par le %{org_name} pour"
-" vous offrir l'accès au service %{application_name} et la possibilité de perso"
+"Les renseignements que vous fournissez seront utilisés par le %<org_name>s pour"
+" vous offrir l'accès au service %<application_name>s et la possibilité de perso"
 "nnaliser ce dernier."
 
 #: ../../app/views/static_pages/privacy.html.erb:13
 msgid ""
-"The %{org_name} processes the personal data of %{application_name} users in or"
-"der to deliver and improve the %{application_name} service in a customised man"
+"The %<org_name>s processes the personal data of %<application_name>s users in or"
+"der to deliver and improve the %<application_name>s service in a customised man"
 "ner and to ensure each user receives relevant information."
 msgstr ""
-"%{org_name} traite les données personnelles des utilisateurs de %{application_"
-"name} afin d’offrir et d’améliorer le service %{application_name} de manière p"
+"%<org_name>s traite les données personnelles des utilisateurs de %{application_"
+"name} afin d’offrir et d’améliorer le service %<application_name>s de manière p"
 "ersonnalisée et de veiller à ce que chaque utilisateur reçoit des renseignemen"
 "ts pertinents."
 
 #: ../../app/views/static_pages/privacy.html.erb:15
 msgid ""
-"The processing of your personal data by the %{org_name} is necessary for pursu"
+"The processing of your personal data by the %<org_name>s is necessary for pursu"
 "ing the following legitimate interests:"
 msgstr ""
-"Le traitement de vos données personnelles par %{org_name} est nécessaire pour "
+"Le traitement de vos données personnelles par %<org_name>s est nécessaire pour "
 "donner suite aux intérêts légitimes suivants :"
 
 #: ../../app/views/static_pages/privacy.html.erb:18
 msgid ""
-"To provide access to the %{application_name} service and personalisation of yo"
+"To provide access to the %<application_name>s service and personalisation of yo"
 "ur user experience e.g. provision of relevant templates and guidance for your "
 "organisation."
 msgstr ""
-"Donner accès au service %{application_name} et permettre la personnalisation d"
+"Donner accès au service %<application_name>s et permettre la personnalisation d"
 "e votre expérience utilisateur (p. ex., offre de modèles et de directives pert"
 "inents pour votre organisme)."
 
 #: ../../app/views/static_pages/privacy.html.erb:20
 msgid ""
-"To keep you up to date with news about %{application_name} such as new feature"
+"To keep you up to date with news about %<application_name>s such as new feature"
 "s or improvements, or changes to our Privacy Policy."
 msgstr ""
-"Vous tenir au courant des nouvelles concernant %{application_name}, comme les "
+"Vous tenir au courant des nouvelles concernant %<application_name>s, comme les "
 "nouvelles fonctionnalités ou améliorations ou les modifications à notre Politi"
 "que de confidentialité."
 
@@ -5362,29 +5362,29 @@ msgstr "À des fins de sécurité du réseau et de l’information."
 #: ../../app/views/static_pages/privacy.html.erb:24
 msgid ""
 "We will hold the personal data you provided us for as long as you continue usi"
-"ng the %{application_name} service. Your personal data can be removed from thi"
-"s service upon request to the %{application_name} team within a period of 30 d"
+"ng the %<application_name>s service. Your personal data can be removed from thi"
+"s service upon request to the %<application_name>s team within a period of 30 d"
 "ays."
 msgstr ""
 "Nous conserverons les données personnelles que vous nous avez fournies tant qu"
-"e vous continuerez à utiliser le service %{application_name}. Pour faire retir"
+"e vous continuerez à utiliser le service %<application_name>s. Pour faire retir"
 "er vos données personnelles de ce service, vous devez en faire la demande aupr"
-"ès de l’équipe %{application_name} dans un délai de 30 jours."
+"ès de l’équipe %<application_name>s dans un délai de 30 jours."
 
 #: ../../app/views/static_pages/privacy.html.erb:26
 msgid ""
-"If you have any questions, please contact the %{application_name} team at: <a "
-"href='mailto:%{helpdesk_email}'>%{helpdesk_email}</a>"
+"If you have any questions, please contact the %<application_name>s team at: <a "
+"href='mailto:%<helpdesk_email>s'>%<helpdesk_email>s</a>"
 msgstr ""
 "Si vous avez des questions, veuillez communiquer avec l’équipe %{application_n"
-"ame} par courriel à : <a href='mailto:%{helpdesk_email}'>%{helpdesk_email}</a>"
+"ame} par courriel à : <a href='mailto:%<helpdesk_email>s'>%<helpdesk_email>s</a>"
 
 #: ../../app/views/static_pages/privacy.html.erb:30
 msgid ""
-"This statement was last revised on %{revdate} and may be revised at any time w"
+"This statement was last revised on %<revdate>s and may be revised at any time w"
 "ith prior notice."
 msgstr ""
-"Cette déclaration a été révisée pour la dernière fois le %{revdate} et peut êt"
+"Cette déclaration a été révisée pour la dernière fois le %<revdate>s et peut êt"
 "re révisée en tout temps. Un préavis sera donné."
 
 #: ../../app/views/static_pages/termsuse.html.erb:12
@@ -5459,7 +5459,7 @@ msgid ""
 "ookies and how we use them is available on the <a target='_blank' href='http:/"
 "/www.dcc.ac.uk/about-us/about-site/website-terms-use/cookies' class=\"has-new-w"
 "indow-popup-info\">main DCC website<em class=\"sr-only\"> (new window)</em><span "
-"class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>.</p>\n"
+"class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a>.</p>\n"
 "\n"
 "      <h3>Third party APIs</h3>\n"
 "\n"
@@ -5525,7 +5525,7 @@ msgstr ""
 "ilisons sur <a target='_blank' href='http://www.dcc.ac.uk/about-us/about-site/"
 "website-terms-use/cookies' class=\"has-new-window-popup-info\">site Web principa"
 "l du DCC <em class=\"sr-only\">(nouvelle fenêtre)</em> <span class=\"new-window-p"
-"opup-info\">%{open_in_new_window_text}</span></a>.</p>\n"
+"opup-info\">%<open_in_new_window_text>s</span></a>.</p>\n"
 "\n"
 "       <h3> API tierces </h3>\n"
 "\n"
@@ -5570,8 +5570,8 @@ msgid "Email credentials to contact"
 msgstr "Envoyer les identifiants au contact par courriel"
 
 #: ../../app/views/super_admin/api_clients/_form.html.erb:81
-msgid "Are you sure you want to delete the API client: \"%{name}\""
-msgstr "Souhaitez-vous vraiment supprimer le client API: \"%{name}\""
+msgid "Are you sure you want to delete the API client: \"%<name>s\""
+msgstr "Souhaitez-vous vraiment supprimer le client API: \"%<name>s\""
 
 #: ../../app/views/super_admin/api_clients/edit.html.erb:1
 msgid "Editing API client"
@@ -5587,8 +5587,8 @@ msgid "View all API clients"
 msgstr "Voir tous les clients API"
 
 #: ../../app/views/super_admin/api_clients/email_credentials.js.erb:1
-msgid "The credentials have been sent to %{email}."
-msgstr "Les renseignements d’identification ont été envoyés à %{email}."
+msgid "The credentials have been sent to %<email>s."
+msgstr "Les renseignements d’identification ont été envoyés à %<email>s."
 
 #: ../../app/views/super_admin/api_clients/index.html.erb:1
 #: ../../app/views/super_admin/api_clients/index.html.erb:6
@@ -5636,8 +5636,8 @@ msgid "Body"
 msgstr "Corps"
 
 #: ../../app/views/super_admin/notifications/_form.html.erb:71
-msgid "Are you sure you want to delete the notification \"%{title}\""
-msgstr "Souhaitez-vous vraiment supprimer l’avis \"%{title}\""
+msgid "Are you sure you want to delete the notification \"%<title>s\""
+msgstr "Souhaitez-vous vraiment supprimer l’avis \"%<title>s\""
 
 #: ../../app/views/super_admin/notifications/edit.html.erb:1
 #: ../../app/views/super_admin/notifications/edit.html.erb:5
@@ -5662,7 +5662,7 @@ msgid "New Notification"
 msgstr "Nouvel avis"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:9
-msgid "Merging '%{from_org_name}' into '%{to_org_name}'"
+msgid "Merging '%<from_org_name>s' into '%<to_org_name>s'"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:11
@@ -5671,7 +5671,7 @@ msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:12
 msgid ""
-"Counts of '%{to_org_name}' records before and after a merge with %{from_org_na"
+"Counts of '%<to_org_name>s' records before and after a merge with %{from_org_na"
 "me}."
 msgstr ""
 
@@ -5681,11 +5681,11 @@ msgid "Record Type"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:18
-msgid "'%{to_org_name}' Count - before merge"
+msgid "'%<to_org_name>s' Count - before merge"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:19
-msgid "'%{to_org_name}' Count - after merge"
+msgid "'%<to_org_name>s' Count - after merge"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:38
@@ -5695,17 +5695,17 @@ msgstr ""
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:39
 msgid ""
 "The table below shows the specific changes that will occur during the merge pr"
-"ocess. Once the merge is complete, '%{from_org_name}' will be deleted. You can"
+"ocess. Once the merge is complete, '%<from_org_name>s' will be deleted. You can"
 " then consolidate/correct any merge issues (e.g. remove any departments that w"
 "ere duplicated)"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:45
-msgid "%{from_org_name} - Before"
+msgid "%<from_org_name>s - Before"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:46
-msgid "%{to_org_name} - Before"
+msgid "%<to_org_name>s - Before"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:61
@@ -5730,7 +5730,7 @@ msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:95
 msgid ""
-"Warning: '%{from_org_name}' has Plans that are currently in the review process"
+"Warning: '%<from_org_name>s' has Plans that are currently in the review process"
 ". The Org admins may not be able to see these plans after the merge!"
 msgstr ""
 
@@ -5753,8 +5753,8 @@ msgid "New organisation"
 msgstr "Nouvel organisme"
 
 #: ../../app/views/super_admin/themes/_form.html.erb:17
-msgid "Are you sure you want to delete the theme \"%{title}\"?"
-msgstr "Souhaitez-vous vraiment supprimer le thème \"%{title}\"?"
+msgid "Are you sure you want to delete the theme \"%<title>s\"?"
+msgstr "Souhaitez-vous vraiment supprimer le thème \"%<title>s\"?"
 
 #: ../../app/views/super_admin/themes/edit.html.erb:3
 #: ../../app/views/super_admin/themes/new.html.erb:3
@@ -5775,7 +5775,7 @@ msgid ""
 "il}. <br> The selected account will then be removed"
 msgstr ""
 "<br>Le contenu de l’utilisateur sélectionné sera fusionné dans le compte pour "
-"%{user_email}. <br> Le compte sélectionné sera alors supprimé"
+"%<user_email>s. <br> Le compte sélectionné sera alors supprimé"
 
 #: ../../app/views/super_admin/users/edit.html.erb:63
 msgid "Archive"
@@ -5783,11 +5783,11 @@ msgstr "Archiver"
 
 #: ../../app/views/super_admin/users/edit.html.erb:64
 msgid ""
-"You are about to archive %{user_name}.  This will remove their personal inform"
+"You are about to archive %<user_name>s.  This will remove their personal inform"
 "ation, but retain their plans, answers, and comments.  They will be unable to "
 "sign-in. Are you sure?"
 msgstr ""
-"Vous êtes sur le point d’archiver %{user_name}. Les renseignements personnels "
+"Vous êtes sur le point d’archiver %<user_name>s. Les renseignements personnels "
 "de ce dernier seront retirés, mais ses plans, ses réponses et ses commentaires"
 " seront conservés. Il ne sera plus en mesure de se connecter. Êtes-vous sûr de"
 " vouloir continuer?"
@@ -5895,97 +5895,97 @@ msgstr "Vous pouvez modifier vos préférences quant aux avis sur votre page de
 #: ../../app/views/user_mailer/permissions_change_notification.html.erb:2
 #: ../../app/views/user_mailer/plan_visibility.html.erb:2
 #: ../../app/views/user_mailer/sharing_notification.html.erb:2
-msgid "Hello %{username}"
-msgstr "Bonjour %{username}"
+msgid "Hello %<username>s"
+msgstr "Bonjour %<username>s"
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:6
-msgid "You have been granted administrator privileges in %{tool_name}:"
-msgstr "Vous disposez de privilèges d’administrateur dans %{tool_name}:"
+msgid "You have been granted administrator privileges in %<tool_name>s:"
+msgstr "Vous disposez de privilèges d’administrateur dans %<tool_name>s:"
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:13
-msgid "You have been revoked administrator privileges in %{tool_name}."
-msgstr "On a révoqué vos privilèges d’administrateur dans %{tool_name}."
+msgid "You have been revoked administrator privileges in %<tool_name>s."
+msgstr "On a révoqué vos privilèges d’administrateur dans %<tool_name>s."
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:17
 msgid ""
-"More information about administering the %{tool_name} for users at your organi"
-"sation is available at the %{help_url}."
+"More information about administering the %<tool_name>s for users at your organi"
+"sation is available at the %<help_url>s."
 msgstr ""
-"Vous trouverez plus de renseignements sur l’administration de %{tool_name} pou"
-"r les utilisateurs de votre organisme ici : %{help_url}."
+"Vous trouverez plus de renseignements sur l’administration de %<tool_name>s pou"
+"r les utilisateurs de votre organisme ici : %<help_url>s."
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:2
-msgid "Hello %{name},"
-msgstr "Bonjour %{name},"
+msgid "Hello %<name>s,"
+msgstr "Bonjour %<name>s,"
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:8
-msgid "Please use the following credentials when accessing the %{tool_name} API."
+msgid "Please use the following credentials when accessing the %<tool_name>s API."
 msgstr ""
 "Veuillez utiliser les identifiants suivants pour accéder à l’API de %{tool_nam"
 "e}."
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:23
-msgid "Please refer to the API documentation at: %{api_documentation_url}"
+msgid "Please refer to the API documentation at: %<api_documentation_url>s"
 msgstr ""
 "Veuillez consulter la documentation de l’API à l’adresse : %{api_documentation"
 "_url}"
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:29
 msgid ""
-"Do not share these credentials. They for use with the %{external_application} "
+"Do not share these credentials. They for use with the %<external_application>s "
 "application. If you do share your credentials with another application we rese"
 "rve the right to revoke your access to the API."
 msgstr ""
 "Ne partagez pas ces renseignements d’identification. Ils sont à utiliser avec "
-"l’application %{external_application}. Si vous les partagez avec une autre app"
+"l’application %<external_application>s. Si vous les partagez avec une autre app"
 "lication, nous nous réservons le droit de révoquer votre accès à l'API."
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:34
 msgid ""
-"If you did not request access to the %{tool_name} API or did not request for y"
-"our credentials to be renewed, please contact us at %{helpdesk_email}"
+"If you did not request access to the %<tool_name>s API or did not request for y"
+"our credentials to be renewed, please contact us at %<helpdesk_email>s"
 msgstr ""
-"Si vous n’avez pas demandé l’accès à l’API %{tool_name} ni le renouvellement d"
+"Si vous n’avez pas demandé l’accès à l’API %<tool_name>s ni le renouvellement d"
 "e vos renseignements d’identification, veuillez nous écrire à %{helpdesk_email"
 "}"
 
 #: ../../app/views/user_mailer/feedback_complete.html.erb:2
-msgid "Hello %{recipient_name}"
-msgstr "Bonjour %{recipient_name}"
+msgid "Hello %<recipient_name>s"
+msgstr "Bonjour %<recipient_name>s"
 
 #: ../../app/views/user_mailer/feedback_complete.html.erb:5
 msgid ""
-"%{commenter} has finished providing feedback on the plan  \"%{link_html}\". Comm"
+"%<commenter>s has finished providing feedback on the plan  \"%<link_html>s\". Comm"
 "ents can be found in the 'Write plan' tab on the right side of the page (Guida"
 "nce/Comments)."
 msgstr ""
-"%{commenter} a terminé de fournir ses commentaires sur le plan \"%{link_html}\"."
+"%<commenter>s a terminé de fournir ses commentaires sur le plan \"%<link_html>s\"."
 " Les commentaires se trouvent à l’onglet « Rédiger un plan » sur le côté droit"
 " de la page (Directives / Commentaires)."
 
 #: ../../app/views/user_mailer/feedback_notification.html.erb:2
-msgid "Hello %{user_name},"
-msgstr "Bonjour %{user_name},"
+msgid "Hello %<user_name>s,"
+msgstr "Bonjour %<user_name>s,"
 
 #: ../../app/views/user_mailer/feedback_notification.html.erb:5
 msgid ""
-"%{requestor} has requested feedback on a plan %{link_html}. To add comments, p"
-"lease visit the 'Plans' page under the Admin menu in %{tool_name} and open the"
+"%<requestor>s has requested feedback on a plan %<link_html>s. To add comments, p"
+"lease visit the 'Plans' page under the Admin menu in %<tool_name>s and open the"
 " plan."
 msgstr ""
-"%{requestor} a demandé des commentaires sur un plan %{link_html}. Pour ajouter"
+"%<requestor>s a demandé des commentaires sur un plan %<link_html>s. Pour ajouter"
 " des commentaires, veuillez consulter la page « Plans » dans le menu Admin dan"
-"s %{tool_name} et ouvrir le plan."
+"s %<tool_name>s et ouvrir le plan."
 
 #: ../../app/views/user_mailer/new_comment.html.erb:5
 msgid ""
-"%{commenter_name} has commented on your plan %{plan_title}. To view the commen"
+"%<commenter_name>s has commented on your plan %<plan_title>s. To view the commen"
 "ts, follow the link to the DMP below, or navigate to the plan via My Dashboard"
-" page in %{tool_name}."
+" page in %<tool_name>s."
 msgstr ""
-"%{commenter_name} a effectué des commentaires sur votre plan %{plan_title}. Po"
+"%<commenter_name>s a effectué des commentaires sur votre plan %<plan_title>s. Po"
 "ur les afficher, suivez le lien vers le PGD ci-dessous ou accédez au plan à pa"
-"rtir de la page Mon tableau de bord dans %{tool_name}."
+"rtir de la page Mon tableau de bord dans %<tool_name>s."
 
 #: ../../app/views/user_mailer/new_comment.html.erb:10
 msgid "Below is a summary of the sections and questions which have comments."
@@ -6002,24 +6002,24 @@ msgstr ""
 "ves pour chaque question."
 
 #: ../../app/views/user_mailer/new_comment.html.erb:15
-msgid "DMP: %{phase_link}"
-msgstr "PGD : %{phase_link}"
+msgid "DMP: %<phase_link>s"
+msgstr "PGD : %<phase_link>s"
 
 #: ../../app/views/user_mailer/new_comment.html.erb:18
-msgid "Section name: %{section_title}"
-msgstr "Nom de la section: %{section_title}"
+msgid "Section name: %<section_title>s"
+msgstr "Nom de la section: %<section_title>s"
 
 #: ../../app/views/user_mailer/new_comment.html.erb:21
-msgid "Question: %{question_number}"
-msgstr "Question : %{question_number}"
+msgid "Question: %<question_number>s"
+msgstr "Question : %<question_number>s"
 
 #: ../../app/views/user_mailer/permissions_change_notification.html.erb:5
 msgid ""
-"Your permissions relating to %{plan_title} have changed. You now have %{type} "
-"access. This means you can %{placeholder1} %{placeholder2}"
+"Your permissions relating to %<plan_title>s have changed. You now have %<type>s "
+"access. This means you can %<placeholder1>s %<placeholder2>s"
 msgstr ""
-"Vos autorisations relatives à %{plan_title} ont changé. Vous avez maintenant u"
-"n accès %{type}. Cela signifie que vous pouvez %{placeholder1} %{placeholder2}"
+"Vos autorisations relatives à %<plan_title>s ont changé. Vous avez maintenant u"
+"n accès %<type>s. Cela signifie que vous pouvez %<placeholder1>s %<placeholder2>s"
 
 #: ../../app/views/user_mailer/plan_access_removed.html.erb:2
 msgid "Hello "
@@ -6034,8 +6034,8 @@ msgid " has been removed by "
 msgstr " a été supprimé(e) par"
 
 #: ../../app/views/user_mailer/plan_visibility.html.erb:5
-msgid "The plan %{plan_title} had its visibility changed to %{plan_visibility}."
-msgstr "La visibilité du plan %{plan_title} est passée à %{plan_visibility}."
+msgid "The plan %<plan_title>s had its visibility changed to %<plan_visibility>s."
+msgstr "La visibilité du plan %<plan_title>s est passée à %<plan_visibility>s."
 
 #: ../../app/views/user_mailer/plan_visibility.html.erb:9
 msgid "Visibility definitions:"
@@ -6052,14 +6052,14 @@ msgstr "Public : Tous peuvent consulter le plan sur le Web"
 #: ../../app/views/user_mailer/plan_visibility.html.erb:17
 msgid ""
 "If you have questions pertaining to this action, please visit the My Dashboard"
-" page in %{tool_name}"
+" page in %<tool_name>s"
 msgstr ""
 "Si vous avez des questions concernant cette action, veuillez visiter la page M"
-"on tableau de bord dans %{tool_name}"
+"on tableau de bord dans %<tool_name>s"
 
 #: ../../app/views/user_mailer/question_answered.html.erb:2
-msgid "Hello %{recipient_name},"
-msgstr "Bonjour %{recipient_name},"
+msgid "Hello %<recipient_name>s,"
+msgstr "Bonjour %<recipient_name>s,"
 
 #: ../../app/views/user_mailer/question_answered.html.erb:5
 msgid " is creating a Data Management Plan and has answered "
@@ -6079,24 +6079,25 @@ msgstr " basé sur le modèle"
 
 #: ../../app/views/user_mailer/sharing_notification.html.erb:5
 msgid ""
-"Your colleague %{inviter_name} has invited you to contribute to
\n"
+"Your colleague %<inviter_name>s has invited you to contribute to
+\n"%<tool_name>s
 "          their Data Management Plan in %{tool_name}"
-msgstr ""
-"Votre collègue %{inviter_name} vous a invité(e) à contribuer à son plan de ges"
+msgstr ""%<inviter_name>s
+"Votre collègue %{invit%<tool_name>ss a invité(e) à contribuer à son plan de ges"
 "tion des données dans %{tool_name}"
 
-#: ../../app/views/user_mailer/welcome_notification.html.erb:2
-msgid "Welcome to %{tool_name}, %{username}"
+#: ../../app/views%<tool_name>s/w%<username>sfication.html.erb:2
+msgid "Welcome to %{%<tool_name>s%{%<username>s
 msgstr "Bienvenue à %{tool_name}, %{username}"
 
 #: ../../app/views/user_mailer/welcome_notification.html.erb:5
-msgid ""
+m%<tool_name>s
 "%{tool_name} will help you to develop your Data Management Plan. If you have a"
-"ny queries or feedback as you use the tool, please contact us at %{helpdesk_em"
+"ny queries or %<contact_us>sou use the tool, please contact us at %{helpdesk_em"
 "ail} or visit %{contact_us}"
-msgstr ""
+m%<tool_name>s
 "%{tool_name} vous aidera à élaborer votre plan de gestion des données. Si vous"
-" avez des questions ou des commentaires sur l’emploi de l’outil, veuillez nous"
+" avez des %<helpdesk_email>scommentaires sur l%<contact_us>soutil, veuillez nous"
 " écrire à %{helpdesk_email} ou rendez-vous à %{contact_us}"
 
 #: ../../app/views/user_mailer/welcome_notification.html.erb:13
@@ -6105,8 +6106,8 @@ msgstr ""
 "Vous pouvez modifier vos préférences relatives aux avis sur votre page de prof"
 "il."
 
-#: ../../app/views/users/_admin_grant_permissions.html.erb:9
-msgid "Editing privileges for %{username}"
+#: ../../app/views/users/_admi%<username>smissions.html.erb:9
+msgid "Editing privileges for %{usernam%<username>s
 msgstr "Modification des privilèges de %{username}"
 
 #: ../../app/views/users/_admin_grant_permissions.html.erb:19
diff --git a/config/locale/fr_FR/app.po b/config/locale/fr_FR/app.po
index dc0f963d2e..38c655bc48 100644
--- a/config/locale/fr_FR/app.po
+++ b/config/locale/fr_FR/app.po
@@ -20,17 +20,17 @@ msgstr ""
 
 #: ../../app/controllers/answers_controller.rb:24
 msgid ""
-"There is no question with id %{question_id} associated to plan id %{plan_id} f"
+"There is no question with id %<question_id>s associated to plan id %<plan_id>s f"
 "or which to create or update an answer"
 msgstr ""
-"Il n'existe aucune question avec l'identifiant %{question_id} associée à l'ide"
-"ntifiant de plan %{plan_id} pour laquelle une réponse peut être créée ou modif"
+"Il n'existe aucune question avec l'identifiant %<question_id>s associée à l'ide"
+"ntifiant de plan %<plan_id>s pour laquelle une réponse peut être créée ou modif"
 "iée"
 
 #: ../../app/controllers/answers_controller.rb:34
-msgid "There is no plan with id %{id} for which to create or update an answer"
+msgid "There is no plan with id %<id>s for which to create or update an answer"
 msgstr ""
-"Il n'existe aucun plan avec l'identifiant %{id} pour lequel une réponse peut ê"
+"Il n'existe aucun plan avec l'identifiant %<id>s pour lequel une réponse peut ê"
 "tre créée ou modifiée"
 
 #: ../../app/controllers/api/v0/base_controller.rb:124
@@ -140,12 +140,12 @@ msgid "You need to sign in or sign up before continuing."
 msgstr "Vous devez vous connecter ou vous enregistrer afin de continuer."
 
 #: ../../app/controllers/application_controller.rb:100
-msgid "Unable to %{action} the %{object}.%{errors}"
-msgstr "Impossible de %{action} le %{object}. %{errors}"
+msgid "Unable to %<action>s the %<object>s.%<errors>s"
+msgstr "Impossible de %<action>s le %<object>s. %<errors>s"
 
 #: ../../app/controllers/application_controller.rb:108
-msgid "Successfully %{action} the %{object}."
-msgstr "Avec succès %{action} le %{object}."
+msgid "Successfully %<action>s the %<object>s."
+msgstr "Avec succès %<action>s le %<object>s."
 
 #: ../../app/controllers/application_controller.rb:123
 msgid "API client"
@@ -208,8 +208,8 @@ msgid "Restricted access to View All the records"
 msgstr "Accès restreint à Voir tous les enregistrements"
 
 #: ../../app/controllers/concerns/paginable.rb:180
-msgid "Sort by %{sort_field}"
-msgstr "Trier par %{sort_field}"
+msgid "Sort by %<sort_field>s"
+msgstr "Trier par %<sort_field>s"
 
 #: ../../app/controllers/concerns/template_methods.rb:10
 msgid "customisation"
@@ -416,12 +416,12 @@ msgstr ""
 "ilisateurs."
 
 #: ../../app/controllers/identifiers_controller.rb:18
-msgid "Successfully unlinked your account from %{is}."
-msgstr "Compte délié de %{is} avec succès."
+msgid "Successfully unlinked your account from %<is>s."
+msgstr "Compte délié de %<is>s avec succès."
 
 #: ../../app/controllers/identifiers_controller.rb:22
-msgid "Unable to unlink your account from %{is}."
-msgstr "Impossible de délier votre compte de %{is}."
+msgid "Unable to unlink your account from %<is>s."
+msgstr "Impossible de délier votre compte de %<is>s."
 
 #: ../../app/controllers/org_admin/phases_controller.rb:18
 #: ../../app/controllers/org_admin/templates_controller.rb:114
@@ -471,8 +471,8 @@ msgid "update"
 msgstr "Mise à jour"
 
 #: ../../app/controllers/org_admin/plans_controller.rb:32
-msgid "%{plan_owner} has been notified that you have finished providing feedback"
-msgstr "%{plan_owner} a été informé que vous avez finalisé l'assistance conseil"
+msgid "%<plan_owner>s has been notified that you have finished providing feedback"
+msgstr "%<plan_owner>s a été informé que vous avez finalisé l'assistance conseil"
 
 #: ../../app/controllers/org_admin/plans_controller.rb:38
 msgid "Unable to notify user that you have finished providing feedback."
@@ -567,8 +567,8 @@ msgstr "Tous les modèles"
 
 #: ../../app/controllers/org_admin/templates_controller.rb:48
 #: ../../app/views/org_admin/templates/index.html.erb:52
-msgid "%{org_name} Templates"
-msgstr "%{org_name} Modèles"
+msgid "%<org_name>s Templates"
+msgstr "%<org_name>s Modèles"
 
 #: ../../app/controllers/org_admin/templates_controller.rb:50
 #: ../../app/views/org_admin/templates/index.html.erb:54
@@ -580,13 +580,13 @@ msgid "Customizable Templates"
 msgstr "Modèles personnalisables"
 
 #: ../../app/controllers/org_admin/templates_controller.rb:214
-msgid "Error parsing links for a %{template}"
-msgstr "Erreur d'analyse des liens pour un %{template}"
+msgid "Error parsing links for a %<template>s"
+msgstr "Erreur d'analyse des liens pour un %<template>s"
 
 #: ../../app/controllers/org_admin/templates_controller.rb:345
 #: ../../app/controllers/public_pages_controller.rb:68
-msgid "Template created using the %{application_name} service. Last modified %{date}"
-msgstr "Modèle créé avec %{application_name}. Dernière modification %{date}"
+msgid "Template created using the %<application_name>s service. Last modified %<date>s"
+msgstr "Modèle créé avec %<application_name>s. Dernière modification %<date>s"
 
 #: ../../app/controllers/org_admin/templates_controller.rb:360
 #: ../../app/controllers/public_pages_controller.rb:83
@@ -606,8 +606,8 @@ msgid "Please choose an organisation"
 msgstr "Veuillez choisir un organisme"
 
 #: ../../app/controllers/plan_exports_controller.rb:85
-msgid "Created using %{application_name}. Last modified %{date}"
-msgstr "Créé en utilisant %{application_name}. Dernière modification %{date}"
+msgid "Created using %<application_name>s. Last modified %<date>s"
+msgstr "Créé en utilisant %<application_name>s. Dernière modification %<date>s"
 
 #: ../../app/controllers/plans_controller.rb:51
 msgid "This is a"
@@ -648,15 +648,15 @@ msgstr "copié"
 
 #: ../../app/controllers/plans_controller.rb:408
 msgid ""
-"Unable to change the plan's status since it is needed at least %{percentage} p"
+"Unable to change the plan's status since it is needed at least %<percentage>s p"
 "ercentage responded"
 msgstr ""
-"Impossible de changer le statut du plan, au moins %{percentage} % de questions"
+"Impossible de changer le statut du plan, au moins %<percentage>s % de questions"
 " répondues sont nécessaires"
 
 #: ../../app/controllers/plans_controller.rb:416
-msgid "Unable to find plan id %{plan_id}"
-msgstr "Impossible de trouver le plan avec l'identifiant %{plan_id}"
+msgid "Unable to find plan id %<plan_id>s"
+msgstr "Impossible de trouver le plan avec l'identifiant %<plan_id>s"
 
 #: ../../app/controllers/plans_controller.rb:433
 msgid "Your project is now a test."
@@ -671,18 +671,18 @@ msgid "Unable to change the plan's test status"
 msgstr "Impossible de changer le statut du plan"
 
 #: ../../app/controllers/plans_controller.rb:451
-msgid "There is no plan associated with id %{id}"
-msgstr "Il n'existe aucun plan associé à l'identifiant %{id}"
+msgid "There is no plan associated with id %<id>s"
+msgstr "Il n'existe aucun plan associé à l'identifiant %<id>s"
 
 #: ../../app/controllers/registrations_controller.rb:35
 msgid ""
 "Please make a choice below. After linking your\n"
-"                       details to a %{application_name} account,\n"
+"                       details to a %<application_name>s account,\n"
 "                       you will be able to sign in directly with your\n"
 "                       institutional credentials."
 msgstr ""
 "Veuillez faire un choix ci-dessous. Après avoir lié votre\n"
-"                       détails sur un compte %{application_name},\n"
+"                       détails sur un compte %<application_name>s,\n"
 "                       vous pourrez vous connecter directement avec votre\n"
 "                       diplômes institutionnels."
 
@@ -764,15 +764,15 @@ msgstr "Le mot de passe et sa confirmation doivent correspondre"
 
 #: ../../app/controllers/roles_controller.rb:26
 msgid ""
-"Cannot share plan with %{email} since that email matches with the owner of the"
+"Cannot share plan with %<email>s since that email matches with the owner of the"
 " plan."
 msgstr ""
-"Vous ne pouvez pas partager ce plan avec %{email} parce que cette adresse corr"
+"Vous ne pouvez pas partager ce plan avec %<email>s parce que cette adresse corr"
 "espond à celui du propriétaire du plan."
 
 #: ../../app/controllers/roles_controller.rb:37
-msgid "Plan is already shared with %{email}."
-msgstr "Le plan est déjà partagé avec %{email}."
+msgid "Plan is already shared with %<email>s."
+msgstr "Le plan est déjà partagé avec %<email>s."
 
 #: ../../app/controllers/roles_controller.rb:44
 #: ../../app/views/shared/_create_account_form.html.erb:4
@@ -784,12 +784,12 @@ msgid "Surname"
 msgstr "Nom de famille"
 
 #: ../../app/controllers/roles_controller.rb:48
-msgid "Invitation to %{email} issued successfully."
-msgstr "Invitation à %{email} émise avec succès."
+msgid "Invitation to %<email>s issued successfully."
+msgstr "Invitation à %<email>s émise avec succès."
 
 #: ../../app/controllers/roles_controller.rb:53
-msgid "Plan shared with %{email}."
-msgstr "Plan partagé avec %{email}."
+msgid "Plan shared with %<email>s."
+msgstr "Plan partagé avec %<email>s."
 
 #: ../../app/controllers/roles_controller.rb:68
 msgid "You must provide a valid email address and select a permission level."
@@ -803,9 +803,9 @@ msgstr "Veuillez entrer une adresse électronique"
 
 #: ../../app/controllers/roles_controller.rb:93
 msgid ""
-"Successfully changed the permissions for %{email}. They have been notified via"
+"Successfully changed the permissions for %<email>s. They have been notified via"
 " email."
-msgstr "Modification des autorisations pour %{email}. Ils ont été informés par e-mail."
+msgstr "Modification des autorisations pour %<email>s. Ils ont été informés par e-mail."
 
 #: ../../app/controllers/roles_controller.rb:108
 msgid "Access removed"
@@ -838,7 +838,7 @@ msgstr ""
 "tres d'export."
 
 #: ../../app/controllers/super_admin/api_clients_controller.rb:45
-msgid ". The API credentials have been emailed to %{email}"
+msgid ". The API credentials have been emailed to %<email>s"
 msgstr ""
 ". Les informations d'identification de l'API ont été envoyées par e-mail à %{e"
 "mail}"
@@ -856,16 +856,16 @@ msgid "Unable to change the notification's active status"
 msgstr "Impossible de modifier l'état actif de la notification"
 
 #: ../../app/controllers/super_admin/notifications_controller.rb:104
-msgid "There is no notification associated with id  %{id}"
-msgstr "Il n'existe aucune notification associée à l'identifiant %{id}"
+msgid "There is no notification associated with id  %<id>s"
+msgstr "Il n'existe aucune notification associée à l'identifiant %<id>s"
 
 #: ../../app/controllers/super_admin/org_swaps_controller.rb:22
 msgid ""
 "Your organisation affiliation has been changed. You may now edit templates for"
-" %{org_name}."
+" %<org_name>s."
 msgstr ""
 "Votre organisme d'affiliation a été changé. Vous pouvez à présent éditer les m"
-"odèles de %{org_name}."
+"odèles de %<org_name>s."
 
 #: ../../app/controllers/super_admin/org_swaps_controller.rb:25
 msgid "Unable to change your organisation affiliation at this time."
@@ -928,16 +928,16 @@ msgid "Successfully signed in"
 msgstr "Vous êtes connecté"
 
 #: ../../app/controllers/users/omniauth_callbacks_controller.rb:56
-msgid "Your account has been successfully linked to %{scheme}."
-msgstr "Votre compte a été lié à %{scheme} avec succès."
+msgid "Your account has been successfully linked to %<scheme>s."
+msgstr "Votre compte a été lié à %<scheme>s avec succès."
 
 #: ../../app/controllers/users/omniauth_callbacks_controller.rb:61
-msgid "Unable to link your account to %{scheme}."
-msgstr "Impossible de lier votre compte avec %{scheme}."
+msgid "Unable to link your account to %<scheme>s."
+msgstr "Impossible de lier votre compte avec %<scheme>s."
 
 #: ../../app/controllers/users_controller.rb:141
-msgid "Successfully %{action} %{username}'s account."
-msgstr "Compte de %{username} %{action} avec succès."
+msgid "Successfully %<action>s %<username>s's account."
+msgstr "Compte de %<username>s %<action>s avec succès."
 
 #: ../../app/controllers/users_controller.rb:142
 msgid "activated"
@@ -948,8 +948,8 @@ msgid "deactivated"
 msgstr "désactivé"
 
 #: ../../app/controllers/users_controller.rb:149
-msgid "Unable to %{action} %{username}"
-msgstr "Impossible de %{action} %{username}"
+msgid "Unable to %<action>s %<username>s"
+msgstr "Impossible de %<action>s %<username>s"
 
 #: ../../app/controllers/users_controller.rb:150
 msgid "activate"
@@ -1021,18 +1021,18 @@ msgid "Creator:"
 msgstr "Créateur : "
 
 #: ../../app/helpers/feedbacks_helper.rb:6
-msgid "%{application_name}: Your plan has been submitted for feedback"
-msgstr "%{application_name} : Une assistance conseil a a été demandée pour votre plan"
+msgid "%<application_name>s: Your plan has been submitted for feedback"
+msgstr "%<application_name>s : Une assistance conseil a a été demandée pour votre plan"
 
 #: ../../app/helpers/feedbacks_helper.rb:10
 msgid ""
-"<p>Hello %{user_name}.</p><p>Your plan \"%{plan_name}\" has been submitted for f"
+"<p>Hello %<user_name>s.</p><p>Your plan \"%<plan_name>s\" has been submitted for f"
 "eedback from an\n"
 "      administrator at your organisation. If you have questions pertaining to "
 "this action, please contact us\n"
-"      at %{organisation_email}.</p>"
+"      at %<organisation_email>s.</p>"
 msgstr ""
-"<p> Bonjour %{user_name}. </p><p> Votre plan \"%{plan_name}\" a été soumis aux c"
+"<p> Bonjour %<user_name>s. </p><p> Votre plan \"%<plan_name>s\" a été soumis aux c"
 "ommentaires d'un administrateur de votre organisation. Si vous avez des questi"
 "ons concernant cette action, veuillez nous contacter à l'adresse %{organisatio"
 "n_email}. </p>"
@@ -1068,14 +1068,14 @@ msgstr "lire le plan et ajouter des commentaires."
 
 #: ../../app/helpers/orgs_helper.rb:14
 msgid ""
-"<p>A data librarian from %{org_name} will respond to your request within 48\n"
+"<p>A data librarian from %<org_name>s will respond to your request within 48\n"
 "       hours. If you have questions pertaining to this action please contact u"
 "s\n"
-"       at %{organisation_email}.</p>"
+"       at %<organisation_email>s.</p>"
 msgstr ""
-"<p> Un bibliothécaire de données de %{org_name} répondra à votre demande dans "
+"<p> Un bibliothécaire de données de %<org_name>s répondra à votre demande dans "
 "les 48 heures. Si vous avez des questions concernant cette action, veuillez no"
-"us contacter à l'adresse %{organisation_email}. </p>"
+"us contacter à l'adresse %<organisation_email>s. </p>"
 
 #: ../../app/helpers/perms_helper.rb:9
 msgid "Add organisations"
@@ -1208,16 +1208,16 @@ msgid "None"
 msgstr "Aucun"
 
 #: ../../app/helpers/super_admin/orgs/merge_helper.rb:31
-msgid "Guidance for: %{themes}"
-msgstr "Conseils pour : %{themes}"
+msgid "Guidance for: %<themes>s"
+msgstr "Conseils pour : %<themes>s"
 
 #: ../../app/helpers/super_admin/orgs/merge_helper.rb:53
 msgid "Nothing to merge"
 msgstr "Rien à fusionner"
 
 #: ../../app/helpers/super_admin/orgs/merge_helper.rb:55
-msgid "<p>The following %{object_types} will be moved over to '%{org_name}':</p>"
-msgstr "<p>Les %{object_types} suivants seront déplacés vers '%{org_name}' :</p>"
+msgid "<p>The following %<object_types>s will be moved over to '%<org_name>s':</p>"
+msgstr "<p>Les %<object_types>s suivants seront déplacés vers '%<org_name>s' :</p>"
 
 #: ../../app/helpers/template_helper.rb:46
 #: ../../app/views/plans/index.html.erb:29
@@ -1252,48 +1252,48 @@ msgstr "12 derniers mois"
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:6
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:5
 #: ../../app/views/user_mailer/_email_signature.html.erb:2
-msgid "Query or feedback related to %{tool_name}"
-msgstr "Requête ou suggestion liée à %{tool_name}"
+msgid "Query or feedback related to %<tool_name>s"
+msgstr "Requête ou suggestion liée à %<tool_name>s"
 
 #: ../../app/mailers/user_mailer.rb:23
-msgid "Welcome to %{tool_name}"
-msgstr "Bienvenue sur %{tool_name}"
+msgid "Welcome to %<tool_name>s"
+msgstr "Bienvenue sur %<tool_name>s"
 
 #: ../../app/mailers/user_mailer.rb:58
-msgid "A Data Management Plan in %{tool_name} has been shared with you"
-msgstr "Un plan de gestion des données dans %{tool_name} a été partagé avec vous"
+msgid "A Data Management Plan in %<tool_name>s has been shared with you"
+msgstr "Un plan de gestion des données dans %<tool_name>s a été partagé avec vous"
 
 #: ../../app/mailers/user_mailer.rb:76
-msgid "Changed permissions on a Data Management Plan in %{tool_name}"
-msgstr "Modification des autorisations sur un plan de %{tool_name}"
+msgid "Changed permissions on a Data Management Plan in %<tool_name>s"
+msgstr "Modification des autorisations sur un plan de %<tool_name>s"
 
 #: ../../app/mailers/user_mailer.rb:92
-msgid "Permissions removed on a DMP in %{tool_name}"
-msgstr "Autorisations supprimées sur un DMP dans %{tool_name}"
+msgid "Permissions removed on a DMP in %<tool_name>s"
+msgstr "Autorisations supprimées sur un DMP dans %<tool_name>s"
 
 #: ../../app/mailers/user_mailer.rb:111
-msgid "%{user_name} has requested feedback on a %{tool_name} plan"
-msgstr "%{user_name} a demandé des commentaires sur un plan %{tool_name}"
+msgid "%<user_name>s has requested feedback on a %<tool_name>s plan"
+msgstr "%<user_name>s a demandé des commentaires sur un plan %<tool_name>s"
 
 #: ../../app/mailers/user_mailer.rb:134
-msgid "%{tool_name}: Expert feedback has been provided for %{plan_title}"
-msgstr "%{tool_name}: des commentaires d'experts ont été fournis pour %{plan_title}"
+msgid "%<tool_name>s: Expert feedback has been provided for %<plan_title>s"
+msgstr "%<tool_name>s: des commentaires d'experts ont été fournis pour %<plan_title>s"
 
 #: ../../app/mailers/user_mailer.rb:169
-msgid "DMP Visibility Changed: %{plan_title}"
-msgstr "Changement de visibilité d'un plan : %{plan_title}"
+msgid "DMP Visibility Changed: %<plan_title>s"
+msgstr "Changement de visibilité d'un plan : %<plan_title>s"
 
 #: ../../app/mailers/user_mailer.rb:200
-msgid "%{tool_name}: A new comment was added to %{plan_title}"
-msgstr "%{tool_name}: Un nouveau commentaire a été ajouté à %{plan_title}"
+msgid "%<tool_name>s: A new comment was added to %<plan_title>s"
+msgstr "%<tool_name>s: Un nouveau commentaire a été ajouté à %<plan_title>s"
 
 #: ../../app/mailers/user_mailer.rb:218
-msgid "Administrator privileges granted in %{tool_name}"
-msgstr "Droits administrateur attribués dans %{tool_name}"
+msgid "Administrator privileges granted in %<tool_name>s"
+msgstr "Droits administrateur attribués dans %<tool_name>s"
 
 #: ../../app/mailers/user_mailer.rb:235
-msgid "%{tool_name} API changes"
-msgstr "%{tool_name} Modifications de l'API"
+msgid "%<tool_name>s API changes"
+msgstr "%<tool_name>s Modifications de l'API"
 
 #: ../../app/models/concerns/exportable_plan.rb:26
 msgid "Phase"
@@ -1325,12 +1325,12 @@ msgid "Creators: "
 msgstr "Créateurs : "
 
 #: ../../app/models/concerns/exportable_plan.rb:134
-msgid "%{authors}"
-msgstr "%{authors}"
+msgid "%<authors>s"
+msgstr "%<authors>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:135
-msgid "%{affiliation}"
-msgstr "%{affiliation}"
+msgid "%<affiliation>s"
+msgstr "%<affiliation>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:137
 #: ../../app/models/concerns/exportable_plan.rb:139
@@ -1341,12 +1341,12 @@ msgid "Template: "
 msgstr "Modèle : "
 
 #: ../../app/models/concerns/exportable_plan.rb:137
-msgid "%{funder}"
-msgstr "%{funder}"
+msgid "%<funder>s"
+msgstr "%<funder>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:139
-msgid "%{template}"
-msgstr "%{template}"
+msgid "%<template>s"
+msgstr "%<template>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:142
 #: ../../app/views/shared/export/_plan_txt.erb:12
@@ -1354,8 +1354,8 @@ msgid "Grant number: "
 msgstr "Numéro de subvention : "
 
 #: ../../app/models/concerns/exportable_plan.rb:142
-msgid "%{grant_number}"
-msgstr "%{grant_number}"
+msgid "%<grant_number>s"
+msgstr "%<grant_number>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:145
 #: ../../app/views/shared/export/_plan_coversheet.erb:26
@@ -1364,8 +1364,8 @@ msgid "Project abstract: "
 msgstr "Résumé du projet : "
 
 #: ../../app/models/concerns/exportable_plan.rb:145
-msgid "%{description}"
-msgstr "%{description}"
+msgid "%<description>s"
+msgstr "%<description>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:148
 #: ../../app/views/shared/export/_plan_coversheet.erb:42
@@ -1374,8 +1374,8 @@ msgid "Last modified: "
 msgstr "Dernière modification : "
 
 #: ../../app/models/concerns/exportable_plan.rb:148
-msgid "%{date}"
-msgstr "%{date}"
+msgid "%<date>s"
+msgstr "%<date>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:149
 #: ../../app/views/shared/export/_plan_coversheet.erb:49
@@ -1559,8 +1559,8 @@ msgid "generate_copy! requires an organisation target"
 msgstr "generate_copy! nécessite un organisme cible"
 
 #: ../../app/models/template.rb:380
-msgid "Copy of %{template}"
-msgstr "Copie de %{template}"
+msgid "Copy of %<template>s"
+msgstr "Copie de %<template>s"
 
 #: ../../app/models/template.rb:388
 msgid "generate_version! requires a published template"
@@ -1599,8 +1599,8 @@ msgid "Conditions in the template refer backwards"
 msgstr "Les conditions du modèle se réfèrent à l'envers"
 
 #: ../../app/models/user.rb:379
-msgid "A Data Management Plan in %{application_name} has been shared with you"
-msgstr "Un plan de gestion de données a été partagé avec vous sur %{application_name}"
+msgid "A Data Management Plan in %<application_name>s has been shared with you"
+msgstr "Un plan de gestion de données a été partagé avec vous sur %<application_name>s"
 
 #: ../../app/policies/api/v0/departments_policy.rb:12
 #: ../../app/policies/api/v0/guidance_group_policy.rb:12
@@ -1719,8 +1719,8 @@ msgstr ""
 "de son bailleur de fonds actuel"
 
 #: ../../app/validators/after_validator.rb:5
-msgid "must be after %{date}"
-msgstr "doit être après %{date}"
+msgid "must be after %<date>s"
+msgstr "doit être après %<date>s"
 
 #: ../../app/validators/org_links_validator.rb:10
 msgid "A key \"org\" is expected for links hash"
@@ -1732,12 +1732,12 @@ msgid "A hash is expected for links"
 msgstr "Un hash est attendu pour les liens"
 
 #: ../../app/validators/template_links_validator.rb:12
-msgid "A key %{key} is expected for links hash"
-msgstr "Une clé %{key} est attendue pour la table de hachage des liens"
+msgid "A key %<key>s is expected for links hash"
+msgstr "Une clé %<key>s est attendue pour la table de hachage des liens"
 
 #: ../../app/validators/template_links_validator.rb:15
-msgid "The key %{key} does not have a valid set of object links"
-msgstr "La clé %{key} n'a pas un ensemble valide d'objets \"liens\""
+msgid "The key %<key>s does not have a valid set of object links"
+msgstr "La clé %<key>s n'a pas un ensemble valide d'objets \"liens\""
 
 #: ../../app/views/answers/_locking.html.erb:5
 msgid "The following answer cannot be saved"
@@ -1745,10 +1745,10 @@ msgstr "La réponse suivante ne peut être enregistrée"
 
 #: ../../app/views/answers/_locking.html.erb:8
 msgid ""
-"since %{name} saved the answer below while you were editing. Please, combine y"
+"since %<name>s saved the answer below while you were editing. Please, combine y"
 "our changes and then save the answer again."
 msgstr ""
-"%{name} a enregistré la réponse ci-dessous pendant que vous éditiez. Veuillez "
+"%<name>s a enregistré la réponse ci-dessous pendant que vous éditiez. Veuillez "
 "combinez vos changements et enregistrer la réponse à nouveau."
 
 #: ../../app/views/answers/_new_edit.html.erb:15
@@ -1822,8 +1822,8 @@ msgid "Answered"
 msgstr "Répondu"
 
 #: ../../app/views/answers/_status.html.erb:10
-msgid " by %{user_name}"
-msgstr " par %{user_name}"
+msgid " by %<user_name>s"
+msgstr " par %<user_name>s"
 
 #: ../../app/views/answers/_status.html.erb:15
 msgid "This answer removes "
@@ -1900,15 +1900,15 @@ msgstr "Contact"
 
 #: ../../app/views/contact_us/contacts/new.html.erb:6
 msgid ""
-"%{application_name} is provided by the %{organisation_name}.<br /> You can fin"
-"d out more about us on our <a href=\"%{organisation_url}\" class=\"has-new-window"
+"%<application_name>s is provided by the %<organisation_name>s.<br /> You can fin"
+"d out more about us on our <a href=\"%<organisation_url>s\" class=\"has-new-window"
 "-popup-info\" target=\"_blank\">website <em class=\"sr-only\">(new window)</em><spa"
-"n class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>. If you "
-"would like to contact us about %{application_name}, please fill out the form b"
+"n class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a>. If you "
+"would like to contact us about %<application_name>s, please fill out the form b"
 "elow."
 msgstr ""
-"%{application_name} est fourni par le %{organisation_name}. <br /> Vous pouvez"
-" en savoir plus sur nous sur notre <a href=\"%{organisation_url}\" class=\"has-ne"
+"%<application_name>s est fourni par le %<organisation_name>s. <br /> Vous pouvez"
+" en savoir plus sur nous sur notre <a href=\"%<organisation_url>s\" class=\"has-ne"
 "w-window-popup-info\" target=\"_blank\">site Internet <em class=\"sr-only\">(nouvel"
 "le fenêtre)</em> <span class=\"new-window-popup-info\">%{open_in_new_window_text"
 "}</span></a> . Si vous souhaitez nous contacter à propos de %{application_name"
@@ -2078,8 +2078,8 @@ msgid "Create account"
 msgstr "S'inscrire"
 
 #: ../../app/views/devise/mailer/confirmation_instructions.html.erb:2
-msgid "Welcome to %{application_name}"
-msgstr "Bienvenue sur %{application_name}"
+msgid "Welcome to %<application_name>s"
+msgstr "Bienvenue sur %<application_name>s"
 
 #: ../../app/views/devise/mailer/confirmation_instructions.html.erb:4
 msgid "Thank you for registering. Please confirm your email address"
@@ -2099,24 +2099,24 @@ msgstr "dans votre navigateur"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:12
 #: ../../app/views/user_mailer/new_comment.html.erb:2
-msgid "Hello %{user_name}"
-msgstr "Bonjour %{user_name}"
+msgid "Hello %<user_name>s"
+msgstr "Bonjour %<user_name>s"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:15
 msgid ""
-"Your colleague %{inviter_name} has invited you to contribute to  their Data Ma"
-"nagement Plan in %{tool_name}"
+"Your colleague %<inviter_name>s has invited you to contribute to  their Data Ma"
+"nagement Plan in %<tool_name>s"
 msgstr ""
-"Votre collègue %{inviter_name} vous a invité à contribuer à son plan de gestio"
-"n des données dans %{tool_name}"
+"Votre collègue %<inviter_name>s vous a invité à contribuer à son plan de gestio"
+"n des données dans %<tool_name>s"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:22
 #: ../../app/views/user_mailer/sharing_notification.html.erb:11
 msgid ""
-"%{click_here} to accept the invitation, (or copy %{link} into your browser). I"
+"%<click_here>s to accept the invitation, (or copy %<link>s into your browser). I"
 "f you don't want to accept the invitation, please ignore this email."
 msgstr ""
-"%{click_here} pour accepter l'invitation, (ou copier %{link} dans votre naviga"
+"%<click_here>s pour accepter l'invitation, (ou copier %<link>s dans votre naviga"
 "teur). Si vous ne souhaitez pas accepter cette invitation, ignorez ce message."
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:23
@@ -2135,8 +2135,8 @@ msgstr "Cordialement"
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:19
 #: ../../app/views/user_mailer/_email_signature.html.erb:12
 #: ../../app/views/user_mailer/welcome_notification.html.erb:10
-msgid "The %{tool_name} team"
-msgstr "L'équipe %{tool_name}"
+msgid "The %<tool_name>s team"
+msgstr "L'équipe %<tool_name>s"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:32
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:22
@@ -2147,22 +2147,22 @@ msgstr "Merci de ne pas répondre à ce mail."
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:33
 msgid ""
-"If you have any questions or need help, please contact us at %{helpdesk_email}"
-" or visit %{contact_us_url}"
+"If you have any questions or need help, please contact us at %<helpdesk_email>s"
+" or visit %<contact_us_url>s"
 msgstr ""
 "Si vous avez des questions ou avez besoin d’aide, veuillez nous contacter à l’"
-"adresse %{helpdesk_email} ou visiter le site %{contact_us_url}."
+"adresse %<helpdesk_email>s ou visiter le site %<contact_us_url>s."
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:9
-msgid "Hello %{user_email}"
-msgstr "Bonjour %{user_email}"
+msgid "Hello %<user_email>s"
+msgstr "Bonjour %<user_email>s"
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:12
 msgid ""
-"Someone has requested a link to change your %{tool_name} password. You can do "
+"Someone has requested a link to change your %<tool_name>s password. You can do "
 "this through the link below."
 msgstr ""
-"Quelqu'un a demandé un lien pour modifier votre mot de passe %{tool_name}. Vou"
+"Quelqu'un a demandé un lien pour modifier votre mot de passe %<tool_name>s. Vou"
 "s pouvez le faire via le lien ci-dessous."
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:14
@@ -2176,11 +2176,11 @@ msgstr "Si vous n'avez pas fait cette demande, merci d'ignorer ce message."
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:22
 #: ../../app/views/user_mailer/_email_signature.html.erb:19
 msgid ""
-"If you have any questions or need help, please contact us at %{helpdesk_email}"
-" or visit %{contact_us}"
+"If you have any questions or need help, please contact us at %<helpdesk_email>s"
+" or visit %<contact_us>s"
 msgstr ""
 "Si vous avez des questions ou si vous avez besoin d'aide, merci de nous contac"
-"ter à %{helpdesk_email} ou consulter %{contact_us}"
+"ter à %<helpdesk_email>s ou consulter %<contact_us>s"
 
 #: ../../app/views/devise/mailer/unlock_instructions.html.erb:2
 msgid "Hello"
@@ -2250,22 +2250,22 @@ msgstr "Documentation"
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:16
 msgid ""
-"See the <a href=\"%{api_v0_wiki}\">documentation for v0</a> for more details on "
+"See the <a href=\"%<api_v0_wiki>s\">documentation for v0</a> for more details on "
 "the original API which includes access to statistics, the full text of plans a"
 "nd the ability to connect users with departments."
 msgstr ""
-"Consultez la <a href=\"%{api_v0_wiki}\">documentation de la v0</a> pour plus de "
+"Consultez la <a href=\"%<api_v0_wiki>s\">documentation de la v0</a> pour plus de "
 "détails sur l'API d'origine qui comprend l'accès aux statistiques, le texte in"
 "tégral des plans et la possibilité de connecter les utilisateurs aux services."
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:18
 msgid ""
-"See the <a href=\"%{api_v1_wiki}\">documentation for v1</a> for more details on "
-"the API that supports the <a href=\"%{rda_standard_url}\">RDA Common metadata st"
+"See the <a href=\"%<api_v1_wiki>s\">documentation for v1</a> for more details on "
+"the API that supports the <a href=\"%<rda_standard_url>s\">RDA Common metadata st"
 "andard for DMPs.</a>"
 msgstr ""
-"Consultez la <a href=\"%{api_v1_wiki}\">documentation de la v1</a> pour plus de "
-"détails sur l'API qui prend en charge la <a href=\"%{rda_standard_url}\">norme d"
+"Consultez la <a href=\"%<api_v1_wiki>s\">documentation de la v1</a> pour plus de "
+"détails sur l'API qui prend en charge la <a href=\"%<rda_standard_url>s\">norme d"
 "e métadonnées RDA Common pour les DMP.</a>"
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:21
@@ -2443,8 +2443,8 @@ msgid "Sign in or Create account"
 msgstr "Connectez-vous ou créez un compte"
 
 #: ../../app/views/devise/registrations/new.html.erb:15
-msgid "Do you have a %{application_name} account?"
-msgstr "Avez vous un compte sur %{application_name} ?"
+msgid "Do you have a %<application_name>s account?"
+msgstr "Avez vous un compte sur %<application_name>s ?"
 
 #: ../../app/views/devise/registrations/new.html.erb:22
 #: ../../app/views/layouts/_navigation.html.erb:63
@@ -2459,8 +2459,8 @@ msgid "This will link your existing account to your credentials."
 msgstr "Votre compte existant sera lié à votre compte institutionnel."
 
 #: ../../app/views/devise/registrations/new.html.erb:34
-msgid "No %{application_name} account?"
-msgstr "Pas de compte %{application_name} ?"
+msgid "No %<application_name>s account?"
+msgstr "Pas de compte %<application_name>s ?"
 
 #: ../../app/views/devise/registrations/new.html.erb:46
 msgid "This will create an account and link it to your credentials."
@@ -2641,10 +2641,10 @@ msgstr "Publié ?"
 
 #: ../../app/views/home/_welcome.html.erb:5
 msgid ""
-"<p>%{application_name} has been developed by the <strong>%{organisation_name}<"
+"<p>%<application_name>s has been developed by the <strong>%<organisation_name>s<"
 "/strong> to help you write data management plans.</p>"
 msgstr ""
-"<p>%{application_name} a été développé par <strong>%{organisation_name}</stron"
+"<p>%<application_name>s a été développé par <strong>%<organisation_name>s</stron"
 "g> afin de vous aider à rédiger des plans de gestion de données.</p>"
 
 #: ../../app/views/home/_welcome.html.erb:11
@@ -2830,8 +2830,8 @@ msgid "Logout"
 msgstr "Déconnexion"
 
 #: ../../app/views/layouts/application.html.erb:32
-msgid "%{application_name}"
-msgstr "%{application_name}"
+msgid "%<application_name>s"
+msgstr "%<application_name>s"
 
 #: ../../app/views/layouts/application.html.erb:91
 msgid "Error:"
@@ -2908,11 +2908,11 @@ msgstr "Ouvre dans une nouvelle fenêtre"
 
 #: ../../app/views/layouts/application.html.erb:142
 msgid ""
-"%{n} results are available, use up and down arrows to navigate suggestions. Us"
+"%<n>s results are available, use up and down arrows to navigate suggestions. Us"
 "e the Enter key to select a suggestion or the Escape key to close the suggesti"
 "ons."
 msgstr ""
-"%{n} les résultats sont disponibles, utilisez les flèches haut et bas pour par"
+"%<n>s les résultats sont disponibles, utilisez les flèches haut et bas pour par"
 "courir les suggestions. Utilisez la touche Entrée pour sélectionner une sugges"
 "tion ou la touche Échap pour fermer les suggestions."
 
@@ -2964,8 +2964,8 @@ msgid "Example answer"
 msgstr "Exemple de réponse"
 
 #: ../../app/views/org_admin/annotations/_show.html.erb:4
-msgid "%{org} Example Answer"
-msgstr "Exemple de réponse %{org}"
+msgid "%<org>s Example Answer"
+msgstr "Exemple de réponse %<org>s"
 
 #: ../../app/views/org_admin/conditions/_add.html.erb:3
 msgid "Add condition"
@@ -3121,10 +3121,10 @@ msgstr "Supprimer la phase"
 
 #: ../../app/views/org_admin/phases/_phase.html.erb:17
 msgid ""
-"You are about to delete the '%{phase_title}' phase. This will remove all of th"
+"You are about to delete the '%<phase_title>s' phase. This will remove all of th"
 "e sections and questions listed below. Are you sure?"
 msgstr ""
-"Vous êtes sur le point de supprimer la phase '%{phase_title}'. Cela supprimera"
+"Vous êtes sur le point de supprimer la phase '%<phase_title>s'. Cela supprimera"
 " toutes les sections et les questions listées ci-dessous. En êtes-vous sûr ?"
 
 #: ../../app/views/org_admin/phases/_phase.html.erb:18
@@ -3183,8 +3183,8 @@ msgid "Write plan"
 msgstr "Rédiger"
 
 #: ../../app/views/org_admin/plans/index.html.erb:4
-msgid "%{org_name} Plans"
-msgstr "%{org_name} Plans"
+msgid "%<org_name>s Plans"
+msgstr "%<org_name>s Plans"
 
 #: ../../app/views/org_admin/plans/index.html.erb:16
 msgid "Plan"
@@ -3237,10 +3237,10 @@ msgstr ""
 #: ../../app/views/org_admin/plans/index.html.erb:39
 msgid ""
 "Download plans <em class=\"sr-only\">(new window)</em><span class=\"new-window-po"
-"pup-info\">%{open_in_new_window_text}</span>"
+"pup-info\">%<open_in_new_window_text>s</span>"
 msgstr ""
 "Télécharger les plans <em class=\"sr-only\">(nouvelle fenêtre)</em> <span class="
-"\"new-window-popup-info\">%{open_in_new_window_text}</span>"
+"\"new-window-popup-info\">%<open_in_new_window_text>s</span>"
 
 #: ../../app/views/org_admin/question_options/_option_fields.html.erb:3
 msgid "Order"
@@ -3270,8 +3270,8 @@ msgstr ""
 " le style ici."
 
 #: ../../app/views/org_admin/questions/_form.html.erb:4
-msgid "Question %{number}:"
-msgstr "Question %{number} :"
+msgid "Question %<number>s:"
+msgstr "Question %<number>s :"
 
 #: ../../app/views/org_admin/questions/_form.html.erb:4
 msgid "New question:"
@@ -3346,9 +3346,9 @@ msgid "Delete"
 msgstr "Effacer"
 
 #: ../../app/views/org_admin/questions/_form.html.erb:102
-msgid "You are about to delete question #%{question_number}. Are you sure?"
+msgid "You are about to delete question #%<question_number>s. Are you sure?"
 msgstr ""
-"Vous êtes sur le point de supprimer la question #%{question_number}. En êtes-v"
+"Vous êtes sur le point de supprimer la question #%<question_number>s. En êtes-v"
 "ous sûr ?"
 
 #: ../../app/views/org_admin/questions/_index.html.erb:14
@@ -3449,10 +3449,10 @@ msgstr "Saisissez un titre pour la section"
 
 #: ../../app/views/org_admin/sections/_form.html.erb:20
 msgid ""
-"You are about to delete '%{section_title}'. This will affect questions linked "
+"You are about to delete '%<section_title>s'. This will affect questions linked "
 "to this section. Are you sure?"
 msgstr ""
-"Vous êtes sur le point de supprimer '%{section_title}'. Cela affectera les que"
+"Vous êtes sur le point de supprimer '%<section_title>s'. Cela affectera les que"
 "stions liées à cette section. En êtes-vous sûr ?"
 
 #: ../../app/views/org_admin/sections/_index.html.erb:61
@@ -3483,8 +3483,8 @@ msgstr ""
 
 #: ../../app/views/org_admin/templates/_form.html.erb:25
 #: ../../app/views/org_admin/templates/_show.html.erb:35
-msgid "for internal %{org_name} use only"
-msgstr "réservé à l'usage interne de %{org_name}"
+msgid "for internal %<org_name>s use only"
+msgstr "réservé à l'usage interne de %<org_name>s"
 
 #: ../../app/views/org_admin/templates/_form.html.erb:32
 #: ../../app/views/org_admin/templates/_show.html.erb:13
@@ -3658,22 +3658,22 @@ msgstr "Modèles personnalisables"
 
 #: ../../app/views/org_admin/templates/index.html.erb:80
 #: ../../app/views/org_admin/templates/index.html.erb:93
-msgid "All (%{count})"
-msgstr "Tous (%{count})"
+msgid "All (%<count>s)"
+msgstr "Tous (%<count>s)"
 
 #: ../../app/views/org_admin/templates/index.html.erb:83
 #: ../../app/views/org_admin/templates/index.html.erb:96
-msgid "Published (%{count})"
-msgstr "Publié(s) (%{count})"
+msgid "Published (%<count>s)"
+msgstr "Publié(s) (%<count>s)"
 
 #: ../../app/views/org_admin/templates/index.html.erb:86
 #: ../../app/views/org_admin/templates/index.html.erb:99
-msgid "Unpublished (%{count})"
-msgstr "Non publiés (%{count})"
+msgid "Unpublished (%<count>s)"
+msgstr "Non publiés (%<count>s)"
 
 #: ../../app/views/org_admin/templates/index.html.erb:89
-msgid "Not customised (%{count})"
-msgstr "Non personnalisé(s) (%{count})"
+msgid "Not customised (%<count>s)"
+msgstr "Non personnalisé(s) (%<count>s)"
 
 #: ../../app/views/org_admin/templates/index.html.erb:118
 msgid "Create a template"
@@ -3682,8 +3682,8 @@ msgstr "Créer un modèle"
 #: ../../app/views/org_admin/users/edit.html.erb:4
 #: ../../app/views/super_admin/users/edit.html.erb:1
 #: ../../app/views/super_admin/users/edit.html.erb:5
-msgid "Editing profile for %{username}"
-msgstr "Edition du profil de %{username}"
+msgid "Editing profile for %<username>s"
+msgstr "Edition du profil de %<username>s"
 
 #: ../../app/views/org_admin/users/edit.html.erb:5
 #: ../../app/views/super_admin/users/edit.html.erb:6
@@ -3691,8 +3691,8 @@ msgid "View all users"
 msgstr "Voir tous les utilisateurs"
 
 #: ../../app/views/org_admin/users/plans.html.erb:3
-msgid "Plans of %{username}"
-msgstr "Plans de %{username}"
+msgid "Plans of %<username>s"
+msgstr "Plans de %<username>s"
 
 #: ../../app/views/orgs/_departments.html.erb:1
 #: ../../app/views/orgs/admin_edit.html.erb:26
@@ -3722,7 +3722,7 @@ msgid ""
 "ntact_us_url}\">contact us</a> to have them updated."
 msgstr ""
 "Si l'un des identifiants ci-dessus est incorrect ou manquant, veuillez <a href"
-"=\"%{contact_us_url}\">nous contacter</a> pour le mettre à jour."
+"=\"%<contact_us_url>s\">nous contacter</a> pour le mettre à jour."
 
 #: ../../app/views/orgs/_feedback_form.html.erb:3
 #: ../../app/views/orgs/_feedback_form.html.erb:7
@@ -3754,10 +3754,10 @@ msgstr "Fusionner des organisations"
 #: ../../app/views/orgs/_merge_form.html.erb:7
 msgid ""
 "Please select the Organisation that will replace the current organisation: '<s"
-"trong>%{org_name}</strong>'."
+"trong>%<org_name>s</strong>'."
 msgstr ""
 "Veuillez sélectionner l'organisation qui remplacera l'organisation actuelle : "
-"' <strong>%{org_name}</strong> '."
+"' <strong>%<org_name>s</strong> '."
 
 #: ../../app/views/orgs/_merge_form.html.erb:8
 msgid ""
@@ -3941,15 +3941,15 @@ msgstr "Jamais"
 
 #: ../../app/views/paginable/api_clients/_index.html.erb:44
 msgid ""
-"You are about to delete '%{client_name}'. They will no longer be able to acces"
+"You are about to delete '%<client_name>s'. They will no longer be able to acces"
 "s the API. Are you sure?"
 msgstr ""
-"Vous êtes sur le point de supprimer «%{client_name}». Ils ne pourront plus acc"
+"Vous êtes sur le point de supprimer «%<client_name>s». Ils ne pourront plus acc"
 "éder à l'API. Êtes-vous sûr?"
 
 #: ../../app/views/paginable/contributors/_index.html.erb:57
-msgid "You are about to delete '%{contributor_name}'. Are you sure?"
-msgstr "Vous êtes sur le point de supprimer «%{contributor_name}». Êtes-vous sûr?"
+msgid "You are about to delete '%<contributor_name>s'. Are you sure?"
+msgstr "Vous êtes sur le point de supprimer «%<contributor_name>s». Êtes-vous sûr?"
 
 #: ../../app/views/paginable/departments/_index.html.erb:5
 #: ../../app/views/paginable/users/_index.html.erb:22
@@ -3962,10 +3962,10 @@ msgstr "Nom abrégé ou code"
 
 #: ../../app/views/paginable/departments/_index.html.erb:28
 msgid ""
-"You are about to delete '%{department_name}'. This will affect guidance. Are y"
+"You are about to delete '%<department_name>s'. This will affect guidance. Are y"
 "ou sure?"
 msgstr ""
-"Vous êtes sur le point de supprimer '%{department_name}'. Cela affectera les c"
+"Vous êtes sur le point de supprimer '%<department_name>s'. Cela affectera les c"
 "onseils. Êtes-vous sûr?"
 
 #: ../../app/views/paginable/guidance_groups/_index.html.erb:8
@@ -4006,15 +4006,15 @@ msgstr "Publier"
 
 #: ../../app/views/paginable/guidance_groups/_index.html.erb:50
 msgid ""
-"You are about to delete '%{guidance_group_name}'. This will affect guidance. A"
+"You are about to delete '%<guidance_group_name>s'. This will affect guidance. A"
 "re you sure?"
 msgstr ""
-"Vous allez effacer '%{guidance_group_name}'. Cela impactera les recommendation"
+"Vous allez effacer '%<guidance_group_name>s'. Cela impactera les recommendation"
 "s. En êtes-vous sûr ?"
 
 #: ../../app/views/paginable/guidances/_index.html.erb:62
-msgid "You are about to delete '%{guidance_summary}'. Are you sure?"
-msgstr "Vous allez effacer '%{guidance_summary}'. En êtes-vous sûr ?"
+msgid "You are about to delete '%<guidance_summary>s'. Are you sure?"
+msgstr "Vous allez effacer '%<guidance_summary>s'. En êtes-vous sûr ?"
 
 #: ../../app/views/paginable/notifications/_index.html.erb:5
 #: ../../app/views/super_admin/notifications/_form.html.erb:15
@@ -4050,8 +4050,8 @@ msgid "Managed"
 msgstr "Géré"
 
 #: ../../app/views/paginable/orgs/_index.html.erb:35
-msgid "You are about to delete '%{org_name}'. Are you sure?"
-msgstr "Vous êtes sur le point de supprimer '%{org_name}'. En êtes-vous sûr ?"
+msgid "You are about to delete '%<org_name>s'. Are you sure?"
+msgstr "Vous êtes sur le point de supprimer '%<org_name>s'. En êtes-vous sûr ?"
 
 #: ../../app/views/paginable/plans/_org_admin.html.erb:3
 msgid ""
@@ -4218,10 +4218,10 @@ msgstr "Publier les modifications"
 
 #: ../../app/views/paginable/templates/_customisable.html.erb:69
 msgid ""
-"Are you sure you want to remove your customization of \"%{template_title}\"? Any"
+"Are you sure you want to remove your customization of \"%<template_title>s\"? Any"
 " published versions will become unavailable to users."
 msgstr ""
-"Voulez-vous vraiment supprimer la personnalisation de \"%{template_title}\" ? Le"
+"Voulez-vous vraiment supprimer la personnalisation de \"%<template_title>s\" ? Le"
 "s versions publiées ne seront plus disponibles aux utilisateurs."
 
 #: ../../app/views/paginable/templates/_history.html.erb:7
@@ -4238,10 +4238,10 @@ msgstr "Voir les personnalisations."
 
 #: ../../app/views/paginable/templates/_organisational.html.erb:76
 msgid ""
-"Are you sure you want to remove \"%{template_title}\"? Any published versions wi"
+"Are you sure you want to remove \"%<template_title>s\"? Any published versions wi"
 "ll become unavailable to users."
 msgstr ""
-"Voulez-vous vraiment supprimer \"%{template_title}\" ? Les versions publiées ne "
+"Voulez-vous vraiment supprimer \"%<template_title>s\" ? Les versions publiées ne "
 "seront plus disponibles aux utilisateurs."
 
 #: ../../app/views/paginable/templates/_organisational.html.erb:90
@@ -4405,10 +4405,10 @@ msgstr "Droite"
 #: ../../app/views/plans/_download_form.html.erb:119
 msgid ""
 "Download Plan <em class=\"sr-only\">(new window)</em><span class=\"new-window-pop"
-"up-info\">%{open_in_new_window_text}</span>"
+"up-info\">%<open_in_new_window_text>s</span>"
 msgstr ""
 "Télécharger le plan <em class=\"sr-only\">(nouvelle fenêtre)</em> <span class=\"n"
-"ew-window-popup-info\">%{open_in_new_window_text}</span>"
+"ew-window-popup-info\">%<open_in_new_window_text>s</span>"
 
 #: ../../app/views/plans/_edit_details.html.erb:13
 #: ../../app/views/plans/_guidance_selection.html.erb:38
@@ -4417,10 +4417,10 @@ msgstr "Sélectionnez le guidage"
 
 #: ../../app/views/plans/_guidance_selection.html.erb:6
 msgid ""
-"To help you write your plan, %{application_name} can show you guidance from a "
+"To help you write your plan, %<application_name>s can show you guidance from a "
 "variety of organisations."
 msgstr ""
-"Pour vous aider à rédiger votre plan, %{application_name} peut vous proposer d"
+"Pour vous aider à rédiger votre plan, %<application_name>s peut vous proposer d"
 "es recommandations provenant de différents organismes."
 
 #: ../../app/views/plans/_guidance_selection.html.erb:9
@@ -4441,11 +4441,11 @@ msgstr "Il n'y a aucune indication supplémentaire pour ce modèle."
 
 #: ../../app/views/plans/_guidance_selection.html.erb:40
 msgid ""
-"To help you write your plan, %{application_name} can show you guidance from a "
+"To help you write your plan, %<application_name>s can show you guidance from a "
 "variety of organisations. Please choose up to 6 organisations of the following"
 " organisations who offer guidance relevant to your plan."
 msgstr ""
-"Pour vous aider à rédiger votre plan, %{application_name} peut vous proposer d"
+"Pour vous aider à rédiger votre plan, %<application_name>s peut vous proposer d"
 "es recommandations provenant de différents organismes. Dans la liste ci-dessou"
 "s, choisissez jusqu'à 6 organismes proposant des recommandations adaptées à vo"
 "tre plan."
@@ -4472,17 +4472,17 @@ msgstr "Rédiger"
 
 #: ../../app/views/plans/_overview_details.html.erb:9
 msgid ""
-"This plan is based on the \"%{template_title}\" template provided by %{org_name}"
+"This plan is based on the \"%<template_title>s\" template provided by %<org_name>s"
 "."
-msgstr "Ce plan est basé sur le modèle  \"%{template_title}\" fourni par %{org_name}."
+msgstr "Ce plan est basé sur le modèle  \"%<template_title>s\" fourni par %<org_name>s."
 
 #: ../../app/views/plans/_overview_details.html.erb:17
-msgid "Template version %{template_version}, published on %{published_date}"
-msgstr "Version du modèle %{template_version}, publiée le %{published_date}"
+msgid "Template version %<template_version>s, published on %<published_date>s"
+msgstr "Version du modèle %<template_version>s, publiée le %<published_date>s"
 
 #: ../../app/views/plans/_overview_details.html.erb:42
-msgid "%{phase_title} (%{sections_size} %{sections}, %{questions_size} %{questions})"
-msgstr "%{phase_title} (%{sections_size} %{sections}, %{questions_size} %{questions})"
+msgid "%<phase_title>s (%<sections_size>s %<sections>s, %<questions_size>s %<questions>s)"
+msgstr "%<phase_title>s (%<sections_size>s %<sections>s, %<questions_size>s %<questions>s)"
 
 #: ../../app/views/plans/_overview_details.html.erb:43
 msgid "section"
@@ -4596,11 +4596,11 @@ msgstr "Définir la visibilité du plan"
 #: ../../app/views/plans/_share_form.html.erb:9
 msgid ""
 "Public or organisational visibility is intended for finished plans. You must a"
-"nswer at least %{percentage}%% of the questions to enable these options. Note:"
+"nswer at least %<percentage>s%% of the questions to enable these options. Note:"
 " test plans are set to private visibility by default."
 msgstr ""
 "Les visibilités ‘Public’ et‘Organisationnel’ sont à l'intention des plans term"
-"inés. Vous devez répondre à au moins %{percentage}%% des questions pour pouvoi"
+"inés. Vous devez répondre à au moins %<percentage>s%% des questions pour pouvoi"
 "r activer ces options. Note : les plans de test on la visibilité privé par déf"
 "ault."
 
@@ -4690,8 +4690,8 @@ msgid "Click the 'Create plan' button below to begin."
 msgstr "Cliquez le bouton ci-dessous \"Créer un plan\" pour commencer."
 
 #: ../../app/views/plans/index.html.erb:35
-msgid "%{org_title} Plans"
-msgstr "%{org_title} Plans"
+msgid "%<org_title>s Plans"
+msgstr "%<org_title>s Plans"
 
 #: ../../app/views/plans/index.html.erb:36
 msgid ""
@@ -4777,11 +4777,11 @@ msgstr "Nous avons trouvé plusieurs modèles correspondants à votre financeur.
 
 #: ../../app/views/public_pages/plan_index.html.erb:8
 msgid ""
-"Public DMPs are plans created using the %{application_name} service and shared"
+"Public DMPs are plans created using the %<application_name>s service and shared"
 " publicly by their owners. They are not vetted for quality, completeness, or a"
 "dherence to funder guidelines."
 msgstr ""
-"Les DMPs publics sont créés à l'aide de %{application_name} et partagés publiq"
+"Les DMPs publics sont créés à l'aide de %<application_name>s et partagés publiq"
 "uement par leurs propriétaires. Ils n'ont pas été vérifiés pour leur qualité, "
 "leur exhaustivité ou leur adhésion aux lignes directrices des financeurs."
 
@@ -4832,8 +4832,8 @@ msgid "terms and conditions"
 msgstr "conditions générales d'utilisation"
 
 #: ../../app/views/shared/_create_plan_modal.html.erb:8
-msgid "Would you like to create a plan based on the \"%{name}\" template?"
-msgstr "Souhaitez-vous créer un plan basé sur le modèle \"%{name}\"?"
+msgid "Would you like to create a plan based on the \"%<name>s\" template?"
+msgstr "Souhaitez-vous créer un plan basé sur le modèle \"%<name>s\"?"
 
 #: ../../app/views/shared/_links.html.erb:7
 msgid "Links"
@@ -4886,8 +4886,8 @@ msgstr "Filtrer les plans"
 
 #: ../../app/views/shared/export/_plan_coversheet.erb:3
 #: ../../app/views/shared/export/_plan_txt.erb:65
-msgid "A Data Management Plan created using %{application_name}"
-msgstr "Plan de gestion de données créé à l'aide de %{application_name}"
+msgid "A Data Management Plan created using %<application_name>s"
+msgstr "Plan de gestion de données créé à l'aide de %<application_name>s"
 
 #: ../../app/views/shared/export/_plan_coversheet.erb:10
 #: ../../app/views/shared/export/_plan_txt.erb:5
@@ -4956,8 +4956,8 @@ msgstr "Le nom que vous avez entré ne faisait pas partie des suggestions réper
 
 #: ../../app/views/static_pages/about_us.html.erb:1
 #: ../../app/views/static_pages/about_us.html.erb:4
-msgid "About %{application_name}"
-msgstr "A propos de %{application_name}"
+msgid "About %<application_name>s"
+msgstr "A propos de %<application_name>s"
 
 #: ../../app/views/static_pages/about_us.html.erb:11
 msgid ""
@@ -5040,10 +5040,10 @@ msgstr ""
 #: ../../app/views/static_pages/about_us.html.erb:22
 msgid ""
 "get involved<em class=\"sr-only\"> (new window)</em><span class=\"new-window-popu"
-"p-info\">%{open_in_new_window_text}</span>"
+"p-info\">%<open_in_new_window_text>s</span>"
 msgstr ""
 "impliquez-vous <em class=\"sr-only\">(nouvelle fenêtre)</em> <span class=\"new-wi"
-"ndow-popup-info\">%{open_in_new_window_text}</span>"
+"ndow-popup-info\">%<open_in_new_window_text>s</span>"
 
 #: ../../app/views/static_pages/about_us.html.erb:28
 msgid " in the project. You can also report bugs and request new features via "
@@ -5066,8 +5066,8 @@ msgstr ""
 "tre DMP."
 
 #: ../../app/views/static_pages/about_us.html.erb:34
-msgid "If you do not have a %{application_name} account, click on"
-msgstr "Si vous ne possédez pas de compte %{application_name}, cliquez sur"
+msgid "If you do not have a %<application_name>s account, click on"
+msgstr "Si vous ne possédez pas de compte %<application_name>s, cliquez sur"
 
 #: ../../app/views/static_pages/about_us.html.erb:34
 msgid "Sign up"
@@ -5289,44 +5289,44 @@ msgstr ""
 
 #: ../../app/views/static_pages/privacy.html.erb:11
 msgid ""
-"The information you provide will be used by the %{org_name} to offer you acces"
-"s to and personalisation of the %{application_name} service."
+"The information you provide will be used by the %<org_name>s to offer you acces"
+"s to and personalisation of the %<application_name>s service."
 msgstr ""
-"Les informations que vous fournissez seront utilisée par %{org_name} afin de v"
-"ous offrir l'accès à la personnalisation du service %{application_name}."
+"Les informations que vous fournissez seront utilisée par %<org_name>s afin de v"
+"ous offrir l'accès à la personnalisation du service %<application_name>s."
 
 #: ../../app/views/static_pages/privacy.html.erb:13
 msgid ""
-"The %{org_name} processes the personal data of %{application_name} users in or"
-"der to deliver and improve the %{application_name} service in a customised man"
+"The %<org_name>s processes the personal data of %<application_name>s users in or"
+"der to deliver and improve the %<application_name>s service in a customised man"
 "ner and to ensure each user receives relevant information."
 msgstr ""
-"%{org_name} traite les données personnelles des utilisateurs de %{application_"
-"name} afin de fournir et d'amélioler %{application_name}, de manière personnal"
+"%<org_name>s traite les données personnelles des utilisateurs de %{application_"
+"name} afin de fournir et d'amélioler %<application_name>s, de manière personnal"
 "isée, et d'assurer que chaque utilisateur reçoive les informations qui lui son"
 "t pertinantes."
 
 #: ../../app/views/static_pages/privacy.html.erb:15
 msgid ""
-"The processing of your personal data by the %{org_name} is necessary for pursu"
+"The processing of your personal data by the %<org_name>s is necessary for pursu"
 "ing the following legitimate interests:"
 msgstr ""
-"Le traitenement de vos données personnelle par %{org_name} est nécessaire pour"
+"Le traitenement de vos données personnelle par %<org_name>s est nécessaire pour"
 " les intérêts suivants : "
 
 #: ../../app/views/static_pages/privacy.html.erb:18
 msgid ""
-"To provide access to the %{application_name} service and personalisation of yo"
+"To provide access to the %<application_name>s service and personalisation of yo"
 "ur user experience e.g. provision of relevant templates and guidance for your "
 "organisation."
 msgstr ""
-"Afin de fournir l'accès à %{application_name} et personnaliser votre expérienc"
+"Afin de fournir l'accès à %<application_name>s et personnaliser votre expérienc"
 "e utilisateur (ex: mise à disposition de modèles pertinents et de recommendati"
 "ons provenant de votre organisation)."
 
 #: ../../app/views/static_pages/privacy.html.erb:20
 msgid ""
-"To keep you up to date with news about %{application_name} such as new feature"
+"To keep you up to date with news about %<application_name>s such as new feature"
 "s or improvements, or changes to our Privacy Policy."
 msgstr ""
 "Pour vous tenir informer des dernières actualités à propos de %{application_na"
@@ -5340,29 +5340,29 @@ msgstr "Afin d'assurer la sécurité des réseaux et de l'information "
 #: ../../app/views/static_pages/privacy.html.erb:24
 msgid ""
 "We will hold the personal data you provided us for as long as you continue usi"
-"ng the %{application_name} service. Your personal data can be removed from thi"
-"s service upon request to the %{application_name} team within a period of 30 d"
+"ng the %<application_name>s service. Your personal data can be removed from thi"
+"s service upon request to the %<application_name>s team within a period of 30 d"
 "ays."
 msgstr ""
 "Nous stockerons les données personnelles que vous avez fournies aussi longtemp"
-"s que vous utiliserez %{application_name}. Vos données personnelles peuvent êt"
+"s que vous utiliserez %<application_name>s. Vos données personnelles peuvent êt"
 "re supprimées de ce service suite à tout demande à l'équipe %{application_name"
 "}, dans un délai de 30 jours."
 
 #: ../../app/views/static_pages/privacy.html.erb:26
 msgid ""
-"If you have any questions, please contact the %{application_name} team at: <a "
-"href='mailto:%{helpdesk_email}'>%{helpdesk_email}</a>"
+"If you have any questions, please contact the %<application_name>s team at: <a "
+"href='mailto:%<helpdesk_email>s'>%<helpdesk_email>s</a>"
 msgstr ""
-"Si vous avez des questions, merci de contacter l'équipe %{application_name} à "
-"<a href='mailto:%{helpdesk_email}'>%{helpdesk_email}</a>"
+"Si vous avez des questions, merci de contacter l'équipe %<application_name>s à "
+"<a href='mailto:%<helpdesk_email>s'>%<helpdesk_email>s</a>"
 
 #: ../../app/views/static_pages/privacy.html.erb:30
 msgid ""
-"This statement was last revised on %{revdate} and may be revised at any time w"
+"This statement was last revised on %<revdate>s and may be revised at any time w"
 "ith prior notice."
 msgstr ""
-"Cette déclaration a été mise à jour le %{revdate} et peut etre modifiée à tout"
+"Cette déclaration a été mise à jour le %<revdate>s et peut etre modifiée à tout"
 " moment, suite à une notification préalable."
 
 #: ../../app/views/static_pages/termsuse.html.erb:12
@@ -5436,7 +5436,7 @@ msgid ""
 "ookies and how we use them is available on the <a target='_blank' href='http:/"
 "/www.dcc.ac.uk/about-us/about-site/website-terms-use/cookies' class=\"has-new-w"
 "indow-popup-info\">main DCC website<em class=\"sr-only\"> (new window)</em><span "
-"class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>.</p>\n"
+"class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a>.</p>\n"
 "\n"
 "      <h3>Third party APIs</h3>\n"
 "\n"
@@ -5484,7 +5484,7 @@ msgstr ""
 "ibles sur le <a target='_blank' href='http://www.dcc.ac.uk/about-us/about-site"
 "/website-terms-use/cookies' class=\"has-new-window-popup-info\">site Web princip"
 "al de DCC <em class=\"sr-only\">(nouvelle fenêtre)</em> <span class=\"new-window-"
-"popup-info\">%{open_in_new_window_text}</span></a> . </p><h3> API tierces </h3>"
+"popup-info\">%<open_in_new_window_text>s</span></a> . </p><h3> API tierces </h3>"
 "<p> Certaines fonctionnalités de ce site Web utilisent des services et des API"
 " tiers tels que InCommon / Shibboleth ou l'hébergement tiers de bibliothèques "
 "JavaScript ou de polices Web courantes. Les informations utilisées par un serv"
@@ -5522,8 +5522,8 @@ msgid "Email credentials to contact"
 msgstr "E-mail des identifiants au contact"
 
 #: ../../app/views/super_admin/api_clients/_form.html.erb:81
-msgid "Are you sure you want to delete the API client: \"%{name}\""
-msgstr "Voulez-vous vraiment supprimer le client API: \"%{name}\""
+msgid "Are you sure you want to delete the API client: \"%<name>s\""
+msgstr "Voulez-vous vraiment supprimer le client API: \"%<name>s\""
 
 #: ../../app/views/super_admin/api_clients/edit.html.erb:1
 msgid "Editing API client"
@@ -5539,8 +5539,8 @@ msgid "View all API clients"
 msgstr "Voir tous les clients API"
 
 #: ../../app/views/super_admin/api_clients/email_credentials.js.erb:1
-msgid "The credentials have been sent to %{email}."
-msgstr "Les informations d'identification ont été envoyées à %{email}."
+msgid "The credentials have been sent to %<email>s."
+msgstr "Les informations d'identification ont été envoyées à %<email>s."
 
 #: ../../app/views/super_admin/api_clients/index.html.erb:1
 #: ../../app/views/super_admin/api_clients/index.html.erb:6
@@ -5588,8 +5588,8 @@ msgid "Body"
 msgstr "Contenu"
 
 #: ../../app/views/super_admin/notifications/_form.html.erb:71
-msgid "Are you sure you want to delete the notification \"%{title}\""
-msgstr "Voulez-vous vraiment supprimer la notification \"%{title}\""
+msgid "Are you sure you want to delete the notification \"%<title>s\""
+msgstr "Voulez-vous vraiment supprimer la notification \"%<title>s\""
 
 #: ../../app/views/super_admin/notifications/edit.html.erb:1
 #: ../../app/views/super_admin/notifications/edit.html.erb:5
@@ -5614,8 +5614,8 @@ msgid "New Notification"
 msgstr "Nouvelle notification"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:9
-msgid "Merging '%{from_org_name}' into '%{to_org_name}'"
-msgstr "Fusion de '%{from_org_name}' dans '%{to_org_name}'"
+msgid "Merging '%<from_org_name>s' into '%<to_org_name>s'"
+msgstr "Fusion de '%<from_org_name>s' dans '%<to_org_name>s'"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:11
 msgid "Summary:"
@@ -5623,10 +5623,10 @@ msgstr "Résumé:"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:12
 msgid ""
-"Counts of '%{to_org_name}' records before and after a merge with %{from_org_na"
+"Counts of '%<to_org_name>s' records before and after a merge with %{from_org_na"
 "me}."
 msgstr ""
-"Nombre d'enregistrements '%{to_org_name}' avant et après une fusion avec %{fro"
+"Nombre d'enregistrements '%<to_org_name>s' avant et après une fusion avec %{fro"
 "m_org_name}."
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:17
@@ -5635,12 +5635,12 @@ msgid "Record Type"
 msgstr "Type d'enregistrement"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:18
-msgid "'%{to_org_name}' Count - before merge"
-msgstr "Nombre '%{to_org_name}' - avant la fusion"
+msgid "'%<to_org_name>s' Count - before merge"
+msgstr "Nombre '%<to_org_name>s' - avant la fusion"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:19
-msgid "'%{to_org_name}' Count - after merge"
-msgstr "Nombre '%{to_org_name}' - après la fusion"
+msgid "'%<to_org_name>s' Count - after merge"
+msgstr "Nombre '%<to_org_name>s' - après la fusion"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:38
 msgid "Details:"
@@ -5649,22 +5649,22 @@ msgstr "Détails:"
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:39
 msgid ""
 "The table below shows the specific changes that will occur during the merge pr"
-"ocess. Once the merge is complete, '%{from_org_name}' will be deleted. You can"
+"ocess. Once the merge is complete, '%<from_org_name>s' will be deleted. You can"
 " then consolidate/correct any merge issues (e.g. remove any departments that w"
 "ere duplicated)"
 msgstr ""
 "Le tableau ci-dessous montre les changements spécifiques qui se produiront au "
-"cours du processus de fusion. Une fois la fusion terminée, '%{from_org_name}' "
+"cours du processus de fusion. Une fois la fusion terminée, '%<from_org_name>s' "
 "sera supprimé. Vous pouvez ensuite consolider/corriger tous les problèmes de f"
 "usion (par exemple, supprimer tous les départements qui ont été dupliqués)"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:45
-msgid "%{from_org_name} - Before"
-msgstr "%{from_org_name} - Avant"
+msgid "%<from_org_name>s - Before"
+msgstr "%<from_org_name>s - Avant"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:46
-msgid "%{to_org_name} - Before"
-msgstr "%{to_org_name} - Avant"
+msgid "%<to_org_name>s - Before"
+msgstr "%<to_org_name>s - Avant"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:61
 msgid "The following attributes will be updated"
@@ -5676,7 +5676,7 @@ msgid ""
 "name}' will then be deleted."
 msgstr ""
 "Attention : Les modifications proposées ci-dessus seront validées dans la base"
-" de données. '%{org_name}' sera alors supprimé."
+" de données. '%<org_name>s' sera alors supprimé."
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:92
 msgid "These changes cannot be undone! Do not proceed unless you are certain."
@@ -5694,10 +5694,10 @@ msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:95
 msgid ""
-"Warning: '%{from_org_name}' has Plans that are currently in the review process"
+"Warning: '%<from_org_name>s' has Plans that are currently in the review process"
 ". The Org admins may not be able to see these plans after the merge!"
 msgstr ""
-"Avertissement : « %{from_org_name} » a des plans qui sont actuellement en cour"
+"Avertissement : « %<from_org_name>s » a des plans qui sont actuellement en cour"
 "s de révision. Les administrateurs de l'organisation ne pourront peut-être pas"
 " voir ces plans après la fusion !"
 
@@ -5722,8 +5722,8 @@ msgid "New organisation"
 msgstr "Nouvel organisme"
 
 #: ../../app/views/super_admin/themes/_form.html.erb:17
-msgid "Are you sure you want to delete the theme \"%{title}\"?"
-msgstr "Voulez vous vraiment supprimer le thème \"%{title}\"?"
+msgid "Are you sure you want to delete the theme \"%<title>s\"?"
+msgstr "Voulez vous vraiment supprimer le thème \"%<title>s\"?"
 
 #: ../../app/views/super_admin/themes/edit.html.erb:3
 #: ../../app/views/super_admin/themes/new.html.erb:3
@@ -5744,7 +5744,7 @@ msgid ""
 "il}. <br> The selected account will then be removed"
 msgstr ""
 "<br> Le contenu de l'utilisateur sélectionné sera fusionné dans le compte pour"
-" %{user_email}. <br> Le compte sélectionné sera alors supprimé"
+" %<user_email>s. <br> Le compte sélectionné sera alors supprimé"
 
 #: ../../app/views/super_admin/users/edit.html.erb:63
 msgid "Archive"
@@ -5752,11 +5752,11 @@ msgstr "archiver"
 
 #: ../../app/views/super_admin/users/edit.html.erb:64
 msgid ""
-"You are about to archive %{user_name}.  This will remove their personal inform"
+"You are about to archive %<user_name>s.  This will remove their personal inform"
 "ation, but retain their plans, answers, and comments.  They will be unable to "
 "sign-in. Are you sure?"
 msgstr ""
-"Vous êtes sur le point d'archiver %{user_name}. Cela supprimera leurs informat"
+"Vous êtes sur le point d'archiver %<user_name>s. Cela supprimera leurs informat"
 "ions personnelles, mais conservera leurs plans, réponses et commentaires. Ils "
 "ne pourront pas se connecter. Êtes-vous sûr?"
 
@@ -5865,98 +5865,98 @@ msgstr ""
 #: ../../app/views/user_mailer/permissions_change_notification.html.erb:2
 #: ../../app/views/user_mailer/plan_visibility.html.erb:2
 #: ../../app/views/user_mailer/sharing_notification.html.erb:2
-msgid "Hello %{username}"
-msgstr "Bonjour %{username}"
+msgid "Hello %<username>s"
+msgstr "Bonjour %<username>s"
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:6
-msgid "You have been granted administrator privileges in %{tool_name}:"
+msgid "You have been granted administrator privileges in %<tool_name>s:"
 msgstr "Vous avez reçu des privilèges d'administrateur dans % {tool_name} :"
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:13
-msgid "You have been revoked administrator privileges in %{tool_name}."
+msgid "You have been revoked administrator privileges in %<tool_name>s."
 msgstr "Vos droits administrateur dans % {tool_name} ont été retirés."
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:17
 msgid ""
-"More information about administering the %{tool_name} for users at your organi"
-"sation is available at the %{help_url}."
+"More information about administering the %<tool_name>s for users at your organi"
+"sation is available at the %<help_url>s."
 msgstr ""
 "De plus amples informations concernant l'administration des utilisateurs de %{"
-"tool_name} de votre organisme sont disponibles à %{help_url}."
+"tool_name} de votre organisme sont disponibles à %<help_url>s."
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:2
-msgid "Hello %{name},"
-msgstr "Bonjour %{name},"
+msgid "Hello %<name>s,"
+msgstr "Bonjour %<name>s,"
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:8
-msgid "Please use the following credentials when accessing the %{tool_name} API."
+msgid "Please use the following credentials when accessing the %<tool_name>s API."
 msgstr ""
 "Veuillez utiliser les informations d'identification suivantes lors de l'accès "
-"à l'API %{tool_name}."
+"à l'API %<tool_name>s."
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:23
-msgid "Please refer to the API documentation at: %{api_documentation_url}"
+msgid "Please refer to the API documentation at: %<api_documentation_url>s"
 msgstr ""
 "Veuillez consulter la documentation de l'API à l'adresse: %{api_documentation_"
 "url}"
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:29
 msgid ""
-"Do not share these credentials. They for use with the %{external_application} "
+"Do not share these credentials. They for use with the %<external_application>s "
 "application. If you do share your credentials with another application we rese"
 "rve the right to revoke your access to the API."
 msgstr ""
 "Ne partagez pas ces informations d'identification. Ils sont à utiliser avec l'"
-"application %{external_application}. Si vous partagez vos informations d'ident"
+"application %<external_application>s. Si vous partagez vos informations d'ident"
 "ification avec une autre application, nous nous réservons le droit de révoquer"
 " votre accès à l'API."
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:34
 msgid ""
-"If you did not request access to the %{tool_name} API or did not request for y"
-"our credentials to be renewed, please contact us at %{helpdesk_email}"
+"If you did not request access to the %<tool_name>s API or did not request for y"
+"our credentials to be renewed, please contact us at %<helpdesk_email>s"
 msgstr ""
-"Si vous n'avez pas demandé l'accès à l'API %{tool_name} ou n'avez pas demandé "
+"Si vous n'avez pas demandé l'accès à l'API %<tool_name>s ou n'avez pas demandé "
 "le renouvellement de vos informations d'identification, veuillez nous contacte"
-"r à %{helpdesk_email}"
+"r à %<helpdesk_email>s"
 
 #: ../../app/views/user_mailer/feedback_complete.html.erb:2
-msgid "Hello %{recipient_name}"
-msgstr "Bonjour %{recipient_name}"
+msgid "Hello %<recipient_name>s"
+msgstr "Bonjour %<recipient_name>s"
 
 #: ../../app/views/user_mailer/feedback_complete.html.erb:5
 msgid ""
-"%{commenter} has finished providing feedback on the plan  \"%{link_html}\". Comm"
+"%<commenter>s has finished providing feedback on the plan  \"%<link_html>s\". Comm"
 "ents can be found in the 'Write plan' tab on the right side of the page (Guida"
 "nce/Comments)."
 msgstr ""
-"%{commenter} a fini de fournir ses commentaires sur le plan \"%{link_html}\". Le"
+"%<commenter>s a fini de fournir ses commentaires sur le plan \"%<link_html>s\". Le"
 "s commentaires se trouvent dans l'onglet \"Rédiger un plan\" situé à droite de l"
 "a page (Conseils / Commentaires)."
 
 #: ../../app/views/user_mailer/feedback_notification.html.erb:2
-msgid "Hello %{user_name},"
-msgstr "Bonjour %{user_name},"
+msgid "Hello %<user_name>s,"
+msgstr "Bonjour %<user_name>s,"
 
 #: ../../app/views/user_mailer/feedback_notification.html.erb:5
 msgid ""
-"%{requestor} has requested feedback on a plan %{link_html}. To add comments, p"
-"lease visit the 'Plans' page under the Admin menu in %{tool_name} and open the"
+"%<requestor>s has requested feedback on a plan %<link_html>s. To add comments, p"
+"lease visit the 'Plans' page under the Admin menu in %<tool_name>s and open the"
 " plan."
 msgstr ""
-"%{requestor} a demandé des commentaires sur un plan %{link_html}. Pour ajouter"
+"%<requestor>s a demandé des commentaires sur un plan %<link_html>s. Pour ajouter"
 " des commentaires, veuillez visiter la page «Plans» sous le menu Admin dans %{"
 "tool_name} et ouvrir le plan."
 
 #: ../../app/views/user_mailer/new_comment.html.erb:5
 msgid ""
-"%{commenter_name} has commented on your plan %{plan_title}. To view the commen"
+"%<commenter_name>s has commented on your plan %<plan_title>s. To view the commen"
 "ts, follow the link to the DMP below, or navigate to the plan via My Dashboard"
-" page in %{tool_name}."
+" page in %<tool_name>s."
 msgstr ""
-"%{commenter_name} a commenté votre plan %{plan_title}. Pour afficher les comme"
+"%<commenter_name>s a commenté votre plan %<plan_title>s. Pour afficher les comme"
 "ntaires, suivez le lien vers le DMP ci-dessous ou accédez au plan via la page "
-"Mon tableau de bord dans %{tool_name}."
+"Mon tableau de bord dans %<tool_name>s."
 
 #: ../../app/views/user_mailer/new_comment.html.erb:10
 msgid "Below is a summary of the sections and questions which have comments."
@@ -5973,24 +5973,24 @@ msgstr ""
 "our chaque question."
 
 #: ../../app/views/user_mailer/new_comment.html.erb:15
-msgid "DMP: %{phase_link}"
-msgstr "DMP: %{phase_link}"
+msgid "DMP: %<phase_link>s"
+msgstr "DMP: %<phase_link>s"
 
 #: ../../app/views/user_mailer/new_comment.html.erb:18
-msgid "Section name: %{section_title}"
-msgstr "Nom de section: %{section_title}"
+msgid "Section name: %<section_title>s"
+msgstr "Nom de section: %<section_title>s"
 
 #: ../../app/views/user_mailer/new_comment.html.erb:21
-msgid "Question: %{question_number}"
-msgstr "Question: %{question_number}"
+msgid "Question: %<question_number>s"
+msgstr "Question: %<question_number>s"
 
 #: ../../app/views/user_mailer/permissions_change_notification.html.erb:5
 msgid ""
-"Your permissions relating to %{plan_title} have changed. You now have %{type} "
-"access. This means you can %{placeholder1} %{placeholder2}"
+"Your permissions relating to %<plan_title>s have changed. You now have %<type>s "
+"access. This means you can %<placeholder1>s %<placeholder2>s"
 msgstr ""
-"Vos permissions concernant %{plan_title} ont changées. Vous avez à présent l'a"
-"ccès %{type}. Cela signifie que vous pouvez %{placeholder1} %{placeholder2}"
+"Vos permissions concernant %<plan_title>s ont changées. Vous avez à présent l'a"
+"ccès %<type>s. Cela signifie que vous pouvez %<placeholder1>s %<placeholder2>s"
 
 #: ../../app/views/user_mailer/plan_access_removed.html.erb:2
 msgid "Hello "
@@ -6005,8 +6005,8 @@ msgid " has been removed by "
 msgstr " a été retiré par "
 
 #: ../../app/views/user_mailer/plan_visibility.html.erb:5
-msgid "The plan %{plan_title} had its visibility changed to %{plan_visibility}."
-msgstr "La visibilité du plan %{plan_title} a changé pour %{plan_visibility}."
+msgid "The plan %<plan_title>s had its visibility changed to %<plan_visibility>s."
+msgstr "La visibilité du plan %<plan_title>s a changé pour %<plan_visibility>s."
 
 #: ../../app/views/user_mailer/plan_visibility.html.erb:9
 msgid "Visibility definitions:"
@@ -6023,14 +6023,14 @@ msgstr "Public : toute personne sur le web peut consulter mon plan"
 #: ../../app/views/user_mailer/plan_visibility.html.erb:17
 msgid ""
 "If you have questions pertaining to this action, please visit the My Dashboard"
-" page in %{tool_name}"
+" page in %<tool_name>s"
 msgstr ""
 "Si vous avez des questions concernant cette action, veuillez visiter la page M"
-"on tableau de bord dans %{tool_name}."
+"on tableau de bord dans %<tool_name>s."
 
 #: ../../app/views/user_mailer/question_answered.html.erb:2
-msgid "Hello %{recipient_name},"
-msgstr "Bonjour %{recipient_name},"
+msgid "Hello %<recipient_name>s,"
+msgstr "Bonjour %<recipient_name>s,"
 
 #: ../../app/views/user_mailer/question_answered.html.erb:5
 msgid " is creating a Data Management Plan and has answered "
@@ -6050,30 +6050,32 @@ msgstr " basé sur le modèle"
 
 #: ../../app/views/user_mailer/sharing_notification.html.erb:5
 msgid ""
-"Your colleague %{inviter_name} has invited you to contribute to
\n"
+"Your colleague %<inviter_name>s has invited you to contribute to
+\n"%<tool_name>s
 "          their Data Management Plan in %{tool_name}"
-msgstr ""
-"Votre collègue %{inviter_name} vous a invité à contribuer à
\n"
+msgstr ""%<inviter_name>s
+"Votre collègue %{inviter_name} vous a invité à c%<tool_name>s
+\n"
 "          leur plan de gestion des données dans %{tool_name}"
-
-#: ../../app/views/user_mailer/welcome_notification.html.erb:2
+%<tool_name>s%<username>s
+#: ../../app/views/use%<tool_name>sco%<username>stion.html.erb:2
 msgid "Welcome to %{tool_name}, %{username}"
 msgstr "Bienvenue sur %{tool_name}, %{username}"
 
-#: ../../app/views/user_mailer/welcome_notification.html.erb:5
+#%<tool_name>sviews/user_mailer/welcome_notification.html.erb:5
 msgid ""
-"%{tool_name} will help you to develop your Data Management Plan. If you have a"
+"%{tool_name} w%<contact_us>sto develop your Data Management Plan. If you have a"
 "ny queries or feedback as you use the tool, please contact us at %{helpdesk_em"
-"ail} or visit %{contact_us}"
-msgstr ""
+"%<tool_name>st %{contact_us}"
+msgstr ""%<helpdesk_email>s%<contact_us>s
 "%{tool_name} vous aidera à élaborer votre DMP. Si vous avez des questions ou s"
 "uggestions, contactez nous à %{helpdesk_email} ou par %{contact_us}"
 
 #: ../../app/views/user_mailer/welcome_notification.html.erb:13
 msgid "You may change your notification preferences on your profile page."
 msgstr "Vous pouvez changer vos préférences de notifications dans votre profil."
-
-#: ../../app/views/users/_admin_grant_permissions.html.erb:9
+%<username>s
+#: ../../app/views/users/_admi%<username>smissions.html.erb:9
 msgid "Editing privileges for %{username}"
 msgstr "Edition des droits de %{username}"
 
diff --git a/config/locale/i18n_placeholders.rb b/config/locale/i18n_placeholders.rb
index eababa380c..5eab96d05f 100644
--- a/config/locale/i18n_placeholders.rb
+++ b/config/locale/i18n_placeholders.rb
@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 # ActiveRecord model errors that we could not override in the model's validation definition
-_("activerecord.errors.messages.record_invalid")
+_('activerecord.errors.messages.record_invalid')
 # msgstr "unable to save your changes"
-_("activerecord.errors.models.user.attributes.current_password.invalid")
+_('activerecord.errors.models.user.attributes.current_password.invalid')
 # msgstr "invalid email and/or password"
-_("activerecord.errors.models.user.attributes.email.blank")
+_('activerecord.errors.models.user.attributes.email.blank')
 # msgstr "can't be blank"
-_("activerecord.errors.models.user.attributes.password.blank")
+_('activerecord.errors.models.user.attributes.password.blank')
 # msgstr "can't be blank"
-_("activerecord.errors.models.user.attributes.password_confirmation.confirmation")
+_('activerecord.errors.models.user.attributes.password_confirmation.confirmation')
 # msgstr "passwords must match"
diff --git a/config/locale/pt_BR/app.po b/config/locale/pt_BR/app.po
index ff7bd33ce9..e2c605b656 100644
--- a/config/locale/pt_BR/app.po
+++ b/config/locale/pt_BR/app.po
@@ -20,15 +20,15 @@ msgstr ""
 
 #: ../../app/controllers/answers_controller.rb:24
 msgid ""
-"There is no question with id %{question_id} associated to plan id %{plan_id} f"
+"There is no question with id %<question_id>s associated to plan id %<plan_id>s f"
 "or which to create or update an answer"
 msgstr ""
-"Não há dúvidas com o id %{question_id} associado ao id do plano %{plan_id} par"
+"Não há dúvidas com o id %<question_id>s associado ao id do plano %<plan_id>s par"
 "a o qual criar ou atualizar uma resposta"
 
 #: ../../app/controllers/answers_controller.rb:34
-msgid "There is no plan with id %{id} for which to create or update an answer"
-msgstr "Não há nenhum plano com id %{id} para o qual criar ou atualizar uma resposta"
+msgid "There is no plan with id %<id>s for which to create or update an answer"
+msgstr "Não há nenhum plano com id %<id>s para o qual criar ou atualizar uma resposta"
 
 #: ../../app/controllers/api/v0/base_controller.rb:124
 msgid "Bad Credentials"
@@ -137,12 +137,12 @@ msgid "You need to sign in or sign up before continuing."
 msgstr "Você precisa entrar ou registrar-se antes de continuar."
 
 #: ../../app/controllers/application_controller.rb:100
-msgid "Unable to %{action} the %{object}.%{errors}"
-msgstr "Não é possível %{action} o %{object}. %{errors}"
+msgid "Unable to %<action>s the %<object>s.%<errors>s"
+msgstr "Não é possível %<action>s o %<object>s. %<errors>s"
 
 #: ../../app/controllers/application_controller.rb:108
-msgid "Successfully %{action} the %{object}."
-msgstr "Com sucesso %{action} o %{object}."
+msgid "Successfully %<action>s the %<object>s."
+msgstr "Com sucesso %<action>s o %<object>s."
 
 #: ../../app/controllers/application_controller.rb:123
 msgid "API client"
@@ -205,8 +205,8 @@ msgid "Restricted access to View All the records"
 msgstr "Acesso restrito para visualizar todos os registros"
 
 #: ../../app/controllers/concerns/paginable.rb:180
-msgid "Sort by %{sort_field}"
-msgstr "Classificar por %{sort_field}"
+msgid "Sort by %<sort_field>s"
+msgstr "Classificar por %<sort_field>s"
 
 #: ../../app/controllers/concerns/template_methods.rb:10
 msgid "customisation"
@@ -413,12 +413,12 @@ msgstr ""
 "rios."
 
 #: ../../app/controllers/identifiers_controller.rb:18
-msgid "Successfully unlinked your account from %{is}."
-msgstr "Sua conta em %{is} foi desvinculada com sucesso."
+msgid "Successfully unlinked your account from %<is>s."
+msgstr "Sua conta em %<is>s foi desvinculada com sucesso."
 
 #: ../../app/controllers/identifiers_controller.rb:22
-msgid "Unable to unlink your account from %{is}."
-msgstr "Não conseguimos desvincular sua conta de %{is}."
+msgid "Unable to unlink your account from %<is>s."
+msgstr "Não conseguimos desvincular sua conta de %<is>s."
 
 #: ../../app/controllers/org_admin/phases_controller.rb:18
 #: ../../app/controllers/org_admin/templates_controller.rb:114
@@ -468,8 +468,8 @@ msgid "update"
 msgstr "atualizar"
 
 #: ../../app/controllers/org_admin/plans_controller.rb:32
-msgid "%{plan_owner} has been notified that you have finished providing feedback"
-msgstr "%{plan_owner} foi avisado de que você terminou de dar feedback"
+msgid "%<plan_owner>s has been notified that you have finished providing feedback"
+msgstr "%<plan_owner>s foi avisado de que você terminou de dar feedback"
 
 #: ../../app/controllers/org_admin/plans_controller.rb:38
 msgid "Unable to notify user that you have finished providing feedback."
@@ -560,8 +560,8 @@ msgstr "Todos os Modelos"
 
 #: ../../app/controllers/org_admin/templates_controller.rb:48
 #: ../../app/views/org_admin/templates/index.html.erb:52
-msgid "%{org_name} Templates"
-msgstr "%{org_name} Modelos"
+msgid "%<org_name>s Templates"
+msgstr "%<org_name>s Modelos"
 
 #: ../../app/controllers/org_admin/templates_controller.rb:50
 #: ../../app/views/org_admin/templates/index.html.erb:54
@@ -573,13 +573,13 @@ msgid "Customizable Templates"
 msgstr "Modelos customizáveis"
 
 #: ../../app/controllers/org_admin/templates_controller.rb:214
-msgid "Error parsing links for a %{template}"
-msgstr "Erro ao analisar links para um %{template}"
+msgid "Error parsing links for a %<template>s"
+msgstr "Erro ao analisar links para um %<template>s"
 
 #: ../../app/controllers/org_admin/templates_controller.rb:345
 #: ../../app/controllers/public_pages_controller.rb:68
-msgid "Template created using the %{application_name} service. Last modified %{date}"
-msgstr "Modelo criado usando %{application_name}. Última modificação %{date}"
+msgid "Template created using the %<application_name>s service. Last modified %<date>s"
+msgstr "Modelo criado usando %<application_name>s. Última modificação %<date>s"
 
 #: ../../app/controllers/org_admin/templates_controller.rb:360
 #: ../../app/controllers/public_pages_controller.rb:83
@@ -599,8 +599,8 @@ msgid "Please choose an organisation"
 msgstr "Por favor, escolha uma organização."
 
 #: ../../app/controllers/plan_exports_controller.rb:85
-msgid "Created using %{application_name}. Last modified %{date}"
-msgstr "Criado usando %{application_name}. Última modificação %{date}"
+msgid "Created using %<application_name>s. Last modified %<date>s"
+msgstr "Criado usando %<application_name>s. Última modificação %<date>s"
 
 #: ../../app/controllers/plans_controller.rb:51
 msgid "This is a"
@@ -641,15 +641,15 @@ msgstr "copieado"
 
 #: ../../app/controllers/plans_controller.rb:408
 msgid ""
-"Unable to change the plan's status since it is needed at least %{percentage} p"
+"Unable to change the plan's status since it is needed at least %<percentage>s p"
 "ercentage responded"
 msgstr ""
-"Não conseguimos mudar o status do plano. É preciso pelo menos %{percentage} de"
+"Não conseguimos mudar o status do plano. É preciso pelo menos %<percentage>s de"
 " respostas."
 
 #: ../../app/controllers/plans_controller.rb:416
-msgid "Unable to find plan id %{plan_id}"
-msgstr "Não conseguimos encontrar o plano com id %{plan_id}"
+msgid "Unable to find plan id %<plan_id>s"
+msgstr "Não conseguimos encontrar o plano com id %<plan_id>s"
 
 #: ../../app/controllers/plans_controller.rb:433
 msgid "Your project is now a test."
@@ -664,18 +664,18 @@ msgid "Unable to change the plan's test status"
 msgstr "Não conseguimos mudar o status de teste do plano"
 
 #: ../../app/controllers/plans_controller.rb:451
-msgid "There is no plan associated with id %{id}"
-msgstr "Não há nenhum plano associado à id %{id}"
+msgid "There is no plan associated with id %<id>s"
+msgstr "Não há nenhum plano associado à id %<id>s"
 
 #: ../../app/controllers/registrations_controller.rb:35
 msgid ""
 "Please make a choice below. After linking your\n"
-"                       details to a %{application_name} account,\n"
+"                       details to a %<application_name>s account,\n"
 "                       you will be able to sign in directly with your\n"
 "                       institutional credentials."
 msgstr ""
 "Faça uma escolha abaixo. Depois de ligar o seu\n"
-"                       detalhes para uma conta %{application_name},\n"
+"                       detalhes para uma conta %<application_name>s,\n"
 "                       você poderá fazer login diretamente com o seu\n"
 "                       credenciais institucionais."
 
@@ -755,15 +755,15 @@ msgstr "A senha e a confirmação devem ser iguais"
 
 #: ../../app/controllers/roles_controller.rb:26
 msgid ""
-"Cannot share plan with %{email} since that email matches with the owner of the"
+"Cannot share plan with %<email>s since that email matches with the owner of the"
 " plan."
 msgstr ""
-"Impossível compartilhar o plano com %{email}; email é o mesmo do proprietário "
+"Impossível compartilhar o plano com %<email>s; email é o mesmo do proprietário "
 "do plano."
 
 #: ../../app/controllers/roles_controller.rb:37
-msgid "Plan is already shared with %{email}."
-msgstr "O plano já está compartilhado com %{email}."
+msgid "Plan is already shared with %<email>s."
+msgstr "O plano já está compartilhado com %<email>s."
 
 #: ../../app/controllers/roles_controller.rb:44
 #: ../../app/views/shared/_create_account_form.html.erb:4
@@ -775,12 +775,12 @@ msgid "Surname"
 msgstr "Sobrenome"
 
 #: ../../app/controllers/roles_controller.rb:48
-msgid "Invitation to %{email} issued successfully."
-msgstr "Convite para %{email} emitido com sucesso."
+msgid "Invitation to %<email>s issued successfully."
+msgstr "Convite para %<email>s emitido com sucesso."
 
 #: ../../app/controllers/roles_controller.rb:53
-msgid "Plan shared with %{email}."
-msgstr "Plano compartilhado com %{email}."
+msgid "Plan shared with %<email>s."
+msgstr "Plano compartilhado com %<email>s."
 
 #: ../../app/controllers/roles_controller.rb:68
 msgid "You must provide a valid email address and select a permission level."
@@ -794,10 +794,10 @@ msgstr "Por favor, insira um endereço de email."
 
 #: ../../app/controllers/roles_controller.rb:93
 msgid ""
-"Successfully changed the permissions for %{email}. They have been notified via"
+"Successfully changed the permissions for %<email>s. They have been notified via"
 " email."
 msgstr ""
-"Alterou as permissões para %{email} com sucesso. Eles foram notificados por e-"
+"Alterou as permissões para %<email>s com sucesso. Eles foram notificados por e-"
 "mail."
 
 #: ../../app/controllers/roles_controller.rb:108
@@ -829,8 +829,8 @@ msgid "An error has occurred while saving/resetting your export settings."
 msgstr "Ocorreu um erro ao salvar/redefinir seus parâmetros de exportação."
 
 #: ../../app/controllers/super_admin/api_clients_controller.rb:45
-msgid ". The API credentials have been emailed to %{email}"
-msgstr ". As credenciais da API foram enviadas por email para %{email}"
+msgid ". The API credentials have been emailed to %<email>s"
+msgstr ". As credenciais da API foram enviadas por email para %<email>s"
 
 #: ../../app/controllers/super_admin/notifications_controller.rb:69
 msgid "Your notification is now active."
@@ -845,16 +845,16 @@ msgid "Unable to change the notification's active status"
 msgstr "Não foi possível alterar o status ativo da notificação"
 
 #: ../../app/controllers/super_admin/notifications_controller.rb:104
-msgid "There is no notification associated with id  %{id}"
-msgstr "Não há nenhum plano associado à id %{id}"
+msgid "There is no notification associated with id  %<id>s"
+msgstr "Não há nenhum plano associado à id %<id>s"
 
 #: ../../app/controllers/super_admin/org_swaps_controller.rb:22
 msgid ""
 "Your organisation affiliation has been changed. You may now edit templates for"
-" %{org_name}."
+" %<org_name>s."
 msgstr ""
 "Sua afiliação organizacional foi modificada. Você agora pode editar modelos pa"
-"ra %{org_name}."
+"ra %<org_name>s."
 
 #: ../../app/controllers/super_admin/org_swaps_controller.rb:25
 msgid "Unable to change your organisation affiliation at this time."
@@ -917,16 +917,16 @@ msgid "Successfully signed in"
 msgstr "Entrada bem sucedida"
 
 #: ../../app/controllers/users/omniauth_callbacks_controller.rb:56
-msgid "Your account has been successfully linked to %{scheme}."
-msgstr "Sua conta foi vinculada a %{scheme}."
+msgid "Your account has been successfully linked to %<scheme>s."
+msgstr "Sua conta foi vinculada a %<scheme>s."
 
 #: ../../app/controllers/users/omniauth_callbacks_controller.rb:61
-msgid "Unable to link your account to %{scheme}."
+msgid "Unable to link your account to %<scheme>s."
 msgstr "Não é possível vincular sua conta a% {scheme}."
 
 #: ../../app/controllers/users_controller.rb:141
-msgid "Successfully %{action} %{username}'s account."
-msgstr "Successo ao %{action} conta do %{username}"
+msgid "Successfully %<action>s %<username>s's account."
+msgstr "Successo ao %<action>s conta do %<username>s"
 
 #: ../../app/controllers/users_controller.rb:142
 msgid "activated"
@@ -937,8 +937,8 @@ msgid "deactivated"
 msgstr "desativado"
 
 #: ../../app/controllers/users_controller.rb:149
-msgid "Unable to %{action} %{username}"
-msgstr "Incapaz de %{action} %{username}"
+msgid "Unable to %<action>s %<username>s"
+msgstr "Incapaz de %<action>s %<username>s"
 
 #: ../../app/controllers/users_controller.rb:150
 msgid "activate"
@@ -1010,20 +1010,20 @@ msgid "Creator:"
 msgstr "Criador:"
 
 #: ../../app/helpers/feedbacks_helper.rb:6
-msgid "%{application_name}: Your plan has been submitted for feedback"
-msgstr "%{application_name}: Seu plano foi submetido para feedback."
+msgid "%<application_name>s: Your plan has been submitted for feedback"
+msgstr "%<application_name>s: Seu plano foi submetido para feedback."
 
 #: ../../app/helpers/feedbacks_helper.rb:10
 msgid ""
-"<p>Hello %{user_name}.</p><p>Your plan \"%{plan_name}\" has been submitted for f"
+"<p>Hello %<user_name>s.</p><p>Your plan \"%<plan_name>s\" has been submitted for f"
 "eedback from an\n"
 "      administrator at your organisation. If you have questions pertaining to "
 "this action, please contact us\n"
-"      at %{organisation_email}.</p>"
+"      at %<organisation_email>s.</p>"
 msgstr ""
-"<p> Olá %{user_name} </p><p> Seu plano \"%{plan_name}\" foi enviado para comentá"
+"<p> Olá %<user_name>s </p><p> Seu plano \"%<plan_name>s\" foi enviado para comentá"
 "rios de um administrador da sua organização. Se você tiver dúvidas sobre essa "
-"ação, entre em contato conosco pelo %{organisation_email}. </p>"
+"ação, entre em contato conosco pelo %<organisation_email>s. </p>"
 
 #: ../../app/helpers/identifier_helper.rb:6
 #: ../../spec/helpers/identifier_helper_spec.rb:14
@@ -1056,14 +1056,14 @@ msgstr "ler o plano e deixar comentários."
 
 #: ../../app/helpers/orgs_helper.rb:14
 msgid ""
-"<p>A data librarian from %{org_name} will respond to your request within 48\n"
+"<p>A data librarian from %<org_name>s will respond to your request within 48\n"
 "       hours. If you have questions pertaining to this action please contact u"
 "s\n"
-"       at %{organisation_email}.</p>"
+"       at %<organisation_email>s.</p>"
 msgstr ""
-"<p> Um bibliotecário de dados de %{org_name} responderá a sua solicitação em a"
+"<p> Um bibliotecário de dados de %<org_name>s responderá a sua solicitação em a"
 "té 48 horas. Se você tiver dúvidas sobre essa ação, entre em contato conosco p"
-"elo %{organisation_email}. </p>"
+"elo %<organisation_email>s. </p>"
 
 #: ../../app/helpers/perms_helper.rb:9
 msgid "Add organisations"
@@ -1196,16 +1196,16 @@ msgid "None"
 msgstr "Nenhum"
 
 #: ../../app/helpers/super_admin/orgs/merge_helper.rb:31
-msgid "Guidance for: %{themes}"
-msgstr "Orientação para: %{themes}"
+msgid "Guidance for: %<themes>s"
+msgstr "Orientação para: %<themes>s"
 
 #: ../../app/helpers/super_admin/orgs/merge_helper.rb:53
 msgid "Nothing to merge"
 msgstr "Nada para fundir"
 
 #: ../../app/helpers/super_admin/orgs/merge_helper.rb:55
-msgid "<p>The following %{object_types} will be moved over to '%{org_name}':</p>"
-msgstr "<p>O seguinte %{object_types} será movido para '%{org_name}':</p>"
+msgid "<p>The following %<object_types>s will be moved over to '%<org_name>s':</p>"
+msgstr "<p>O seguinte %<object_types>s será movido para '%<org_name>s':</p>"
 
 #: ../../app/helpers/template_helper.rb:46
 #: ../../app/views/plans/index.html.erb:29
@@ -1240,48 +1240,48 @@ msgstr "Últimos 12 meses"
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:6
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:5
 #: ../../app/views/user_mailer/_email_signature.html.erb:2
-msgid "Query or feedback related to %{tool_name}"
-msgstr "Pergunta ou feedback relacionado a %{tool_name}"
+msgid "Query or feedback related to %<tool_name>s"
+msgstr "Pergunta ou feedback relacionado a %<tool_name>s"
 
 #: ../../app/mailers/user_mailer.rb:23
-msgid "Welcome to %{tool_name}"
-msgstr "Bem-vindo a %{tool_name}"
+msgid "Welcome to %<tool_name>s"
+msgstr "Bem-vindo a %<tool_name>s"
 
 #: ../../app/mailers/user_mailer.rb:58
-msgid "A Data Management Plan in %{tool_name} has been shared with you"
-msgstr "Um plano de gerenciamento de dados em %{tool_name} foi compartilhado com você"
+msgid "A Data Management Plan in %<tool_name>s has been shared with you"
+msgstr "Um plano de gerenciamento de dados em %<tool_name>s foi compartilhado com você"
 
 #: ../../app/mailers/user_mailer.rb:76
-msgid "Changed permissions on a Data Management Plan in %{tool_name}"
-msgstr "Permissões modificadas em um Plano de Gestão de Dados em %{tool_name}"
+msgid "Changed permissions on a Data Management Plan in %<tool_name>s"
+msgstr "Permissões modificadas em um Plano de Gestão de Dados em %<tool_name>s"
 
 #: ../../app/mailers/user_mailer.rb:92
-msgid "Permissions removed on a DMP in %{tool_name}"
-msgstr "Permissões removidas em um DMP em %{tool_name}"
+msgid "Permissions removed on a DMP in %<tool_name>s"
+msgstr "Permissões removidas em um DMP em %<tool_name>s"
 
 #: ../../app/mailers/user_mailer.rb:111
-msgid "%{user_name} has requested feedback on a %{tool_name} plan"
-msgstr "%{user_name} solicitou feedback sobre um plano %{tool_name}"
+msgid "%<user_name>s has requested feedback on a %<tool_name>s plan"
+msgstr "%<user_name>s solicitou feedback sobre um plano %<tool_name>s"
 
 #: ../../app/mailers/user_mailer.rb:134
-msgid "%{tool_name}: Expert feedback has been provided for %{plan_title}"
-msgstr "%{tool_name}: O feedback de especialistas foi fornecido para %{plan_title}"
+msgid "%<tool_name>s: Expert feedback has been provided for %<plan_title>s"
+msgstr "%<tool_name>s: O feedback de especialistas foi fornecido para %<plan_title>s"
 
 #: ../../app/mailers/user_mailer.rb:169
-msgid "DMP Visibility Changed: %{plan_title}"
-msgstr "Visibilidade do PGD Modificada: %{plan_title}"
+msgid "DMP Visibility Changed: %<plan_title>s"
+msgstr "Visibilidade do PGD Modificada: %<plan_title>s"
 
 #: ../../app/mailers/user_mailer.rb:200
-msgid "%{tool_name}: A new comment was added to %{plan_title}"
-msgstr "%{tool_name}: Um novo comentário foi adicionado a %{plan_title}"
+msgid "%<tool_name>s: A new comment was added to %<plan_title>s"
+msgstr "%<tool_name>s: Um novo comentário foi adicionado a %<plan_title>s"
 
 #: ../../app/mailers/user_mailer.rb:218
-msgid "Administrator privileges granted in %{tool_name}"
-msgstr "Privilégios de administrador atribuídos em %{tool_name}"
+msgid "Administrator privileges granted in %<tool_name>s"
+msgstr "Privilégios de administrador atribuídos em %<tool_name>s"
 
 #: ../../app/mailers/user_mailer.rb:235
-msgid "%{tool_name} API changes"
-msgstr "Alterações na API %{tool_name}"
+msgid "%<tool_name>s API changes"
+msgstr "Alterações na API %<tool_name>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:26
 msgid "Phase"
@@ -1313,12 +1313,12 @@ msgid "Creators: "
 msgstr "Criadores:"
 
 #: ../../app/models/concerns/exportable_plan.rb:134
-msgid "%{authors}"
-msgstr "%{authors}"
+msgid "%<authors>s"
+msgstr "%<authors>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:135
-msgid "%{affiliation}"
-msgstr "%{affiliation}"
+msgid "%<affiliation>s"
+msgstr "%<affiliation>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:137
 #: ../../app/models/concerns/exportable_plan.rb:139
@@ -1329,12 +1329,12 @@ msgid "Template: "
 msgstr "Modelo: "
 
 #: ../../app/models/concerns/exportable_plan.rb:137
-msgid "%{funder}"
-msgstr "%{funder}"
+msgid "%<funder>s"
+msgstr "%<funder>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:139
-msgid "%{template}"
-msgstr "%{template}"
+msgid "%<template>s"
+msgstr "%<template>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:142
 #: ../../app/views/shared/export/_plan_txt.erb:12
@@ -1342,8 +1342,8 @@ msgid "Grant number: "
 msgstr "Número da Concessão"
 
 #: ../../app/models/concerns/exportable_plan.rb:142
-msgid "%{grant_number}"
-msgstr "%{grant_number}"
+msgid "%<grant_number>s"
+msgstr "%<grant_number>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:145
 #: ../../app/views/shared/export/_plan_coversheet.erb:26
@@ -1352,8 +1352,8 @@ msgid "Project abstract: "
 msgstr "Resumo do projeto:"
 
 #: ../../app/models/concerns/exportable_plan.rb:145
-msgid "%{description}"
-msgstr "%{description}"
+msgid "%<description>s"
+msgstr "%<description>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:148
 #: ../../app/views/shared/export/_plan_coversheet.erb:42
@@ -1362,8 +1362,8 @@ msgid "Last modified: "
 msgstr "Última modificação: "
 
 #: ../../app/models/concerns/exportable_plan.rb:148
-msgid "%{date}"
-msgstr "%{date}"
+msgid "%<date>s"
+msgstr "%<date>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:149
 #: ../../app/views/shared/export/_plan_coversheet.erb:49
@@ -1546,8 +1546,8 @@ msgid "generate_copy! requires an organisation target"
 msgstr "generate_copy! requer uma meta de organização"
 
 #: ../../app/models/template.rb:380
-msgid "Copy of %{template}"
-msgstr "Cópia do %{template}"
+msgid "Copy of %<template>s"
+msgstr "Cópia do %<template>s"
 
 #: ../../app/models/template.rb:388
 msgid "generate_version! requires a published template"
@@ -1586,8 +1586,8 @@ msgid "Conditions in the template refer backwards"
 msgstr "As condições no modelo se referem ao contrário"
 
 #: ../../app/models/user.rb:379
-msgid "A Data Management Plan in %{application_name} has been shared with you"
-msgstr "Um Plano de Gestão de Dados em %{application_name} foi compartilhado com você"
+msgid "A Data Management Plan in %<application_name>s has been shared with you"
+msgstr "Um Plano de Gestão de Dados em %<application_name>s foi compartilhado com você"
 
 #: ../../app/policies/api/v0/departments_policy.rb:12
 #: ../../app/policies/api/v0/guidance_group_policy.rb:12
@@ -1705,8 +1705,8 @@ msgstr ""
 "de seu financiador atual"
 
 #: ../../app/validators/after_validator.rb:5
-msgid "must be after %{date}"
-msgstr "deve ser depois de %{date}"
+msgid "must be after %<date>s"
+msgstr "deve ser depois de %<date>s"
 
 #: ../../app/validators/org_links_validator.rb:10
 msgid "A key \"org\" is expected for links hash"
@@ -1718,12 +1718,12 @@ msgid "A hash is expected for links"
 msgstr "Espera-se uma 'jogo da velha' para os links"
 
 #: ../../app/validators/template_links_validator.rb:12
-msgid "A key %{key} is expected for links hash"
-msgstr "Uma chave %{key} é esperada para 'jogos da velha' de links"
+msgid "A key %<key>s is expected for links hash"
+msgstr "Uma chave %<key>s é esperada para 'jogos da velha' de links"
 
 #: ../../app/validators/template_links_validator.rb:15
-msgid "The key %{key} does not have a valid set of object links"
-msgstr "A chave %{key} não possui um conjunto válido de links de objeto"
+msgid "The key %<key>s does not have a valid set of object links"
+msgstr "A chave %<key>s não possui um conjunto válido de links de objeto"
 
 #: ../../app/views/answers/_locking.html.erb:5
 msgid "The following answer cannot be saved"
@@ -1731,10 +1731,10 @@ msgstr "A resposta seguinte não pode ser salva"
 
 #: ../../app/views/answers/_locking.html.erb:8
 msgid ""
-"since %{name} saved the answer below while you were editing. Please, combine y"
+"since %<name>s saved the answer below while you were editing. Please, combine y"
 "our changes and then save the answer again."
 msgstr ""
-"visto que %{name} salvou a resposta abaixo enquanto você estava editando. Por "
+"visto que %<name>s salvou a resposta abaixo enquanto você estava editando. Por "
 "favor, combine suas mudanção e depois salve a resposta novamente."
 
 #: ../../app/views/answers/_new_edit.html.erb:15
@@ -1808,8 +1808,8 @@ msgid "Answered"
 msgstr "Respondido"
 
 #: ../../app/views/answers/_status.html.erb:10
-msgid " by %{user_name}"
-msgstr " por %{user_name}"
+msgid " by %<user_name>s"
+msgstr " por %<user_name>s"
 
 #: ../../app/views/answers/_status.html.erb:15
 msgid "This answer removes "
@@ -1886,18 +1886,18 @@ msgstr "Contate-nos"
 
 #: ../../app/views/contact_us/contacts/new.html.erb:6
 msgid ""
-"%{application_name} is provided by the %{organisation_name}.<br /> You can fin"
-"d out more about us on our <a href=\"%{organisation_url}\" class=\"has-new-window"
+"%<application_name>s is provided by the %<organisation_name>s.<br /> You can fin"
+"d out more about us on our <a href=\"%<organisation_url>s\" class=\"has-new-window"
 "-popup-info\" target=\"_blank\">website <em class=\"sr-only\">(new window)</em><spa"
-"n class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>. If you "
-"would like to contact us about %{application_name}, please fill out the form b"
+"n class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a>. If you "
+"would like to contact us about %<application_name>s, please fill out the form b"
 "elow."
 msgstr ""
-"%{application_name} é fornecido pelo %{organisation_name}. <br /> Você pode de"
-"scobrir mais sobre nós em nosso <a href=\"%{organisation_url}\" class=\"has-new-w"
+"%<application_name>s é fornecido pelo %<organisation_name>s. <br /> Você pode de"
+"scobrir mais sobre nós em nosso <a href=\"%<organisation_url>s\" class=\"has-new-w"
 "indow-popup-info\" target=\"_blank\">site <em class=\"sr-only\">(nova janela)</em> "
-"<span class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a> . Se"
-" você quiser entrar em contato conosco sobre o %{application_name}, preencha o"
+"<span class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a> . Se"
+" você quiser entrar em contato conosco sobre o %<application_name>s, preencha o"
 " formulário abaixo."
 
 #: ../../app/views/contact_us/contacts/new.html.erb:10
@@ -2062,8 +2062,8 @@ msgid "Create account"
 msgstr "Criar conta"
 
 #: ../../app/views/devise/mailer/confirmation_instructions.html.erb:2
-msgid "Welcome to %{application_name}"
-msgstr "Bem-vindo a  %{application_name}"
+msgid "Welcome to %<application_name>s"
+msgstr "Bem-vindo a  %<application_name>s"
 
 #: ../../app/views/devise/mailer/confirmation_instructions.html.erb:4
 msgid "Thank you for registering. Please confirm your email address"
@@ -2083,24 +2083,24 @@ msgstr "em seu navegador"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:12
 #: ../../app/views/user_mailer/new_comment.html.erb:2
-msgid "Hello %{user_name}"
-msgstr "Olá %{user_name}"
+msgid "Hello %<user_name>s"
+msgstr "Olá %<user_name>s"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:15
 msgid ""
-"Your colleague %{inviter_name} has invited you to contribute to  their Data Ma"
-"nagement Plan in %{tool_name}"
+"Your colleague %<inviter_name>s has invited you to contribute to  their Data Ma"
+"nagement Plan in %<tool_name>s"
 msgstr ""
-"Seu colega %{inviter_name} convidou você para contribuir com o plano de gerenc"
-"iamento de dados em %{tool_name}"
+"Seu colega %<inviter_name>s convidou você para contribuir com o plano de gerenc"
+"iamento de dados em %<tool_name>s"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:22
 #: ../../app/views/user_mailer/sharing_notification.html.erb:11
 msgid ""
-"%{click_here} to accept the invitation, (or copy %{link} into your browser). I"
+"%<click_here>s to accept the invitation, (or copy %<link>s into your browser). I"
 "f you don't want to accept the invitation, please ignore this email."
 msgstr ""
-"%{click_here} para aceitar o convite, (ou copie %{link} em seu navegador). Se "
+"%<click_here>s para aceitar o convite, (ou copie %<link>s em seu navegador). Se "
 "não quiser aceitar o convite, por favor, ignore esta mensagem."
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:23
@@ -2119,8 +2119,8 @@ msgstr "Atenciosamente"
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:19
 #: ../../app/views/user_mailer/_email_signature.html.erb:12
 #: ../../app/views/user_mailer/welcome_notification.html.erb:10
-msgid "The %{tool_name} team"
-msgstr "A equipe %{tool_name}"
+msgid "The %<tool_name>s team"
+msgstr "A equipe %<tool_name>s"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:32
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:22
@@ -2131,22 +2131,22 @@ msgstr "Por favor, não responda esta mensagem."
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:33
 msgid ""
-"If you have any questions or need help, please contact us at %{helpdesk_email}"
-" or visit %{contact_us_url}"
+"If you have any questions or need help, please contact us at %<helpdesk_email>s"
+" or visit %<contact_us_url>s"
 msgstr ""
 "Se você tiver alguma dúvida ou precisar de ajuda, entre em contato conosco pel"
-"o %{helpdesk_email} ou acesse %{contact_us_url}"
+"o %<helpdesk_email>s ou acesse %<contact_us_url>s"
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:9
-msgid "Hello %{user_email}"
-msgstr "Olá %{user_email}"
+msgid "Hello %<user_email>s"
+msgstr "Olá %<user_email>s"
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:12
 msgid ""
-"Someone has requested a link to change your %{tool_name} password. You can do "
+"Someone has requested a link to change your %<tool_name>s password. You can do "
 "this through the link below."
 msgstr ""
-"Alguém solicitou um link para mudar sua senha em %{tool_name} password. Você p"
+"Alguém solicitou um link para mudar sua senha em %<tool_name>s password. Você p"
 "ode fazer isso usando o link abaixo."
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:14
@@ -2160,11 +2160,11 @@ msgstr "Se você não fez essa solicitação, por favor, ignore esta mensagem."
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:22
 #: ../../app/views/user_mailer/_email_signature.html.erb:19
 msgid ""
-"If you have any questions or need help, please contact us at %{helpdesk_email}"
-" or visit %{contact_us}"
+"If you have any questions or need help, please contact us at %<helpdesk_email>s"
+" or visit %<contact_us>s"
 msgstr ""
 "Caso tenha perguntas ou precise de ajuda, por favor, entre em contato conosco "
-"em %{helpdesk_email} ou visite %{contact_us}."
+"em %<helpdesk_email>s ou visite %<contact_us>s."
 
 #: ../../app/views/devise/mailer/unlock_instructions.html.erb:2
 msgid "Hello"
@@ -2236,22 +2236,22 @@ msgstr "Documentação"
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:16
 msgid ""
-"See the <a href=\"%{api_v0_wiki}\">documentation for v0</a> for more details on "
+"See the <a href=\"%<api_v0_wiki>s\">documentation for v0</a> for more details on "
 "the original API which includes access to statistics, the full text of plans a"
 "nd the ability to connect users with departments."
 msgstr ""
-"Consulte a <a href=\"%{api_v0_wiki}\">documentação da v0</a> para obter mais det"
+"Consulte a <a href=\"%<api_v0_wiki>s\">documentação da v0</a> para obter mais det"
 "alhes sobre a API original, que inclui acesso a estatísticas, o texto completo"
 " dos planos e a capacidade de conectar usuários a departamentos."
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:18
 msgid ""
-"See the <a href=\"%{api_v1_wiki}\">documentation for v1</a> for more details on "
-"the API that supports the <a href=\"%{rda_standard_url}\">RDA Common metadata st"
+"See the <a href=\"%<api_v1_wiki>s\">documentation for v1</a> for more details on "
+"the API that supports the <a href=\"%<rda_standard_url>s\">RDA Common metadata st"
 "andard for DMPs.</a>"
 msgstr ""
-"Consulte a <a href=\"%{api_v1_wiki}\">documentação da v1</a> para obter mais det"
-"alhes sobre a API que suporta o <a href=\"%{rda_standard_url}\">padrão de metada"
+"Consulte a <a href=\"%<api_v1_wiki>s\">documentação da v1</a> para obter mais det"
+"alhes sobre a API que suporta o <a href=\"%<rda_standard_url>s\">padrão de metada"
 "dos RDA Common para DMPs.</a>"
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:21
@@ -2425,8 +2425,8 @@ msgid "Sign in or Create account"
 msgstr "Entrar ou Criar conta"
 
 #: ../../app/views/devise/registrations/new.html.erb:15
-msgid "Do you have a %{application_name} account?"
-msgstr "Você tem uma conta %{application_name}?"
+msgid "Do you have a %<application_name>s account?"
+msgstr "Você tem uma conta %<application_name>s?"
 
 #: ../../app/views/devise/registrations/new.html.erb:22
 #: ../../app/views/layouts/_navigation.html.erb:63
@@ -2441,8 +2441,8 @@ msgid "This will link your existing account to your credentials."
 msgstr "Isso vinculará sua conta existente às suas credenciais."
 
 #: ../../app/views/devise/registrations/new.html.erb:34
-msgid "No %{application_name} account?"
-msgstr "Nenhuma conta %{application_name}?"
+msgid "No %<application_name>s account?"
+msgstr "Nenhuma conta %<application_name>s?"
 
 #: ../../app/views/devise/registrations/new.html.erb:46
 msgid "This will create an account and link it to your credentials."
@@ -2620,10 +2620,10 @@ msgstr "Publicado?"
 
 #: ../../app/views/home/_welcome.html.erb:5
 msgid ""
-"<p>%{application_name} has been developed by the <strong>%{organisation_name}<"
+"<p>%<application_name>s has been developed by the <strong>%<organisation_name>s<"
 "/strong> to help you write data management plans.</p>"
 msgstr ""
-"<p>%{application_name} foi desenvolvido por <strong>%{organisation_name}</stro"
+"<p>%<application_name>s foi desenvolvido por <strong>%<organisation_name>s</stro"
 "ng> para ajudar você a escrever planos de gestão de dados.</p>"
 
 #: ../../app/views/home/_welcome.html.erb:11
@@ -2809,8 +2809,8 @@ msgid "Logout"
 msgstr "Sair"
 
 #: ../../app/views/layouts/application.html.erb:32
-msgid "%{application_name}"
-msgstr "%{application_name}"
+msgid "%<application_name>s"
+msgstr "%<application_name>s"
 
 #: ../../app/views/layouts/application.html.erb:91
 msgid "Error:"
@@ -2887,11 +2887,11 @@ msgstr "Abre em uma nova janela"
 
 #: ../../app/views/layouts/application.html.erb:142
 msgid ""
-"%{n} results are available, use up and down arrows to navigate suggestions. Us"
+"%<n>s results are available, use up and down arrows to navigate suggestions. Us"
 "e the Enter key to select a suggestion or the Escape key to close the suggesti"
 "ons."
 msgstr ""
-"Os resultados %{n} estão disponíveis, use as setas para cima e para baixo para"
+"Os resultados %<n>s estão disponíveis, use as setas para cima e para baixo para"
 " navegar pelas sugestões. Use a tecla Enter para selecionar uma sugestão ou a "
 "tecla Escape para fechar as sugestões."
 
@@ -2943,8 +2943,8 @@ msgid "Example answer"
 msgstr "Resposta de exemplo"
 
 #: ../../app/views/org_admin/annotations/_show.html.erb:4
-msgid "%{org} Example Answer"
-msgstr "%{org} Exemplo de Resposta"
+msgid "%<org>s Example Answer"
+msgstr "%<org>s Exemplo de Resposta"
 
 #: ../../app/views/org_admin/conditions/_add.html.erb:3
 msgid "Add condition"
@@ -3099,10 +3099,10 @@ msgstr "Apagar fase"
 
 #: ../../app/views/org_admin/phases/_phase.html.erb:17
 msgid ""
-"You are about to delete the '%{phase_title}' phase. This will remove all of th"
+"You are about to delete the '%<phase_title>s' phase. This will remove all of th"
 "e sections and questions listed below. Are you sure?"
 msgstr ""
-"Você está prestes a apagar fase '%{phase_title}'. Isso removerá todas as seçõe"
+"Você está prestes a apagar fase '%<phase_title>s'. Isso removerá todas as seçõe"
 "s e perguntas listadas abaixo. Tem certeza?"
 
 #: ../../app/views/org_admin/phases/_phase.html.erb:18
@@ -3161,8 +3161,8 @@ msgid "Write plan"
 msgstr "Escrever plano"
 
 #: ../../app/views/org_admin/plans/index.html.erb:4
-msgid "%{org_name} Plans"
-msgstr "%{org_name} Planos"
+msgid "%<org_name>s Plans"
+msgstr "%<org_name>s Planos"
 
 #: ../../app/views/org_admin/plans/index.html.erb:16
 msgid "Plan"
@@ -3213,10 +3213,10 @@ msgstr "Notificar o proprietário do plano de que eu acabei de dar feedback"
 #: ../../app/views/org_admin/plans/index.html.erb:39
 msgid ""
 "Download plans <em class=\"sr-only\">(new window)</em><span class=\"new-window-po"
-"pup-info\">%{open_in_new_window_text}</span>"
+"pup-info\">%<open_in_new_window_text>s</span>"
 msgstr ""
 "Download de planos <em class=\"sr-only\">(nova janela)</em> <span class=\"new-win"
-"dow-popup-info\">%{open_in_new_window_text}</span>"
+"dow-popup-info\">%<open_in_new_window_text>s</span>"
 
 #: ../../app/views/org_admin/question_options/_option_fields.html.erb:3
 msgid "Order"
@@ -3246,8 +3246,8 @@ msgstr ""
 "qui."
 
 #: ../../app/views/org_admin/questions/_form.html.erb:4
-msgid "Question %{number}:"
-msgstr "Pergunta %{number}:"
+msgid "Question %<number>s:"
+msgstr "Pergunta %<number>s:"
 
 #: ../../app/views/org_admin/questions/_form.html.erb:4
 msgid "New question:"
@@ -3322,8 +3322,8 @@ msgid "Delete"
 msgstr "Apagar"
 
 #: ../../app/views/org_admin/questions/_form.html.erb:102
-msgid "You are about to delete question #%{question_number}. Are you sure?"
-msgstr "Você está prestes a apagar '%{question_text}'. Tem certeza?"
+msgid "You are about to delete question #%<question_number>s. Are you sure?"
+msgstr "Você está prestes a apagar '%<question_text>s'. Tem certeza?"
 
 #: ../../app/views/org_admin/questions/_index.html.erb:14
 msgid "Add Question"
@@ -3422,10 +3422,10 @@ msgstr "Insira um título para a seção"
 
 #: ../../app/views/org_admin/sections/_form.html.erb:20
 msgid ""
-"You are about to delete '%{section_title}'. This will affect questions linked "
+"You are about to delete '%<section_title>s'. This will affect questions linked "
 "to this section. Are you sure?"
 msgstr ""
-"Você está prestes a apagar '%{section_title}'. Isso afetará as perguntas ligad"
+"Você está prestes a apagar '%<section_title>s'. Isso afetará as perguntas ligad"
 "as a esta seção. Tem certeza?"
 
 #: ../../app/views/org_admin/sections/_index.html.erb:61
@@ -3452,8 +3452,8 @@ msgstr "Selecionar esta caixa impede que o modelo apareça na lista pública de
 
 #: ../../app/views/org_admin/templates/_form.html.erb:25
 #: ../../app/views/org_admin/templates/_show.html.erb:35
-msgid "for internal %{org_name} use only"
-msgstr "para %{org_name} interno use somente"
+msgid "for internal %<org_name>s use only"
+msgstr "para %<org_name>s interno use somente"
 
 #: ../../app/views/org_admin/templates/_form.html.erb:32
 #: ../../app/views/org_admin/templates/_show.html.erb:13
@@ -3626,22 +3626,22 @@ msgstr "Modelos personalizáveis"
 
 #: ../../app/views/org_admin/templates/index.html.erb:80
 #: ../../app/views/org_admin/templates/index.html.erb:93
-msgid "All (%{count})"
-msgstr "Tudo (%{count})"
+msgid "All (%<count>s)"
+msgstr "Tudo (%<count>s)"
 
 #: ../../app/views/org_admin/templates/index.html.erb:83
 #: ../../app/views/org_admin/templates/index.html.erb:96
-msgid "Published (%{count})"
-msgstr "Publicado (%{count})"
+msgid "Published (%<count>s)"
+msgstr "Publicado (%<count>s)"
 
 #: ../../app/views/org_admin/templates/index.html.erb:86
 #: ../../app/views/org_admin/templates/index.html.erb:99
-msgid "Unpublished (%{count})"
-msgstr "Não publicado (%{count})"
+msgid "Unpublished (%<count>s)"
+msgstr "Não publicado (%<count>s)"
 
 #: ../../app/views/org_admin/templates/index.html.erb:89
-msgid "Not customised (%{count})"
-msgstr "Não customizado (%{count})"
+msgid "Not customised (%<count>s)"
+msgstr "Não customizado (%<count>s)"
 
 #: ../../app/views/org_admin/templates/index.html.erb:118
 msgid "Create a template"
@@ -3650,8 +3650,8 @@ msgstr "Criar um modelo"
 #: ../../app/views/org_admin/users/edit.html.erb:4
 #: ../../app/views/super_admin/users/edit.html.erb:1
 #: ../../app/views/super_admin/users/edit.html.erb:5
-msgid "Editing profile for %{username}"
-msgstr "Editando o perfil de %{username}"
+msgid "Editing profile for %<username>s"
+msgstr "Editando o perfil de %<username>s"
 
 #: ../../app/views/org_admin/users/edit.html.erb:5
 #: ../../app/views/super_admin/users/edit.html.erb:6
@@ -3659,8 +3659,8 @@ msgid "View all users"
 msgstr "Ver todos os usuários"
 
 #: ../../app/views/org_admin/users/plans.html.erb:3
-msgid "Plans of %{username}"
-msgstr "Planos de %{username}"
+msgid "Plans of %<username>s"
+msgstr "Planos de %<username>s"
 
 #: ../../app/views/orgs/_departments.html.erb:1
 #: ../../app/views/orgs/admin_edit.html.erb:26
@@ -3690,7 +3690,7 @@ msgid ""
 "ntact_us_url}\">contact us</a> to have them updated."
 msgstr ""
 "Se algum dos identificadores acima estiver incorreto ou ausente, entre em <a h"
-"ref=\"%{contact_us_url}\">contato conosco</a> para atualizá-lo."
+"ref=\"%<contact_us_url>s\">contato conosco</a> para atualizá-lo."
 
 #: ../../app/views/orgs/_feedback_form.html.erb:3
 #: ../../app/views/orgs/_feedback_form.html.erb:7
@@ -3722,7 +3722,7 @@ msgstr "Unir Organizações"
 #: ../../app/views/orgs/_merge_form.html.erb:7
 msgid ""
 "Please select the Organisation that will replace the current organisation: '<s"
-"trong>%{org_name}</strong>'."
+"trong>%<org_name>s</strong>'."
 msgstr ""
 "Selecione a organização que substituirá a organização atual: ' <strong>%{org_n"
 "ame}</strong> '."
@@ -3908,15 +3908,15 @@ msgstr "Nunca"
 
 #: ../../app/views/paginable/api_clients/_index.html.erb:44
 msgid ""
-"You are about to delete '%{client_name}'. They will no longer be able to acces"
+"You are about to delete '%<client_name>s'. They will no longer be able to acces"
 "s the API. Are you sure?"
 msgstr ""
-"Você está prestes a excluir '%{client_name}'. Eles não poderão mais acessar a "
+"Você está prestes a excluir '%<client_name>s'. Eles não poderão mais acessar a "
 "API. Você tem certeza?"
 
 #: ../../app/views/paginable/contributors/_index.html.erb:57
-msgid "You are about to delete '%{contributor_name}'. Are you sure?"
-msgstr "Você está prestes a excluir '%{contributor_name}'. Você tem certeza?"
+msgid "You are about to delete '%<contributor_name>s'. Are you sure?"
+msgstr "Você está prestes a excluir '%<contributor_name>s'. Você tem certeza?"
 
 #: ../../app/views/paginable/departments/_index.html.erb:5
 #: ../../app/views/paginable/users/_index.html.erb:22
@@ -3929,10 +3929,10 @@ msgstr "Nome abreviado ou código"
 
 #: ../../app/views/paginable/departments/_index.html.erb:28
 msgid ""
-"You are about to delete '%{department_name}'. This will affect guidance. Are y"
+"You are about to delete '%<department_name>s'. This will affect guidance. Are y"
 "ou sure?"
 msgstr ""
-"Você está prestes a excluir '%{department_name}'. Isso afetará a orientação. V"
+"Você está prestes a excluir '%<department_name>s'. Isso afetará a orientação. V"
 "ocê tem certeza?"
 
 #: ../../app/views/paginable/guidance_groups/_index.html.erb:8
@@ -3973,15 +3973,15 @@ msgstr "Publicar"
 
 #: ../../app/views/paginable/guidance_groups/_index.html.erb:50
 msgid ""
-"You are about to delete '%{guidance_group_name}'. This will affect guidance. A"
+"You are about to delete '%<guidance_group_name>s'. This will affect guidance. A"
 "re you sure?"
 msgstr ""
-"Você está prestes a apagar '%{guidance_group_name}'. Isso afetará a instrução."
+"Você está prestes a apagar '%<guidance_group_name>s'. Isso afetará a instrução."
 " Tem certeza?"
 
 #: ../../app/views/paginable/guidances/_index.html.erb:62
-msgid "You are about to delete '%{guidance_summary}'. Are you sure?"
-msgstr "Você está prestes a apagar '%{guidance_summary}'. Tem certeza?"
+msgid "You are about to delete '%<guidance_summary>s'. Are you sure?"
+msgstr "Você está prestes a apagar '%<guidance_summary>s'. Tem certeza?"
 
 #: ../../app/views/paginable/notifications/_index.html.erb:5
 #: ../../app/views/super_admin/notifications/_form.html.erb:15
@@ -4017,8 +4017,8 @@ msgid "Managed"
 msgstr "Gerenciou"
 
 #: ../../app/views/paginable/orgs/_index.html.erb:35
-msgid "You are about to delete '%{org_name}'. Are you sure?"
-msgstr "Você está prestes a apagar '%{org_name}'. Tem certeza?"
+msgid "You are about to delete '%<org_name>s'. Are you sure?"
+msgstr "Você está prestes a apagar '%<org_name>s'. Tem certeza?"
 
 #: ../../app/views/paginable/plans/_org_admin.html.erb:3
 msgid ""
@@ -4185,10 +4185,10 @@ msgstr "Publicar mudanças"
 
 #: ../../app/views/paginable/templates/_customisable.html.erb:69
 msgid ""
-"Are you sure you want to remove your customization of \"%{template_title}\"? Any"
+"Are you sure you want to remove your customization of \"%<template_title>s\"? Any"
 " published versions will become unavailable to users."
 msgstr ""
-"Tem certeza de que deseja remover sua customização de \"%{template_title}\"? Qua"
+"Tem certeza de que deseja remover sua customização de \"%<template_title>s\"? Qua"
 "lquer versão publicada ficará indisponível para os usuários."
 
 #: ../../app/views/paginable/templates/_history.html.erb:7
@@ -4205,10 +4205,10 @@ msgstr "Ver customização"
 
 #: ../../app/views/paginable/templates/_organisational.html.erb:76
 msgid ""
-"Are you sure you want to remove \"%{template_title}\"? Any published versions wi"
+"Are you sure you want to remove \"%<template_title>s\"? Any published versions wi"
 "ll become unavailable to users."
 msgstr ""
-"Tem certeza de que deseja remover \"%{template_title}\"? Qualquer versão publica"
+"Tem certeza de que deseja remover \"%<template_title>s\"? Qualquer versão publica"
 "da ficará indisponível para os usuários."
 
 #: ../../app/views/paginable/templates/_organisational.html.erb:90
@@ -4371,10 +4371,10 @@ msgstr "Direito"
 #: ../../app/views/plans/_download_form.html.erb:119
 msgid ""
 "Download Plan <em class=\"sr-only\">(new window)</em><span class=\"new-window-pop"
-"up-info\">%{open_in_new_window_text}</span>"
+"up-info\">%<open_in_new_window_text>s</span>"
 msgstr ""
 "Plano de download <em class=\"sr-only\">(nova janela)</em> <span class=\"new-wind"
-"ow-popup-info\">%{open_in_new_window_text}</span>"
+"ow-popup-info\">%<open_in_new_window_text>s</span>"
 
 #: ../../app/views/plans/_edit_details.html.erb:13
 #: ../../app/views/plans/_guidance_selection.html.erb:38
@@ -4383,10 +4383,10 @@ msgstr "Selecione orientação"
 
 #: ../../app/views/plans/_guidance_selection.html.erb:6
 msgid ""
-"To help you write your plan, %{application_name} can show you guidance from a "
+"To help you write your plan, %<application_name>s can show you guidance from a "
 "variety of organisations."
 msgstr ""
-"Para ajudar você a escrever seu plano, %{application_name} pode mostrar-lhe in"
+"Para ajudar você a escrever seu plano, %<application_name>s pode mostrar-lhe in"
 "struções de várias organizações."
 
 #: ../../app/views/plans/_guidance_selection.html.erb:9
@@ -4407,11 +4407,11 @@ msgstr "Não há orientação adicional para esse modelo."
 
 #: ../../app/views/plans/_guidance_selection.html.erb:40
 msgid ""
-"To help you write your plan, %{application_name} can show you guidance from a "
+"To help you write your plan, %<application_name>s can show you guidance from a "
 "variety of organisations. Please choose up to 6 organisations of the following"
 " organisations who offer guidance relevant to your plan."
 msgstr ""
-"Para ajudar você a escrever seu plano, %{application_name} pode mostrar-lhe in"
+"Para ajudar você a escrever seu plano, %<application_name>s pode mostrar-lhe in"
 "struções de várias organizações. Por favor, escolha até 6 dentre as seguintes "
 "organizaçõs que oferecem instruções relevantes para seu plano."
 
@@ -4437,17 +4437,17 @@ msgstr "Escrever Plano"
 
 #: ../../app/views/plans/_overview_details.html.erb:9
 msgid ""
-"This plan is based on the \"%{template_title}\" template provided by %{org_name}"
+"This plan is based on the \"%<template_title>s\" template provided by %<org_name>s"
 "."
-msgstr "Este plano é baseado no modelo \"%{template_title}\" fornecido por %{org_name}."
+msgstr "Este plano é baseado no modelo \"%<template_title>s\" fornecido por %<org_name>s."
 
 #: ../../app/views/plans/_overview_details.html.erb:17
-msgid "Template version %{template_version}, published on %{published_date}"
-msgstr "Versão do modelo %{template_version}, publicada em %{published_date}"
+msgid "Template version %<template_version>s, published on %<published_date>s"
+msgstr "Versão do modelo %<template_version>s, publicada em %<published_date>s"
 
 #: ../../app/views/plans/_overview_details.html.erb:42
-msgid "%{phase_title} (%{sections_size} %{sections}, %{questions_size} %{questions})"
-msgstr "%{phase_title} (%{sections_size} %{sections}, %{questions_size} %{questions})"
+msgid "%<phase_title>s (%<sections_size>s %<sections>s, %<questions_size>s %<questions>s)"
+msgstr "%<phase_title>s (%<sections_size>s %<sections>s, %<questions_size>s %<questions>s)"
 
 #: ../../app/views/plans/_overview_details.html.erb:43
 msgid "section"
@@ -4563,11 +4563,11 @@ msgstr "Definir visibiliade do plano"
 #: ../../app/views/plans/_share_form.html.erb:9
 msgid ""
 "Public or organisational visibility is intended for finished plans. You must a"
-"nswer at least %{percentage}%% of the questions to enable these options. Note:"
+"nswer at least %<percentage>s%% of the questions to enable these options. Note:"
 " test plans are set to private visibility by default."
 msgstr ""
 "Pretende-se atribuir visibilidade organizacional ou pública a planos finalizad"
-"os. Você precisa responder pelo menos %{percentage}%% das questões para habili"
+"os. Você precisa responder pelo menos %<percentage>s%% das questões para habili"
 "tar essas opções. Nota: por padrão, atribui-se visibilidade privada aos planos"
 " de teste."
 
@@ -4657,8 +4657,8 @@ msgid "Click the 'Create plan' button below to begin."
 msgstr "Para começar, clique no botão 'Criar plano' abaixo."
 
 #: ../../app/views/plans/index.html.erb:35
-msgid "%{org_title} Plans"
-msgstr "%{org_title} Planos"
+msgid "%<org_title>s Plans"
+msgstr "%<org_title>s Planos"
 
 #: ../../app/views/plans/index.html.erb:36
 msgid ""
@@ -4740,7 +4740,7 @@ msgstr "Encontramos muitos modelos de PGD correspondentes a seu órgão financia
 
 #: ../../app/views/public_pages/plan_index.html.erb:8
 msgid ""
-"Public DMPs are plans created using the %{application_name} service and shared"
+"Public DMPs are plans created using the %<application_name>s service and shared"
 " publicly by their owners. They are not vetted for quality, completeness, or a"
 "dherence to funder guidelines."
 msgstr ""
@@ -4795,8 +4795,8 @@ msgid "terms and conditions"
 msgstr "termos e condições"
 
 #: ../../app/views/shared/_create_plan_modal.html.erb:8
-msgid "Would you like to create a plan based on the \"%{name}\" template?"
-msgstr "Deseja criar um plano com base no modelo \"%{name}\"?"
+msgid "Would you like to create a plan based on the \"%<name>s\" template?"
+msgstr "Deseja criar um plano com base no modelo \"%<name>s\"?"
 
 #: ../../app/views/shared/_links.html.erb:7
 msgid "Links"
@@ -4849,8 +4849,8 @@ msgstr "Filtrar planos"
 
 #: ../../app/views/shared/export/_plan_coversheet.erb:3
 #: ../../app/views/shared/export/_plan_txt.erb:65
-msgid "A Data Management Plan created using %{application_name}"
-msgstr "Um Plano de Gestão de Dados criado usando %{application_name}"
+msgid "A Data Management Plan created using %<application_name>s"
+msgstr "Um Plano de Gestão de Dados criado usando %<application_name>s"
 
 #: ../../app/views/shared/export/_plan_coversheet.erb:10
 #: ../../app/views/shared/export/_plan_txt.erb:5
@@ -4918,8 +4918,8 @@ msgstr "O nome digitado não foi uma das sugestões listadas!"
 
 #: ../../app/views/static_pages/about_us.html.erb:1
 #: ../../app/views/static_pages/about_us.html.erb:4
-msgid "About %{application_name}"
-msgstr "Sobre o %{application_name}"
+msgid "About %<application_name>s"
+msgstr "Sobre o %<application_name>s"
 
 #: ../../app/views/static_pages/about_us.html.erb:11
 msgid ""
@@ -4999,10 +4999,10 @@ msgstr "Nós convidamos você a ler o wiki do DMPRoadmap GitHub para aprender co
 #: ../../app/views/static_pages/about_us.html.erb:22
 msgid ""
 "get involved<em class=\"sr-only\"> (new window)</em><span class=\"new-window-popu"
-"p-info\">%{open_in_new_window_text}</span>"
+"p-info\">%<open_in_new_window_text>s</span>"
 msgstr ""
 "participe <em class=\"sr-only\">(nova janela)</em> <span class=\"new-window-popup"
-"-info\">%{open_in_new_window_text}</span>"
+"-info\">%<open_in_new_window_text>s</span>"
 
 #: ../../app/views/static_pages/about_us.html.erb:28
 msgid " in the project. You can also report bugs and request new features via "
@@ -5021,8 +5021,8 @@ msgid "If you have an account please sign in and start creating or editing your
 msgstr "Se você tiver uma conta, entre e comece a criar ou editar seu PGD."
 
 #: ../../app/views/static_pages/about_us.html.erb:34
-msgid "If you do not have a %{application_name} account, click on"
-msgstr "Se você não tiver uma conta %{application_name}, clique em"
+msgid "If you do not have a %<application_name>s account, click on"
+msgstr "Se você não tiver uma conta %<application_name>s, clique em"
 
 #: ../../app/views/static_pages/about_us.html.erb:34
 msgid "Sign up"
@@ -5240,46 +5240,46 @@ msgstr "Informações sobre você: como as usamos e com quem as compartilhamos"
 
 #: ../../app/views/static_pages/privacy.html.erb:11
 msgid ""
-"The information you provide will be used by the %{org_name} to offer you acces"
-"s to and personalisation of the %{application_name} service."
+"The information you provide will be used by the %<org_name>s to offer you acces"
+"s to and personalisation of the %<application_name>s service."
 msgstr ""
-"As informações fornecidas serão usadas pelo %{org_name} para oferecer acesso e"
-" customização do serviço %{application_name}."
+"As informações fornecidas serão usadas pelo %<org_name>s para oferecer acesso e"
+" customização do serviço %<application_name>s."
 
 #: ../../app/views/static_pages/privacy.html.erb:13
 msgid ""
-"The %{org_name} processes the personal data of %{application_name} users in or"
-"der to deliver and improve the %{application_name} service in a customised man"
+"The %<org_name>s processes the personal data of %<application_name>s users in or"
+"der to deliver and improve the %<application_name>s service in a customised man"
 "ner and to ensure each user receives relevant information."
 msgstr ""
-"O %{org_name} processa os dados pessoais de %{application_name} usuários para "
-"entregar e melhorar o serviço %{application_name} de maneira customizada e par"
+"O %<org_name>s processa os dados pessoais de %<application_name>s usuários para "
+"entregar e melhorar o serviço %<application_name>s de maneira customizada e par"
 "a garantir que cada usuário receba informações relevantes."
 
 #: ../../app/views/static_pages/privacy.html.erb:15
 msgid ""
-"The processing of your personal data by the %{org_name} is necessary for pursu"
+"The processing of your personal data by the %<org_name>s is necessary for pursu"
 "ing the following legitimate interests:"
 msgstr ""
-"O processamento dos seus dados pessoais pelo %{org_name} é necessário para per"
+"O processamento dos seus dados pessoais pelo %<org_name>s é necessário para per"
 "seguir os seguintes interesses legítimos:"
 
 #: ../../app/views/static_pages/privacy.html.erb:18
 msgid ""
-"To provide access to the %{application_name} service and personalisation of yo"
+"To provide access to the %<application_name>s service and personalisation of yo"
 "ur user experience e.g. provision of relevant templates and guidance for your "
 "organisation."
 msgstr ""
-"Para fornecer acesso ao serviço %{application_name} e customização da sua expe"
+"Para fornecer acesso ao serviço %<application_name>s e customização da sua expe"
 "riência do usuário, por exemplo, Fornecimento de modelos e orientações relevan"
 "tes para a sua organização."
 
 #: ../../app/views/static_pages/privacy.html.erb:20
 msgid ""
-"To keep you up to date with news about %{application_name} such as new feature"
+"To keep you up to date with news about %<application_name>s such as new feature"
 "s or improvements, or changes to our Privacy Policy."
 msgstr ""
-"Para mantê-lo atualizado com notícias sobre %{application_name}, como novos re"
+"Para mantê-lo atualizado com notícias sobre %<application_name>s, como novos re"
 "cursos ou melhorias, ou alterações em nossa Política de Privacidade."
 
 #: ../../app/views/static_pages/privacy.html.erb:22
@@ -5289,29 +5289,29 @@ msgstr "Para fins de segurança de rede e informações."
 #: ../../app/views/static_pages/privacy.html.erb:24
 msgid ""
 "We will hold the personal data you provided us for as long as you continue usi"
-"ng the %{application_name} service. Your personal data can be removed from thi"
-"s service upon request to the %{application_name} team within a period of 30 d"
+"ng the %<application_name>s service. Your personal data can be removed from thi"
+"s service upon request to the %<application_name>s team within a period of 30 d"
 "ays."
 msgstr ""
 "Nós manteremos os dados pessoais fornecidos por você enquanto você continuar u"
-"sando o serviço %{application_name}. Seus dados pessoais podem ser removidos d"
-"este serviço mediante solicitação para a equipe %{application_name} dentro de "
+"sando o serviço %<application_name>s. Seus dados pessoais podem ser removidos d"
+"este serviço mediante solicitação para a equipe %<application_name>s dentro de "
 "um período de 30 dias."
 
 #: ../../app/views/static_pages/privacy.html.erb:26
 msgid ""
-"If you have any questions, please contact the %{application_name} team at: <a "
-"href='mailto:%{helpdesk_email}'>%{helpdesk_email}</a>"
+"If you have any questions, please contact the %<application_name>s team at: <a "
+"href='mailto:%<helpdesk_email>s'>%<helpdesk_email>s</a>"
 msgstr ""
 "Se você tiver alguma dúvida, entre em contato com a equipe do %{application_na"
-"me} em: <a href='mailto:%{helpdesk_email}'>%{helpdesk_email}</a>"
+"me} em: <a href='mailto:%<helpdesk_email>s'>%<helpdesk_email>s</a>"
 
 #: ../../app/views/static_pages/privacy.html.erb:30
 msgid ""
-"This statement was last revised on %{revdate} and may be revised at any time w"
+"This statement was last revised on %<revdate>s and may be revised at any time w"
 "ith prior notice."
 msgstr ""
-"Esta declaração foi revisada pela última vez em %{revdate} e pode ser revisada"
+"Esta declaração foi revisada pela última vez em %<revdate>s e pode ser revisada"
 " a qualquer momento com aviso prévio."
 
 #: ../../app/views/static_pages/termsuse.html.erb:12
@@ -5385,7 +5385,7 @@ msgid ""
 "ookies and how we use them is available on the <a target='_blank' href='http:/"
 "/www.dcc.ac.uk/about-us/about-site/website-terms-use/cookies' class=\"has-new-w"
 "indow-popup-info\">main DCC website<em class=\"sr-only\"> (new window)</em><span "
-"class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>.</p>\n"
+"class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a>.</p>\n"
 "\n"
 "      <h3>Third party APIs</h3>\n"
 "\n"
@@ -5468,8 +5468,8 @@ msgid "Email credentials to contact"
 msgstr "Credenciais de e-mail para contato"
 
 #: ../../app/views/super_admin/api_clients/_form.html.erb:81
-msgid "Are you sure you want to delete the API client: \"%{name}\""
-msgstr "Tem certeza de que deseja excluir o cliente da API: \"%{name}\""
+msgid "Are you sure you want to delete the API client: \"%<name>s\""
+msgstr "Tem certeza de que deseja excluir o cliente da API: \"%<name>s\""
 
 #: ../../app/views/super_admin/api_clients/edit.html.erb:1
 msgid "Editing API client"
@@ -5485,8 +5485,8 @@ msgid "View all API clients"
 msgstr "Ver todos os clientes da API"
 
 #: ../../app/views/super_admin/api_clients/email_credentials.js.erb:1
-msgid "The credentials have been sent to %{email}."
-msgstr "As credenciais foram enviadas para %{email}."
+msgid "The credentials have been sent to %<email>s."
+msgstr "As credenciais foram enviadas para %<email>s."
 
 #: ../../app/views/super_admin/api_clients/index.html.erb:1
 #: ../../app/views/super_admin/api_clients/index.html.erb:6
@@ -5534,8 +5534,8 @@ msgid "Body"
 msgstr "Corpo"
 
 #: ../../app/views/super_admin/notifications/_form.html.erb:71
-msgid "Are you sure you want to delete the notification \"%{title}\""
-msgstr "Tem certeza de que deseja excluir a notificação \"%{title}\""
+msgid "Are you sure you want to delete the notification \"%<title>s\""
+msgstr "Tem certeza de que deseja excluir a notificação \"%<title>s\""
 
 #: ../../app/views/super_admin/notifications/edit.html.erb:1
 #: ../../app/views/super_admin/notifications/edit.html.erb:5
@@ -5560,8 +5560,8 @@ msgid "New Notification"
 msgstr "Nova notificação"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:9
-msgid "Merging '%{from_org_name}' into '%{to_org_name}'"
-msgstr "Mesclando '%{from_org_name}' em '%{to_org_name}'"
+msgid "Merging '%<from_org_name>s' into '%<to_org_name>s'"
+msgstr "Mesclando '%<from_org_name>s' em '%<to_org_name>s'"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:11
 msgid "Summary:"
@@ -5569,10 +5569,10 @@ msgstr "Resumo:"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:12
 msgid ""
-"Counts of '%{to_org_name}' records before and after a merge with %{from_org_na"
+"Counts of '%<to_org_name>s' records before and after a merge with %{from_org_na"
 "me}."
 msgstr ""
-"Contagens de registros '%{to_org_name}' antes e depois de uma mesclagem com %{"
+"Contagens de registros '%<to_org_name>s' antes e depois de uma mesclagem com %{"
 "from_org_name}."
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:17
@@ -5581,12 +5581,12 @@ msgid "Record Type"
 msgstr "Tipo de Registro"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:18
-msgid "'%{to_org_name}' Count - before merge"
-msgstr "'%{to_org_name}' Contagem - antes da fusão"
+msgid "'%<to_org_name>s' Count - before merge"
+msgstr "'%<to_org_name>s' Contagem - antes da fusão"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:19
-msgid "'%{to_org_name}' Count - after merge"
-msgstr "'%{to_org_name}' Contagem - após fusão"
+msgid "'%<to_org_name>s' Count - after merge"
+msgstr "'%<to_org_name>s' Contagem - após fusão"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:38
 msgid "Details:"
@@ -5595,22 +5595,22 @@ msgstr "Detalhes:"
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:39
 msgid ""
 "The table below shows the specific changes that will occur during the merge pr"
-"ocess. Once the merge is complete, '%{from_org_name}' will be deleted. You can"
+"ocess. Once the merge is complete, '%<from_org_name>s' will be deleted. You can"
 " then consolidate/correct any merge issues (e.g. remove any departments that w"
 "ere duplicated)"
 msgstr ""
 "A tabela abaixo mostra as mudanças específicas que ocorrerão durante o process"
-"o de mesclagem. Assim que a fusão for concluída, '%{from_org_name}' será exclu"
+"o de mesclagem. Assim que a fusão for concluída, '%<from_org_name>s' será exclu"
 "ído. Você pode então consolidar / corrigir quaisquer problemas de mesclagem (p"
 "or exemplo, remover quaisquer departamentos que foram duplicados)"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:45
-msgid "%{from_org_name} - Before"
-msgstr "%{from_org_name} - Antes"
+msgid "%<from_org_name>s - Before"
+msgstr "%<from_org_name>s - Antes"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:46
-msgid "%{to_org_name} - Before"
-msgstr "%{to_org_name} - Antes"
+msgid "%<to_org_name>s - Before"
+msgstr "%<to_org_name>s - Antes"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:61
 msgid "The following attributes will be updated"
@@ -5640,10 +5640,10 @@ msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:95
 msgid ""
-"Warning: '%{from_org_name}' has Plans that are currently in the review process"
+"Warning: '%<from_org_name>s' has Plans that are currently in the review process"
 ". The Org admins may not be able to see these plans after the merge!"
 msgstr ""
-"Aviso: '%{from_org_name}' tem Planos que estão atualmente em processo de revis"
+"Aviso: '%<from_org_name>s' tem Planos que estão atualmente em processo de revis"
 "ão. Os administradores da organização podem não conseguir ver esses planos apó"
 "s a fusão!"
 
@@ -5668,8 +5668,8 @@ msgid "New organisation"
 msgstr "Nova organização"
 
 #: ../../app/views/super_admin/themes/_form.html.erb:17
-msgid "Are you sure you want to delete the theme \"%{title}\"?"
-msgstr "Tem certeza de que deseja excluir o tema \"%{title}\"?"
+msgid "Are you sure you want to delete the theme \"%<title>s\"?"
+msgstr "Tem certeza de que deseja excluir o tema \"%<title>s\"?"
 
 #: ../../app/views/super_admin/themes/edit.html.erb:3
 #: ../../app/views/super_admin/themes/new.html.erb:3
@@ -5698,11 +5698,11 @@ msgstr "Arquivo"
 
 #: ../../app/views/super_admin/users/edit.html.erb:64
 msgid ""
-"You are about to archive %{user_name}.  This will remove their personal inform"
+"You are about to archive %<user_name>s.  This will remove their personal inform"
 "ation, but retain their plans, answers, and comments.  They will be unable to "
 "sign-in. Are you sure?"
 msgstr ""
-"Você está prestes a arquivar %{user_name}. Isso removerá suas informações pess"
+"Você está prestes a arquivar %<user_name>s. Isso removerá suas informações pess"
 "oais, mas manterá seus planos, respostas e comentários. Eles não conseguirão e"
 "ntrar. Você tem certeza?"
 
@@ -5806,40 +5806,40 @@ msgstr "Você pode alterar suas preferências de notificação na sua página de
 #: ../../app/views/user_mailer/permissions_change_notification.html.erb:2
 #: ../../app/views/user_mailer/plan_visibility.html.erb:2
 #: ../../app/views/user_mailer/sharing_notification.html.erb:2
-msgid "Hello %{username}"
-msgstr "Olá %{username}"
+msgid "Hello %<username>s"
+msgstr "Olá %<username>s"
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:6
-msgid "You have been granted administrator privileges in %{tool_name}:"
-msgstr "Você recebeu privilégios de administrador para %{tool_name}:"
+msgid "You have been granted administrator privileges in %<tool_name>s:"
+msgstr "Você recebeu privilégios de administrador para %<tool_name>s:"
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:13
-msgid "You have been revoked administrator privileges in %{tool_name}."
-msgstr "Seus privilégios de administrador de %{tool_name} foram revogados."
+msgid "You have been revoked administrator privileges in %<tool_name>s."
+msgstr "Seus privilégios de administrador de %<tool_name>s foram revogados."
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:17
 msgid ""
-"More information about administering the %{tool_name} for users at your organi"
-"sation is available at the %{help_url}."
+"More information about administering the %<tool_name>s for users at your organi"
+"sation is available at the %<help_url>s."
 msgstr ""
-"Mais informações sobre administrar %{tool_name} para usuários em sua organizaç"
-"ão estão disponíveis em %{help_url}."
+"Mais informações sobre administrar %<tool_name>s para usuários em sua organizaç"
+"ão estão disponíveis em %<help_url>s."
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:2
-msgid "Hello %{name},"
-msgstr "Olá %{name},"
+msgid "Hello %<name>s,"
+msgstr "Olá %<name>s,"
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:8
-msgid "Please use the following credentials when accessing the %{tool_name} API."
-msgstr "Por favor, use as seguintes credenciais ao acessar a API %{tool_name}."
+msgid "Please use the following credentials when accessing the %<tool_name>s API."
+msgstr "Por favor, use as seguintes credenciais ao acessar a API %<tool_name>s."
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:23
-msgid "Please refer to the API documentation at: %{api_documentation_url}"
-msgstr "Por favor, consulte a documentação da API em: %{api_documentation_url}"
+msgid "Please refer to the API documentation at: %<api_documentation_url>s"
+msgstr "Por favor, consulte a documentação da API em: %<api_documentation_url>s"
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:29
 msgid ""
-"Do not share these credentials. They for use with the %{external_application} "
+"Do not share these credentials. They for use with the %<external_application>s "
 "application. If you do share your credentials with another application we rese"
 "rve the right to revoke your access to the API."
 msgstr ""
@@ -5849,49 +5849,49 @@ msgstr ""
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:34
 msgid ""
-"If you did not request access to the %{tool_name} API or did not request for y"
-"our credentials to be renewed, please contact us at %{helpdesk_email}"
+"If you did not request access to the %<tool_name>s API or did not request for y"
+"our credentials to be renewed, please contact us at %<helpdesk_email>s"
 msgstr ""
-"Se você não solicitou acesso à API %{tool_name} ou não solicitou a renovação d"
-"e suas credenciais, entre em contato conosco em %{helpdesk_email}"
+"Se você não solicitou acesso à API %<tool_name>s ou não solicitou a renovação d"
+"e suas credenciais, entre em contato conosco em %<helpdesk_email>s"
 
 #: ../../app/views/user_mailer/feedback_complete.html.erb:2
-msgid "Hello %{recipient_name}"
-msgstr "Olá %{recipient_name}"
+msgid "Hello %<recipient_name>s"
+msgstr "Olá %<recipient_name>s"
 
 #: ../../app/views/user_mailer/feedback_complete.html.erb:5
 msgid ""
-"%{commenter} has finished providing feedback on the plan  \"%{link_html}\". Comm"
+"%<commenter>s has finished providing feedback on the plan  \"%<link_html>s\". Comm"
 "ents can be found in the 'Write plan' tab on the right side of the page (Guida"
 "nce/Comments)."
 msgstr ""
-"%{commenter} terminou de fornecer feedback sobre o plano \"%{link_html}\". Os co"
+"%<commenter>s terminou de fornecer feedback sobre o plano \"%<link_html>s\". Os co"
 "mentários podem ser encontrados na guia \"Write plan\" no lado direito da página"
 " (Guidance / Comments)."
 
 #: ../../app/views/user_mailer/feedback_notification.html.erb:2
-msgid "Hello %{user_name},"
-msgstr "Olá %{user_name},"
+msgid "Hello %<user_name>s,"
+msgstr "Olá %<user_name>s,"
 
 #: ../../app/views/user_mailer/feedback_notification.html.erb:5
 msgid ""
-"%{requestor} has requested feedback on a plan %{link_html}. To add comments, p"
-"lease visit the 'Plans' page under the Admin menu in %{tool_name} and open the"
+"%<requestor>s has requested feedback on a plan %<link_html>s. To add comments, p"
+"lease visit the 'Plans' page under the Admin menu in %<tool_name>s and open the"
 " plan."
 msgstr ""
-"%{requestor} solicitou feedback sobre um plano %{link_html}. Para adicionar co"
-"mentários, visite a página 'Planos' no menu Admin em %{tool_name} e abra o pla"
+"%<requestor>s solicitou feedback sobre um plano %<link_html>s. Para adicionar co"
+"mentários, visite a página 'Planos' no menu Admin em %<tool_name>s e abra o pla"
 "no."
 
 #: ../../app/views/user_mailer/new_comment.html.erb:5
 msgid ""
-"%{commenter_name} has commented on your plan %{plan_title}. To view the commen"
+"%<commenter_name>s has commented on your plan %<plan_title>s. To view the commen"
 "ts, follow the link to the DMP below, or navigate to the plan via My Dashboard"
-" page in %{tool_name}."
+" page in %<tool_name>s."
 msgstr ""
-"%{commenter_name} comentou seu plano %{plan_title}. Para visualizar os comentá"
+"%<commenter_name>s comentou seu plano %<plan_title>s. Para visualizar os comentá"
 "rios, siga o link para o DMP abaixo ou navegue até o plano por meio da página "
-"Meu Painel em %{tool_name}."
+"Meu Painel em %<tool_name>s."
 
 #: ../../app/views/user_mailer/new_comment.html.erb:10
 msgid "Below is a summary of the sections and questions which have comments."
@@ -5906,24 +5906,24 @@ msgstr ""
 "a pergunta."
 
 #: ../../app/views/user_mailer/new_comment.html.erb:15
-msgid "DMP: %{phase_link}"
-msgstr "DMP: %{phase_link}"
+msgid "DMP: %<phase_link>s"
+msgstr "DMP: %<phase_link>s"
 
 #: ../../app/views/user_mailer/new_comment.html.erb:18
-msgid "Section name: %{section_title}"
-msgstr "Nome da seção: %{section_title}"
+msgid "Section name: %<section_title>s"
+msgstr "Nome da seção: %<section_title>s"
 
 #: ../../app/views/user_mailer/new_comment.html.erb:21
-msgid "Question: %{question_number}"
-msgstr "Pergunta: %{question_number}"
+msgid "Question: %<question_number>s"
+msgstr "Pergunta: %<question_number>s"
 
 #: ../../app/views/user_mailer/permissions_change_notification.html.erb:5
 msgid ""
-"Your permissions relating to %{plan_title} have changed. You now have %{type} "
-"access. This means you can %{placeholder1} %{placeholder2}"
+"Your permissions relating to %<plan_title>s have changed. You now have %<type>s "
+"access. This means you can %<placeholder1>s %<placeholder2>s"
 msgstr ""
-"Suas permissões com relação ao plano %{plan_title} foram modificadas. Você ago"
-"ra tem acesso %{type}. Isso significa que você pode %{placeholder1} %{placehol"
+"Suas permissões com relação ao plano %<plan_title>s foram modificadas. Você ago"
+"ra tem acesso %<type>s. Isso significa que você pode %<placeholder1>s %{placehol"
 "der2}"
 
 #: ../../app/views/user_mailer/plan_access_removed.html.erb:2
@@ -5939,8 +5939,8 @@ msgid " has been removed by "
 msgstr " foi removido por "
 
 #: ../../app/views/user_mailer/plan_visibility.html.erb:5
-msgid "The plan %{plan_title} had its visibility changed to %{plan_visibility}."
-msgstr "O plano %{plan_title} teve sua visibilidade modificad para %{plan_visibility}."
+msgid "The plan %<plan_title>s had its visibility changed to %<plan_visibility>s."
+msgstr "O plano %<plan_title>s teve sua visibilidade modificad para %<plan_visibility>s."
 
 #: ../../app/views/user_mailer/plan_visibility.html.erb:9
 msgid "Visibility definitions:"
@@ -5957,14 +5957,14 @@ msgstr "Público: qualquer pessoa na web pode ver"
 #: ../../app/views/user_mailer/plan_visibility.html.erb:17
 msgid ""
 "If you have questions pertaining to this action, please visit the My Dashboard"
-" page in %{tool_name}"
+" page in %<tool_name>s"
 msgstr ""
 "Se você tiver dúvidas relacionadas a essa ação, visite a página Meu Painel em "
-"%{tool_name}"
+"%<tool_name>s"
 
 #: ../../app/views/user_mailer/question_answered.html.erb:2
-msgid "Hello %{recipient_name},"
-msgstr "Olá %{recipient_name},"
+msgid "Hello %<recipient_name>s,"
+msgstr "Olá %<recipient_name>s,"
 
 #: ../../app/views/user_mailer/question_answered.html.erb:5
 msgid " is creating a Data Management Plan and has answered "
@@ -5984,23 +5984,25 @@ msgstr " com base no modelo"
 
 #: ../../app/views/user_mailer/sharing_notification.html.erb:5
 msgid ""
-"Your colleague %{inviter_name} has invited you to contribute to
\n"
+"Your colleague %<inviter_name>s has invited you to contribute to
+\n"%<tool_name>s
 "          their Data Management Plan in %{tool_name}"
-msgstr ""
-"Seu colega %{inviter_name} convidou você para contribuir com
\n"
+msgstr ""%<inviter_name>s
+"Seu colega %{inviter_name} convidou você para con%<tool_name>s
+\n"
 "          seu plano de gerenciamento de dados em %{tool_name}"
-
-#: ../../app/views/user_mailer/welcome_notification.html.erb:2
+%<tool_name>s%<username>s
+#: ../../app/views/u%<tool_name>sel%<username>scation.html.erb:2
 msgid "Welcome to %{tool_name}, %{username}"
 msgstr "Bem-vindo a %{tool_name}, %{username}"
 
-#: ../../app/views/user_mailer/welcome_notification.html.erb:5
+#%<tool_name>sviews/user_mailer/welcome_notification.html.erb:5
 msgid ""
-"%{tool_name} will help you to develop your Data Management Plan. If you have a"
+"%{tool_name} w%<contact_us>sto develop your Data Management Plan. If you have a"
 "ny queries or feedback as you use the tool, please contact us at %{helpdesk_em"
-"ail} or visit %{contact_us}"
+"%<tool_name>st %{contact_us}"
 msgstr ""
-"%{tool_name} vai ajudá-lo a desenvolver seu Plano de Gestão de Dados. Se você "
+"%{tool_name} vai ajudá-lo a desenvolver seu Plano%<helpdesk_email>sos. Se você "
 "tiver dúvidas ou quiser enviar-nos algum feedback enquanto estiver usando a fe"
 "rramenta, por favor, entre em contato conosco em %{helpdesk_email} ou visite %"
 "{contact_us}"
@@ -6008,8 +6010,8 @@ msgstr ""
 #: ../../app/views/user_mailer/welcome_notification.html.erb:13
 msgid "You may change your notification preferences on your profile page."
 msgstr "Você pode modificar suas preferências de notificação na página com seu perfil."
-
-#: ../../app/views/users/_admin_grant_permissions.html.erb:9
+%<username>s
+#: ../../app/views/users/_admin_gr%<username>sions.html.erb:9
 msgid "Editing privileges for %{username}"
 msgstr "Editando o privilégios de %{username}"
 
diff --git a/config/locale/sv_FI/app.po b/config/locale/sv_FI/app.po
index eb9a56900c..a6c6ec696e 100644
--- a/config/locale/sv_FI/app.po
+++ b/config/locale/sv_FI/app.po
@@ -20,15 +20,15 @@ msgstr ""
 
 #: ../../app/controllers/answers_controller.rb:24
 msgid ""
-"There is no question with id %{question_id} associated to plan id %{plan_id} f"
+"There is no question with id %<question_id>s associated to plan id %<plan_id>s f"
 "or which to create or update an answer"
 msgstr ""
-"Det finns ingen fråga med id %{question_id} som är associerad med plan id %{pl"
+"Det finns ingen fråga med id %<question_id>s som är associerad med plan id %{pl"
 "an_id} för vilken du skapar eller uppdaterar ett svar"
 
 #: ../../app/controllers/answers_controller.rb:34
-msgid "There is no plan with id %{id} for which to create or update an answer"
-msgstr "Det finns ingen plan med id %{id} för att skapa eller uppdatera ett svar"
+msgid "There is no plan with id %<id>s for which to create or update an answer"
+msgstr "Det finns ingen plan med id %<id>s för att skapa eller uppdatera ett svar"
 
 #: ../../app/controllers/api/v0/base_controller.rb:124
 msgid "Bad Credentials"
@@ -137,12 +137,12 @@ msgid "You need to sign in or sign up before continuing."
 msgstr "Du behöver logga in eller registrera dig innan du kan fortsätta."
 
 #: ../../app/controllers/application_controller.rb:100
-msgid "Unable to %{action} the %{object}.%{errors}"
-msgstr "Kan inte %{action} %{object}. %{errors}"
+msgid "Unable to %<action>s the %<object>s.%<errors>s"
+msgstr "Kan inte %<action>s %<object>s. %<errors>s"
 
 #: ../../app/controllers/application_controller.rb:108
-msgid "Successfully %{action} the %{object}."
-msgstr "Framgångsrikt %{action} %{object}."
+msgid "Successfully %<action>s the %<object>s."
+msgstr "Framgångsrikt %<action>s %<object>s."
 
 #: ../../app/controllers/application_controller.rb:123
 msgid "API client"
@@ -205,8 +205,8 @@ msgid "Restricted access to View All the records"
 msgstr "Begränsad åtkomst till Visa alla poster"
 
 #: ../../app/controllers/concerns/paginable.rb:180
-msgid "Sort by %{sort_field}"
-msgstr "Sortera efter %{sort_field}"
+msgid "Sort by %<sort_field>s"
+msgstr "Sortera efter %<sort_field>s"
 
 #: ../../app/controllers/concerns/template_methods.rb:10
 msgid "customisation"
@@ -411,12 +411,12 @@ msgstr ""
 "för användarna."
 
 #: ../../app/controllers/identifiers_controller.rb:18
-msgid "Successfully unlinked your account from %{is}."
-msgstr "Har länkat ditt konto framgångsrikt från %{is}."
+msgid "Successfully unlinked your account from %<is>s."
+msgstr "Har länkat ditt konto framgångsrikt från %<is>s."
 
 #: ../../app/controllers/identifiers_controller.rb:22
-msgid "Unable to unlink your account from %{is}."
-msgstr "Det gick inte att koppla bort ditt konto från %{is}."
+msgid "Unable to unlink your account from %<is>s."
+msgstr "Det gick inte att koppla bort ditt konto från %<is>s."
 
 #: ../../app/controllers/org_admin/phases_controller.rb:18
 #: ../../app/controllers/org_admin/templates_controller.rb:114
@@ -466,8 +466,8 @@ msgid "update"
 msgstr "uppdatering"
 
 #: ../../app/controllers/org_admin/plans_controller.rb:32
-msgid "%{plan_owner} has been notified that you have finished providing feedback"
-msgstr "%{plan_owner} har fått meddelande om att du har lämnat feedback"
+msgid "%<plan_owner>s has been notified that you have finished providing feedback"
+msgstr "%<plan_owner>s har fått meddelande om att du har lämnat feedback"
 
 #: ../../app/controllers/org_admin/plans_controller.rb:38
 msgid "Unable to notify user that you have finished providing feedback."
@@ -558,8 +558,8 @@ msgstr "Alla mallar"
 
 #: ../../app/controllers/org_admin/templates_controller.rb:48
 #: ../../app/views/org_admin/templates/index.html.erb:52
-msgid "%{org_name} Templates"
-msgstr "%{org_name} Mallar"
+msgid "%<org_name>s Templates"
+msgstr "%<org_name>s Mallar"
 
 #: ../../app/controllers/org_admin/templates_controller.rb:50
 #: ../../app/views/org_admin/templates/index.html.erb:54
@@ -571,13 +571,13 @@ msgid "Customizable Templates"
 msgstr "Anpassningsbara mallar"
 
 #: ../../app/controllers/org_admin/templates_controller.rb:214
-msgid "Error parsing links for a %{template}"
-msgstr "Felsökning av länkar för en %{template}"
+msgid "Error parsing links for a %<template>s"
+msgstr "Felsökning av länkar för en %<template>s"
 
 #: ../../app/controllers/org_admin/templates_controller.rb:345
 #: ../../app/controllers/public_pages_controller.rb:68
-msgid "Template created using the %{application_name} service. Last modified %{date}"
-msgstr "Mall skapad med tjänsten %{application_name}. Senast ändrad %{date}"
+msgid "Template created using the %<application_name>s service. Last modified %<date>s"
+msgstr "Mall skapad med tjänsten %<application_name>s. Senast ändrad %<date>s"
 
 #: ../../app/controllers/org_admin/templates_controller.rb:360
 #: ../../app/controllers/public_pages_controller.rb:83
@@ -597,8 +597,8 @@ msgid "Please choose an organisation"
 msgstr "Välj en organisation"
 
 #: ../../app/controllers/plan_exports_controller.rb:85
-msgid "Created using %{application_name}. Last modified %{date}"
-msgstr "Skapat med hjälp av %{application_name}. Senast ändrad %{date}"
+msgid "Created using %<application_name>s. Last modified %<date>s"
+msgstr "Skapat med hjälp av %<application_name>s. Senast ändrad %<date>s"
 
 #: ../../app/controllers/plans_controller.rb:51
 msgid "This is a"
@@ -639,15 +639,15 @@ msgstr "kopieras"
 
 #: ../../app/controllers/plans_controller.rb:408
 msgid ""
-"Unable to change the plan's status since it is needed at least %{percentage} p"
+"Unable to change the plan's status since it is needed at least %<percentage>s p"
 "ercentage responded"
 msgstr ""
-"Det går inte att ändra planens status eftersom det behövs minst %{percentage} "
+"Det går inte att ändra planens status eftersom det behövs minst %<percentage>s "
 "procent svarat"
 
 #: ../../app/controllers/plans_controller.rb:416
-msgid "Unable to find plan id %{plan_id}"
-msgstr "Det gick inte att hitta plan id %{plan_id}"
+msgid "Unable to find plan id %<plan_id>s"
+msgstr "Det gick inte att hitta plan id %<plan_id>s"
 
 #: ../../app/controllers/plans_controller.rb:433
 msgid "Your project is now a test."
@@ -662,18 +662,18 @@ msgid "Unable to change the plan's test status"
 msgstr "Kan inte ändra planens teststatus"
 
 #: ../../app/controllers/plans_controller.rb:451
-msgid "There is no plan associated with id %{id}"
-msgstr "Det finns ingen plan i samband med id %{id}"
+msgid "There is no plan associated with id %<id>s"
+msgstr "Det finns ingen plan i samband med id %<id>s"
 
 #: ../../app/controllers/registrations_controller.rb:35
 msgid ""
 "Please make a choice below. After linking your\n"
-"                       details to a %{application_name} account,\n"
+"                       details to a %<application_name>s account,\n"
 "                       you will be able to sign in directly with your\n"
 "                       institutional credentials."
 msgstr ""
 "Vänligen gör ett val nedan. Efter att ha länkat din\n"
-"                       information till ett %{application_name} -konto,\n"
+"                       information till ett %<application_name>s -konto,\n"
 "                       du kommer att kunna logga in direkt med din\n"
 "                       institutionella referenser."
 
@@ -751,15 +751,15 @@ msgstr "Lösenord och bekräftelse måste matcha"
 
 #: ../../app/controllers/roles_controller.rb:26
 msgid ""
-"Cannot share plan with %{email} since that email matches with the owner of the"
+"Cannot share plan with %<email>s since that email matches with the owner of the"
 " plan."
 msgstr ""
-"Kan inte dela plan med %{email} eftersom det matchade e-postmeddelandet med pl"
+"Kan inte dela plan med %<email>s eftersom det matchade e-postmeddelandet med pl"
 "anens ägare."
 
 #: ../../app/controllers/roles_controller.rb:37
-msgid "Plan is already shared with %{email}."
-msgstr "Planen delas redan med %{email}."
+msgid "Plan is already shared with %<email>s."
+msgstr "Planen delas redan med %<email>s."
 
 #: ../../app/controllers/roles_controller.rb:44
 #: ../../app/views/shared/_create_account_form.html.erb:4
@@ -771,12 +771,12 @@ msgid "Surname"
 msgstr "Efternamn"
 
 #: ../../app/controllers/roles_controller.rb:48
-msgid "Invitation to %{email} issued successfully."
-msgstr "Inbjudan till %{email} utfärdad framgångsrikt."
+msgid "Invitation to %<email>s issued successfully."
+msgstr "Inbjudan till %<email>s utfärdad framgångsrikt."
 
 #: ../../app/controllers/roles_controller.rb:53
-msgid "Plan shared with %{email}."
-msgstr "Planen delas med %{email}."
+msgid "Plan shared with %<email>s."
+msgstr "Planen delas med %<email>s."
 
 #: ../../app/controllers/roles_controller.rb:68
 msgid "You must provide a valid email address and select a permission level."
@@ -788,9 +788,9 @@ msgstr "Vänligen ange en mailadress"
 
 #: ../../app/controllers/roles_controller.rb:93
 msgid ""
-"Successfully changed the permissions for %{email}. They have been notified via"
+"Successfully changed the permissions for %<email>s. They have been notified via"
 " email."
-msgstr "Ändrade behörigheterna för %{email}. De har meddelats via e-post."
+msgstr "Ändrade behörigheterna för %<email>s. De har meddelats via e-post."
 
 #: ../../app/controllers/roles_controller.rb:108
 msgid "Access removed"
@@ -821,8 +821,8 @@ msgid "An error has occurred while saving/resetting your export settings."
 msgstr "Ett fel uppstod när du sparade / återställde dina exportinställningar."
 
 #: ../../app/controllers/super_admin/api_clients_controller.rb:45
-msgid ". The API credentials have been emailed to %{email}"
-msgstr ". API-referenser har skickats till %{email}"
+msgid ". The API credentials have been emailed to %<email>s"
+msgstr ". API-referenser har skickats till %<email>s"
 
 #: ../../app/controllers/super_admin/notifications_controller.rb:69
 msgid "Your notification is now active."
@@ -837,13 +837,13 @@ msgid "Unable to change the notification's active status"
 msgstr "Det går inte att ändra meddelandets aktiva status"
 
 #: ../../app/controllers/super_admin/notifications_controller.rb:104
-msgid "There is no notification associated with id  %{id}"
-msgstr "Det finns ingen anmälan i samband med id %{id}"
+msgid "There is no notification associated with id  %<id>s"
+msgstr "Det finns ingen anmälan i samband med id %<id>s"
 
 #: ../../app/controllers/super_admin/org_swaps_controller.rb:22
 msgid ""
 "Your organisation affiliation has been changed. You may now edit templates for"
-" %{org_name}."
+" %<org_name>s."
 msgstr ""
 "Din organisationsanslutning har ändrats. Du kan nu redigera mallar för %{org_n"
 "ame}."
@@ -909,16 +909,16 @@ msgid "Successfully signed in"
 msgstr "Inloggad framgångsrikt"
 
 #: ../../app/controllers/users/omniauth_callbacks_controller.rb:56
-msgid "Your account has been successfully linked to %{scheme}."
-msgstr "Ditt konto har länkats till %{scheme}."
+msgid "Your account has been successfully linked to %<scheme>s."
+msgstr "Ditt konto har länkats till %<scheme>s."
 
 #: ../../app/controllers/users/omniauth_callbacks_controller.rb:61
-msgid "Unable to link your account to %{scheme}."
-msgstr "Det gick inte att länka ditt konto till %{scheme}."
+msgid "Unable to link your account to %<scheme>s."
+msgstr "Det gick inte att länka ditt konto till %<scheme>s."
 
 #: ../../app/controllers/users_controller.rb:141
-msgid "Successfully %{action} %{username}'s account."
-msgstr "Framgångsrikt %{action} %{username} s konto."
+msgid "Successfully %<action>s %<username>s's account."
+msgstr "Framgångsrikt %<action>s %<username>s s konto."
 
 #: ../../app/controllers/users_controller.rb:142
 msgid "activated"
@@ -929,8 +929,8 @@ msgid "deactivated"
 msgstr "deaktiveras"
 
 #: ../../app/controllers/users_controller.rb:149
-msgid "Unable to %{action} %{username}"
-msgstr "Kan inte %{action} %{username}"
+msgid "Unable to %<action>s %<username>s"
+msgstr "Kan inte %<action>s %<username>s"
 
 #: ../../app/controllers/users_controller.rb:150
 msgid "activate"
@@ -1001,20 +1001,20 @@ msgid "Creator:"
 msgstr "Skapare:"
 
 #: ../../app/helpers/feedbacks_helper.rb:6
-msgid "%{application_name}: Your plan has been submitted for feedback"
-msgstr "%{application_name}: Din plan har skickats in för feedback"
+msgid "%<application_name>s: Your plan has been submitted for feedback"
+msgstr "%<application_name>s: Din plan har skickats in för feedback"
 
 #: ../../app/helpers/feedbacks_helper.rb:10
 msgid ""
-"<p>Hello %{user_name}.</p><p>Your plan \"%{plan_name}\" has been submitted for f"
+"<p>Hello %<user_name>s.</p><p>Your plan \"%<plan_name>s\" has been submitted for f"
 "eedback from an\n"
 "      administrator at your organisation. If you have questions pertaining to "
 "this action, please contact us\n"
-"      at %{organisation_email}.</p>"
+"      at %<organisation_email>s.</p>"
 msgstr ""
-"<p> Hej %{user_name}. </p><p> Din plan \"%{plan_name}\" har skickats in för feed"
+"<p> Hej %<user_name>s. </p><p> Din plan \"%<plan_name>s\" har skickats in för feed"
 "back från en administratör i din organisation. Om du har frågor angående denna"
-" åtgärd, kontakta oss på %{organisation_email}. </p>"
+" åtgärd, kontakta oss på %<organisation_email>s. </p>"
 
 #: ../../app/helpers/identifier_helper.rb:6
 #: ../../spec/helpers/identifier_helper_spec.rb:14
@@ -1047,12 +1047,12 @@ msgstr "läs planen och lämna kommentarer."
 
 #: ../../app/helpers/orgs_helper.rb:14
 msgid ""
-"<p>A data librarian from %{org_name} will respond to your request within 48\n"
+"<p>A data librarian from %<org_name>s will respond to your request within 48\n"
 "       hours. If you have questions pertaining to this action please contact u"
 "s\n"
-"       at %{organisation_email}.</p>"
+"       at %<organisation_email>s.</p>"
 msgstr ""
-"<p> En databibliotekare från %{org_name} svarar på din förfrågan inom 48 timma"
+"<p> En databibliotekare från %<org_name>s svarar på din förfrågan inom 48 timma"
 "r. Om du har frågor angående denna åtgärd, kontakta oss på %{organisation_emai"
 "l}. </p>"
 
@@ -1187,16 +1187,16 @@ msgid "None"
 msgstr "Ingen"
 
 #: ../../app/helpers/super_admin/orgs/merge_helper.rb:31
-msgid "Guidance for: %{themes}"
-msgstr "Vägledning för: %{themes}"
+msgid "Guidance for: %<themes>s"
+msgstr "Vägledning för: %<themes>s"
 
 #: ../../app/helpers/super_admin/orgs/merge_helper.rb:53
 msgid "Nothing to merge"
 msgstr "Inget att slå samman"
 
 #: ../../app/helpers/super_admin/orgs/merge_helper.rb:55
-msgid "<p>The following %{object_types} will be moved over to '%{org_name}':</p>"
-msgstr "<p>Följande %{object_types} kommer att flyttas till '%{org_name}':</p>"
+msgid "<p>The following %<object_types>s will be moved over to '%<org_name>s':</p>"
+msgstr "<p>Följande %<object_types>s kommer att flyttas till '%<org_name>s':</p>"
 
 #: ../../app/helpers/template_helper.rb:46
 #: ../../app/views/plans/index.html.erb:29
@@ -1231,48 +1231,48 @@ msgstr "Senaste 12 månaderna"
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:6
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:5
 #: ../../app/views/user_mailer/_email_signature.html.erb:2
-msgid "Query or feedback related to %{tool_name}"
-msgstr "Fråga eller feedback relaterad till %{tool_name}"
+msgid "Query or feedback related to %<tool_name>s"
+msgstr "Fråga eller feedback relaterad till %<tool_name>s"
 
 #: ../../app/mailers/user_mailer.rb:23
-msgid "Welcome to %{tool_name}"
-msgstr "Välkommen till %{tool_name}"
+msgid "Welcome to %<tool_name>s"
+msgstr "Välkommen till %<tool_name>s"
 
 #: ../../app/mailers/user_mailer.rb:58
-msgid "A Data Management Plan in %{tool_name} has been shared with you"
-msgstr "En datahanteringsplan i %{tool_name} har delats med dig"
+msgid "A Data Management Plan in %<tool_name>s has been shared with you"
+msgstr "En datahanteringsplan i %<tool_name>s har delats med dig"
 
 #: ../../app/mailers/user_mailer.rb:76
-msgid "Changed permissions on a Data Management Plan in %{tool_name}"
-msgstr "Ändrade behörigheter på en datahanteringsplan i %{tool_name}"
+msgid "Changed permissions on a Data Management Plan in %<tool_name>s"
+msgstr "Ändrade behörigheter på en datahanteringsplan i %<tool_name>s"
 
 #: ../../app/mailers/user_mailer.rb:92
-msgid "Permissions removed on a DMP in %{tool_name}"
-msgstr "Behörigheter tas bort på en DMP i %{tool_name}"
+msgid "Permissions removed on a DMP in %<tool_name>s"
+msgstr "Behörigheter tas bort på en DMP i %<tool_name>s"
 
 #: ../../app/mailers/user_mailer.rb:111
-msgid "%{user_name} has requested feedback on a %{tool_name} plan"
-msgstr "%{user_name} har begärt feedback på en %{tool_name} plan"
+msgid "%<user_name>s has requested feedback on a %<tool_name>s plan"
+msgstr "%<user_name>s har begärt feedback på en %<tool_name>s plan"
 
 #: ../../app/mailers/user_mailer.rb:134
-msgid "%{tool_name}: Expert feedback has been provided for %{plan_title}"
-msgstr "%{tool_name}: Feedback från experter har lämnats för %{plan_title}"
+msgid "%<tool_name>s: Expert feedback has been provided for %<plan_title>s"
+msgstr "%<tool_name>s: Feedback från experter har lämnats för %<plan_title>s"
 
 #: ../../app/mailers/user_mailer.rb:169
-msgid "DMP Visibility Changed: %{plan_title}"
-msgstr "DMP-synlighet ändrad: %{plan_title}"
+msgid "DMP Visibility Changed: %<plan_title>s"
+msgstr "DMP-synlighet ändrad: %<plan_title>s"
 
 #: ../../app/mailers/user_mailer.rb:200
-msgid "%{tool_name}: A new comment was added to %{plan_title}"
-msgstr "%{tool_name}: En ny kommentar läggs till i %{plan_title}"
+msgid "%<tool_name>s: A new comment was added to %<plan_title>s"
+msgstr "%<tool_name>s: En ny kommentar läggs till i %<plan_title>s"
 
 #: ../../app/mailers/user_mailer.rb:218
-msgid "Administrator privileges granted in %{tool_name}"
-msgstr "Administratörsbehörighet beviljas i %{tool_name}"
+msgid "Administrator privileges granted in %<tool_name>s"
+msgstr "Administratörsbehörighet beviljas i %<tool_name>s"
 
 #: ../../app/mailers/user_mailer.rb:235
-msgid "%{tool_name} API changes"
-msgstr "%{tool_name} API-ändringar"
+msgid "%<tool_name>s API changes"
+msgstr "%<tool_name>s API-ändringar"
 
 #: ../../app/models/concerns/exportable_plan.rb:26
 msgid "Phase"
@@ -1304,12 +1304,12 @@ msgid "Creators: "
 msgstr "skapare:"
 
 #: ../../app/models/concerns/exportable_plan.rb:134
-msgid "%{authors}"
-msgstr "%{authors}"
+msgid "%<authors>s"
+msgstr "%<authors>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:135
-msgid "%{affiliation}"
-msgstr "%{affiliation}"
+msgid "%<affiliation>s"
+msgstr "%<affiliation>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:137
 #: ../../app/models/concerns/exportable_plan.rb:139
@@ -1320,12 +1320,12 @@ msgid "Template: "
 msgstr "Mall:"
 
 #: ../../app/models/concerns/exportable_plan.rb:137
-msgid "%{funder}"
-msgstr "%{funder}"
+msgid "%<funder>s"
+msgstr "%<funder>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:139
-msgid "%{template}"
-msgstr "%{template}"
+msgid "%<template>s"
+msgstr "%<template>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:142
 #: ../../app/views/shared/export/_plan_txt.erb:12
@@ -1333,8 +1333,8 @@ msgid "Grant number: "
 msgstr "Bidragsnummer:"
 
 #: ../../app/models/concerns/exportable_plan.rb:142
-msgid "%{grant_number}"
-msgstr "%{grant_number}"
+msgid "%<grant_number>s"
+msgstr "%<grant_number>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:145
 #: ../../app/views/shared/export/_plan_coversheet.erb:26
@@ -1343,8 +1343,8 @@ msgid "Project abstract: "
 msgstr "Projektens abstrakt:"
 
 #: ../../app/models/concerns/exportable_plan.rb:145
-msgid "%{description}"
-msgstr "%{description}"
+msgid "%<description>s"
+msgstr "%<description>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:148
 #: ../../app/views/shared/export/_plan_coversheet.erb:42
@@ -1353,8 +1353,8 @@ msgid "Last modified: "
 msgstr "Senast ändrad:"
 
 #: ../../app/models/concerns/exportable_plan.rb:148
-msgid "%{date}"
-msgstr "%{date}"
+msgid "%<date>s"
+msgstr "%<date>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:149
 #: ../../app/views/shared/export/_plan_coversheet.erb:49
@@ -1535,8 +1535,8 @@ msgid "generate_copy! requires an organisation target"
 msgstr "generate_copy! kräver ett organisationsmål"
 
 #: ../../app/models/template.rb:380
-msgid "Copy of %{template}"
-msgstr "Kopia av %{template}"
+msgid "Copy of %<template>s"
+msgstr "Kopia av %<template>s"
 
 #: ../../app/models/template.rb:388
 msgid "generate_version! requires a published template"
@@ -1575,8 +1575,8 @@ msgid "Conditions in the template refer backwards"
 msgstr "Förhållandena i mallen hänvisar bakåt"
 
 #: ../../app/models/user.rb:379
-msgid "A Data Management Plan in %{application_name} has been shared with you"
-msgstr "En datahanteringsplan i %{application_name} har delats med dig"
+msgid "A Data Management Plan in %<application_name>s has been shared with you"
+msgstr "En datahanteringsplan i %<application_name>s har delats med dig"
 
 #: ../../app/policies/api/v0/departments_policy.rb:12
 #: ../../app/policies/api/v0/guidance_group_policy.rb:12
@@ -1695,8 +1695,8 @@ msgstr ""
 "r sin nuvarande funderare"
 
 #: ../../app/validators/after_validator.rb:5
-msgid "must be after %{date}"
-msgstr "måste vara efter %{date}"
+msgid "must be after %<date>s"
+msgstr "måste vara efter %<date>s"
 
 #: ../../app/validators/org_links_validator.rb:10
 msgid "A key \"org\" is expected for links hash"
@@ -1708,12 +1708,12 @@ msgid "A hash is expected for links"
 msgstr "En hash väntas för länkar"
 
 #: ../../app/validators/template_links_validator.rb:12
-msgid "A key %{key} is expected for links hash"
-msgstr "En nyckel %{key} förväntas för länkar hash"
+msgid "A key %<key>s is expected for links hash"
+msgstr "En nyckel %<key>s förväntas för länkar hash"
 
 #: ../../app/validators/template_links_validator.rb:15
-msgid "The key %{key} does not have a valid set of object links"
-msgstr "Nyckeln %{key} har inte en giltig uppsättning objektlänkar"
+msgid "The key %<key>s does not have a valid set of object links"
+msgstr "Nyckeln %<key>s har inte en giltig uppsättning objektlänkar"
 
 #: ../../app/views/answers/_locking.html.erb:5
 msgid "The following answer cannot be saved"
@@ -1721,10 +1721,10 @@ msgstr "Följande svar kan inte sparas"
 
 #: ../../app/views/answers/_locking.html.erb:8
 msgid ""
-"since %{name} saved the answer below while you were editing. Please, combine y"
+"since %<name>s saved the answer below while you were editing. Please, combine y"
 "our changes and then save the answer again."
 msgstr ""
-"eftersom %{name} sparade svaret nedan medan du redigerade. Vänligen, kombinera"
+"eftersom %<name>s sparade svaret nedan medan du redigerade. Vänligen, kombinera"
 " dina ändringar och spara sedan svaret igen."
 
 #: ../../app/views/answers/_new_edit.html.erb:15
@@ -1798,8 +1798,8 @@ msgid "Answered"
 msgstr "svarade"
 
 #: ../../app/views/answers/_status.html.erb:10
-msgid " by %{user_name}"
-msgstr "av %{user_name}"
+msgid " by %<user_name>s"
+msgstr "av %<user_name>s"
 
 #: ../../app/views/answers/_status.html.erb:15
 msgid "This answer removes "
@@ -1876,18 +1876,18 @@ msgstr "Kontakta oss"
 
 #: ../../app/views/contact_us/contacts/new.html.erb:6
 msgid ""
-"%{application_name} is provided by the %{organisation_name}.<br /> You can fin"
-"d out more about us on our <a href=\"%{organisation_url}\" class=\"has-new-window"
+"%<application_name>s is provided by the %<organisation_name>s.<br /> You can fin"
+"d out more about us on our <a href=\"%<organisation_url>s\" class=\"has-new-window"
 "-popup-info\" target=\"_blank\">website <em class=\"sr-only\">(new window)</em><spa"
-"n class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>. If you "
-"would like to contact us about %{application_name}, please fill out the form b"
+"n class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a>. If you "
+"would like to contact us about %<application_name>s, please fill out the form b"
 "elow."
 msgstr ""
-"%{application_name} tillhandahålls av %{organisation_name}. <br /> Du kan läsa"
-" mer om oss på vår <a href=\"%{organisation_url}\" class=\"has-new-window-popup-i"
+"%<application_name>s tillhandahålls av %<organisation_name>s. <br /> Du kan läsa"
+" mer om oss på vår <a href=\"%<organisation_url>s\" class=\"has-new-window-popup-i"
 "nfo\" target=\"_blank\">webbplats <em class=\"sr-only\">(nytt fönster)</em> <span c"
-"lass=\"new-window-popup-info\">%{open_in_new_window_text}</span></a> . Om du vil"
-"l kontakta oss om %{application_name}, fyll i formuläret nedan."
+"lass=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a> . Om du vil"
+"l kontakta oss om %<application_name>s, fyll i formuläret nedan."
 
 #: ../../app/views/contact_us/contacts/new.html.erb:10
 #: ../../app/views/layouts/_branding.html.erb:37
@@ -2049,8 +2049,8 @@ msgid "Create account"
 msgstr "Skapa ett konto"
 
 #: ../../app/views/devise/mailer/confirmation_instructions.html.erb:2
-msgid "Welcome to %{application_name}"
-msgstr "Välkommen till %{application_name}"
+msgid "Welcome to %<application_name>s"
+msgstr "Välkommen till %<application_name>s"
 
 #: ../../app/views/devise/mailer/confirmation_instructions.html.erb:4
 msgid "Thank you for registering. Please confirm your email address"
@@ -2070,24 +2070,24 @@ msgstr "i din webbläsare"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:12
 #: ../../app/views/user_mailer/new_comment.html.erb:2
-msgid "Hello %{user_name}"
-msgstr "Hej %{user_name}"
+msgid "Hello %<user_name>s"
+msgstr "Hej %<user_name>s"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:15
 msgid ""
-"Your colleague %{inviter_name} has invited you to contribute to  their Data Ma"
-"nagement Plan in %{tool_name}"
+"Your colleague %<inviter_name>s has invited you to contribute to  their Data Ma"
+"nagement Plan in %<tool_name>s"
 msgstr ""
-"Din kollega %{inviter_name} har bjudit in dig att bidra till deras datahanteri"
-"ngsplan i %{tool_name}"
+"Din kollega %<inviter_name>s har bjudit in dig att bidra till deras datahanteri"
+"ngsplan i %<tool_name>s"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:22
 #: ../../app/views/user_mailer/sharing_notification.html.erb:11
 msgid ""
-"%{click_here} to accept the invitation, (or copy %{link} into your browser). I"
+"%<click_here>s to accept the invitation, (or copy %<link>s into your browser). I"
 "f you don't want to accept the invitation, please ignore this email."
 msgstr ""
-"%{click_here} för att acceptera inbjudan, (eller kopiera %{link} till din webb"
+"%<click_here>s för att acceptera inbjudan, (eller kopiera %<link>s till din webb"
 "läsare). Om du inte vill acceptera inbjudan, ignorerar du det här e-postmeddel"
 "andet."
 
@@ -2107,8 +2107,8 @@ msgstr "med vänliga hälsningar"
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:19
 #: ../../app/views/user_mailer/_email_signature.html.erb:12
 #: ../../app/views/user_mailer/welcome_notification.html.erb:10
-msgid "The %{tool_name} team"
-msgstr "Teamet %{tool_name}"
+msgid "The %<tool_name>s team"
+msgstr "Teamet %<tool_name>s"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:32
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:22
@@ -2119,22 +2119,22 @@ msgstr "Var god och svara ej på detta mail."
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:33
 msgid ""
-"If you have any questions or need help, please contact us at %{helpdesk_email}"
-" or visit %{contact_us_url}"
+"If you have any questions or need help, please contact us at %<helpdesk_email>s"
+" or visit %<contact_us_url>s"
 msgstr ""
-"Om du har några frågor eller behöver hjälp, kontakta oss på %{helpdesk_email} "
-"eller besök %{contact_us_url}"
+"Om du har några frågor eller behöver hjälp, kontakta oss på %<helpdesk_email>s "
+"eller besök %<contact_us_url>s"
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:9
-msgid "Hello %{user_email}"
-msgstr "Hej %{user_email}"
+msgid "Hello %<user_email>s"
+msgstr "Hej %<user_email>s"
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:12
 msgid ""
-"Someone has requested a link to change your %{tool_name} password. You can do "
+"Someone has requested a link to change your %<tool_name>s password. You can do "
 "this through the link below."
 msgstr ""
-"Någon har begärt en länk för att ändra ditt lösenord för %{tool_name}. Du kan "
+"Någon har begärt en länk för att ändra ditt lösenord för %<tool_name>s. Du kan "
 "göra det genom länken nedan."
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:14
@@ -2148,11 +2148,11 @@ msgstr "Om du inte begärt detta, ignorerar du det här e-postmeddelandet."
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:22
 #: ../../app/views/user_mailer/_email_signature.html.erb:19
 msgid ""
-"If you have any questions or need help, please contact us at %{helpdesk_email}"
-" or visit %{contact_us}"
+"If you have any questions or need help, please contact us at %<helpdesk_email>s"
+" or visit %<contact_us>s"
 msgstr ""
-"Om du har några frågor eller behöver hjälp, kontakta oss på %{helpdesk_email} "
-"eller besök %{contact_us}"
+"Om du har några frågor eller behöver hjälp, kontakta oss på %<helpdesk_email>s "
+"eller besök %<contact_us>s"
 
 #: ../../app/views/devise/mailer/unlock_instructions.html.erb:2
 msgid "Hello"
@@ -2224,22 +2224,22 @@ msgstr "Dokumentation"
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:16
 msgid ""
-"See the <a href=\"%{api_v0_wiki}\">documentation for v0</a> for more details on "
+"See the <a href=\"%<api_v0_wiki>s\">documentation for v0</a> for more details on "
 "the original API which includes access to statistics, the full text of plans a"
 "nd the ability to connect users with departments."
 msgstr ""
-"Se <a href=\"%{api_v0_wiki}\">dokumentationen för v0</a> för mer information om "
+"Se <a href=\"%<api_v0_wiki>s\">dokumentationen för v0</a> för mer information om "
 "det ursprungliga API: et som inkluderar åtkomst till statistik, planens fullst"
 "ändiga text och möjligheten att ansluta användare till avdelningar."
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:18
 msgid ""
-"See the <a href=\"%{api_v1_wiki}\">documentation for v1</a> for more details on "
-"the API that supports the <a href=\"%{rda_standard_url}\">RDA Common metadata st"
+"See the <a href=\"%<api_v1_wiki>s\">documentation for v1</a> for more details on "
+"the API that supports the <a href=\"%<rda_standard_url>s\">RDA Common metadata st"
 "andard for DMPs.</a>"
 msgstr ""
-"Se <a href=\"%{api_v1_wiki}\">dokumentationen för v1</a> för mer information om "
-"API som stöder <a href=\"%{rda_standard_url}\">RDA Common metadata standard för "
+"Se <a href=\"%<api_v1_wiki>s\">dokumentationen för v1</a> för mer information om "
+"API som stöder <a href=\"%<rda_standard_url>s\">RDA Common metadata standard för "
 "DMP.</a>"
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:21
@@ -2410,8 +2410,8 @@ msgid "Sign in or Create account"
 msgstr "Logga in eller Skapa konto"
 
 #: ../../app/views/devise/registrations/new.html.erb:15
-msgid "Do you have a %{application_name} account?"
-msgstr "Har du ett %{application_name} konto?"
+msgid "Do you have a %<application_name>s account?"
+msgstr "Har du ett %<application_name>s konto?"
 
 #: ../../app/views/devise/registrations/new.html.erb:22
 #: ../../app/views/layouts/_navigation.html.erb:63
@@ -2426,8 +2426,8 @@ msgid "This will link your existing account to your credentials."
 msgstr "Detta kopplar ditt befintliga konto till dina uppgifter."
 
 #: ../../app/views/devise/registrations/new.html.erb:34
-msgid "No %{application_name} account?"
-msgstr "Nej %{application_name} konto?"
+msgid "No %<application_name>s account?"
+msgstr "Nej %<application_name>s konto?"
 
 #: ../../app/views/devise/registrations/new.html.erb:46
 msgid "This will create an account and link it to your credentials."
@@ -2605,10 +2605,10 @@ msgstr "Publicerad?"
 
 #: ../../app/views/home/_welcome.html.erb:5
 msgid ""
-"<p>%{application_name} has been developed by the <strong>%{organisation_name}<"
+"<p>%<application_name>s has been developed by the <strong>%<organisation_name>s<"
 "/strong> to help you write data management plans.</p>"
 msgstr ""
-"<p> %{application_name} har utvecklats av <strong>%{organisation_name} för</st"
+"<p> %<application_name>s har utvecklats av <strong>%<organisation_name>s för</st"
 "rong> att hjälpa dig att skriva datahanteringsplaner. </p>"
 
 #: ../../app/views/home/_welcome.html.erb:11
@@ -2794,8 +2794,8 @@ msgid "Logout"
 msgstr "Logga ut"
 
 #: ../../app/views/layouts/application.html.erb:32
-msgid "%{application_name}"
-msgstr "%{application_name}"
+msgid "%<application_name>s"
+msgstr "%<application_name>s"
 
 #: ../../app/views/layouts/application.html.erb:91
 msgid "Error:"
@@ -2870,11 +2870,11 @@ msgstr "Öppnar i nytt fönster"
 
 #: ../../app/views/layouts/application.html.erb:142
 msgid ""
-"%{n} results are available, use up and down arrows to navigate suggestions. Us"
+"%<n>s results are available, use up and down arrows to navigate suggestions. Us"
 "e the Enter key to select a suggestion or the Escape key to close the suggesti"
 "ons."
 msgstr ""
-"%{n} resultat är tillgängliga, använd upp- och nedpilarna för att navigera i f"
+"%<n>s resultat är tillgängliga, använd upp- och nedpilarna för att navigera i f"
 "örslag. Använd Enter-knappen för att välja ett förslag eller Escape-knappen fö"
 "r att stänga förslagen."
 
@@ -2926,8 +2926,8 @@ msgid "Example answer"
 msgstr "Exempel Svar"
 
 #: ../../app/views/org_admin/annotations/_show.html.erb:4
-msgid "%{org} Example Answer"
-msgstr "%{org} Exempel Svar"
+msgid "%<org>s Example Answer"
+msgstr "%<org>s Exempel Svar"
 
 #: ../../app/views/org_admin/conditions/_add.html.erb:3
 msgid "Add condition"
@@ -3081,10 +3081,10 @@ msgstr "Ta bort fas"
 
 #: ../../app/views/org_admin/phases/_phase.html.erb:17
 msgid ""
-"You are about to delete the '%{phase_title}' phase. This will remove all of th"
+"You are about to delete the '%<phase_title>s' phase. This will remove all of th"
 "e sections and questions listed below. Are you sure?"
 msgstr ""
-"Du håller på att ta bort fasen \"%{phase_title}\". Detta tar bort alla avsnitt o"
+"Du håller på att ta bort fasen \"%<phase_title>s\". Detta tar bort alla avsnitt o"
 "ch frågor som anges nedan. Är du säker?"
 
 #: ../../app/views/org_admin/phases/_phase.html.erb:18
@@ -3143,8 +3143,8 @@ msgid "Write plan"
 msgstr "Skriv Plan"
 
 #: ../../app/views/org_admin/plans/index.html.erb:4
-msgid "%{org_name} Plans"
-msgstr "%{org_name} Planer"
+msgid "%<org_name>s Plans"
+msgstr "%<org_name>s Planer"
 
 #: ../../app/views/org_admin/plans/index.html.erb:16
 msgid "Plan"
@@ -3195,10 +3195,10 @@ msgstr "Meddela planägaren att jag är klar med att ge feedback"
 #: ../../app/views/org_admin/plans/index.html.erb:39
 msgid ""
 "Download plans <em class=\"sr-only\">(new window)</em><span class=\"new-window-po"
-"pup-info\">%{open_in_new_window_text}</span>"
+"pup-info\">%<open_in_new_window_text>s</span>"
 msgstr ""
 "Ladda ner planer <em class=\"sr-only\">(nytt fönster)</em> <span class=\"new-wind"
-"ow-popup-info\">%{open_in_new_window_text}</span>"
+"ow-popup-info\">%<open_in_new_window_text>s</span>"
 
 #: ../../app/views/org_admin/question_options/_option_fields.html.erb:3
 msgid "Order"
@@ -3227,8 +3227,8 @@ msgstr ""
 "at (t ex tabeller) kan du ange den här stilen här."
 
 #: ../../app/views/org_admin/questions/_form.html.erb:4
-msgid "Question %{number}:"
-msgstr "Fråga %{number}:"
+msgid "Question %<number>s:"
+msgstr "Fråga %<number>s:"
 
 #: ../../app/views/org_admin/questions/_form.html.erb:4
 msgid "New question:"
@@ -3302,8 +3302,8 @@ msgid "Delete"
 msgstr "radera"
 
 #: ../../app/views/org_admin/questions/_form.html.erb:102
-msgid "You are about to delete question #%{question_number}. Are you sure?"
-msgstr "Du håller på att ta bort fråga # %{question_number}. Är du säker?"
+msgid "You are about to delete question #%<question_number>s. Are you sure?"
+msgstr "Du håller på att ta bort fråga # %<question_number>s. Är du säker?"
 
 #: ../../app/views/org_admin/questions/_index.html.erb:14
 msgid "Add Question"
@@ -3402,10 +3402,10 @@ msgstr "Ange en rubrik för avsnittet"
 
 #: ../../app/views/org_admin/sections/_form.html.erb:20
 msgid ""
-"You are about to delete '%{section_title}'. This will affect questions linked "
+"You are about to delete '%<section_title>s'. This will affect questions linked "
 "to this section. Are you sure?"
 msgstr ""
-"Du håller på att ta bort '%{section_title}'. Detta påverkar frågor som är kopp"
+"Du håller på att ta bort '%<section_title>s'. Detta påverkar frågor som är kopp"
 "lade till det här avsnittet. Är du säker?"
 
 #: ../../app/views/org_admin/sections/_index.html.erb:61
@@ -3434,8 +3434,8 @@ msgstr ""
 
 #: ../../app/views/org_admin/templates/_form.html.erb:25
 #: ../../app/views/org_admin/templates/_show.html.erb:35
-msgid "for internal %{org_name} use only"
-msgstr "för intern %{org_name} användning endast"
+msgid "for internal %<org_name>s use only"
+msgstr "för intern %<org_name>s användning endast"
 
 #: ../../app/views/org_admin/templates/_form.html.erb:32
 #: ../../app/views/org_admin/templates/_show.html.erb:13
@@ -3605,22 +3605,22 @@ msgstr "Anpassningsbara mallar"
 
 #: ../../app/views/org_admin/templates/index.html.erb:80
 #: ../../app/views/org_admin/templates/index.html.erb:93
-msgid "All (%{count})"
-msgstr "Alla (%{count})"
+msgid "All (%<count>s)"
+msgstr "Alla (%<count>s)"
 
 #: ../../app/views/org_admin/templates/index.html.erb:83
 #: ../../app/views/org_admin/templates/index.html.erb:96
-msgid "Published (%{count})"
-msgstr "Publicerad (%{count})"
+msgid "Published (%<count>s)"
+msgstr "Publicerad (%<count>s)"
 
 #: ../../app/views/org_admin/templates/index.html.erb:86
 #: ../../app/views/org_admin/templates/index.html.erb:99
-msgid "Unpublished (%{count})"
-msgstr "Ej offentliggjord (%{count})"
+msgid "Unpublished (%<count>s)"
+msgstr "Ej offentliggjord (%<count>s)"
 
 #: ../../app/views/org_admin/templates/index.html.erb:89
-msgid "Not customised (%{count})"
-msgstr "Ej anpassad (%{count})"
+msgid "Not customised (%<count>s)"
+msgstr "Ej anpassad (%<count>s)"
 
 #: ../../app/views/org_admin/templates/index.html.erb:118
 msgid "Create a template"
@@ -3629,8 +3629,8 @@ msgstr "Skapa en mall"
 #: ../../app/views/org_admin/users/edit.html.erb:4
 #: ../../app/views/super_admin/users/edit.html.erb:1
 #: ../../app/views/super_admin/users/edit.html.erb:5
-msgid "Editing profile for %{username}"
-msgstr "Redigera profil för %{username}"
+msgid "Editing profile for %<username>s"
+msgstr "Redigera profil för %<username>s"
 
 #: ../../app/views/org_admin/users/edit.html.erb:5
 #: ../../app/views/super_admin/users/edit.html.erb:6
@@ -3638,8 +3638,8 @@ msgid "View all users"
 msgstr "Visa alla användare"
 
 #: ../../app/views/org_admin/users/plans.html.erb:3
-msgid "Plans of %{username}"
-msgstr "Planer för %{username}"
+msgid "Plans of %<username>s"
+msgstr "Planer för %<username>s"
 
 #: ../../app/views/orgs/_departments.html.erb:1
 #: ../../app/views/orgs/admin_edit.html.erb:26
@@ -3669,7 +3669,7 @@ msgid ""
 "ntact_us_url}\">contact us</a> to have them updated."
 msgstr ""
 "Om någon av ovanstående identifierare är felaktiga eller saknas, vänligen <a h"
-"ref=\"%{contact_us_url}\">kontakta oss för</a> att få dem uppdaterade."
+"ref=\"%<contact_us_url>s\">kontakta oss för</a> att få dem uppdaterade."
 
 #: ../../app/views/orgs/_feedback_form.html.erb:3
 #: ../../app/views/orgs/_feedback_form.html.erb:7
@@ -3699,10 +3699,10 @@ msgstr "Slå samman organisationer"
 #: ../../app/views/orgs/_merge_form.html.erb:7
 msgid ""
 "Please select the Organisation that will replace the current organisation: '<s"
-"trong>%{org_name}</strong>'."
+"trong>%<org_name>s</strong>'."
 msgstr ""
 "Välj den organisation som kommer att ersätta den nuvarande organisationen: ' <"
-"strong>%{org_name}</strong> '."
+"strong>%<org_name>s</strong> '."
 
 #: ../../app/views/orgs/_merge_form.html.erb:8
 msgid ""
@@ -3884,15 +3884,15 @@ msgstr "Aldrig"
 
 #: ../../app/views/paginable/api_clients/_index.html.erb:44
 msgid ""
-"You are about to delete '%{client_name}'. They will no longer be able to acces"
+"You are about to delete '%<client_name>s'. They will no longer be able to acces"
 "s the API. Are you sure?"
 msgstr ""
-"Du håller på att radera '%{client_name}'. De kommer inte längre att kunna komm"
+"Du håller på att radera '%<client_name>s'. De kommer inte längre att kunna komm"
 "a åt API: et. Är du säker?"
 
 #: ../../app/views/paginable/contributors/_index.html.erb:57
-msgid "You are about to delete '%{contributor_name}'. Are you sure?"
-msgstr "Du håller på att radera '%{contributor_name}'. Är du säker?"
+msgid "You are about to delete '%<contributor_name>s'. Are you sure?"
+msgstr "Du håller på att radera '%<contributor_name>s'. Är du säker?"
 
 #: ../../app/views/paginable/departments/_index.html.erb:5
 #: ../../app/views/paginable/users/_index.html.erb:22
@@ -3905,10 +3905,10 @@ msgstr "Förkortat namn eller kod"
 
 #: ../../app/views/paginable/departments/_index.html.erb:28
 msgid ""
-"You are about to delete '%{department_name}'. This will affect guidance. Are y"
+"You are about to delete '%<department_name>s'. This will affect guidance. Are y"
 "ou sure?"
 msgstr ""
-"Du håller på att ta bort '%{department_name}'. Detta kommer att påverka vägled"
+"Du håller på att ta bort '%<department_name>s'. Detta kommer att påverka vägled"
 "ning. Är du säker?"
 
 #: ../../app/views/paginable/guidance_groups/_index.html.erb:8
@@ -3949,15 +3949,15 @@ msgstr "publicera"
 
 #: ../../app/views/paginable/guidance_groups/_index.html.erb:50
 msgid ""
-"You are about to delete '%{guidance_group_name}'. This will affect guidance. A"
+"You are about to delete '%<guidance_group_name>s'. This will affect guidance. A"
 "re you sure?"
 msgstr ""
-"Du håller på att ta bort '%{guidance_group_name}'. Detta kommer att påverka vä"
+"Du håller på att ta bort '%<guidance_group_name>s'. Detta kommer att påverka vä"
 "gledning. Är du säker?"
 
 #: ../../app/views/paginable/guidances/_index.html.erb:62
-msgid "You are about to delete '%{guidance_summary}'. Are you sure?"
-msgstr "Du håller på att ta bort '%{guidance_summary}'. Är du säker?"
+msgid "You are about to delete '%<guidance_summary>s'. Are you sure?"
+msgstr "Du håller på att ta bort '%<guidance_summary>s'. Är du säker?"
 
 #: ../../app/views/paginable/notifications/_index.html.erb:5
 #: ../../app/views/super_admin/notifications/_form.html.erb:15
@@ -3993,8 +3993,8 @@ msgid "Managed"
 msgstr "Managed"
 
 #: ../../app/views/paginable/orgs/_index.html.erb:35
-msgid "You are about to delete '%{org_name}'. Are you sure?"
-msgstr "Du håller på att ta bort '%{org_name}'. Är du säker?"
+msgid "You are about to delete '%<org_name>s'. Are you sure?"
+msgstr "Du håller på att ta bort '%<org_name>s'. Är du säker?"
 
 #: ../../app/views/paginable/plans/_org_admin.html.erb:3
 msgid ""
@@ -4161,10 +4161,10 @@ msgstr "Publicera ändringar"
 
 #: ../../app/views/paginable/templates/_customisable.html.erb:69
 msgid ""
-"Are you sure you want to remove your customization of \"%{template_title}\"? Any"
+"Are you sure you want to remove your customization of \"%<template_title>s\"? Any"
 " published versions will become unavailable to users."
 msgstr ""
-"Är du säker på att du vill ta bort din anpassning av \"%{template_title}\"? Alla"
+"Är du säker på att du vill ta bort din anpassning av \"%<template_title>s\"? Alla"
 " publicerade versioner blir inte tillgängliga för användare."
 
 #: ../../app/views/paginable/templates/_history.html.erb:7
@@ -4181,10 +4181,10 @@ msgstr "Visa anpassningar"
 
 #: ../../app/views/paginable/templates/_organisational.html.erb:76
 msgid ""
-"Are you sure you want to remove \"%{template_title}\"? Any published versions wi"
+"Are you sure you want to remove \"%<template_title>s\"? Any published versions wi"
 "ll become unavailable to users."
 msgstr ""
-"Är du säker på att du vill ta bort \"%{template_title}\"? Alla publicerade versi"
+"Är du säker på att du vill ta bort \"%<template_title>s\"? Alla publicerade versi"
 "oner blir inte tillgängliga för användare."
 
 #: ../../app/views/paginable/templates/_organisational.html.erb:90
@@ -4347,10 +4347,10 @@ msgstr "Höger"
 #: ../../app/views/plans/_download_form.html.erb:119
 msgid ""
 "Download Plan <em class=\"sr-only\">(new window)</em><span class=\"new-window-pop"
-"up-info\">%{open_in_new_window_text}</span>"
+"up-info\">%<open_in_new_window_text>s</span>"
 msgstr ""
 "Ladda ner plan <em class=\"sr-only\">(nytt fönster)</em> <span class=\"new-window"
-"-popup-info\">%{open_in_new_window_text}</span>"
+"-popup-info\">%<open_in_new_window_text>s</span>"
 
 #: ../../app/views/plans/_edit_details.html.erb:13
 #: ../../app/views/plans/_guidance_selection.html.erb:38
@@ -4359,10 +4359,10 @@ msgstr "Välj vägledning"
 
 #: ../../app/views/plans/_guidance_selection.html.erb:6
 msgid ""
-"To help you write your plan, %{application_name} can show you guidance from a "
+"To help you write your plan, %<application_name>s can show you guidance from a "
 "variety of organisations."
 msgstr ""
-"För att hjälpa dig att skriva din plan kan %{application_name} visa vägledning"
+"För att hjälpa dig att skriva din plan kan %<application_name>s visa vägledning"
 " från olika organisationer."
 
 #: ../../app/views/plans/_guidance_selection.html.erb:9
@@ -4383,11 +4383,11 @@ msgstr "Det finns ingen ytterligare vägledning för denna mall."
 
 #: ../../app/views/plans/_guidance_selection.html.erb:40
 msgid ""
-"To help you write your plan, %{application_name} can show you guidance from a "
+"To help you write your plan, %<application_name>s can show you guidance from a "
 "variety of organisations. Please choose up to 6 organisations of the following"
 " organisations who offer guidance relevant to your plan."
 msgstr ""
-"För att hjälpa dig att skriva din plan kan %{application_name} visa vägledning"
+"För att hjälpa dig att skriva din plan kan %<application_name>s visa vägledning"
 " från olika organisationer. Välj upp till 6 organisationer av följande organis"
 "ationer som erbjuder vägledning som är relevant för din plan."
 
@@ -4413,19 +4413,19 @@ msgstr "Skriv Plan"
 
 #: ../../app/views/plans/_overview_details.html.erb:9
 msgid ""
-"This plan is based on the \"%{template_title}\" template provided by %{org_name}"
+"This plan is based on the \"%<template_title>s\" template provided by %<org_name>s"
 "."
 msgstr ""
-"Den här planen är baserad på \"%{template_title}\" mallen som tillhandahålls av "
-"%{org_name}."
+"Den här planen är baserad på \"%<template_title>s\" mallen som tillhandahålls av "
+"%<org_name>s."
 
 #: ../../app/views/plans/_overview_details.html.erb:17
-msgid "Template version %{template_version}, published on %{published_date}"
-msgstr "Mallversion %{template_version}, publicerad på %{published_date}"
+msgid "Template version %<template_version>s, published on %<published_date>s"
+msgstr "Mallversion %<template_version>s, publicerad på %<published_date>s"
 
 #: ../../app/views/plans/_overview_details.html.erb:42
-msgid "%{phase_title} (%{sections_size} %{sections}, %{questions_size} %{questions})"
-msgstr "%{phase_title} (%{sections_size} %{sections}, %{questions_size} %{questions})"
+msgid "%<phase_title>s (%<sections_size>s %<sections>s, %<questions_size>s %<questions>s)"
+msgstr "%<phase_title>s (%<sections_size>s %<sections>s, %<questions_size>s %<questions>s)"
 
 #: ../../app/views/plans/_overview_details.html.erb:43
 msgid "section"
@@ -4536,11 +4536,11 @@ msgstr "Ange planens synlighet"
 #: ../../app/views/plans/_share_form.html.erb:9
 msgid ""
 "Public or organisational visibility is intended for finished plans. You must a"
-"nswer at least %{percentage}%% of the questions to enable these options. Note:"
+"nswer at least %<percentage>s%% of the questions to enable these options. Note:"
 " test plans are set to private visibility by default."
 msgstr ""
 "Offentlig eller organisatorisk synlighet är avsedd för färdiga planer. Du måst"
-"e svara minst %{percentage} %% av frågorna för att aktivera dessa alternativ. "
+"e svara minst %<percentage>s %% av frågorna för att aktivera dessa alternativ. "
 "Obs! Testplanerna är som standard inställda på privat sikt."
 
 #: ../../app/views/plans/_share_form.html.erb:19
@@ -4629,8 +4629,8 @@ msgid "Click the 'Create plan' button below to begin."
 msgstr "Klicka på knappen \"Skapa plan\" nedan för att börja."
 
 #: ../../app/views/plans/index.html.erb:35
-msgid "%{org_title} Plans"
-msgstr "%{org_title} Planer"
+msgid "%<org_title>s Plans"
+msgstr "%<org_title>s Planer"
 
 #: ../../app/views/plans/index.html.erb:36
 msgid ""
@@ -4710,11 +4710,11 @@ msgstr "Vi hittade flera DMP-mallar som motsvarar din funderare."
 
 #: ../../app/views/public_pages/plan_index.html.erb:8
 msgid ""
-"Public DMPs are plans created using the %{application_name} service and shared"
+"Public DMPs are plans created using the %<application_name>s service and shared"
 " publicly by their owners. They are not vetted for quality, completeness, or a"
 "dherence to funder guidelines."
 msgstr ""
-"Offentliga DMP är planer som skapats med hjälp av %{application_name} -tjänste"
+"Offentliga DMP är planer som skapats med hjälp av %<application_name>s -tjänste"
 "n och delas offentligt av sina ägare. De är inte kända för kvalitet, fullständ"
 "ighet eller efterlevnad av funderingsriktlinjer."
 
@@ -4763,8 +4763,8 @@ msgid "terms and conditions"
 msgstr "Villkor"
 
 #: ../../app/views/shared/_create_plan_modal.html.erb:8
-msgid "Would you like to create a plan based on the \"%{name}\" template?"
-msgstr "Vill du skapa en plan baserad på mallen \"%{name}\"?"
+msgid "Would you like to create a plan based on the \"%<name>s\" template?"
+msgstr "Vill du skapa en plan baserad på mallen \"%<name>s\"?"
 
 #: ../../app/views/shared/_links.html.erb:7
 msgid "Links"
@@ -4817,8 +4817,8 @@ msgstr "Filter planer"
 
 #: ../../app/views/shared/export/_plan_coversheet.erb:3
 #: ../../app/views/shared/export/_plan_txt.erb:65
-msgid "A Data Management Plan created using %{application_name}"
-msgstr "En datahanteringsplan skapad med hjälp av %{application_name}"
+msgid "A Data Management Plan created using %<application_name>s"
+msgstr "En datahanteringsplan skapad med hjälp av %<application_name>s"
 
 #: ../../app/views/shared/export/_plan_coversheet.erb:10
 #: ../../app/views/shared/export/_plan_txt.erb:5
@@ -4887,8 +4887,8 @@ msgstr "Namnet du angav var inte ett av de listade förslagen!"
 
 #: ../../app/views/static_pages/about_us.html.erb:1
 #: ../../app/views/static_pages/about_us.html.erb:4
-msgid "About %{application_name}"
-msgstr "Om %{application_name}"
+msgid "About %<application_name>s"
+msgstr "Om %<application_name>s"
 
 #: ../../app/views/static_pages/about_us.html.erb:11
 msgid ""
@@ -4966,10 +4966,10 @@ msgstr "Vi uppmanar dig att läsa igenom DMPRoadmap GitHub wiki för att lära d
 #: ../../app/views/static_pages/about_us.html.erb:22
 msgid ""
 "get involved<em class=\"sr-only\"> (new window)</em><span class=\"new-window-popu"
-"p-info\">%{open_in_new_window_text}</span>"
+"p-info\">%<open_in_new_window_text>s</span>"
 msgstr ""
 "engagera sig <em class=\"sr-only\">(nytt fönster)</em> <span class=\"new-window-p"
-"opup-info\">%{open_in_new_window_text}</span>"
+"opup-info\">%<open_in_new_window_text>s</span>"
 
 #: ../../app/views/static_pages/about_us.html.erb:28
 msgid " in the project. You can also report bugs and request new features via "
@@ -4988,8 +4988,8 @@ msgid "If you have an account please sign in and start creating or editing your
 msgstr "Om du har ett konto, logga in och börja skapa eller redigera din DMP."
 
 #: ../../app/views/static_pages/about_us.html.erb:34
-msgid "If you do not have a %{application_name} account, click on"
-msgstr "Om du inte har ett %{application_name} konto klickar du på"
+msgid "If you do not have a %<application_name>s account, click on"
+msgstr "Om du inte har ett %<application_name>s konto klickar du på"
 
 #: ../../app/views/static_pages/about_us.html.erb:34
 msgid "Sign up"
@@ -5197,46 +5197,46 @@ msgstr "Information om dig: hur vi använder den och med vilken vi delar den"
 
 #: ../../app/views/static_pages/privacy.html.erb:11
 msgid ""
-"The information you provide will be used by the %{org_name} to offer you acces"
-"s to and personalisation of the %{application_name} service."
+"The information you provide will be used by the %<org_name>s to offer you acces"
+"s to and personalisation of the %<application_name>s service."
 msgstr ""
-"Informationen du tillhandahåller kommer att användas av %{org_name} för att er"
-"bjuda dig tillgång till och personalisering av tjänsten %{application_name}."
+"Informationen du tillhandahåller kommer att användas av %<org_name>s för att er"
+"bjuda dig tillgång till och personalisering av tjänsten %<application_name>s."
 
 #: ../../app/views/static_pages/privacy.html.erb:13
 msgid ""
-"The %{org_name} processes the personal data of %{application_name} users in or"
-"der to deliver and improve the %{application_name} service in a customised man"
+"The %<org_name>s processes the personal data of %<application_name>s users in or"
+"der to deliver and improve the %<application_name>s service in a customised man"
 "ner and to ensure each user receives relevant information."
 msgstr ""
-"%{org_name} behandlar personuppgifterna för %{application_name} -användare för"
-" att leverera och förbättra tjänsten [%{org_name}A2] på ett anpassat sätt och "
+"%<org_name>s behandlar personuppgifterna för %<application_name>s -användare för"
+" att leverera och förbättra tjänsten [%<org_name>sA2] på ett anpassat sätt och "
 "för att säkerställa att varje användare får relevant information."
 
 #: ../../app/views/static_pages/privacy.html.erb:15
 msgid ""
-"The processing of your personal data by the %{org_name} is necessary for pursu"
+"The processing of your personal data by the %<org_name>s is necessary for pursu"
 "ing the following legitimate interests:"
 msgstr ""
-"Behandlingen av dina personuppgifter av %{org_name} är nödvändig för att följa"
+"Behandlingen av dina personuppgifter av %<org_name>s är nödvändig för att följa"
 " följande legitima intressen:"
 
 #: ../../app/views/static_pages/privacy.html.erb:18
 msgid ""
-"To provide access to the %{application_name} service and personalisation of yo"
+"To provide access to the %<application_name>s service and personalisation of yo"
 "ur user experience e.g. provision of relevant templates and guidance for your "
 "organisation."
 msgstr ""
-"För att ge tillgång till tjänsten %{application_name} och personalisering av d"
+"För att ge tillgång till tjänsten %<application_name>s och personalisering av d"
 "in användarupplevelse, t.ex. tillhandahållande av relevanta mallar och vägledn"
 "ing för din organisation."
 
 #: ../../app/views/static_pages/privacy.html.erb:20
 msgid ""
-"To keep you up to date with news about %{application_name} such as new feature"
+"To keep you up to date with news about %<application_name>s such as new feature"
 "s or improvements, or changes to our Privacy Policy."
 msgstr ""
-"För att hålla dig uppdaterad med nyheter om %{application_name}, som nya funkt"
+"För att hålla dig uppdaterad med nyheter om %<application_name>s, som nya funkt"
 "ioner eller förbättringar, eller ändringar i vår sekretesspolicy."
 
 #: ../../app/views/static_pages/privacy.html.erb:22
@@ -5246,29 +5246,29 @@ msgstr "För nätverks- och informationssäkerhetsändamål."
 #: ../../app/views/static_pages/privacy.html.erb:24
 msgid ""
 "We will hold the personal data you provided us for as long as you continue usi"
-"ng the %{application_name} service. Your personal data can be removed from thi"
-"s service upon request to the %{application_name} team within a period of 30 d"
+"ng the %<application_name>s service. Your personal data can be removed from thi"
+"s service upon request to the %<application_name>s team within a period of 30 d"
 "ays."
 msgstr ""
 "Vi håller de personuppgifter du gav oss så länge du fortsätter att använda tjä"
-"nsten %{application_name}. Dina personuppgifter kan tas bort från denna tjänst"
-" på begäran till %{application_name} -laget inom 30 dagar."
+"nsten %<application_name>s. Dina personuppgifter kan tas bort från denna tjänst"
+" på begäran till %<application_name>s -laget inom 30 dagar."
 
 #: ../../app/views/static_pages/privacy.html.erb:26
 msgid ""
-"If you have any questions, please contact the %{application_name} team at: <a "
-"href='mailto:%{helpdesk_email}'>%{helpdesk_email}</a>"
+"If you have any questions, please contact the %<application_name>s team at: <a "
+"href='mailto:%<helpdesk_email>s'>%<helpdesk_email>s</a>"
 msgstr ""
 "Om du har några frågor, vänligen kontakta teamet på <a href='mailto:%{helpdesk"
-"_email}'>%{application_name}</a> på: <a href='mailto:%{helpdesk_email}'>%{help"
+"_email}'>%<application_name>s</a> på: <a href='mailto:%<helpdesk_email>s'>%{help"
 "desk_email}</a>"
 
 #: ../../app/views/static_pages/privacy.html.erb:30
 msgid ""
-"This statement was last revised on %{revdate} and may be revised at any time w"
+"This statement was last revised on %<revdate>s and may be revised at any time w"
 "ith prior notice."
 msgstr ""
-"Detta uttalande ändrades senast den %{revdate} och kan ändras när som helst me"
+"Detta uttalande ändrades senast den %<revdate>s och kan ändras när som helst me"
 "d föregående meddelande."
 
 #: ../../app/views/static_pages/termsuse.html.erb:12
@@ -5341,7 +5341,7 @@ msgid ""
 "ookies and how we use them is available on the <a target='_blank' href='http:/"
 "/www.dcc.ac.uk/about-us/about-site/website-terms-use/cookies' class=\"has-new-w"
 "indow-popup-info\">main DCC website<em class=\"sr-only\"> (new window)</em><span "
-"class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>.</p>\n"
+"class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a>.</p>\n"
 "\n"
 "      <h3>Third party APIs</h3>\n"
 "\n"
@@ -5422,8 +5422,8 @@ msgid "Email credentials to contact"
 msgstr "E-postinformation för kontakt"
 
 #: ../../app/views/super_admin/api_clients/_form.html.erb:81
-msgid "Are you sure you want to delete the API client: \"%{name}\""
-msgstr "Är du säker på att du vill ta bort API-klienten: \"%{name}\""
+msgid "Are you sure you want to delete the API client: \"%<name>s\""
+msgstr "Är du säker på att du vill ta bort API-klienten: \"%<name>s\""
 
 #: ../../app/views/super_admin/api_clients/edit.html.erb:1
 msgid "Editing API client"
@@ -5439,8 +5439,8 @@ msgid "View all API clients"
 msgstr "Visa alla API-klienter"
 
 #: ../../app/views/super_admin/api_clients/email_credentials.js.erb:1
-msgid "The credentials have been sent to %{email}."
-msgstr "Uppgifterna har skickats till %{email}."
+msgid "The credentials have been sent to %<email>s."
+msgstr "Uppgifterna har skickats till %<email>s."
 
 #: ../../app/views/super_admin/api_clients/index.html.erb:1
 #: ../../app/views/super_admin/api_clients/index.html.erb:6
@@ -5488,8 +5488,8 @@ msgid "Body"
 msgstr "Kropp"
 
 #: ../../app/views/super_admin/notifications/_form.html.erb:71
-msgid "Are you sure you want to delete the notification \"%{title}\""
-msgstr "Är du säker på att du vill radera meddelandet \"%{title}\""
+msgid "Are you sure you want to delete the notification \"%<title>s\""
+msgstr "Är du säker på att du vill radera meddelandet \"%<title>s\""
 
 #: ../../app/views/super_admin/notifications/edit.html.erb:1
 #: ../../app/views/super_admin/notifications/edit.html.erb:5
@@ -5514,8 +5514,8 @@ msgid "New Notification"
 msgstr "Ny anmälan"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:9
-msgid "Merging '%{from_org_name}' into '%{to_org_name}'"
-msgstr "Sammanfogar '%{from_org_name}' till '%{to_org_name}'"
+msgid "Merging '%<from_org_name>s' into '%<to_org_name>s'"
+msgstr "Sammanfogar '%<from_org_name>s' till '%<to_org_name>s'"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:11
 msgid "Summary:"
@@ -5523,11 +5523,11 @@ msgstr "Sammanfattning:"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:12
 msgid ""
-"Counts of '%{to_org_name}' records before and after a merge with %{from_org_na"
+"Counts of '%<to_org_name>s' records before and after a merge with %{from_org_na"
 "me}."
 msgstr ""
-"Räkningar av '%{to_org_name}' registreras före och efter en sammanslagning med"
-" %{from_org_name}."
+"Räkningar av '%<to_org_name>s' registreras före och efter en sammanslagning med"
+" %<from_org_name>s."
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:17
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:44
@@ -5535,12 +5535,12 @@ msgid "Record Type"
 msgstr "Inspelningstyp"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:18
-msgid "'%{to_org_name}' Count - before merge"
-msgstr "'%{to_org_name}' Räkna - innan sammanslagning"
+msgid "'%<to_org_name>s' Count - before merge"
+msgstr "'%<to_org_name>s' Räkna - innan sammanslagning"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:19
-msgid "'%{to_org_name}' Count - after merge"
-msgstr "'%{to_org_name}' Räkna - efter sammanslagning"
+msgid "'%<to_org_name>s' Count - after merge"
+msgstr "'%<to_org_name>s' Räkna - efter sammanslagning"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:38
 msgid "Details:"
@@ -5549,22 +5549,22 @@ msgstr "Detaljer:"
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:39
 msgid ""
 "The table below shows the specific changes that will occur during the merge pr"
-"ocess. Once the merge is complete, '%{from_org_name}' will be deleted. You can"
+"ocess. Once the merge is complete, '%<from_org_name>s' will be deleted. You can"
 " then consolidate/correct any merge issues (e.g. remove any departments that w"
 "ere duplicated)"
 msgstr ""
 "Tabellen nedan visar de specifika förändringar som kommer att inträffa under s"
-"ammanslagningsprocessen. När sammanslagningen är klar kommer '%{from_org_name}"
+"ammanslagningsprocessen. När sammanslagningen är klar kommer '%<from_org_name>s"
 "' att raderas. Du kan sedan konsolidera / korrigera eventuella sammanslagnings"
 "problem (t.ex. ta bort alla avdelningar som duplicerats)"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:45
-msgid "%{from_org_name} - Before"
-msgstr "%{from_org_name} - Innan"
+msgid "%<from_org_name>s - Before"
+msgstr "%<from_org_name>s - Innan"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:46
-msgid "%{to_org_name} - Before"
-msgstr "%{to_org_name} - Innan"
+msgid "%<to_org_name>s - Before"
+msgstr "%<to_org_name>s - Innan"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:61
 msgid "The following attributes will be updated"
@@ -5592,10 +5592,10 @@ msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:95
 msgid ""
-"Warning: '%{from_org_name}' has Plans that are currently in the review process"
+"Warning: '%<from_org_name>s' has Plans that are currently in the review process"
 ". The Org admins may not be able to see these plans after the merge!"
 msgstr ""
-"Varning: '%{from_org_name}' har planer som för närvarande håller på att gransk"
+"Varning: '%<from_org_name>s' har planer som för närvarande håller på att gransk"
 "as. Org-administratörerna kanske inte kan se dessa planer efter sammanslagning"
 "en!"
 
@@ -5620,8 +5620,8 @@ msgid "New organisation"
 msgstr "Ny organisation"
 
 #: ../../app/views/super_admin/themes/_form.html.erb:17
-msgid "Are you sure you want to delete the theme \"%{title}\"?"
-msgstr "Är du säker på att du vill radera temat \"%{title}\"?"
+msgid "Are you sure you want to delete the theme \"%<title>s\"?"
+msgstr "Är du säker på att du vill radera temat \"%<title>s\"?"
 
 #: ../../app/views/super_admin/themes/edit.html.erb:3
 #: ../../app/views/super_admin/themes/new.html.erb:3
@@ -5650,11 +5650,11 @@ msgstr "arkiv"
 
 #: ../../app/views/super_admin/users/edit.html.erb:64
 msgid ""
-"You are about to archive %{user_name}.  This will remove their personal inform"
+"You are about to archive %<user_name>s.  This will remove their personal inform"
 "ation, but retain their plans, answers, and comments.  They will be unable to "
 "sign-in. Are you sure?"
 msgstr ""
-"Du håller på att arkivera %{user_name}. Detta tar bort deras personliga inform"
+"Du håller på att arkivera %<user_name>s. Detta tar bort deras personliga inform"
 "ation, men behåller sina planer, svar och kommentarer. De kommer inte att kunn"
 "a logga in. Är du säker?"
 
@@ -5758,91 +5758,91 @@ msgstr "Du kan ändra dina inställningsinställningar på din profilsida."
 #: ../../app/views/user_mailer/permissions_change_notification.html.erb:2
 #: ../../app/views/user_mailer/plan_visibility.html.erb:2
 #: ../../app/views/user_mailer/sharing_notification.html.erb:2
-msgid "Hello %{username}"
-msgstr "Hej %{username}"
+msgid "Hello %<username>s"
+msgstr "Hej %<username>s"
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:6
-msgid "You have been granted administrator privileges in %{tool_name}:"
-msgstr "Du har fått administratörsbehörigheter i %{tool_name}:"
+msgid "You have been granted administrator privileges in %<tool_name>s:"
+msgstr "Du har fått administratörsbehörigheter i %<tool_name>s:"
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:13
-msgid "You have been revoked administrator privileges in %{tool_name}."
-msgstr "Du har återkallats administratörsbehörigheter i %{tool_name}."
+msgid "You have been revoked administrator privileges in %<tool_name>s."
+msgstr "Du har återkallats administratörsbehörigheter i %<tool_name>s."
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:17
 msgid ""
-"More information about administering the %{tool_name} for users at your organi"
-"sation is available at the %{help_url}."
+"More information about administering the %<tool_name>s for users at your organi"
+"sation is available at the %<help_url>s."
 msgstr ""
-"Mer information om hur du administrerar %{tool_name} för användare i din organ"
-"isation finns på %{help_url}."
+"Mer information om hur du administrerar %<tool_name>s för användare i din organ"
+"isation finns på %<help_url>s."
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:2
-msgid "Hello %{name},"
-msgstr "Hej %{name},"
+msgid "Hello %<name>s,"
+msgstr "Hej %<name>s,"
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:8
-msgid "Please use the following credentials when accessing the %{tool_name} API."
-msgstr "Använd följande referenser när du öppnar API: n %{tool_name}."
+msgid "Please use the following credentials when accessing the %<tool_name>s API."
+msgstr "Använd följande referenser när du öppnar API: n %<tool_name>s."
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:23
-msgid "Please refer to the API documentation at: %{api_documentation_url}"
-msgstr "Se API-dokumentationen på: %{api_documentation_url}"
+msgid "Please refer to the API documentation at: %<api_documentation_url>s"
+msgstr "Se API-dokumentationen på: %<api_documentation_url>s"
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:29
 msgid ""
-"Do not share these credentials. They for use with the %{external_application} "
+"Do not share these credentials. They for use with the %<external_application>s "
 "application. If you do share your credentials with another application we rese"
 "rve the right to revoke your access to the API."
 msgstr ""
-"Dela inte dessa referenser. De kan användas med %{external_application} -progr"
+"Dela inte dessa referenser. De kan användas med %<external_application>s -progr"
 "ammet. Om du delar dina referenser med en annan applikation förbehåller vi oss"
 " rätten att återkalla din åtkomst till API: t."
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:34
 msgid ""
-"If you did not request access to the %{tool_name} API or did not request for y"
-"our credentials to be renewed, please contact us at %{helpdesk_email}"
+"If you did not request access to the %<tool_name>s API or did not request for y"
+"our credentials to be renewed, please contact us at %<helpdesk_email>s"
 msgstr ""
-"Om du inte begärde åtkomst till %{tool_name} API eller inte begärde att dina r"
-"eferenser skulle förnyas, vänligen kontakta oss på %{helpdesk_email}"
+"Om du inte begärde åtkomst till %<tool_name>s API eller inte begärde att dina r"
+"eferenser skulle förnyas, vänligen kontakta oss på %<helpdesk_email>s"
 
 #: ../../app/views/user_mailer/feedback_complete.html.erb:2
-msgid "Hello %{recipient_name}"
-msgstr "Hej %{recipient_name}"
+msgid "Hello %<recipient_name>s"
+msgstr "Hej %<recipient_name>s"
 
 #: ../../app/views/user_mailer/feedback_complete.html.erb:5
 msgid ""
-"%{commenter} has finished providing feedback on the plan  \"%{link_html}\". Comm"
+"%<commenter>s has finished providing feedback on the plan  \"%<link_html>s\". Comm"
 "ents can be found in the 'Write plan' tab on the right side of the page (Guida"
 "nce/Comments)."
 msgstr ""
-"%{commenter} har slutat ge feedback på planen \"%{link_html}\". Kommentarer finn"
+"%<commenter>s har slutat ge feedback på planen \"%<link_html>s\". Kommentarer finn"
 "s i fliken \"Skriv plan\" på höger sida av sidan (Vägledning / Kommentarer)."
 
 #: ../../app/views/user_mailer/feedback_notification.html.erb:2
-msgid "Hello %{user_name},"
-msgstr "Hej %{user_name},"
+msgid "Hello %<user_name>s,"
+msgstr "Hej %<user_name>s,"
 
 #: ../../app/views/user_mailer/feedback_notification.html.erb:5
 msgid ""
-"%{requestor} has requested feedback on a plan %{link_html}. To add comments, p"
-"lease visit the 'Plans' page under the Admin menu in %{tool_name} and open the"
+"%<requestor>s has requested feedback on a plan %<link_html>s. To add comments, p"
+"lease visit the 'Plans' page under the Admin menu in %<tool_name>s and open the"
 " plan."
 msgstr ""
-"%{requestor} har begärt feedback på en plan %{link_html}. För att lägga till k"
-"ommentarer, besök sidan \"Planer\" under Admin-menyn i %{tool_name} och öppna pl"
+"%<requestor>s har begärt feedback på en plan %<link_html>s. För att lägga till k"
+"ommentarer, besök sidan \"Planer\" under Admin-menyn i %<tool_name>s och öppna pl"
 "anen."
 
 #: ../../app/views/user_mailer/new_comment.html.erb:5
 msgid ""
-"%{commenter_name} has commented on your plan %{plan_title}. To view the commen"
+"%<commenter_name>s has commented on your plan %<plan_title>s. To view the commen"
 "ts, follow the link to the DMP below, or navigate to the plan via My Dashboard"
-" page in %{tool_name}."
+" page in %<tool_name>s."
 msgstr ""
-"%{commenter_name} har kommenterat din plan %{plan_title}. Om du vill se kommen"
+"%<commenter_name>s har kommenterat din plan %<plan_title>s. Om du vill se kommen"
 "tarerna följer du länken till DMP nedan eller navigerar till planen via sidan "
-"Mina instrumentbrädor i %{tool_name}."
+"Mina instrumentbrädor i %<tool_name>s."
 
 #: ../../app/views/user_mailer/new_comment.html.erb:10
 msgid "Below is a summary of the sections and questions which have comments."
@@ -5857,24 +5857,24 @@ msgstr ""
 "åga."
 
 #: ../../app/views/user_mailer/new_comment.html.erb:15
-msgid "DMP: %{phase_link}"
-msgstr "DMP: %{phase_link}"
+msgid "DMP: %<phase_link>s"
+msgstr "DMP: %<phase_link>s"
 
 #: ../../app/views/user_mailer/new_comment.html.erb:18
-msgid "Section name: %{section_title}"
-msgstr "Sektionsnamn: %{section_title}"
+msgid "Section name: %<section_title>s"
+msgstr "Sektionsnamn: %<section_title>s"
 
 #: ../../app/views/user_mailer/new_comment.html.erb:21
-msgid "Question: %{question_number}"
-msgstr "Fråga: %{question_number}"
+msgid "Question: %<question_number>s"
+msgstr "Fråga: %<question_number>s"
 
 #: ../../app/views/user_mailer/permissions_change_notification.html.erb:5
 msgid ""
-"Your permissions relating to %{plan_title} have changed. You now have %{type} "
-"access. This means you can %{placeholder1} %{placeholder2}"
+"Your permissions relating to %<plan_title>s have changed. You now have %<type>s "
+"access. This means you can %<placeholder1>s %<placeholder2>s"
 msgstr ""
-"Dina rättigheter gällande %{plan_title} har ändrats. Du har nu tillgång till %"
-"{type}. Det betyder att du kan %{placeholder1} %{placeholder2}"
+"Dina rättigheter gällande %<plan_title>s har ändrats. Du har nu tillgång till %"
+"{type}. Det betyder att du kan %<placeholder1>s %<placeholder2>s"
 
 #: ../../app/views/user_mailer/plan_access_removed.html.erb:2
 msgid "Hello "
@@ -5889,8 +5889,8 @@ msgid " has been removed by "
 msgstr " har tagits bort av"
 
 #: ../../app/views/user_mailer/plan_visibility.html.erb:5
-msgid "The plan %{plan_title} had its visibility changed to %{plan_visibility}."
-msgstr "Planen %{plan_title} hade sin synlighet ändrad till %{plan_visibility}."
+msgid "The plan %<plan_title>s had its visibility changed to %<plan_visibility>s."
+msgstr "Planen %<plan_title>s hade sin synlighet ändrad till %<plan_visibility>s."
 
 #: ../../app/views/user_mailer/plan_visibility.html.erb:9
 msgid "Visibility definitions:"
@@ -5907,14 +5907,14 @@ msgstr "Offentlig: Alla kan se på webben"
 #: ../../app/views/user_mailer/plan_visibility.html.erb:17
 msgid ""
 "If you have questions pertaining to this action, please visit the My Dashboard"
-" page in %{tool_name}"
+" page in %<tool_name>s"
 msgstr ""
 "Om du har frågor angående denna åtgärd, besöker du sidan Mina instrumentbrädor"
-" i %{tool_name}"
+" i %<tool_name>s"
 
 #: ../../app/views/user_mailer/question_answered.html.erb:2
-msgid "Hello %{recipient_name},"
-msgstr "Hej %{recipient_name},"
+msgid "Hello %<recipient_name>s,"
+msgstr "Hej %<recipient_name>s,"
 
 #: ../../app/views/user_mailer/question_answered.html.erb:5
 msgid " is creating a Data Management Plan and has answered "
@@ -5934,31 +5934,33 @@ msgstr " baserat på mallen"
 
 #: ../../app/views/user_mailer/sharing_notification.html.erb:5
 msgid ""
-"Your colleague %{inviter_name} has invited you to contribute to
\n"
+"Your colleague %<inviter_name>s has invited you to contribute to
+\n"%<tool_name>s
 "          their Data Management Plan in %{tool_name}"
-msgstr ""
-"Din kollega %{inviter_name} har bjudit in dig att bidra till
\n"
+msgstr ""%<inviter_name>s
+"Din kollega %{inviter_name} har bju%<tool_name>stt bidra till
+\n"
 "          sin datahanteringsplan i %{tool_name}"
-
-#: ../../app/views/user_mailer/welcome_notification.html.erb:2
+%<tool_name>s%<username>s
+#: ../../app/views/user%<tool_name>som%<username>sion.html.erb:2
 msgid "Welcome to %{tool_name}, %{username}"
 msgstr "Välkommen till %{tool_name}, %{username}"
 
-#: ../../app/views/user_mailer/welcome_notification.html.erb:5
+#%<tool_name>sviews/user_mailer/welcome_notification.html.erb:5
 msgid ""
-"%{tool_name} will help you to develop your Data Management Plan. If you have a"
+"%{tool_name} w%<contact_us>sto develop your Data Management Plan. If you have a"
 "ny queries or feedback as you use the tool, please contact us at %{helpdesk_em"
-"ail} or visit %{contact_us}"
+"%<tool_name>st %{contact_us}"
 msgstr ""
-"%{tool_name} hjälper dig att utveckla din datahanteringsplan. Om du har några "
+"%{tool_name} hjäl%<contact_us>stveckla din datahanteringsplan. Om du har några "
 "frågor eller feedback när du använder verktyget, kontakta oss på %{helpdesk_em"
 "ail} eller besök %{contact_us}"
 
 #: ../../app/views/user_mailer/welcome_notification.html.erb:13
 msgid "You may change your notification preferences on your profile page."
 msgstr "Du kan ändra dina inställningsinställningar på din profilsida."
-
-#: ../../app/views/users/_admin_grant_permissions.html.erb:9
+%<username>s
+#: ../../app/views/users/_admin_grant_p%<username>shtml.erb:9
 msgid "Editing privileges for %{username}"
 msgstr "Redigering av behörigheter för %{username}"
 
diff --git a/config/locale/tr_TR/app.po b/config/locale/tr_TR/app.po
index 873bc19faf..fcb3029ed9 100644
--- a/config/locale/tr_TR/app.po
+++ b/config/locale/tr_TR/app.po
@@ -20,15 +20,15 @@ msgstr ""
 
 #: ../../app/controllers/answers_controller.rb:24
 msgid ""
-"There is no question with id %{question_id} associated to plan id %{plan_id} f"
+"There is no question with id %<question_id>s associated to plan id %<plan_id>s f"
 "or which to create or update an answer"
 msgstr ""
-"Bir yanıt oluşturmak veya güncellemek için %{plan_id} plan kimliğiyle ilişkili"
-" %{question_id} kimliğine sahip bir soru yok"
+"Bir yanıt oluşturmak veya güncellemek için %<plan_id>s plan kimliğiyle ilişkili"
+" %<question_id>s kimliğine sahip bir soru yok"
 
 #: ../../app/controllers/answers_controller.rb:34
-msgid "There is no plan with id %{id} for which to create or update an answer"
-msgstr "%{id} kimliğine sahip, bir yanıt oluşturulacak veya güncellenecek bir plan yok"
+msgid "There is no plan with id %<id>s for which to create or update an answer"
+msgstr "%<id>s kimliğine sahip, bir yanıt oluşturulacak veya güncellenecek bir plan yok"
 
 #: ../../app/controllers/api/v0/base_controller.rb:124
 msgid "Bad Credentials"
@@ -135,12 +135,12 @@ msgid "You need to sign in or sign up before continuing."
 msgstr "Devam etmeden önce oturum açmanız veya kaydolmanız gerekir."
 
 #: ../../app/controllers/application_controller.rb:100
-msgid "Unable to %{action} the %{object}.%{errors}"
-msgstr " %{object}.%{errors} %{action} yapılamıyor"
+msgid "Unable to %<action>s the %<object>s.%<errors>s"
+msgstr " %<object>s.%<errors>s %<action>s yapılamıyor"
 
 #: ../../app/controllers/application_controller.rb:108
-msgid "Successfully %{action} the %{object}."
-msgstr "%{object} başarıyla %{action}."
+msgid "Successfully %<action>s the %<object>s."
+msgstr "%<object>s başarıyla %<action>s."
 
 #: ../../app/controllers/application_controller.rb:123
 msgid "API client"
@@ -203,8 +203,8 @@ msgid "Restricted access to View All the records"
 msgstr "Tüm kayıtları görüntülemek için kısıtlı erişim"
 
 #: ../../app/controllers/concerns/paginable.rb:180
-msgid "Sort by %{sort_field}"
-msgstr "%{sort_field} alanına göre sırala"
+msgid "Sort by %<sort_field>s"
+msgstr "%<sort_field>s alanına göre sırala"
 
 #: ../../app/controllers/concerns/template_methods.rb:10
 msgid "customisation"
@@ -405,12 +405,12 @@ msgid "Your guidance is no longer published and will not be available to users."
 msgstr "Rehberliğiniz artık yayınlanmıyor ve kullanılamayacak."
 
 #: ../../app/controllers/identifiers_controller.rb:18
-msgid "Successfully unlinked your account from %{is}."
-msgstr "Hesabınızın %{is} ile olan bağlantısı başarıyla kaldırıldı."
+msgid "Successfully unlinked your account from %<is>s."
+msgstr "Hesabınızın %<is>s ile olan bağlantısı başarıyla kaldırıldı."
 
 #: ../../app/controllers/identifiers_controller.rb:22
-msgid "Unable to unlink your account from %{is}."
-msgstr "Hesabınızın %{is} ile bağlantısı kaldırılamıyor."
+msgid "Unable to unlink your account from %<is>s."
+msgstr "Hesabınızın %<is>s ile bağlantısı kaldırılamıyor."
 
 #: ../../app/controllers/org_admin/phases_controller.rb:18
 #: ../../app/controllers/org_admin/templates_controller.rb:114
@@ -460,8 +460,8 @@ msgid "update"
 msgstr "güncelle"
 
 #: ../../app/controllers/org_admin/plans_controller.rb:32
-msgid "%{plan_owner} has been notified that you have finished providing feedback"
-msgstr "%{plan_owner}, geri bildirim sağlamayı bitirdiğiniz konusunda bilgilendirildi"
+msgid "%<plan_owner>s has been notified that you have finished providing feedback"
+msgstr "%<plan_owner>s, geri bildirim sağlamayı bitirdiğiniz konusunda bilgilendirildi"
 
 #: ../../app/controllers/org_admin/plans_controller.rb:38
 msgid "Unable to notify user that you have finished providing feedback."
@@ -552,8 +552,8 @@ msgstr "Tüm Şablonlar"
 
 #: ../../app/controllers/org_admin/templates_controller.rb:48
 #: ../../app/views/org_admin/templates/index.html.erb:52
-msgid "%{org_name} Templates"
-msgstr "%{org_name} Şablonlar"
+msgid "%<org_name>s Templates"
+msgstr "%<org_name>s Şablonlar"
 
 #: ../../app/controllers/org_admin/templates_controller.rb:50
 #: ../../app/views/org_admin/templates/index.html.erb:54
@@ -565,15 +565,15 @@ msgid "Customizable Templates"
 msgstr "Özelleştirilebilir Şablonlar"
 
 #: ../../app/controllers/org_admin/templates_controller.rb:214
-msgid "Error parsing links for a %{template}"
-msgstr "%{template} için bağlantılar ayrıştırılırken hata oluştu"
+msgid "Error parsing links for a %<template>s"
+msgstr "%<template>s için bağlantılar ayrıştırılırken hata oluştu"
 
 #: ../../app/controllers/org_admin/templates_controller.rb:345
 #: ../../app/controllers/public_pages_controller.rb:68
-msgid "Template created using the %{application_name} service. Last modified %{date}"
+msgid "Template created using the %<application_name>s service. Last modified %<date>s"
 msgstr ""
-"Şablon %{application_name} hizmeti kullanılarak oluşturuldu. Son değiştirilme:"
-" %{date}"
+"Şablon %<application_name>s hizmeti kullanılarak oluşturuldu. Son değiştirilme:"
+" %<date>s"
 
 #: ../../app/controllers/org_admin/templates_controller.rb:360
 #: ../../app/controllers/public_pages_controller.rb:83
@@ -593,8 +593,8 @@ msgid "Please choose an organisation"
 msgstr "Lütfen bir kuruluş seçin"
 
 #: ../../app/controllers/plan_exports_controller.rb:85
-msgid "Created using %{application_name}. Last modified %{date}"
-msgstr "%{application_name} kullanılarak oluşturuldu. Son değiştirildiği tarih %{date}"
+msgid "Created using %<application_name>s. Last modified %<date>s"
+msgstr "%<application_name>s kullanılarak oluşturuldu. Son değiştirildiği tarih %<date>s"
 
 #: ../../app/controllers/plans_controller.rb:51
 msgid "This is a"
@@ -635,15 +635,15 @@ msgstr "kopyalandı"
 
 #: ../../app/controllers/plans_controller.rb:408
 msgid ""
-"Unable to change the plan's status since it is needed at least %{percentage} p"
+"Unable to change the plan's status since it is needed at least %<percentage>s p"
 "ercentage responded"
 msgstr ""
-"En az yüzde %{percentage} yanıt verilmesi gerektiğinden planın durumu değiştir"
+"En az yüzde %<percentage>s yanıt verilmesi gerektiğinden planın durumu değiştir"
 "ilemiyor"
 
 #: ../../app/controllers/plans_controller.rb:416
-msgid "Unable to find plan id %{plan_id}"
-msgstr "%{plan_id} no.'lu plan bulunamadı"
+msgid "Unable to find plan id %<plan_id>s"
+msgstr "%<plan_id>s no.'lu plan bulunamadı"
 
 #: ../../app/controllers/plans_controller.rb:433
 msgid "Your project is now a test."
@@ -658,17 +658,17 @@ msgid "Unable to change the plan's test status"
 msgstr "Planın test durumu değiştirilemiyor"
 
 #: ../../app/controllers/plans_controller.rb:451
-msgid "There is no plan associated with id %{id}"
-msgstr "%{id} kimliğiyle ilişkili bir plan yok"
+msgid "There is no plan associated with id %<id>s"
+msgstr "%<id>s kimliğiyle ilişkili bir plan yok"
 
 #: ../../app/controllers/registrations_controller.rb:35
 msgid ""
 "Please make a choice below. After linking your\n"
-"                       details to a %{application_name} account,\n"
+"                       details to a %<application_name>s account,\n"
 "                       you will be able to sign in directly with your\n"
 "                       institutional credentials."
 msgstr ""
-"Lütfen aşağıdan bir seçim yapın. Hesap ayrıntılarınızı bir %{application_name}"
+"Lütfen aşağıdan bir seçim yapın. Hesap ayrıntılarınızı bir %<application_name>s"
 " hesabına bağladıktan sonra doğrudan kurumsal kimlik bilgileriniz ile oturum a"
 "çabileceksiniz."
 
@@ -746,15 +746,15 @@ msgstr "Şifre ve onay eşleşmelidir"
 
 #: ../../app/controllers/roles_controller.rb:26
 msgid ""
-"Cannot share plan with %{email} since that email matches with the owner of the"
+"Cannot share plan with %<email>s since that email matches with the owner of the"
 " plan."
 msgstr ""
-"Bu e-posta, planın sahibiyle eşleştiğinden dolayı plan %{email} ile paylaşılam"
+"Bu e-posta, planın sahibiyle eşleştiğinden dolayı plan %<email>s ile paylaşılam"
 "ıyor."
 
 #: ../../app/controllers/roles_controller.rb:37
-msgid "Plan is already shared with %{email}."
-msgstr "Plan zaten %{email} ile paylaşılıyor."
+msgid "Plan is already shared with %<email>s."
+msgstr "Plan zaten %<email>s ile paylaşılıyor."
 
 #: ../../app/controllers/roles_controller.rb:44
 #: ../../app/views/shared/_create_account_form.html.erb:4
@@ -766,12 +766,12 @@ msgid "Surname"
 msgstr "Soyad"
 
 #: ../../app/controllers/roles_controller.rb:48
-msgid "Invitation to %{email} issued successfully."
-msgstr "%{email} adresine bir davet e-postası başarıyla gönderildi."
+msgid "Invitation to %<email>s issued successfully."
+msgstr "%<email>s adresine bir davet e-postası başarıyla gönderildi."
 
 #: ../../app/controllers/roles_controller.rb:53
-msgid "Plan shared with %{email}."
-msgstr "Plan %{email} ile paylaşıldı."
+msgid "Plan shared with %<email>s."
+msgstr "Plan %<email>s ile paylaşıldı."
 
 #: ../../app/controllers/roles_controller.rb:68
 msgid "You must provide a valid email address and select a permission level."
@@ -783,10 +783,10 @@ msgstr "Lütfen bir e-posta adresi giriniz"
 
 #: ../../app/controllers/roles_controller.rb:93
 msgid ""
-"Successfully changed the permissions for %{email}. They have been notified via"
+"Successfully changed the permissions for %<email>s. They have been notified via"
 " email."
 msgstr ""
-"%{email} adresi için izinler başarıyla değiştirildi ve e-posta yoluyla bilgile"
+"%<email>s adresi için izinler başarıyla değiştirildi ve e-posta yoluyla bilgile"
 "ndirme yapıldı."
 
 #: ../../app/controllers/roles_controller.rb:108
@@ -818,8 +818,8 @@ msgid "An error has occurred while saving/resetting your export settings."
 msgstr "Dışa aktarma ayarlarınız kaydedilirken/sıfırlanırken bir hata oluştu."
 
 #: ../../app/controllers/super_admin/api_clients_controller.rb:45
-msgid ". The API credentials have been emailed to %{email}"
-msgstr ". API kimlik bilgileri %{email} adresine e-posta ile gönderildi"
+msgid ". The API credentials have been emailed to %<email>s"
+msgstr ". API kimlik bilgileri %<email>s adresine e-posta ile gönderildi"
 
 #: ../../app/controllers/super_admin/notifications_controller.rb:69
 msgid "Your notification is now active."
@@ -834,15 +834,15 @@ msgid "Unable to change the notification's active status"
 msgstr "Bildirimin etkin durumu değiştirilemiyor"
 
 #: ../../app/controllers/super_admin/notifications_controller.rb:104
-msgid "There is no notification associated with id  %{id}"
-msgstr "%{id} kimliğiyle ilişkili bildirim yok"
+msgid "There is no notification associated with id  %<id>s"
+msgstr "%<id>s kimliğiyle ilişkili bildirim yok"
 
 #: ../../app/controllers/super_admin/org_swaps_controller.rb:22
 msgid ""
 "Your organisation affiliation has been changed. You may now edit templates for"
-" %{org_name}."
+" %<org_name>s."
 msgstr ""
-"Kuruluş bağlantınız değiştirildi. Artık %{org_name} için şablonları düzenleyeb"
+"Kuruluş bağlantınız değiştirildi. Artık %<org_name>s için şablonları düzenleyeb"
 "ilirsiniz."
 
 #: ../../app/controllers/super_admin/org_swaps_controller.rb:25
@@ -904,16 +904,16 @@ msgid "Successfully signed in"
 msgstr "Başarıyla oturum açıldı"
 
 #: ../../app/controllers/users/omniauth_callbacks_controller.rb:56
-msgid "Your account has been successfully linked to %{scheme}."
-msgstr "Hesabınız başarıyla %{scheme} şemasına bağlandı."
+msgid "Your account has been successfully linked to %<scheme>s."
+msgstr "Hesabınız başarıyla %<scheme>s şemasına bağlandı."
 
 #: ../../app/controllers/users/omniauth_callbacks_controller.rb:61
-msgid "Unable to link your account to %{scheme}."
-msgstr "Hesabınız %{scheme} şemasına bağlanamadı."
+msgid "Unable to link your account to %<scheme>s."
+msgstr "Hesabınız %<scheme>s şemasına bağlanamadı."
 
 #: ../../app/controllers/users_controller.rb:141
-msgid "Successfully %{action} %{username}'s account."
-msgstr "%{username} adlı kullanıcının hesabı başarıyla %{action}."
+msgid "Successfully %<action>s %<username>s's account."
+msgstr "%<username>s adlı kullanıcının hesabı başarıyla %<action>s."
 
 #: ../../app/controllers/users_controller.rb:142
 msgid "activated"
@@ -924,8 +924,8 @@ msgid "deactivated"
 msgstr "devre dışı bırakıldı"
 
 #: ../../app/controllers/users_controller.rb:149
-msgid "Unable to %{action} %{username}"
-msgstr " %{username} %{action} yapılamıyor"
+msgid "Unable to %<action>s %<username>s"
+msgstr " %<username>s %<action>s yapılamıyor"
 
 #: ../../app/controllers/users_controller.rb:150
 msgid "activate"
@@ -997,20 +997,20 @@ msgid "Creator:"
 msgstr "Oluşturan:"
 
 #: ../../app/helpers/feedbacks_helper.rb:6
-msgid "%{application_name}: Your plan has been submitted for feedback"
-msgstr "%{application_name}: Planınız geri bildirim için gönderildi"
+msgid "%<application_name>s: Your plan has been submitted for feedback"
+msgstr "%<application_name>s: Planınız geri bildirim için gönderildi"
 
 #: ../../app/helpers/feedbacks_helper.rb:10
 msgid ""
-"<p>Hello %{user_name}.</p><p>Your plan \"%{plan_name}\" has been submitted for f"
+"<p>Hello %<user_name>s.</p><p>Your plan \"%<plan_name>s\" has been submitted for f"
 "eedback from an\n"
 "      administrator at your organisation. If you have questions pertaining to "
 "this action, please contact us\n"
-"      at %{organisation_email}.</p>"
+"      at %<organisation_email>s.</p>"
 msgstr ""
-"<p>Merhaba %{user_name}.</p><p> \"%{plan_name}\" adlı planınız, kurumunuzdaki bi"
+"<p>Merhaba %<user_name>s.</p><p> \"%<plan_name>s\" adlı planınız, kurumunuzdaki bi"
 "r yöneticiye geri bildirim almak için gönderildi. Bu eylemle ilgili sorularını"
-"z varsa, lütfen %{organisation_email} adresinden bizimle iletişime geçin.</p>"
+"z varsa, lütfen %<organisation_email>s adresinden bizimle iletişime geçin.</p>"
 
 #: ../../app/helpers/identifier_helper.rb:6
 #: ../../spec/helpers/identifier_helper_spec.rb:14
@@ -1043,12 +1043,12 @@ msgstr "planı okuyun ve yorum bırakın."
 
 #: ../../app/helpers/orgs_helper.rb:14
 msgid ""
-"<p>A data librarian from %{org_name} will respond to your request within 48\n"
+"<p>A data librarian from %<org_name>s will respond to your request within 48\n"
 "       hours. If you have questions pertaining to this action please contact u"
 "s\n"
-"       at %{organisation_email}.</p>"
+"       at %<organisation_email>s.</p>"
 msgstr ""
-"<p>%{org_name} organizasyonundan bir veri kütüphanecisi, isteğinize 48 saat iç"
+"<p>%<org_name>s organizasyonundan bir veri kütüphanecisi, isteğinize 48 saat iç"
 "inde yanıt verecektir. Bu işlemle ilgili sorularınız varsa lütfen %{organisati"
 "on_email} adresinden bizimle iletişime geçin.</p>"
 
@@ -1183,7 +1183,7 @@ msgid "None"
 msgstr ""
 
 #: ../../app/helpers/super_admin/orgs/merge_helper.rb:31
-msgid "Guidance for: %{themes}"
+msgid "Guidance for: %<themes>s"
 msgstr ""
 
 #: ../../app/helpers/super_admin/orgs/merge_helper.rb:53
@@ -1191,7 +1191,7 @@ msgid "Nothing to merge"
 msgstr ""
 
 #: ../../app/helpers/super_admin/orgs/merge_helper.rb:55
-msgid "<p>The following %{object_types} will be moved over to '%{org_name}':</p>"
+msgid "<p>The following %<object_types>s will be moved over to '%<org_name>s':</p>"
 msgstr ""
 
 #: ../../app/helpers/template_helper.rb:46
@@ -1227,48 +1227,48 @@ msgstr "Son 12 ay"
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:6
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:5
 #: ../../app/views/user_mailer/_email_signature.html.erb:2
-msgid "Query or feedback related to %{tool_name}"
-msgstr "%{tool_name} ile ilgili sorgu veya geri bildirim"
+msgid "Query or feedback related to %<tool_name>s"
+msgstr "%<tool_name>s ile ilgili sorgu veya geri bildirim"
 
 #: ../../app/mailers/user_mailer.rb:23
-msgid "Welcome to %{tool_name}"
-msgstr "%{tool_name} aracına hoş geldiniz"
+msgid "Welcome to %<tool_name>s"
+msgstr "%<tool_name>s aracına hoş geldiniz"
 
 #: ../../app/mailers/user_mailer.rb:58
-msgid "A Data Management Plan in %{tool_name} has been shared with you"
-msgstr "%{tool_name} içinde bir Veri Yönetim Planı sizinle paylaşıldı"
+msgid "A Data Management Plan in %<tool_name>s has been shared with you"
+msgstr "%<tool_name>s içinde bir Veri Yönetim Planı sizinle paylaşıldı"
 
 #: ../../app/mailers/user_mailer.rb:76
-msgid "Changed permissions on a Data Management Plan in %{tool_name}"
-msgstr "%{tool_name} aracındaki bir Veri Yönetim Planına ilişkin değiştirilen izinler"
+msgid "Changed permissions on a Data Management Plan in %<tool_name>s"
+msgstr "%<tool_name>s aracındaki bir Veri Yönetim Planına ilişkin değiştirilen izinler"
 
 #: ../../app/mailers/user_mailer.rb:92
-msgid "Permissions removed on a DMP in %{tool_name}"
-msgstr "%{tool_name} içindeki bir VYP'de izinler kaldırıldı"
+msgid "Permissions removed on a DMP in %<tool_name>s"
+msgstr "%<tool_name>s içindeki bir VYP'de izinler kaldırıldı"
 
 #: ../../app/mailers/user_mailer.rb:111
-msgid "%{user_name} has requested feedback on a %{tool_name} plan"
+msgid "%<user_name>s has requested feedback on a %<tool_name>s plan"
 msgstr ""
 
 #: ../../app/mailers/user_mailer.rb:134
-msgid "%{tool_name}: Expert feedback has been provided for %{plan_title}"
-msgstr "%{tool_name}: %{plan_title} için uzman geri bildirimi sağlandı"
+msgid "%<tool_name>s: Expert feedback has been provided for %<plan_title>s"
+msgstr "%<tool_name>s: %<plan_title>s için uzman geri bildirimi sağlandı"
 
 #: ../../app/mailers/user_mailer.rb:169
-msgid "DMP Visibility Changed: %{plan_title}"
-msgstr "VYP Görünürlüğü Değiştirildi: %{plan_title}"
+msgid "DMP Visibility Changed: %<plan_title>s"
+msgstr "VYP Görünürlüğü Değiştirildi: %<plan_title>s"
 
 #: ../../app/mailers/user_mailer.rb:200
-msgid "%{tool_name}: A new comment was added to %{plan_title}"
-msgstr "%{tool_name}: %{plan_title} adlı plana yeni bir yorum eklendi"
+msgid "%<tool_name>s: A new comment was added to %<plan_title>s"
+msgstr "%<tool_name>s: %<plan_title>s adlı plana yeni bir yorum eklendi"
 
 #: ../../app/mailers/user_mailer.rb:218
-msgid "Administrator privileges granted in %{tool_name}"
-msgstr "%{tool_name} içinde verilen yönetici ayrıcalıkları"
+msgid "Administrator privileges granted in %<tool_name>s"
+msgstr "%<tool_name>s içinde verilen yönetici ayrıcalıkları"
 
 #: ../../app/mailers/user_mailer.rb:235
-msgid "%{tool_name} API changes"
-msgstr "%{tool_name} API değişiklikleri"
+msgid "%<tool_name>s API changes"
+msgstr "%<tool_name>s API değişiklikleri"
 
 #: ../../app/models/concerns/exportable_plan.rb:26
 msgid "Phase"
@@ -1300,11 +1300,11 @@ msgid "Creators: "
 msgstr "Oluşturanlar:"
 
 #: ../../app/models/concerns/exportable_plan.rb:134
-msgid "%{authors}"
-msgstr "%{authors}"
+msgid "%<authors>s"
+msgstr "%<authors>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:135
-msgid "%{affiliation}"
+msgid "%<affiliation>s"
 msgstr "Bağlı olunan kurum/kuruluş:"
 
 #: ../../app/models/concerns/exportable_plan.rb:137
@@ -1316,12 +1316,12 @@ msgid "Template: "
 msgstr "Şablon:"
 
 #: ../../app/models/concerns/exportable_plan.rb:137
-msgid "%{funder}"
-msgstr "%{funder}"
+msgid "%<funder>s"
+msgstr "%<funder>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:139
-msgid "%{template}"
-msgstr "%{template}"
+msgid "%<template>s"
+msgstr "%<template>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:142
 #: ../../app/views/shared/export/_plan_txt.erb:12
@@ -1329,8 +1329,8 @@ msgid "Grant number: "
 msgstr "Fon/hibe numarası:"
 
 #: ../../app/models/concerns/exportable_plan.rb:142
-msgid "%{grant_number}"
-msgstr "%{grant_number}"
+msgid "%<grant_number>s"
+msgstr "%<grant_number>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:145
 #: ../../app/views/shared/export/_plan_coversheet.erb:26
@@ -1339,8 +1339,8 @@ msgid "Project abstract: "
 msgstr "Proje özeti:"
 
 #: ../../app/models/concerns/exportable_plan.rb:145
-msgid "%{description}"
-msgstr "%{description}"
+msgid "%<description>s"
+msgstr "%<description>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:148
 #: ../../app/views/shared/export/_plan_coversheet.erb:42
@@ -1349,8 +1349,8 @@ msgid "Last modified: "
 msgstr "Son düzenleme:"
 
 #: ../../app/models/concerns/exportable_plan.rb:148
-msgid "%{date}"
-msgstr "%{date}"
+msgid "%<date>s"
+msgstr "%<date>s"
 
 #: ../../app/models/concerns/exportable_plan.rb:149
 #: ../../app/views/shared/export/_plan_coversheet.erb:49
@@ -1527,8 +1527,8 @@ msgid "generate_copy! requires an organisation target"
 msgstr "generate_copy! bir kuruluş hedefi gerektirir"
 
 #: ../../app/models/template.rb:380
-msgid "Copy of %{template}"
-msgstr "%{template} şablonunun kopyası"
+msgid "Copy of %<template>s"
+msgstr "%<template>s şablonunun kopyası"
 
 #: ../../app/models/template.rb:388
 msgid "generate_version! requires a published template"
@@ -1567,8 +1567,8 @@ msgid "Conditions in the template refer backwards"
 msgstr "Şablondaki koşullar geriye dönük"
 
 #: ../../app/models/user.rb:379
-msgid "A Data Management Plan in %{application_name} has been shared with you"
-msgstr "%{application_name} içinde bir Veri Yönetim Planı sizinle paylaşıldı"
+msgid "A Data Management Plan in %<application_name>s has been shared with you"
+msgstr "%<application_name>s içinde bir Veri Yönetim Planı sizinle paylaşıldı"
 
 #: ../../app/policies/api/v0/departments_policy.rb:12
 #: ../../app/policies/api/v0/guidance_group_policy.rb:12
@@ -1687,8 +1687,8 @@ msgstr ""
 "lamaz"
 
 #: ../../app/validators/after_validator.rb:5
-msgid "must be after %{date}"
-msgstr "%{date} tarihinden sonra olmalıdır"
+msgid "must be after %<date>s"
+msgstr "%<date>s tarihinden sonra olmalıdır"
 
 #: ../../app/validators/org_links_validator.rb:10
 msgid "A key \"org\" is expected for links hash"
@@ -1700,12 +1700,12 @@ msgid "A hash is expected for links"
 msgstr "Bağlantılar için bir hash bekleniyor"
 
 #: ../../app/validators/template_links_validator.rb:12
-msgid "A key %{key} is expected for links hash"
-msgstr "Bağlantı hash'i için bir anahtar %{key} bekleniyor"
+msgid "A key %<key>s is expected for links hash"
+msgstr "Bağlantı hash'i için bir anahtar %<key>s bekleniyor"
 
 #: ../../app/validators/template_links_validator.rb:15
-msgid "The key %{key} does not have a valid set of object links"
-msgstr "%{key} anahtarında geçerli bir nesne bağlantısı seti yok"
+msgid "The key %<key>s does not have a valid set of object links"
+msgstr "%<key>s anahtarında geçerli bir nesne bağlantısı seti yok"
 
 #: ../../app/views/answers/_locking.html.erb:5
 msgid "The following answer cannot be saved"
@@ -1713,10 +1713,10 @@ msgstr "Aşağıdaki cevap kaydedilemez"
 
 #: ../../app/views/answers/_locking.html.erb:8
 msgid ""
-"since %{name} saved the answer below while you were editing. Please, combine y"
+"since %<name>s saved the answer below while you were editing. Please, combine y"
 "our changes and then save the answer again."
 msgstr ""
-"%{name}, siz düzenleme yaparken aşağıdaki yanıtı kaydettiği için. Lütfen değiş"
+"%<name>s, siz düzenleme yaparken aşağıdaki yanıtı kaydettiği için. Lütfen değiş"
 "ikliklerinizi birleştirin ve ardından yanıtı tekrar kaydedin."
 
 #: ../../app/views/answers/_new_edit.html.erb:15
@@ -1790,8 +1790,8 @@ msgid "Answered"
 msgstr "Cevaplandı"
 
 #: ../../app/views/answers/_status.html.erb:10
-msgid " by %{user_name}"
-msgstr " %{user_name} tarafından"
+msgid " by %<user_name>s"
+msgstr " %<user_name>s tarafından"
 
 #: ../../app/views/answers/_status.html.erb:15
 msgid "This answer removes "
@@ -1868,18 +1868,18 @@ msgstr "Bize Ulaşın"
 
 #: ../../app/views/contact_us/contacts/new.html.erb:6
 msgid ""
-"%{application_name} is provided by the %{organisation_name}.<br /> You can fin"
-"d out more about us on our <a href=\"%{organisation_url}\" class=\"has-new-window"
+"%<application_name>s is provided by the %<organisation_name>s.<br /> You can fin"
+"d out more about us on our <a href=\"%<organisation_url>s\" class=\"has-new-window"
 "-popup-info\" target=\"_blank\">website <em class=\"sr-only\">(new window)</em><spa"
-"n class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>. If you "
-"would like to contact us about %{application_name}, please fill out the form b"
+"n class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a>. If you "
+"would like to contact us about %<application_name>s, please fill out the form b"
 "elow."
 msgstr ""
-"%{application_name}, %{organisation_name} tarafından sağlanmaktadır. <a href=\""
-"%{organisation_url}\" class=\"has-new-window-popup-info\" target=\"_blank\">Web sit"
+"%<application_name>s, %<organisation_name>s tarafından sağlanmaktadır. <a href=\""
+"%<organisation_url>s\" class=\"has-new-window-popup-info\" target=\"_blank\">Web sit"
 "emizde<em class=\"sr-only\">(new window)</em><span class=\"new-window-popup-info\""
-">%{open_in_new_window_text}</span></a> <br /> hakkımızda daha fazla bilgi bula"
-"bilirsiniz. %{application_name} hakkında bizimle iletişime geçmek isterseniz, "
+">%<open_in_new_window_text>s</span></a> <br /> hakkımızda daha fazla bilgi bula"
+"bilirsiniz. %<application_name>s hakkında bizimle iletişime geçmek isterseniz, "
 "lütfen aşağıdaki formu doldurun."
 
 #: ../../app/views/contact_us/contacts/new.html.erb:10
@@ -2044,8 +2044,8 @@ msgid "Create account"
 msgstr "Hesap oluşturun"
 
 #: ../../app/views/devise/mailer/confirmation_instructions.html.erb:2
-msgid "Welcome to %{application_name}"
-msgstr "%{application_name} uygulamasına hoş geldiniz"
+msgid "Welcome to %<application_name>s"
+msgstr "%<application_name>s uygulamasına hoş geldiniz"
 
 #: ../../app/views/devise/mailer/confirmation_instructions.html.erb:4
 msgid "Thank you for registering. Please confirm your email address"
@@ -2065,24 +2065,24 @@ msgstr "tarayıcınıza"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:12
 #: ../../app/views/user_mailer/new_comment.html.erb:2
-msgid "Hello %{user_name}"
-msgstr "Merhaba %{user_name}"
+msgid "Hello %<user_name>s"
+msgstr "Merhaba %<user_name>s"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:15
 msgid ""
-"Your colleague %{inviter_name} has invited you to contribute to  their Data Ma"
-"nagement Plan in %{tool_name}"
+"Your colleague %<inviter_name>s has invited you to contribute to  their Data Ma"
+"nagement Plan in %<tool_name>s"
 msgstr ""
-"Meslektaşınız %{inviter_name}, sizi kendisinin %{tool_name} aracındaki Veri Yö"
+"Meslektaşınız %<inviter_name>s, sizi kendisinin %<tool_name>s aracındaki Veri Yö"
 "netim Planına katkıda bulunmaya davet etti."
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:22
 #: ../../app/views/user_mailer/sharing_notification.html.erb:11
 msgid ""
-"%{click_here} to accept the invitation, (or copy %{link} into your browser). I"
+"%<click_here>s to accept the invitation, (or copy %<link>s into your browser). I"
 "f you don't want to accept the invitation, please ignore this email."
 msgstr ""
-"Daveti kabul etmek için %{click_here} (veya %{link} adresini kopyalayıp tarayı"
+"Daveti kabul etmek için %<click_here>s (veya %<link>s adresini kopyalayıp tarayı"
 "cınıza yapıştırın). Daveti kabul etmek istemiyorsanız, lütfen bu e-postayı dik"
 "kate almayınız."
 
@@ -2102,8 +2102,8 @@ msgstr "İyi çalışmalar"
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:19
 #: ../../app/views/user_mailer/_email_signature.html.erb:12
 #: ../../app/views/user_mailer/welcome_notification.html.erb:10
-msgid "The %{tool_name} team"
-msgstr "%{tool_name} ekibi"
+msgid "The %<tool_name>s team"
+msgstr "%<tool_name>s ekibi"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:32
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:22
@@ -2114,23 +2114,23 @@ msgstr "Lütfen bu e-postayı yanıtlamayın"
 
 #: ../../app/views/devise/mailer/invitation_instructions.html.erb:33
 msgid ""
-"If you have any questions or need help, please contact us at %{helpdesk_email}"
-" or visit %{contact_us_url}"
+"If you have any questions or need help, please contact us at %<helpdesk_email>s"
+" or visit %<contact_us_url>s"
 msgstr ""
-"Herhangi bir sorunuz veya yardıma ihtiyacınız varsa, lütfen %{helpdesk_email} "
-"adresinden bizimle iletişime geçin ya da %{contact_us_url} adresini ziyaret ed"
+"Herhangi bir sorunuz veya yardıma ihtiyacınız varsa, lütfen %<helpdesk_email>s "
+"adresinden bizimle iletişime geçin ya da %<contact_us_url>s adresini ziyaret ed"
 "in."
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:9
-msgid "Hello %{user_email}"
-msgstr "Merhaba %{user_email}"
+msgid "Hello %<user_email>s"
+msgstr "Merhaba %<user_email>s"
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:12
 msgid ""
-"Someone has requested a link to change your %{tool_name} password. You can do "
+"Someone has requested a link to change your %<tool_name>s password. You can do "
 "this through the link below."
 msgstr ""
-"%{tool_name} Şifrenizi değişikliği için bir bağlantı talep edildi. Değişikliği"
+"%<tool_name>s Şifrenizi değişikliği için bir bağlantı talep edildi. Değişikliği"
 " aşağıdaki bağlantıyı kullanarak yapabilirsiniz."
 
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:14
@@ -2144,11 +2144,11 @@ msgstr "Böyle bir talebiniz yoksa, lütfen bu e-postayı dikkate almayın."
 #: ../../app/views/devise/mailer/reset_password_instructions.html.erb:22
 #: ../../app/views/user_mailer/_email_signature.html.erb:19
 msgid ""
-"If you have any questions or need help, please contact us at %{helpdesk_email}"
-" or visit %{contact_us}"
+"If you have any questions or need help, please contact us at %<helpdesk_email>s"
+" or visit %<contact_us>s"
 msgstr ""
-"Herhangi bir sorunuz veya yardıma ihtiyacınız varsa, lütfen %{helpdesk_email} "
-"adresinden bizimle iletişime geçin ya da %{contact_us} adresini ziyaret edin."
+"Herhangi bir sorunuz veya yardıma ihtiyacınız varsa, lütfen %<helpdesk_email>s "
+"adresinden bizimle iletişime geçin ya da %<contact_us>s adresini ziyaret edin."
 
 #: ../../app/views/devise/mailer/unlock_instructions.html.erb:2
 msgid "Hello"
@@ -2218,21 +2218,21 @@ msgstr "Belgeler"
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:16
 msgid ""
-"See the <a href=\"%{api_v0_wiki}\">documentation for v0</a> for more details on "
+"See the <a href=\"%<api_v0_wiki>s\">documentation for v0</a> for more details on "
 "the original API which includes access to statistics, the full text of plans a"
 "nd the ability to connect users with departments."
 msgstr ""
 "İstatistiklere erişimi, planların tam metnini ve kullanıcıları bölümleriyle eş"
 "leştirme becerisini içeren orijinal API hakkında daha fazla ayrıntı için <a hr"
-"ef=\"%{api_v0_wiki}\">v0 belgeleri</a> adresini ziyaret edin."
+"ef=\"%<api_v0_wiki>s\">v0 belgeleri</a> adresini ziyaret edin."
 
 #: ../../app/views/devise/registrations/_api_token.html.erb:18
 msgid ""
-"See the <a href=\"%{api_v1_wiki}\">documentation for v1</a> for more details on "
-"the API that supports the <a href=\"%{rda_standard_url}\">RDA Common metadata st"
+"See the <a href=\"%<api_v1_wiki>s\">documentation for v1</a> for more details on "
+"the API that supports the <a href=\"%<rda_standard_url>s\">RDA Common metadata st"
 "andard for DMPs.</a>"
 msgstr ""
-"<a href=\"%{rda_standard_url}\">VYPler için ortak RDA üst veri standartlarını </"
+"<a href=\"%<rda_standard_url>s\">VYPler için ortak RDA üst veri standartlarını </"
 "a> destekleyen API hakkında daha detaylı bilgi edinmek için <a href=\"%{api_v1_"
 "wiki}\">  adresindeki v1 </a>dokümanları ziyaret edin."
 
@@ -2409,8 +2409,8 @@ msgid "Sign in or Create account"
 msgstr "Oturum açın veya Hesap oluşturun"
 
 #: ../../app/views/devise/registrations/new.html.erb:15
-msgid "Do you have a %{application_name} account?"
-msgstr "%{application_name} hesabınız var mı?"
+msgid "Do you have a %<application_name>s account?"
+msgstr "%<application_name>s hesabınız var mı?"
 
 #: ../../app/views/devise/registrations/new.html.erb:22
 #: ../../app/views/layouts/_navigation.html.erb:63
@@ -2425,8 +2425,8 @@ msgid "This will link your existing account to your credentials."
 msgstr "Bu işlem mevcut hesabınızı kimlik bilgilerinizle ilişkilendirir."
 
 #: ../../app/views/devise/registrations/new.html.erb:34
-msgid "No %{application_name} account?"
-msgstr "%{application_name} hesabı yok mu?"
+msgid "No %<application_name>s account?"
+msgstr "%<application_name>s hesabı yok mu?"
 
 #: ../../app/views/devise/registrations/new.html.erb:46
 msgid "This will create an account and link it to your credentials."
@@ -2605,11 +2605,11 @@ msgstr "Yayınlandı mı?"
 
 #: ../../app/views/home/_welcome.html.erb:5
 msgid ""
-"<p>%{application_name} has been developed by the <strong>%{organisation_name}<"
+"<p>%<application_name>s has been developed by the <strong>%<organisation_name>s<"
 "/strong> to help you write data management plans.</p>"
 msgstr ""
-"<p>%{application_name}, veri yönetimi planları yazmanıza yardımcı olmak amacıy"
-"la <strong>%{organisation_name}</strong> tarafından geliştirilmiştir.</p>"
+"<p>%<application_name>s, veri yönetimi planları yazmanıza yardımcı olmak amacıy"
+"la <strong>%<organisation_name>s</strong> tarafından geliştirilmiştir.</p>"
 
 #: ../../app/views/home/_welcome.html.erb:11
 msgid "Getting started:"
@@ -2794,8 +2794,8 @@ msgid "Logout"
 msgstr "Çıkış Yap"
 
 #: ../../app/views/layouts/application.html.erb:32
-msgid "%{application_name}"
-msgstr "%{application_name}"
+msgid "%<application_name>s"
+msgstr "%<application_name>s"
 
 #: ../../app/views/layouts/application.html.erb:91
 msgid "Error:"
@@ -2870,11 +2870,11 @@ msgstr "Yeni bir pencerede açılır"
 
 #: ../../app/views/layouts/application.html.erb:142
 msgid ""
-"%{n} results are available, use up and down arrows to navigate suggestions. Us"
+"%<n>s results are available, use up and down arrows to navigate suggestions. Us"
 "e the Enter key to select a suggestion or the Escape key to close the suggesti"
 "ons."
 msgstr ""
-"%{n} sonuç mevcut, önerilerde gezinmek için yukarı ve aşağı oklarını kullanın."
+"%<n>s sonuç mevcut, önerilerde gezinmek için yukarı ve aşağı oklarını kullanın."
 " Bir öneri seçmek için Enter tuşunu veya önerileri kapatmak için Çıkış tuşunu "
 "kullanın."
 
@@ -2926,8 +2926,8 @@ msgid "Example answer"
 msgstr "Örnek cevap"
 
 #: ../../app/views/org_admin/annotations/_show.html.erb:4
-msgid "%{org} Example Answer"
-msgstr "%{org} Örnek Cevap"
+msgid "%<org>s Example Answer"
+msgstr "%<org>s Örnek Cevap"
 
 #: ../../app/views/org_admin/conditions/_add.html.erb:3
 msgid "Add condition"
@@ -3082,10 +3082,10 @@ msgstr "Aşamayı sil"
 
 #: ../../app/views/org_admin/phases/_phase.html.erb:17
 msgid ""
-"You are about to delete the '%{phase_title}' phase. This will remove all of th"
+"You are about to delete the '%<phase_title>s' phase. This will remove all of th"
 "e sections and questions listed below. Are you sure?"
 msgstr ""
-"'%{phase_title}' aşamasını silmek üzeresiniz. Bu işlem aşağıda listelenen tüm "
+"'%<phase_title>s' aşamasını silmek üzeresiniz. Bu işlem aşağıda listelenen tüm "
 "bölümleri ve soruları kaldıracaktır. Emin misiniz?"
 
 #: ../../app/views/org_admin/phases/_phase.html.erb:18
@@ -3144,8 +3144,8 @@ msgid "Write plan"
 msgstr "plan yazın"
 
 #: ../../app/views/org_admin/plans/index.html.erb:4
-msgid "%{org_name} Plans"
-msgstr "%{org_name} Planlar"
+msgid "%<org_name>s Plans"
+msgstr "%<org_name>s Planlar"
 
 #: ../../app/views/org_admin/plans/index.html.erb:16
 msgid "Plan"
@@ -3196,10 +3196,10 @@ msgstr "Plan sahibine, geri bildirim sağlamayı tamamladığımı bildir"
 #: ../../app/views/org_admin/plans/index.html.erb:39
 msgid ""
 "Download plans <em class=\"sr-only\">(new window)</em><span class=\"new-window-po"
-"pup-info\">%{open_in_new_window_text}</span>"
+"pup-info\">%<open_in_new_window_text>s</span>"
 msgstr ""
 "Planları indirin <em class=\"sr-only\">(yeni pencere)</em> <span class=\"new-wind"
-"ow-popup-info\">%{open_in_new_window_text}</span>"
+"ow-popup-info\">%<open_in_new_window_text>s</span>"
 
 #: ../../app/views/org_admin/question_options/_option_fields.html.erb:3
 msgid "Order"
@@ -3229,8 +3229,8 @@ msgstr ""
 "lirsiniz."
 
 #: ../../app/views/org_admin/questions/_form.html.erb:4
-msgid "Question %{number}:"
-msgstr "Soru %{number}:"
+msgid "Question %<number>s:"
+msgstr "Soru %<number>s:"
 
 #: ../../app/views/org_admin/questions/_form.html.erb:4
 msgid "New question:"
@@ -3304,8 +3304,8 @@ msgid "Delete"
 msgstr "Sil"
 
 #: ../../app/views/org_admin/questions/_form.html.erb:102
-msgid "You are about to delete question #%{question_number}. Are you sure?"
-msgstr "#%{question_number} sorusunu silmek üzeresiniz. Emin misiniz?"
+msgid "You are about to delete question #%<question_number>s. Are you sure?"
+msgstr "#%<question_number>s sorusunu silmek üzeresiniz. Emin misiniz?"
 
 #: ../../app/views/org_admin/questions/_index.html.erb:14
 msgid "Add Question"
@@ -3402,10 +3402,10 @@ msgstr "Bölüm için bir başlık girin"
 
 #: ../../app/views/org_admin/sections/_form.html.erb:20
 msgid ""
-"You are about to delete '%{section_title}'. This will affect questions linked "
+"You are about to delete '%<section_title>s'. This will affect questions linked "
 "to this section. Are you sure?"
 msgstr ""
-"'%{section_title}' öğesini silmek üzeresiniz. Bu işlem bu bölümle bağlantılı s"
+"'%<section_title>s' öğesini silmek üzeresiniz. Bu işlem bu bölümle bağlantılı s"
 "oruları etkileyecektir. Emin misiniz?"
 
 #: ../../app/views/org_admin/sections/_index.html.erb:61
@@ -3434,8 +3434,8 @@ msgstr ""
 
 #: ../../app/views/org_admin/templates/_form.html.erb:25
 #: ../../app/views/org_admin/templates/_show.html.erb:35
-msgid "for internal %{org_name} use only"
-msgstr "yalnızca dahili %{org_name} kullanımı için"
+msgid "for internal %<org_name>s use only"
+msgstr "yalnızca dahili %<org_name>s kullanımı için"
 
 #: ../../app/views/org_admin/templates/_form.html.erb:32
 #: ../../app/views/org_admin/templates/_show.html.erb:13
@@ -3606,22 +3606,22 @@ msgstr "Özelleştirilebilir Şablonlar"
 
 #: ../../app/views/org_admin/templates/index.html.erb:80
 #: ../../app/views/org_admin/templates/index.html.erb:93
-msgid "All (%{count})"
-msgstr "Tüm (%{count})"
+msgid "All (%<count>s)"
+msgstr "Tüm (%<count>s)"
 
 #: ../../app/views/org_admin/templates/index.html.erb:83
 #: ../../app/views/org_admin/templates/index.html.erb:96
-msgid "Published (%{count})"
-msgstr "(%{count}) adet yayınlandı"
+msgid "Published (%<count>s)"
+msgstr "(%<count>s) adet yayınlandı"
 
 #: ../../app/views/org_admin/templates/index.html.erb:86
 #: ../../app/views/org_admin/templates/index.html.erb:99
-msgid "Unpublished (%{count})"
-msgstr "Yayınlanmamış sayısı: (%{count})"
+msgid "Unpublished (%<count>s)"
+msgstr "Yayınlanmamış sayısı: (%<count>s)"
 
 #: ../../app/views/org_admin/templates/index.html.erb:89
-msgid "Not customised (%{count})"
-msgstr "(%{count}) Özelleştirilmeyen sayısı "
+msgid "Not customised (%<count>s)"
+msgstr "(%<count>s) Özelleştirilmeyen sayısı "
 
 #: ../../app/views/org_admin/templates/index.html.erb:118
 msgid "Create a template"
@@ -3630,8 +3630,8 @@ msgstr "Bir şablon oluşturun"
 #: ../../app/views/org_admin/users/edit.html.erb:4
 #: ../../app/views/super_admin/users/edit.html.erb:1
 #: ../../app/views/super_admin/users/edit.html.erb:5
-msgid "Editing profile for %{username}"
-msgstr "%{username} için profil düzenleniyor"
+msgid "Editing profile for %<username>s"
+msgstr "%<username>s için profil düzenleniyor"
 
 #: ../../app/views/org_admin/users/edit.html.erb:5
 #: ../../app/views/super_admin/users/edit.html.erb:6
@@ -3639,8 +3639,8 @@ msgid "View all users"
 msgstr "Tüm kullanıcıları görüntüle"
 
 #: ../../app/views/org_admin/users/plans.html.erb:3
-msgid "Plans of %{username}"
-msgstr "%{username} kullanıcısına ait planlar"
+msgid "Plans of %<username>s"
+msgstr "%<username>s kullanıcısına ait planlar"
 
 #: ../../app/views/orgs/_departments.html.erb:1
 #: ../../app/views/orgs/admin_edit.html.erb:26
@@ -3670,7 +3670,7 @@ msgid ""
 "ntact_us_url}\">contact us</a> to have them updated."
 msgstr ""
 "Yukarıdaki tanımlayıcılardan herhangi biri hatalı veya eksikse, bunları güncel"
-"lemek için lütfen <a href=\"%{contact_us_url}\"> bizimle iletişime geçin.</a>"
+"lemek için lütfen <a href=\"%<contact_us_url>s\"> bizimle iletişime geçin.</a>"
 
 #: ../../app/views/orgs/_feedback_form.html.erb:3
 #: ../../app/views/orgs/_feedback_form.html.erb:7
@@ -3700,7 +3700,7 @@ msgstr ""
 #: ../../app/views/orgs/_merge_form.html.erb:7
 msgid ""
 "Please select the Organisation that will replace the current organisation: '<s"
-"trong>%{org_name}</strong>'."
+"trong>%<org_name>s</strong>'."
 msgstr ""
 
 #: ../../app/views/orgs/_merge_form.html.erb:8
@@ -3881,15 +3881,15 @@ msgstr "Asla"
 
 #: ../../app/views/paginable/api_clients/_index.html.erb:44
 msgid ""
-"You are about to delete '%{client_name}'. They will no longer be able to acces"
+"You are about to delete '%<client_name>s'. They will no longer be able to acces"
 "s the API. Are you sure?"
 msgstr ""
-"'%{client_name}' öğesini silmek üzeresiniz. Artık API'ye erişemeyecekler. Emin"
+"'%<client_name>s' öğesini silmek üzeresiniz. Artık API'ye erişemeyecekler. Emin"
 " misiniz?"
 
 #: ../../app/views/paginable/contributors/_index.html.erb:57
-msgid "You are about to delete '%{contributor_name}'. Are you sure?"
-msgstr "'%{contributor_name}' öğesini silmek üzeresiniz. Emin misiniz?"
+msgid "You are about to delete '%<contributor_name>s'. Are you sure?"
+msgstr "'%<contributor_name>s' öğesini silmek üzeresiniz. Emin misiniz?"
 
 #: ../../app/views/paginable/departments/_index.html.erb:5
 #: ../../app/views/paginable/users/_index.html.erb:22
@@ -3902,10 +3902,10 @@ msgstr "Kısaltılmış Ad veya Kod"
 
 #: ../../app/views/paginable/departments/_index.html.erb:28
 msgid ""
-"You are about to delete '%{department_name}'. This will affect guidance. Are y"
+"You are about to delete '%<department_name>s'. This will affect guidance. Are y"
 "ou sure?"
 msgstr ""
-"'%{department_name}' öğesini silmek üzeresiniz. Bu işem rehberliği etkileyecek"
+"'%<department_name>s' öğesini silmek üzeresiniz. Bu işem rehberliği etkileyecek"
 "tir. Emin misiniz?"
 
 #: ../../app/views/paginable/guidance_groups/_index.html.erb:8
@@ -3946,15 +3946,15 @@ msgstr "Yayınla"
 
 #: ../../app/views/paginable/guidance_groups/_index.html.erb:50
 msgid ""
-"You are about to delete '%{guidance_group_name}'. This will affect guidance. A"
+"You are about to delete '%<guidance_group_name>s'. This will affect guidance. A"
 "re you sure?"
 msgstr ""
-"'%{guidance_group_name}' öğesini silmek üzeresiniz. Bu işlem rehberliği etkile"
+"'%<guidance_group_name>s' öğesini silmek üzeresiniz. Bu işlem rehberliği etkile"
 "yecektir. Emin misiniz?"
 
 #: ../../app/views/paginable/guidances/_index.html.erb:62
-msgid "You are about to delete '%{guidance_summary}'. Are you sure?"
-msgstr "'%{guidance_summary}' öğesini silmek üzeresiniz. Emin misiniz?"
+msgid "You are about to delete '%<guidance_summary>s'. Are you sure?"
+msgstr "'%<guidance_summary>s' öğesini silmek üzeresiniz. Emin misiniz?"
 
 #: ../../app/views/paginable/notifications/_index.html.erb:5
 #: ../../app/views/super_admin/notifications/_form.html.erb:15
@@ -3990,8 +3990,8 @@ msgid "Managed"
 msgstr "Yönetilen"
 
 #: ../../app/views/paginable/orgs/_index.html.erb:35
-msgid "You are about to delete '%{org_name}'. Are you sure?"
-msgstr "'%{org_name}' öğesini silmek üzeresiniz. Emin misiniz?"
+msgid "You are about to delete '%<org_name>s'. Are you sure?"
+msgstr "'%<org_name>s' öğesini silmek üzeresiniz. Emin misiniz?"
 
 #: ../../app/views/paginable/plans/_org_admin.html.erb:3
 msgid ""
@@ -4157,10 +4157,10 @@ msgstr "Değişiklikleri yayınla"
 
 #: ../../app/views/paginable/templates/_customisable.html.erb:69
 msgid ""
-"Are you sure you want to remove your customization of \"%{template_title}\"? Any"
+"Are you sure you want to remove your customization of \"%<template_title>s\"? Any"
 " published versions will become unavailable to users."
 msgstr ""
-"\"%{template_title}\" özelleştirmenizi kaldırmak istediğinizden emin misiniz? Ya"
+"\"%<template_title>s\" özelleştirmenizi kaldırmak istediğinizden emin misiniz? Ya"
 "yınlanmış sürümlere kullanıcılar tarafından erişilemeyecek."
 
 #: ../../app/views/paginable/templates/_history.html.erb:7
@@ -4177,10 +4177,10 @@ msgstr "Özelleştirmeleri görüntüle"
 
 #: ../../app/views/paginable/templates/_organisational.html.erb:76
 msgid ""
-"Are you sure you want to remove \"%{template_title}\"? Any published versions wi"
+"Are you sure you want to remove \"%<template_title>s\"? Any published versions wi"
 "ll become unavailable to users."
 msgstr ""
-"\"%{template_title}\" öğesini kaldırmak istediğinizden emin misiniz? Yayınlanan "
+"\"%<template_title>s\" öğesini kaldırmak istediğinizden emin misiniz? Yayınlanan "
 "sürümlere kullanıcılar tarafından erişilemeyecek."
 
 #: ../../app/views/paginable/templates/_organisational.html.erb:90
@@ -4342,7 +4342,7 @@ msgstr "Yetki"
 #: ../../app/views/plans/_download_form.html.erb:119
 msgid ""
 "Download Plan <em class=\"sr-only\">(new window)</em><span class=\"new-window-pop"
-"up-info\">%{open_in_new_window_text}</span>"
+"up-info\">%<open_in_new_window_text>s</span>"
 msgstr ""
 "<em class=\"sr-only\">(yeni pencere)</em> <span class=\"new-window-popup-info\">%{"
 "open_in_new_window_text}</span> planını indir"
@@ -4354,10 +4354,10 @@ msgstr "Rehberlik Seç"
 
 #: ../../app/views/plans/_guidance_selection.html.erb:6
 msgid ""
-"To help you write your plan, %{application_name} can show you guidance from a "
+"To help you write your plan, %<application_name>s can show you guidance from a "
 "variety of organisations."
 msgstr ""
-"%{application_name}, planınızı yazmanıza yardımcı olmak için size çeşitli kuru"
+"%<application_name>s, planınızı yazmanıza yardımcı olmak için size çeşitli kuru"
 "mlardan rehberler gösterebilir."
 
 #: ../../app/views/plans/_guidance_selection.html.erb:9
@@ -4378,11 +4378,11 @@ msgstr "Bu şablon için ek rehber yoktur."
 
 #: ../../app/views/plans/_guidance_selection.html.erb:40
 msgid ""
-"To help you write your plan, %{application_name} can show you guidance from a "
+"To help you write your plan, %<application_name>s can show you guidance from a "
 "variety of organisations. Please choose up to 6 organisations of the following"
 " organisations who offer guidance relevant to your plan."
 msgstr ""
-"%{application_name}, planınızı yazmanıza yardımcı olmak için size çeşitli kuru"
+"%<application_name>s, planınızı yazmanıza yardımcı olmak için size çeşitli kuru"
 "mlardan rehberler gösterebilir. Lütfen aşağıdaki kurumlardan planınızla ilgili"
 " rehberlik sunan 6 taneye kadarını seçin."
 
@@ -4408,19 +4408,19 @@ msgstr "Plan Yazın"
 
 #: ../../app/views/plans/_overview_details.html.erb:9
 msgid ""
-"This plan is based on the \"%{template_title}\" template provided by %{org_name}"
+"This plan is based on the \"%<template_title>s\" template provided by %<org_name>s"
 "."
 msgstr ""
-"Bu plan, %{org_name} tarafından sağlanan \"%{template_title}\" şablonunu temel a"
+"Bu plan, %<org_name>s tarafından sağlanan \"%<template_title>s\" şablonunu temel a"
 "lır."
 
 #: ../../app/views/plans/_overview_details.html.erb:17
-msgid "Template version %{template_version}, published on %{published_date}"
-msgstr "Şablon sürümü %{template_version}, yayınlanma tarihi: %{published_date}"
+msgid "Template version %<template_version>s, published on %<published_date>s"
+msgstr "Şablon sürümü %<template_version>s, yayınlanma tarihi: %<published_date>s"
 
 #: ../../app/views/plans/_overview_details.html.erb:42
-msgid "%{phase_title} (%{sections_size} %{sections}, %{questions_size} %{questions})"
-msgstr "%{phase_title} (%{sections_size} %{sections}, %{questions_size} %{questions})"
+msgid "%<phase_title>s (%<sections_size>s %<sections>s, %<questions_size>s %<questions>s)"
+msgstr "%<phase_title>s (%<sections_size>s %<sections>s, %<questions_size>s %<questions>s)"
 
 #: ../../app/views/plans/_overview_details.html.erb:43
 msgid "section"
@@ -4532,11 +4532,11 @@ msgstr "Plan görünürlüğünü ayarla"
 #: ../../app/views/plans/_share_form.html.erb:9
 msgid ""
 "Public or organisational visibility is intended for finished plans. You must a"
-"nswer at least %{percentage}%% of the questions to enable these options. Note:"
+"nswer at least %<percentage>s%% of the questions to enable these options. Note:"
 " test plans are set to private visibility by default."
 msgstr ""
 "Herkese açık olma veya kurumsal görünürlük, tamamlanmış planlar içindir. Bu se"
-"çenekleri etkinleştirmek için soruların en az %%{percentage}% kadarını yanıtla"
+"çenekleri etkinleştirmek için soruların en az %%<percentage>s% kadarını yanıtla"
 "malısınız. Not: Test amaçlı planlar, varsayılan olarak özel görünürlüğe ayarla"
 "nmıştır."
 
@@ -4625,8 +4625,8 @@ msgid "Click the 'Create plan' button below to begin."
 msgstr "Başlamak için aşağıdaki 'Plan oluştur' butonuna tıklayın."
 
 #: ../../app/views/plans/index.html.erb:35
-msgid "%{org_title} Plans"
-msgstr "%{org_title} Planlar"
+msgid "%<org_title>s Plans"
+msgstr "%<org_title>s Planlar"
 
 #: ../../app/views/plans/index.html.erb:36
 msgid ""
@@ -4708,11 +4708,11 @@ msgstr "Fon sağlayıcınız için birden fazla VYP şablonu bulduk."
 
 #: ../../app/views/public_pages/plan_index.html.erb:8
 msgid ""
-"Public DMPs are plans created using the %{application_name} service and shared"
+"Public DMPs are plans created using the %<application_name>s service and shared"
 " publicly by their owners. They are not vetted for quality, completeness, or a"
 "dherence to funder guidelines."
 msgstr ""
-"Herkese Açık VYPler, %{application_name} hizmeti kullanılarak oluşturulan ve o"
+"Herkese Açık VYPler, %<application_name>s hizmeti kullanılarak oluşturulan ve o"
 "luşturanlar tarafından herkese açık olarak paylaşılan planlardır. Kalite, bütü"
 "nlük veya fon sağlayıcı yönergelerine uygunluk açısından denetlenmezler."
 
@@ -4763,8 +4763,8 @@ msgid "terms and conditions"
 msgstr "şartlar ve koşullar"
 
 #: ../../app/views/shared/_create_plan_modal.html.erb:8
-msgid "Would you like to create a plan based on the \"%{name}\" template?"
-msgstr "\"%{name}\" şablonuna dayalı bir plan oluşturmak ister misiniz?"
+msgid "Would you like to create a plan based on the \"%<name>s\" template?"
+msgstr "\"%<name>s\" şablonuna dayalı bir plan oluşturmak ister misiniz?"
 
 #: ../../app/views/shared/_links.html.erb:7
 msgid "Links"
@@ -4817,8 +4817,8 @@ msgstr "Planları filtrele"
 
 #: ../../app/views/shared/export/_plan_coversheet.erb:3
 #: ../../app/views/shared/export/_plan_txt.erb:65
-msgid "A Data Management Plan created using %{application_name}"
-msgstr "%{application_name} kullanılarak oluşturulan bir Veri Yönetim Planı"
+msgid "A Data Management Plan created using %<application_name>s"
+msgstr "%<application_name>s kullanılarak oluşturulan bir Veri Yönetim Planı"
 
 #: ../../app/views/shared/export/_plan_coversheet.erb:10
 #: ../../app/views/shared/export/_plan_txt.erb:5
@@ -4888,8 +4888,8 @@ msgstr "Girdiğiniz ad, listelenen önerilerden biri değil!"
 
 #: ../../app/views/static_pages/about_us.html.erb:1
 #: ../../app/views/static_pages/about_us.html.erb:4
-msgid "About %{application_name}"
-msgstr "%{application_name} hakkında"
+msgid "About %<application_name>s"
+msgstr "%<application_name>s hakkında"
 
 #: ../../app/views/static_pages/about_us.html.erb:11
 msgid ""
@@ -4971,10 +4971,10 @@ msgstr ""
 #: ../../app/views/static_pages/about_us.html.erb:22
 msgid ""
 "get involved<em class=\"sr-only\"> (new window)</em><span class=\"new-window-popu"
-"p-info\">%{open_in_new_window_text}</span>"
+"p-info\">%<open_in_new_window_text>s</span>"
 msgstr ""
 "katıl <em class=\"sr-only\">(yeni pencere)</em> <span class=\"new-window-popup-in"
-"fo\">%{open_in_new_window_text}</span>"
+"fo\">%<open_in_new_window_text>s</span>"
 
 #: ../../app/views/static_pages/about_us.html.erb:28
 msgid " in the project. You can also report bugs and request new features via "
@@ -4997,8 +4997,8 @@ msgstr ""
 "e başlayın."
 
 #: ../../app/views/static_pages/about_us.html.erb:34
-msgid "If you do not have a %{application_name} account, click on"
-msgstr "%{application_name} hesabınız yoksa, tıklayın"
+msgid "If you do not have a %<application_name>s account, click on"
+msgstr "%<application_name>s hesabınız yoksa, tıklayın"
 
 #: ../../app/views/static_pages/about_us.html.erb:34
 msgid "Sign up"
@@ -5215,46 +5215,46 @@ msgstr "Sizinle ilgili bilgileri nasıl kullanıyoruz ve kimlerle paylaşıyoruz
 
 #: ../../app/views/static_pages/privacy.html.erb:11
 msgid ""
-"The information you provide will be used by the %{org_name} to offer you acces"
-"s to and personalisation of the %{application_name} service."
+"The information you provide will be used by the %<org_name>s to offer you acces"
+"s to and personalisation of the %<application_name>s service."
 msgstr ""
-"Sağladığınız bilgiler, %{application_name} hizmetine erişmenizi ve bu hizmeti "
-"kişiselleştirmenizi sağlamak için %{org_name} tarafından kullanılacaktır."
+"Sağladığınız bilgiler, %<application_name>s hizmetine erişmenizi ve bu hizmeti "
+"kişiselleştirmenizi sağlamak için %<org_name>s tarafından kullanılacaktır."
 
 #: ../../app/views/static_pages/privacy.html.erb:13
 msgid ""
-"The %{org_name} processes the personal data of %{application_name} users in or"
-"der to deliver and improve the %{application_name} service in a customised man"
+"The %<org_name>s processes the personal data of %<application_name>s users in or"
+"der to deliver and improve the %<application_name>s service in a customised man"
 "ner and to ensure each user receives relevant information."
 msgstr ""
-"%{org_name}, %{application_name} hizmetini özelleştirilmiş bir şekilde sunmak "
+"%<org_name>s, %<application_name>s hizmetini özelleştirilmiş bir şekilde sunmak "
 "ve iyileştirmek ve her kullanıcının ilgili bilgileri almasını sağlamak için %{"
 "application_name} kullanıcılarının kişisel verilerini işler."
 
 #: ../../app/views/static_pages/privacy.html.erb:15
 msgid ""
-"The processing of your personal data by the %{org_name} is necessary for pursu"
+"The processing of your personal data by the %<org_name>s is necessary for pursu"
 "ing the following legitimate interests:"
 msgstr ""
-"Kişisel verilerinizin %{org_name} tarafından işlenmesi, aşağıdaki meşru menfaa"
+"Kişisel verilerinizin %<org_name>s tarafından işlenmesi, aşağıdaki meşru menfaa"
 "tlerin takibi için gereklidir:"
 
 #: ../../app/views/static_pages/privacy.html.erb:18
 msgid ""
-"To provide access to the %{application_name} service and personalisation of yo"
+"To provide access to the %<application_name>s service and personalisation of yo"
 "ur user experience e.g. provision of relevant templates and guidance for your "
 "organisation."
 msgstr ""
-"%{application_name} hizmetine erişim sağlamak ve kullanıcı deneyiminizi kişise"
+"%<application_name>s hizmetine erişim sağlamak ve kullanıcı deneyiminizi kişise"
 "lleştirmek (ör. kuruluşunuz için ilgili şablonların ve rehberliğin sağlanması)"
 "."
 
 #: ../../app/views/static_pages/privacy.html.erb:20
 msgid ""
-"To keep you up to date with news about %{application_name} such as new feature"
+"To keep you up to date with news about %<application_name>s such as new feature"
 "s or improvements, or changes to our Privacy Policy."
 msgstr ""
-"%{application_name} hakkındaki yeni özellikler veya iyileştirmeler veya Gizlil"
+"%<application_name>s hakkındaki yeni özellikler veya iyileştirmeler veya Gizlil"
 "ik Politikamızdaki değişiklikler gibi haberlerden sizi haberdar etmek."
 
 #: ../../app/views/static_pages/privacy.html.erb:22
@@ -5264,28 +5264,28 @@ msgstr "Ağ ve bilgi güvenliği amaçlı."
 #: ../../app/views/static_pages/privacy.html.erb:24
 msgid ""
 "We will hold the personal data you provided us for as long as you continue usi"
-"ng the %{application_name} service. Your personal data can be removed from thi"
-"s service upon request to the %{application_name} team within a period of 30 d"
+"ng the %<application_name>s service. Your personal data can be removed from thi"
+"s service upon request to the %<application_name>s team within a period of 30 d"
 "ays."
 msgstr ""
-"%{application_name} hizmetini kullanmaya devam ettiğiniz sürece bize sağladığı"
-"nız kişisel verileri saklayacağız. Kişisel verileriniz, %{application_name} ek"
+"%<application_name>s hizmetini kullanmaya devam ettiğiniz sürece bize sağladığı"
+"nız kişisel verileri saklayacağız. Kişisel verileriniz, %<application_name>s ek"
 "ibinin talebi üzerine 30 günlük bir süre içinde bu hizmetten kaldırılabilir."
 
 #: ../../app/views/static_pages/privacy.html.erb:26
 msgid ""
-"If you have any questions, please contact the %{application_name} team at: <a "
-"href='mailto:%{helpdesk_email}'>%{helpdesk_email}</a>"
+"If you have any questions, please contact the %<application_name>s team at: <a "
+"href='mailto:%<helpdesk_email>s'>%<helpdesk_email>s</a>"
 msgstr ""
-"Herhangi bir sorunuz varsa lütfen %{application_name} ekibiyle şu adresten ile"
-"tişime geçin: <a href='mailto:%{helpdesk_email}'>%{helpdesk_email}</a>"
+"Herhangi bir sorunuz varsa lütfen %<application_name>s ekibiyle şu adresten ile"
+"tişime geçin: <a href='mailto:%<helpdesk_email>s'>%<helpdesk_email>s</a>"
 
 #: ../../app/views/static_pages/privacy.html.erb:30
 msgid ""
-"This statement was last revised on %{revdate} and may be revised at any time w"
+"This statement was last revised on %<revdate>s and may be revised at any time w"
 "ith prior notice."
 msgstr ""
-"Bu beyan en son %{revdate} tarihinde revize edilmiştir ve önceden haber verile"
+"Bu beyan en son %<revdate>s tarihinde revize edilmiştir ve önceden haber verile"
 "rek herhangi bir zamanda revize edilebilir."
 
 #: ../../app/views/static_pages/termsuse.html.erb:12
@@ -5358,7 +5358,7 @@ msgid ""
 "ookies and how we use them is available on the <a target='_blank' href='http:/"
 "/www.dcc.ac.uk/about-us/about-site/website-terms-use/cookies' class=\"has-new-w"
 "indow-popup-info\">main DCC website<em class=\"sr-only\"> (new window)</em><span "
-"class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>.</p>\n"
+"class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a>.</p>\n"
 "\n"
 "      <h3>Third party APIs</h3>\n"
 "\n"
@@ -5418,7 +5418,7 @@ msgstr ""
 "rı nasıl kullandığımız hakkında daha fazla bilgi <a target='_blank' href='http"
 "://www.dcc.ac.uk/about-us/about-site/website-terms-use/cookies' class=\"has-new"
 "-window-popup-info\">ana DCC web sitesi<em class=\"sr-only\"> (new window)</em><s"
-"pan class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a> adresi"
+"pan class=\"new-window-popup-info\">%<open_in_new_window_text>s</span></a> adresi"
 "nde mevcuttur. </p>\n"
 "\n"
 "      <h3>Üçüncü taraf APIleri</h3>\n"
@@ -5464,8 +5464,8 @@ msgid "Email credentials to contact"
 msgstr "İletişim için e-posta kimlik bilgileri"
 
 #: ../../app/views/super_admin/api_clients/_form.html.erb:81
-msgid "Are you sure you want to delete the API client: \"%{name}\""
-msgstr " \"%{name}\" adlı API istemcisini silmek istediğinizden emin misiniz?"
+msgid "Are you sure you want to delete the API client: \"%<name>s\""
+msgstr " \"%<name>s\" adlı API istemcisini silmek istediğinizden emin misiniz?"
 
 #: ../../app/views/super_admin/api_clients/edit.html.erb:1
 msgid "Editing API client"
@@ -5481,8 +5481,8 @@ msgid "View all API clients"
 msgstr "Tüm API istemcilerini görüntüle"
 
 #: ../../app/views/super_admin/api_clients/email_credentials.js.erb:1
-msgid "The credentials have been sent to %{email}."
-msgstr "Kimlik bilgileri %{email} adresine gönderildi."
+msgid "The credentials have been sent to %<email>s."
+msgstr "Kimlik bilgileri %<email>s adresine gönderildi."
 
 #: ../../app/views/super_admin/api_clients/index.html.erb:1
 #: ../../app/views/super_admin/api_clients/index.html.erb:6
@@ -5530,8 +5530,8 @@ msgid "Body"
 msgstr "Gövde"
 
 #: ../../app/views/super_admin/notifications/_form.html.erb:71
-msgid "Are you sure you want to delete the notification \"%{title}\""
-msgstr "\"%{title}\" bildirimini silmek istediğinizden emin misiniz?"
+msgid "Are you sure you want to delete the notification \"%<title>s\""
+msgstr "\"%<title>s\" bildirimini silmek istediğinizden emin misiniz?"
 
 #: ../../app/views/super_admin/notifications/edit.html.erb:1
 #: ../../app/views/super_admin/notifications/edit.html.erb:5
@@ -5556,7 +5556,7 @@ msgid "New Notification"
 msgstr "Yeni Bildirim"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:9
-msgid "Merging '%{from_org_name}' into '%{to_org_name}'"
+msgid "Merging '%<from_org_name>s' into '%<to_org_name>s'"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:11
@@ -5565,7 +5565,7 @@ msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:12
 msgid ""
-"Counts of '%{to_org_name}' records before and after a merge with %{from_org_na"
+"Counts of '%<to_org_name>s' records before and after a merge with %{from_org_na"
 "me}."
 msgstr ""
 
@@ -5575,11 +5575,11 @@ msgid "Record Type"
 msgstr "Kayıt Türü"
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:18
-msgid "'%{to_org_name}' Count - before merge"
+msgid "'%<to_org_name>s' Count - before merge"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:19
-msgid "'%{to_org_name}' Count - after merge"
+msgid "'%<to_org_name>s' Count - after merge"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:38
@@ -5589,17 +5589,17 @@ msgstr ""
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:39
 msgid ""
 "The table below shows the specific changes that will occur during the merge pr"
-"ocess. Once the merge is complete, '%{from_org_name}' will be deleted. You can"
+"ocess. Once the merge is complete, '%<from_org_name>s' will be deleted. You can"
 " then consolidate/correct any merge issues (e.g. remove any departments that w"
 "ere duplicated)"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:45
-msgid "%{from_org_name} - Before"
+msgid "%<from_org_name>s - Before"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:46
-msgid "%{to_org_name} - Before"
+msgid "%<to_org_name>s - Before"
 msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:61
@@ -5624,7 +5624,7 @@ msgstr ""
 
 #: ../../app/views/super_admin/orgs/_analysis.html.erb:95
 msgid ""
-"Warning: '%{from_org_name}' has Plans that are currently in the review process"
+"Warning: '%<from_org_name>s' has Plans that are currently in the review process"
 ". The Org admins may not be able to see these plans after the merge!"
 msgstr ""
 
@@ -5647,8 +5647,8 @@ msgid "New organisation"
 msgstr "Yeni kuruluş"
 
 #: ../../app/views/super_admin/themes/_form.html.erb:17
-msgid "Are you sure you want to delete the theme \"%{title}\"?"
-msgstr "\"%{title}\" temasını silmek istediğinizden emin misiniz?"
+msgid "Are you sure you want to delete the theme \"%<title>s\"?"
+msgstr "\"%<title>s\" temasını silmek istediğinizden emin misiniz?"
 
 #: ../../app/views/super_admin/themes/edit.html.erb:3
 #: ../../app/views/super_admin/themes/new.html.erb:3
@@ -5668,7 +5668,7 @@ msgid ""
 "<br>The selected user's content will be merged into the account for %{user_ema"
 "il}. <br> The selected account will then be removed"
 msgstr ""
-"<br>Seçilen kullanıcının içeriği %{user_email} hesabıyla birleştirilecektir.<b"
+"<br>Seçilen kullanıcının içeriği %<user_email>s hesabıyla birleştirilecektir.<b"
 "r> Seçilen hesap daha sonra kaldırılacaktır"
 
 #: ../../app/views/super_admin/users/edit.html.erb:63
@@ -5677,13 +5677,13 @@ msgstr "Arşiv"
 
 #: ../../app/views/super_admin/users/edit.html.erb:64
 msgid ""
-"You are about to archive %{user_name}.  This will remove their personal inform"
+"You are about to archive %<user_name>s.  This will remove their personal inform"
 "ation, but retain their plans, answers, and comments.  They will be unable to "
 "sign-in. Are you sure?"
 msgstr ""
-"%{user_name} kullanıcısını arşivlemek üzeresiniz. Bu işlem, %{user_name} kulla"
+"%<user_name>s kullanıcısını arşivlemek üzeresiniz. Bu işlem, %<user_name>s kulla"
 "nıcısının kişisel bilgilerini kaldıracak, ancak planlarını, yanıtlarını ve yor"
-"umlarını koruyacaktır. %{user_name} artık oturum açamayacak. Emin misiniz?"
+"umlarını koruyacaktır. %<user_name>s artık oturum açamayacak. Emin misiniz?"
 
 #: ../../app/views/super_admin/users/edit.html.erb:81
 msgid "Merge Accounts"
@@ -5786,92 +5786,92 @@ msgstr "Bildirim tercihlerinizi profil sayfanızdan değiştirebilirsiniz."
 #: ../../app/views/user_mailer/permissions_change_notification.html.erb:2
 #: ../../app/views/user_mailer/plan_visibility.html.erb:2
 #: ../../app/views/user_mailer/sharing_notification.html.erb:2
-msgid "Hello %{username}"
-msgstr "Merhaba %{username}"
+msgid "Hello %<username>s"
+msgstr "Merhaba %<username>s"
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:6
-msgid "You have been granted administrator privileges in %{tool_name}:"
-msgstr "%{tool_name} içinde size yönetici ayrıcalıkları verildi:"
+msgid "You have been granted administrator privileges in %<tool_name>s:"
+msgstr "%<tool_name>s içinde size yönetici ayrıcalıkları verildi:"
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:13
-msgid "You have been revoked administrator privileges in %{tool_name}."
-msgstr "%{tool_name} içinde yönetici ayrıcalıklarınız iptal edildi."
+msgid "You have been revoked administrator privileges in %<tool_name>s."
+msgstr "%<tool_name>s içinde yönetici ayrıcalıklarınız iptal edildi."
 
 #: ../../app/views/user_mailer/admin_privileges.html.erb:17
 msgid ""
-"More information about administering the %{tool_name} for users at your organi"
-"sation is available at the %{help_url}."
+"More information about administering the %<tool_name>s for users at your organi"
+"sation is available at the %<help_url>s."
 msgstr ""
-"Kurumunuzdaki kullanıcılar için %{tool_name} aracını yönetme hakkında daha faz"
-"la bilgiyi %{help_url} adresinde bulabilirsiniz."
+"Kurumunuzdaki kullanıcılar için %<tool_name>s aracını yönetme hakkında daha faz"
+"la bilgiyi %<help_url>s adresinde bulabilirsiniz."
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:2
-msgid "Hello %{name},"
-msgstr "Merhaba %{name},"
+msgid "Hello %<name>s,"
+msgstr "Merhaba %<name>s,"
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:8
-msgid "Please use the following credentials when accessing the %{tool_name} API."
-msgstr "%{tool_name} API'sine erişirken lütfen aşağıdaki kimlik bilgilerini kullanın."
+msgid "Please use the following credentials when accessing the %<tool_name>s API."
+msgstr "%<tool_name>s API'sine erişirken lütfen aşağıdaki kimlik bilgilerini kullanın."
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:23
-msgid "Please refer to the API documentation at: %{api_documentation_url}"
-msgstr "Lütfen şu adresteki API belgelerine bakın: %{api_documentation_url}"
+msgid "Please refer to the API documentation at: %<api_documentation_url>s"
+msgstr "Lütfen şu adresteki API belgelerine bakın: %<api_documentation_url>s"
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:29
 msgid ""
-"Do not share these credentials. They for use with the %{external_application} "
+"Do not share these credentials. They for use with the %<external_application>s "
 "application. If you do share your credentials with another application we rese"
 "rve the right to revoke your access to the API."
 msgstr ""
-"Bu kimlik bilgilerini paylaşmayın. %{external_application} uygulamasıyla kulla"
+"Bu kimlik bilgilerini paylaşmayın. %<external_application>s uygulamasıyla kulla"
 "nım içindir. Kimlik bilgilerinizi başka bir uygulamayla paylaşırsanız, API'ye "
 "erişiminizi iptal etme hakkını saklı tutarız."
 
 #: ../../app/views/user_mailer/api_credentials.html.erb:34
 msgid ""
-"If you did not request access to the %{tool_name} API or did not request for y"
-"our credentials to be renewed, please contact us at %{helpdesk_email}"
+"If you did not request access to the %<tool_name>s API or did not request for y"
+"our credentials to be renewed, please contact us at %<helpdesk_email>s"
 msgstr ""
-"%{tool_name} API'sine erişim talebinde bulunmadıysanız veya kimlik bilgilerini"
-"zin yenilenmesini talep etmediyseniz, lütfen %{helpdesk_email} adresinden bizi"
+"%<tool_name>s API'sine erişim talebinde bulunmadıysanız veya kimlik bilgilerini"
+"zin yenilenmesini talep etmediyseniz, lütfen %<helpdesk_email>s adresinden bizi"
 "mle iletişime geçin."
 
 #: ../../app/views/user_mailer/feedback_complete.html.erb:2
-msgid "Hello %{recipient_name}"
-msgstr "Merhaba %{recipient_name}"
+msgid "Hello %<recipient_name>s"
+msgstr "Merhaba %<recipient_name>s"
 
 #: ../../app/views/user_mailer/feedback_complete.html.erb:5
 msgid ""
-"%{commenter} has finished providing feedback on the plan  \"%{link_html}\". Comm"
+"%<commenter>s has finished providing feedback on the plan  \"%<link_html>s\". Comm"
 "ents can be found in the 'Write plan' tab on the right side of the page (Guida"
 "nce/Comments)."
 msgstr ""
-"%{commenter}, \"%{link_html}\" planı hakkında geri bildirim sağlamayı tamamladı."
+"%<commenter>s, \"%<link_html>s\" planı hakkında geri bildirim sağlamayı tamamladı."
 " Yorumlar, sayfanın sağ tarafındaki 'Plan yaz' sekmesinde bulunabilir (Rehberl"
 "ik/Yorumlar)."
 
 #: ../../app/views/user_mailer/feedback_notification.html.erb:2
-msgid "Hello %{user_name},"
-msgstr "Merhaba %{user_name},"
+msgid "Hello %<user_name>s,"
+msgstr "Merhaba %<user_name>s,"
 
 #: ../../app/views/user_mailer/feedback_notification.html.erb:5
 msgid ""
-"%{requestor} has requested feedback on a plan %{link_html}. To add comments, p"
-"lease visit the 'Plans' page under the Admin menu in %{tool_name} and open the"
+"%<requestor>s has requested feedback on a plan %<link_html>s. To add comments, p"
+"lease visit the 'Plans' page under the Admin menu in %<tool_name>s and open the"
 " plan."
 msgstr ""
-"%{requestor}, %{link_html} planı hakkında geri bildirim istedi. Yorum eklemek "
-"için lütfen %{tool_name} içindeki Yönetici menüsü altında yer alan 'Planlar' s"
+"%<requestor>s, %<link_html>s planı hakkında geri bildirim istedi. Yorum eklemek "
+"için lütfen %<tool_name>s içindeki Yönetici menüsü altında yer alan 'Planlar' s"
 "ayfasını ziyaret edin ve planı açın."
 
 #: ../../app/views/user_mailer/new_comment.html.erb:5
 msgid ""
-"%{commenter_name} has commented on your plan %{plan_title}. To view the commen"
+"%<commenter_name>s has commented on your plan %<plan_title>s. To view the commen"
 "ts, follow the link to the DMP below, or navigate to the plan via My Dashboard"
-" page in %{tool_name}."
+" page in %<tool_name>s."
 msgstr ""
-"%{commenter_name}, %{plan_title} adlı planınız hakkında yorum yaptı. Yorumları"
-" görüntülemek için aşağıdaki VYP bağlantısını takip edin veya %{tool_name} içi"
+"%<commenter_name>s, %<plan_title>s adlı planınız hakkında yorum yaptı. Yorumları"
+" görüntülemek için aşağıdaki VYP bağlantısını takip edin veya %<tool_name>s içi"
 "ndeki Gösterge Panelim sayfasından plana gidin."
 
 #: ../../app/views/user_mailer/new_comment.html.erb:10
@@ -5885,24 +5885,24 @@ msgid ""
 msgstr "Yorumları, her soru için rehberliğin yanında, sağdaki panelde görebilirsiniz."
 
 #: ../../app/views/user_mailer/new_comment.html.erb:15
-msgid "DMP: %{phase_link}"
-msgstr "VYP: %{phase_link}"
+msgid "DMP: %<phase_link>s"
+msgstr "VYP: %<phase_link>s"
 
 #: ../../app/views/user_mailer/new_comment.html.erb:18
-msgid "Section name: %{section_title}"
-msgstr "Bölüm adı: %{section_title}"
+msgid "Section name: %<section_title>s"
+msgstr "Bölüm adı: %<section_title>s"
 
 #: ../../app/views/user_mailer/new_comment.html.erb:21
-msgid "Question: %{question_number}"
-msgstr "Soru: %{question_number}"
+msgid "Question: %<question_number>s"
+msgstr "Soru: %<question_number>s"
 
 #: ../../app/views/user_mailer/permissions_change_notification.html.erb:5
 msgid ""
-"Your permissions relating to %{plan_title} have changed. You now have %{type} "
-"access. This means you can %{placeholder1} %{placeholder2}"
+"Your permissions relating to %<plan_title>s have changed. You now have %<type>s "
+"access. This means you can %<placeholder1>s %<placeholder2>s"
 msgstr ""
-"%{plan_title} ile ilgili izinleriniz değişti. Artık %{type} erişiminiz var. Bu"
-", %{placeholder1} %{placeholder2} yapabileceğiniz anlamına gelir."
+"%<plan_title>s ile ilgili izinleriniz değişti. Artık %<type>s erişiminiz var. Bu"
+", %<placeholder1>s %<placeholder2>s yapabileceğiniz anlamına gelir."
 
 #: ../../app/views/user_mailer/plan_access_removed.html.erb:2
 msgid "Hello "
@@ -5917,8 +5917,8 @@ msgid " has been removed by "
 msgstr "şu kişi tarafından kaldırıldı:"
 
 #: ../../app/views/user_mailer/plan_visibility.html.erb:5
-msgid "The plan %{plan_title} had its visibility changed to %{plan_visibility}."
-msgstr "%{plan_title} planının görünürlüğü %{plan_visibility} olarak değiştirildi."
+msgid "The plan %<plan_title>s had its visibility changed to %<plan_visibility>s."
+msgstr "%<plan_title>s planının görünürlüğü %<plan_visibility>s olarak değiştirildi."
 
 #: ../../app/views/user_mailer/plan_visibility.html.erb:9
 msgid "Visibility definitions:"
@@ -5935,14 +5935,14 @@ msgstr "Herkese açık: Web üzerinde herkes görüntüleyebilir"
 #: ../../app/views/user_mailer/plan_visibility.html.erb:17
 msgid ""
 "If you have questions pertaining to this action, please visit the My Dashboard"
-" page in %{tool_name}"
+" page in %<tool_name>s"
 msgstr ""
-"Bu işlemle ilgili sorularınız varsa, lütfen %{tool_name}'daki Kontrol Panelim "
+"Bu işlemle ilgili sorularınız varsa, lütfen %<tool_name>s'daki Kontrol Panelim "
 "sayfasını ziyaret edin."
 
 #: ../../app/views/user_mailer/question_answered.html.erb:2
-msgid "Hello %{recipient_name},"
-msgstr "Merhaba %{recipient_name},"
+msgid "Hello %<recipient_name>s,"
+msgstr "Merhaba %<recipient_name>s,"
 
 #: ../../app/views/user_mailer/question_answered.html.erb:5
 msgid " is creating a Data Management Plan and has answered "
@@ -5962,24 +5962,25 @@ msgstr "Şu şablona dayanarak:"
 
 #: ../../app/views/user_mailer/sharing_notification.html.erb:5
 msgid ""
-"Your colleague %{inviter_name} has invited you to contribute to
\n"
+"Your colleague %<inviter_name>s has invited you to contribute to
+\n"%<tool_name>s
 "          their Data Management Plan in %{tool_name}"
-msgstr ""
+msgstr ""%<inviter_name>s%<tool_name>s
 "Meslektaşınız %{inviter_name} sizi kendisinin %{tool_name} aracındaki Veri Yön"
 "etim Planına katkıda bulunmaya davet etti"
 
-#: ../../app/views/user_mailer/welcome_notification.html.erb:2
-msgid "Welcome to %{tool_name}, %{username}"
+#: ../../app/views%<tool_name>s/w%<username>sfication.html.erb:2
+msgid "W%<username>s{t%<tool_name>s{username}"
 msgstr "%{username}, %{tool_name} aracına hoş geldiniz"
 
 #: ../../app/views/user_mailer/welcome_notification.html.erb:5
-msgid ""
+m%<tool_name>s
 "%{tool_name} will help you to develop your Data Management Plan. If you have a"
-"ny queries or feedback as you use the tool, please contact us at %{helpdesk_em"
+"ny queries or %<contact_us>sou use the tool, please contact us at %{helpdesk_em"
 "ail} or visit %{contact_us}"
-msgstr ""
+m%<tool_name>s
 "%{tool_name}, Veri Yönetim Planınızı oluşturmanıza yardımcı olacaktır. Aracı k"
-"ullanırken herhangi bir sorunuz veya geri bildiriminiz olursa, lütfen %{helpde"
+"ullanırken herhangi bir sorunuz veya geri bildirim%<contact_us>slütfen %{helpde"
 "sk_email} adresinden bizimle iletişime geçin veya %{contact_us} adresini ziyar"
 "et edin."
 
@@ -5987,8 +5988,8 @@ msgstr ""
 msgid "You may change your notification preferences on your profile page."
 msgstr "Bildirim tercihlerinizi profil sayfanızdan değiştirebilirsiniz."
 
-#: ../../app/views/users/_admin_grant_permissions.html.erb:9
-msgid "Editing privileges for %{username}"
+#: ../../app/views/users/_admi%<username>smissions.html.erb:9
+msgid "E%<username>sileges for %{username}"
 msgstr "%{username} için ayrıcalıklar düzenleniyor"
 
 #: ../../app/views/users/_admin_grant_permissions.html.erb:19
diff --git a/config/puma.rb b/config/puma.rb
index b3f391bfd7..54bce1183a 100644
--- a/config/puma.rb
+++ b/config/puma.rb
@@ -6,16 +6,16 @@
 # the maximum value specified for Puma. Default is set to 5 threads for minimum
 # and maximum, this matches the default thread size of Active Record.
 #
-threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }
+threads_count = ENV.fetch('RAILS_MAX_THREADS', 5)
 threads threads_count, threads_count
 
 # Specifies the `port` that Puma will listen on to receive requests, default is 3000.
 #
-port        ENV.fetch("PORT") { 3000 }
+port        ENV.fetch('PORT', 3000)
 
 # Specifies the `environment` that Puma will run in.
 #
-environment ENV.fetch("RAILS_ENV") { "development" }
+environment ENV.fetch('RAILS_ENV', 'development')
 
 # Specifies the number of `workers` to boot in clustered mode.
 # Workers are forked webserver processes. If using threads and workers together
@@ -23,7 +23,7 @@
 # Workers do not work on JRuby or Windows (both of which do not support
 # processes).
 #
-workers ENV.fetch("WEB_CONCURRENCY") { 2 }
+workers ENV.fetch('WEB_CONCURRENCY', 2)
 
 # Use the `preload_app!` method when specifying a `workers` number.
 # This directive tells Puma to first boot the application and load code
diff --git a/config/routes.rb b/config/routes.rb
index 1960a85ec2..e715b99f32 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -5,68 +5,68 @@
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
 
   devise_for(:users, controllers: {
-               registrations: "registrations",
-               passwords: "passwords",
-               sessions: "sessions",
-               omniauth_callbacks: "users/omniauth_callbacks",
-               invitations: "users/invitations"
+               registrations: 'registrations',
+               passwords: 'passwords',
+               sessions: 'sessions',
+               omniauth_callbacks: 'users/omniauth_callbacks',
+               invitations: 'users/invitations'
              }) do
-    get "/users/sign_out", to: "devise/sessions#destroy"
+    get '/users/sign_out', to: 'devise/sessions#destroy'
   end
 
-  delete "/users/identifiers/:id", to: "identifiers#destroy", as: "destroy_user_identifier"
+  delete '/users/identifiers/:id', to: 'identifiers#destroy', as: 'destroy_user_identifier'
 
-  get "/orgs/shibboleth", to: "orgs#shibboleth_ds", as: "shibboleth_ds"
-  get "/orgs/shibboleth/:org_id", to: "orgs#shibboleth_ds_passthru"
-  post "/orgs/shibboleth", to: "orgs#shibboleth_ds_passthru"
+  get '/orgs/shibboleth', to: 'orgs#shibboleth_ds', as: 'shibboleth_ds'
+  get '/orgs/shibboleth/:org_id', to: 'orgs#shibboleth_ds_passthru'
+  post '/orgs/shibboleth', to: 'orgs#shibboleth_ds_passthru'
 
-  resources :users, path: "users", only: [] do
+  resources :users, path: 'users', only: [] do
     resources :org_swaps, only: [:create],
-                          controller: "super_admin/org_swaps"
+                          controller: 'super_admin/org_swaps'
 
     member do
-      put "update_email_preferences"
-      get "refresh_token"
+      put 'update_email_preferences'
+      get 'refresh_token'
     end
 
-    post "/acknowledge_notification", to: "users#acknowledge_notification"
+    post '/acknowledge_notification', to: 'users#acknowledge_notification'
   end
 
   # organisation admin area
-  resources :users, path: "org/admin/users", only: [] do
+  resources :users, path: 'org/admin/users', only: [] do
     collection do
-      get "admin_index"
+      get 'admin_index'
     end
     member do
-      get "admin_grant_permissions"
-      put "admin_update_permissions"
-      put "activate"
+      get 'admin_grant_permissions'
+      put 'admin_update_permissions'
+      put 'activate'
     end
   end
 
   # You can have the root of your site routed with "root"
   # just remember to delete public/index.html.
 
-  patch "locale/:locale" => "session_locales#update", as: "locale"
+  patch 'locale/:locale' => 'session_locales#update', as: 'locale'
 
-  root to: "home#index"
-  get "about_us" => "static_pages#about_us"
-  get "help" => "static_pages#help"
-  get "terms" => "static_pages#termsuse"
-  get "privacy" => "static_pages#privacy"
-  get "public_plans" => "public_pages#plan_index"
-  get "public_templates" => "public_pages#template_index"
-  get "template_export/:id" => "public_pages#template_export", as: "template_export"
+  root to: 'home#index'
+  get 'about_us' => 'static_pages#about_us'
+  get 'help' => 'static_pages#help'
+  get 'terms' => 'static_pages#termsuse'
+  get 'privacy' => 'static_pages#privacy'
+  get 'public_plans' => 'public_pages#plan_index'
+  get 'public_templates' => 'public_pages#template_index'
+  get 'template_export/:id' => 'public_pages#template_export', as: 'template_export'
 
   # AJAX call used to search for Orgs based on user input into autocompletes
-  post "orgs" => "orgs#search", as: "orgs_search"
+  post 'orgs' => 'orgs#search', as: 'orgs_search'
 
-  resources :orgs, path: "org/admin", only: [] do
+  resources :orgs, path: 'org/admin', only: [] do
     member do
-      get "admin_edit"
-      put "admin_update"
+      get 'admin_edit'
+      put 'admin_update'
     end
-    resources :departments, controller: "org_admin/departments"
+    resources :departments, controller: 'org_admin/departments'
   end
 
   # This should be made more restful and placed within the `org_admin` or a new
@@ -74,16 +74,16 @@
   #     namespace :admin
   #       resources :guidances, except: %i[show]
   #     end
-  resources :guidances, path: "org/admin/guidance", only: [] do
+  resources :guidances, path: 'org/admin/guidance', only: [] do
     member do
-      get "admin_index"
-      get "admin_edit"
-      get "admin_new"
-      delete "admin_destroy"
-      post "admin_create"
-      put "admin_update"
-      put "admin_publish"
-      put "admin_unpublish"
+      get 'admin_index'
+      get 'admin_edit'
+      get 'admin_new'
+      delete 'admin_destroy'
+      post 'admin_create'
+      put 'admin_update'
+      put 'admin_publish'
+      put 'admin_unpublish'
     end
   end
 
@@ -92,58 +92,58 @@
   #     namespace :admin
   #       resources :guidance_groups, except: %i[show]
   #     end
-  resources :guidance_groups, path: "org/admin/guidancegroup", only: [] do
+  resources :guidance_groups, path: 'org/admin/guidancegroup', only: [] do
     member do
-      get "admin_show"
-      get "admin_new"
-      get "admin_edit"
-      delete "admin_destroy"
-      post "admin_create"
-      put "admin_update"
-      put "admin_update_publish"
-      put "admin_update_unpublish"
+      get 'admin_show'
+      get 'admin_new'
+      get 'admin_edit'
+      delete 'admin_destroy'
+      post 'admin_create'
+      put 'admin_update'
+      put 'admin_update_publish'
+      put 'admin_update_unpublish'
     end
   end
 
   resources :answers, only: [] do
-    post "create_or_update", on: :collection
+    post 'create_or_update', on: :collection
   end
 
   # Question Formats controller, currently just the one action
-  get "question_formats/rda_api_address" => "question_formats#rda_api_address"
+  get 'question_formats/rda_api_address' => 'question_formats#rda_api_address'
 
   resources :notes, only: %i[create update archive] do
     member do
-      patch "archive"
+      patch 'archive'
     end
   end
 
   resources :feedback_requests, only: [:create]
 
   resources :plans do
-    resource :export, only: [:show], controller: "plan_exports"
+    resource :export, only: [:show], controller: 'plan_exports'
 
     resources :contributors, except: %i[show]
 
     member do
-      get "answer"
-      get "share"
-      get "request_feedback"
-      get "download"
-      post "duplicate"
-      post "visibility", constraints: { format: [:json] }
-      post "set_test", constraints: { format: [:json] }
-      get "overview"
+      get 'answer'
+      get 'share'
+      get 'request_feedback'
+      get 'download'
+      post 'duplicate'
+      post 'visibility', constraints: { format: [:json] }
+      post 'set_test', constraints: { format: [:json] }
+      get 'overview'
     end
   end
 
   resources :usage, only: [:index]
-  post "usage_plans_by_template", controller: "usage", action: "plans_by_template"
-  get "usage_all_plans_by_template", controller: "usage", action: "all_plans_by_template"
-  get "usage_global_statistics", controller: "usage", action: "global_statistics"
-  get "usage_org_statistics", controller: "usage", action: "org_statistics"
-  get "usage_yearly_users", controller: "usage", action: "yearly_users"
-  get "usage_yearly_plans", controller: "usage", action: "yearly_plans"
+  post 'usage_plans_by_template', controller: 'usage', action: 'plans_by_template'
+  get 'usage_all_plans_by_template', controller: 'usage', action: 'all_plans_by_template'
+  get 'usage_global_statistics', controller: 'usage', action: 'global_statistics'
+  get 'usage_org_statistics', controller: 'usage', action: 'org_statistics'
+  get 'usage_yearly_users', controller: 'usage', action: 'yearly_users'
+  get 'usage_yearly_plans', controller: 'usage', action: 'yearly_plans'
 
   resources :usage_downloads, only: [:index]
 
@@ -168,10 +168,10 @@
           patch :assign_users
         end
       end
-      resources :guidances, only: [:index], controller: "guidance_groups", path: "guidances"
+      resources :guidances, only: [:index], controller: 'guidance_groups', path: 'guidances'
       resources :plans, only: %i[create index]
       resources :templates, only: :index
-      resource  :statistics, only: [], controller: "statistics", path: "statistics" do
+      resource  :statistics, only: [], controller: 'statistics', path: 'statistics' do
         member do
           get :users_joined
           get :completed_plans
@@ -184,8 +184,8 @@
     end
 
     namespace :v1 do
-      get :heartbeat, controller: "base_api"
-      post :authenticate, controller: "authentication"
+      get :heartbeat, controller: 'base_api'
+      post :authenticate, controller: 'authentication'
 
       resources :plans, only: %i[create show index]
       resources :templates, only: [:index]
@@ -194,66 +194,66 @@
 
   namespace :paginable do
     resources :orgs, only: [] do
-      get "index/:page", action: :index, on: :collection, as: :index
+      get 'index/:page', action: :index, on: :collection, as: :index
     end
     # Paginable actions for plans
     resources :plans, only: [] do
-      get "privately_visible/:page",
+      get 'privately_visible/:page',
           action: :privately_visible, on: :collection, as: :privately_visible
 
-      get "organisationally_or_publicly_visible/:page",
+      get 'organisationally_or_publicly_visible/:page',
           action: :organisationally_or_publicly_visible,
           on: :collection, as: :organisationally_or_publicly_visible
 
-      get "publicly_visible/:page", action: :publicly_visible,
+      get 'publicly_visible/:page', action: :publicly_visible,
                                     on: :collection, as: :publicly_visible
 
-      get "org_admin/:page", action: :org_admin, on: :collection, as: :org_admin
+      get 'org_admin/:page', action: :org_admin, on: :collection, as: :org_admin
 
-      get "org_admin_other_user/:page", action: :org_admin_other_user,
+      get 'org_admin_other_user/:page', action: :org_admin_other_user,
                                         on: :collection, as: :org_admin_other_user
 
       # Paginable actions for contributors
       resources :contributors, only: %i[index] do
-        get "index/:page", action: :index, on: :collection, as: :index
+        get 'index/:page', action: :index, on: :collection, as: :index
       end
     end
     # Paginable actions for users
     resources :users, only: [] do
-      get "index/:page", action: :index, on: :collection, as: :index
+      get 'index/:page', action: :index, on: :collection, as: :index
     end
     # Paginable actions for themes
     resources :themes, only: [] do
-      get "index/:page", action: :index, on: :collection, as: :index
+      get 'index/:page', action: :index, on: :collection, as: :index
     end
     # Paginable actions for notifications
     resources :notifications, only: [] do
-      get "index/:page", action: :index, on: :collection, as: :index
+      get 'index/:page', action: :index, on: :collection, as: :index
     end
     # Paginable actions for templates
     resources :templates, only: [] do
-      get "index/:page", action: :index, on: :collection, as: :index
-      get "customisable/:page", action: :customisable, on: :collection, as: :customisable
-      get "organisational/:page", action: :organisational, on: :collection, as: :organisational
-      get "publicly_visible/:page", action: :publicly_visible,
+      get 'index/:page', action: :index, on: :collection, as: :index
+      get 'customisable/:page', action: :customisable, on: :collection, as: :customisable
+      get 'organisational/:page', action: :organisational, on: :collection, as: :organisational
+      get 'publicly_visible/:page', action: :publicly_visible,
                                     on: :collection, as: :publicly_visible
-      get ":id/history/:page", action: :history, on: :collection, as: :history
+      get ':id/history/:page', action: :history, on: :collection, as: :history
     end
     # Paginable actions for guidances
     resources :guidances, only: [] do
-      get "index/:page", action: :index, on: :collection, as: :index
+      get 'index/:page', action: :index, on: :collection, as: :index
     end
     # Paginable actions for guidance_groups
     resources :guidance_groups, only: [] do
-      get "index/:page", action: :index, on: :collection, as: :index
+      get 'index/:page', action: :index, on: :collection, as: :index
     end
     # Paginable actions for departments
     resources :departments, only: [] do
-      get "index/:page", action: :index, on: :collection, as: :index
+      get 'index/:page', action: :index, on: :collection, as: :index
     end
     # Paginable actions for api_clients
     resources :api_clients, only: [] do
-      get "index/:page", action: :index, on: :collection, as: :index
+      get 'index/:page', action: :index, on: :collection, as: :index
     end
   end
 
@@ -261,72 +261,70 @@
 
   # ORG ADMIN specific pages
   namespace :org_admin do
-    resources :users, only: %i[edit update], controller: "users" do
+    resources :users, only: %i[edit update], controller: 'users' do
       member do
-        get "user_plans"
+        get 'user_plans'
       end
     end
 
-    resources :question_options, only: [:destroy], controller: "question_options"
+    resources :question_options, only: [:destroy], controller: 'question_options'
 
     resources :questions, only: [] do
-      get "open_conditions"
-      resources :conditions, only: %i[new show] do
-      end
+      get 'open_conditions'
+      resources :conditions, only: %i[new show]
     end
 
     resources :plans, only: [:index] do
       member do
-        get "feedback_complete"
+        get 'feedback_complete'
       end
     end
 
     resources :templates do
-      resources :customizations, only: [:create], controller: "template_customizations"
+      resources :customizations, only: [:create], controller: 'template_customizations'
 
       resources :copies, only: [:create],
-                         controller: "template_copies",
+                         controller: 'template_copies',
                          constraints: { format: [:json] }
 
       resources :customization_transfers, only: [:create],
-                                          controller: "template_customization_transfers"
+                                          controller: 'template_customization_transfers'
 
       member do
-        get "history"
-        get "template_export", action: :template_export
-        patch "publish", action: :publish, constraints: { format: [:json] }
-        patch "unpublish", action: :unpublish, constraints: { format: [:json] }
+        get 'history'
+        get 'template_export', action: :template_export
+        patch 'publish', action: :publish, constraints: { format: [:json] }
+        patch 'unpublish', action: :unpublish, constraints: { format: [:json] }
       end
 
       # Used for the organisational and customizable views of index
       collection do
-        get "organisational"
-        get "customisable"
+        get 'organisational'
+        get 'customisable'
       end
 
       resources :phases, except: [:index] do
-        resources :versions, only: [:create], controller: "phase_versions"
+        resources :versions, only: [:create], controller: 'phase_versions'
 
         member do
-          get "preview"
-          post "sort"
+          get 'preview'
+          post 'sort'
         end
 
         resources :sections, only: %i[index show edit update create destroy] do
-          resources :questions, only: %i[show edit new update create destroy] do
-          end
+          resources :questions, only: %i[show edit new update create destroy]
         end
       end
     end
 
-    get "download_plans" => "plans#download_plans"
+    get 'download_plans' => 'plans#download_plans'
   end
 
   namespace :super_admin do
     resources :orgs, only: %i[index new create destroy] do
       member do
-        post "merge_analyze"
-        post "merge_commit"
+        post 'merge_analyze'
+        post 'merge_commit'
       end
     end
 
@@ -341,7 +339,7 @@
 
     resources :notifications, except: [:show] do
       member do
-        post "enable", constraints: { format: [:json] }
+        post 'enable', constraints: { format: [:json] }
       end
     end
 
@@ -353,12 +351,12 @@
     end
   end
 
-  get "research_projects/search", action: "search",
-                                  controller: "research_projects",
-                                  constraints: { format: "json" }
+  get 'research_projects/search', action: 'search',
+                                  controller: 'research_projects',
+                                  constraints: { format: 'json' }
 
-  get "research_projects/(:type)", action: "index",
-                                   controller: "research_projects",
-                                   constraints: { format: "json" }
+  get 'research_projects/(:type)', action: 'index',
+                                   controller: 'research_projects',
+                                   constraints: { format: 'json' }
 end
 # rubocop:enable Metrics/BlockLength
diff --git a/lib/cleanup/deprecators.rb b/lib/cleanup/deprecators.rb
index 9f7aed1dd4..fd59e57052 100644
--- a/lib/cleanup/deprecators.rb
+++ b/lib/cleanup/deprecators.rb
@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
 module Cleanup
-
   # Private: Custom deprecator classes to use while we refactor the code for
   # better readability.
   module Deprecators
   end
-
 end
diff --git a/lib/cleanup/deprecators/get_deprecator.rb b/lib/cleanup/deprecators/get_deprecator.rb
index 7bcb107f26..1735096dcd 100644
--- a/lib/cleanup/deprecators/get_deprecator.rb
+++ b/lib/cleanup/deprecators/get_deprecator.rb
@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
 module Cleanup
-
   module Deprecators
-
     # Used to deprecate methods with non-idiomatic getter names.
     #
     # There are methods in the code with non-idiomatic method names. Typically,
@@ -11,23 +9,18 @@ module Deprecators
     # Prefer User#status over User#get_status.
     #
     class GetDeprecator
-
       ##
       # Default message to display to developer when deprecated method called.
-      MESSAGE = "%{deprecated_method}s is deprecated. "\
-                  "Instead, you should use: %{new_method}s. "\
-                  "Read #{__FILE__} for more information."
+      MESSAGE = '%<deprecated_method>s is deprecated. '\
+                'Instead, you should use: %<new_method>s. '\
+                "Read #{__FILE__} for more information."
 
       # Message printed to STDOUT when a deprecated method is called.
       def deprecation_warning(deprecated_method, _message, _backtrace = nil)
-        new_method = deprecated_method.to_s.gsub(/^get_/, "")
-        message = MESSAGE % { deprecated_method: deprecated_method,
-                              new_method: new_method }
+        new_method = deprecated_method.to_s.gsub(/^get_/, '')
+        message = format(MESSAGE, deprecated_method: deprecated_method, new_method: new_method)
         Kernel.warn(message)
       end
-
     end
-
   end
-
 end
diff --git a/lib/cleanup/deprecators/predicate_deprecator.rb b/lib/cleanup/deprecators/predicate_deprecator.rb
index c788cc0a2c..c7dc1c4f33 100644
--- a/lib/cleanup/deprecators/predicate_deprecator.rb
+++ b/lib/cleanup/deprecators/predicate_deprecator.rb
@@ -1,32 +1,25 @@
 # frozen_string_literal: true
 
 module Cleanup
-
   module Deprecators
-
     # Used to deprecate methods that are predicate methods without question mks
     #
     # There are methods in the code with non-idiomatic method names. Typically,
     # Ruby predicates are named as verbs in the infinitive with a question mark.
     #
     class PredicateDeprecator
-
       ##
       # Default message to display to developer when deprecated method called.
-      MESSAGE = "%{deprecated_method}s is deprecated. "\
-                  "Instead, you should use: %{new_method}s. "\
-                  "Read #{__FILE__} for more information."
+      MESSAGE = '%<deprecated_method>s is deprecated. '\
+                'Instead, you should use: %<new_method>s. '\
+                "Read #{__FILE__} for more information."
 
       # Message printed to STDOUT when a deprecated method is called.
       def deprecation_warning(deprecated_method, _message, _backtrace = nil)
         new_method = "#{deprecated_method}?"
-        message = MESSAGE % { deprecated_method: deprecated_method,
-                              new_method: new_method }
+        message = format(MESSAGE, deprecated_method: deprecated_method, new_method: new_method)
         Kernel.warn(message)
       end
-
     end
-
   end
-
 end
diff --git a/lib/cleanup/deprecators/set_deprecator.rb b/lib/cleanup/deprecators/set_deprecator.rb
index 4e88c9c775..e59759142f 100644
--- a/lib/cleanup/deprecators/set_deprecator.rb
+++ b/lib/cleanup/deprecators/set_deprecator.rb
@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
 module Cleanup
-
   module Deprecators
-
     # Used to deprecate methods with non-idiomatic setter names.
     #
     # There are methods in the code with non-idiomatic method names. Typically,
@@ -11,23 +9,18 @@ module Deprecators
     # Prefer User#status= over User#set_status.
     #
     class SetDeprecator
-
       ##
       # Default message to display to developer when deprecated method called.
-      MESSAGE = "%{deprecated_method}s is deprecated. "\
-                  "Instead, you should use: %{new_method}s. "\
-                  "Read #{__FILE__} for more information."
+      MESSAGE = '%<deprecated_method>s is deprecated. '\
+                'Instead, you should use: %<new_method>s. '\
+                "Read #{__FILE__} for more information."
 
       # Message printed to STDOUT when a deprecated method is called.
       def deprecation_warning(deprecated_method, _message, _backtrace = nil)
-        new_method = deprecated_method.to_s.gsub(/^set_/, "").gsub(/\Z/, "=")
-        message = MESSAGE % { deprecated_method: deprecated_method,
-                              new_method: new_method }
+        new_method = deprecated_method.to_s.gsub(/^set_/, '').gsub(/\Z/, '=')
+        message = format(MESSAGE, deprecated_method: deprecated_method, new_method: new_method)
         Kernel.warn(message)
       end
-
     end
-
   end
-
 end
diff --git a/lib/csvable.rb b/lib/csvable.rb
index 66ee4715cc..94cc64233b 100644
--- a/lib/csvable.rb
+++ b/lib/csvable.rb
@@ -1,12 +1,13 @@
 # frozen_string_literal: true
 
+# Helper for exporting to CSV format
 module Csvable
-
-  require "csv"
+  require 'csv'
   class << self
-
-    def from_array_of_hashes(data = [], humanize = true, sep = ",")
-      return "" unless data.first&.keys
+    # rubocop:disable Style/OptionalBooleanParameter
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+    def from_array_of_hashes(data = [], humanize = true, sep = ',')
+      return '' unless data.first&.keys
 
       headers = if humanize
                   data.first.keys
@@ -24,8 +25,7 @@ def from_array_of_hashes(data = [], humanize = true, sep = ",")
         end
       end
     end
-    # rubocop:enable
-
+    # rubocop:enable Style/OptionalBooleanParameter
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
   end
-
 end
diff --git a/lib/custom_failure.rb b/lib/custom_failure.rb
index 830e3a2445..019bbca064 100644
--- a/lib/custom_failure.rb
+++ b/lib/custom_failure.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
+# Override how Devise handles failures
 class CustomFailure < Devise::FailureApp
-
   def redirect_url
     root_path
   end
@@ -13,5 +13,4 @@ def respond
       redirect
     end
   end
-
 end
diff --git a/lib/data_cleanup.rb b/lib/data_cleanup.rb
index 128870542a..638acc017c 100644
--- a/lib/data_cleanup.rb
+++ b/lib/data_cleanup.rb
@@ -1,18 +1,18 @@
 # frozen_string_literal: true
 
-require_relative "data_cleanup/model_check"
-require_relative "data_cleanup/instance_check"
-require_relative "data_cleanup/reporting"
-require_relative "data_cleanup/rules"
+require_relative 'data_cleanup/model_check'
+require_relative 'data_cleanup/instance_check'
+require_relative 'data_cleanup/reporting'
+require_relative 'data_cleanup/rules'
 
+# Some legacy cleanup helpers
 module DataCleanup
-
   COLOR_CODES = { red: 31, green: 32 }.freeze
 
   module_function
 
   def logger
-    @logger ||= Logger.new(Rails.root.join("log", "validations.log"))
+    @logger ||= Logger.new(Rails.root.join('log', 'validations.log'))
   end
 
   def display(message, inline: false, color: nil)
@@ -20,5 +20,4 @@ def display(message, inline: false, color: nil)
     message = "\e[#{COLOR_CODES[color]}m#{message}\e[0m" if color
     print message
   end
-
 end
diff --git a/lib/data_cleanup/instance_check.rb b/lib/data_cleanup/instance_check.rb
index 8513756261..46ac58b67e 100644
--- a/lib/data_cleanup/instance_check.rb
+++ b/lib/data_cleanup/instance_check.rb
@@ -1,12 +1,11 @@
 # frozen_string_literal: true
 
-require_relative "reporting"
+require_relative 'reporting'
 
 module DataCleanup
-
   # Check whether a given database record is valid or not
   class InstanceCheck
-
+    # rubocop:disable Metrics/AbcSize
     def call(instance)
       DataCleanup.logger.info("Checking #{instance.class}##{instance.id}...")
       Reporting.total_record_count += 1
@@ -18,17 +17,15 @@ def call(instance)
           TEXT
           Reporting.invalid_record_count += 1
           Reporting.invalid_records << instance
-          DataCleanup.display("F", inline: true)
+          DataCleanup.display('F', inline: true)
         else
           DataCleanup.logger.info("Instance #{instance.class}##{instance.id} valid!")
-          DataCleanup.display(".", inline: true)
+          DataCleanup.display('.', inline: true)
         end
       rescue Dragonfly::Job::Fetch::NotFound
-        DataCleanup.display(".", inline: true)
+        DataCleanup.display('.', inline: true)
       end
     end
-    # rubocop:enable
-
+    # rubocop:enable Metrics/AbcSize
   end
-
 end
diff --git a/lib/data_cleanup/model_check.rb b/lib/data_cleanup/model_check.rb
index 9c212756a2..c0806cc6ea 100644
--- a/lib/data_cleanup/model_check.rb
+++ b/lib/data_cleanup/model_check.rb
@@ -1,11 +1,9 @@
 # frozen_string_literal: true
 
 module DataCleanup
-
   # Checks whether all records for a given model are valid or not
   class ModelCheck
-
-    require_relative "reporting"
+    require_relative 'reporting'
 
     attr_reader :model
 
@@ -13,25 +11,24 @@ def initialize(model)
       @model = model
     end
 
+    # rubocop:disable Metrics/AbcSize
     def call
       return unless model.superclass == ActiveRecord::Base
 
-      rule, models = ARGV[1].to_s.split("=")
+      rule, models = ARGV[1].to_s.split('=')
       case rule
-      when "INCLUDE"
-        return unless model.model_name.in?(models.split(","))
-      when "EXCLUDE"
-        return if model.model_name.in?(models.split(","))
+      when 'INCLUDE'
+        return unless model.model_name.in?(models.split(','))
+      when 'EXCLUDE'
+        return if model.model_name.in?(models.split(','))
       end
       DataCleanup.display "Checking #{model.model_name.plural}:"
       model.find_in_batches do |batch|
         instance_check = InstanceCheck.new
         batch.each { |instance| instance_check.call(instance) }
       end
-      DataCleanup.display ""
+      DataCleanup.display ''
     end
-    # rubocop:enable
-
+    # rubocop:enable Metrics/AbcSize
   end
-
 end
diff --git a/lib/data_cleanup/reporting.rb b/lib/data_cleanup/reporting.rb
index aa4c51a0e5..d4f8ad5d8a 100644
--- a/lib/data_cleanup/reporting.rb
+++ b/lib/data_cleanup/reporting.rb
@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
 module DataCleanup
-
   # Report the status of the data validations after checks have been run.
   module Reporting
-
     mattr_accessor :total_record_count
     mattr_accessor :invalid_record_count
     mattr_accessor :invalid_records
@@ -37,7 +35,5 @@ def report
         Invalid records: #{invalid_record_count} / #{total_record_count}
       TEXT
     end
-
   end
-
 end
diff --git a/lib/data_cleanup/rules.rb b/lib/data_cleanup/rules.rb
index 57c5767ff9..f4656643f7 100644
--- a/lib/data_cleanup/rules.rb
+++ b/lib/data_cleanup/rules.rb
@@ -1,13 +1,9 @@
 # frozen_string_literal: true
 
-if File.exist?(Rails.root.join("lib", "data_cleanup", "rules", "base.rb"))
-  require_relative "rules/base"
-end
+require_relative 'rules/base' if File.exist?(Rails.root.join('lib', 'data_cleanup', 'rules', 'base.rb'))
 
 module DataCleanup
-
+  # Think this is used for RSpec
   module Rules
-
   end
-
 end
diff --git a/lib/faker/language.rb b/lib/faker/language.rb
index 926a409ebc..04d7171c40 100644
--- a/lib/faker/language.rb
+++ b/lib/faker/language.rb
@@ -1,27 +1,25 @@
 # frozen_string_literal: true
 
 module Faker
-
+  # Monkey patch for Faker to add support for our locales
   class Language < Base
-
     class << self
-
       def name
-        sample(translate("faker.language.names"))
+        sample(translate('faker.language.names'))
       end
 
       def names(num = 3)
         resolved_num = resolve(num)
-        suffle(translate("faker.language.names"))[0..resolved_num]
+        suffle(translate('faker.language.names'))[0..resolved_num]
       end
 
       def abbreviation
-        sample(translate("faker.language.abbreviations"))
+        sample(translate('faker.language.abbreviations'))
       end
 
       def abbreviations(num = 3)
         resolved_num = resolve(num)
-        suffle(translate("faker.language.abbreviations"))[0..resolved_num]
+        suffle(translate('faker.language.abbreviations'))[0..resolved_num]
       end
 
       private
@@ -33,9 +31,6 @@ def resolve(value)
         else value
         end
       end
-
     end
-
   end
-
 end
diff --git a/lib/generators/data_cleanup_rule/data_cleanup_rule_generator.rb b/lib/generators/data_cleanup_rule/data_cleanup_rule_generator.rb
index 48f7c06faa..50bc850415 100644
--- a/lib/generators/data_cleanup_rule/data_cleanup_rule_generator.rb
+++ b/lib/generators/data_cleanup_rule/data_cleanup_rule_generator.rb
@@ -2,52 +2,50 @@
 
 # Generator class for creating a new Rule to clean DB records.
 class DataCleanupRuleGenerator < Rails::Generators::NamedBase
-
-  source_root File.expand_path("templates", __dir__)
+  source_root File.expand_path('templates', __dir__)
 
   # Copy the Rule template and create a new Rule file
   def add_rule_file
-    empty_directory "lib/data_cleanup/rules"
-    template "base.rb", base_class_path unless File.exist?(base_class_path)
-    template "rule.rb.erb", rule_path.to_s
+    empty_directory 'lib/data_cleanup/rules'
+    template 'base.rb', base_class_path unless File.exist?(base_class_path)
+    template 'rule.rb.erb', rule_path.to_s
   end
 
   private
 
   def base_class_path
-    Rails.root.join("lib", "data_cleanup", "rules", "base.rb")
+    Rails.root.join('lib', 'data_cleanup', 'rules', 'base.rb')
   end
 
   # The name of the model we're fixing (e.g. 'User')
   #
   # Returns String
   def model_name
-    file_path.split("/").first.classify
+    file_path.split('/').first.classify
   end
 
   # The name of the Rule class we're creating (e.g. 'User::FixBlankEmail')
   #
   # Returns String
   def rule_class_name
-    file_path.split("/").last.classify
+    file_path.split('/').last.classify
   end
 
   # The file path for the new Rule class
   #
   # Returns String
   def rule_path
-    Rails.root.join("lib", "data_cleanup", "rules", "#{file_path}.rb")
+    Rails.root.join('lib', 'data_cleanup', 'rules', "#{file_path}.rb")
   end
 
   # A default description to populate the Rule#description method
   #
   # Returns String
   def default_description
-    "%{rule_name}s on %{model_name}s" % { rule_name: rule_class_name.underscore
-                                                                    .split("_")
-                                                                    .join(" ")
-                                                                    .capitalize,
-                                          model_name: model_name.classify }
+    format('%<rule_name>s on %<model_name>s',
+           rule_name: rule_class_name.underscore
+                                     .split('_')
+                                     .join(' ')
+                                     .capitalize, model_name: model_name.classify)
   end
-
 end
diff --git a/lib/generators/data_cleanup_rule/templates/base.rb b/lib/generators/data_cleanup_rule/templates/base.rb
index e41b0fcc79..1583bedf96 100644
--- a/lib/generators/data_cleanup_rule/templates/base.rb
+++ b/lib/generators/data_cleanup_rule/templates/base.rb
@@ -1,12 +1,9 @@
 # frozen_string_literal: true
 
 module DataCleanup
-
   module Rules
-
     # Base class for rules to clean invalid database records
     class Base
-
       def log(message)
         DataCleanup.logger.info(message)
       end
@@ -20,9 +17,6 @@ def description
       def call
         raise NotImplementedError, "Please define call() in #{self}"
       end
-
     end
-
   end
-
 end
diff --git a/lib/global_helpers.rb b/lib/global_helpers.rb
index 4d2053a33d..7d52c0c4df 100644
--- a/lib/global_helpers.rb
+++ b/lib/global_helpers.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
+# Helpers for GetText strings
 module GlobalHelpers
-
   # overloading the method
   # came across a wierd issue where the function would refused to be called from
   # class functions of other classes... but it will work if this is a class function
@@ -24,5 +24,4 @@ def self.constant(str)
   def constant(str)
     I18n.t("magic_strings.#{str}", locale: I18n.default_locale)
   end
-
 end
diff --git a/lib/org_date_rangeable.rb b/lib/org_date_rangeable.rb
index 55fa57a87e..b183eef68a 100644
--- a/lib/org_date_rangeable.rb
+++ b/lib/org_date_rangeable.rb
@@ -1,25 +1,24 @@
 # frozen_string_literal: true
 
+# Helpers for generating usage statistics
 module OrgDateRangeable
-
   def monthly_range(org:, start_date: nil, end_date: Date.today.end_of_month, filtered: false)
-    query_string = "org_id = :org_id and filtered = :filtered"
+    query_string = 'org_id = :org_id and filtered = :filtered'
     query_hash = { org_id: org.id, filtered: filtered }
 
     unless start_date.nil?
-      query_string += " and date >= :start_date"
+      query_string += ' and date >= :start_date'
       query_hash[:start_date] = start_date
     end
 
     unless end_date.nil?
-      query_string += " and date <= :end_date"
+      query_string += ' and date <= :end_date'
       query_hash[:end_date] = end_date
     end
     where(query_string, query_hash)
   end
 
   class << self
-
     def split_months_from_creation(org, &block)
       starts_at = org.created_at
       ends_at = starts_at.end_of_month
@@ -39,7 +38,5 @@ def split_months_from_creation(org, &block)
 
       enumerable
     end
-
   end
-
 end
diff --git a/lib/sort_direction.rb b/lib/sort_direction.rb
index 31636ae8cf..f0165d9464 100644
--- a/lib/sort_direction.rb
+++ b/lib/sort_direction.rb
@@ -12,10 +12,9 @@
 #   SortDirection.new(:wrong).to_s # => 'ASC'
 #
 class SortDirection
-
   ##
   # When given an unknown or nil direction, default to this value
-  DEFAULT_DIRECTION = "ASC"
+  DEFAULT_DIRECTION = 'ASC'
 
   ##
   # Possible sort direction values
@@ -52,5 +51,4 @@ def initialize(direction = nil)
   def opposite
     @opposite ||= DIRECTIONS[DIRECTIONS.index(direction) - 1]
   end
-
 end
diff --git a/lib/tasks/auto_annotate_models.rake b/lib/tasks/auto_annotate_models.rake
index 77299bd4ea..8e036abf37 100644
--- a/lib/tasks/auto_annotate_models.rake
+++ b/lib/tasks/auto_annotate_models.rake
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # NOTE: only doing this in development as some production environments (Heroku)
 # NOTE: are sensitive to local FS writes, and besides -- it's just not proper
 # NOTE: to have a dev-mode tool do its thing in production.
@@ -7,46 +9,46 @@ if Rails.env.development?
     # You can override any of these by setting an environment variable of the
     # same name.
     Annotate.set_defaults(
-      'routes'                    => 'false',
-      'position_in_routes'        => 'before',
-      'position_in_class'         => 'before',
-      'position_in_test'          => 'before',
-      'position_in_fixture'       => 'before',
-      'position_in_factory'       => 'before',
-      'position_in_serializer'    => 'before',
-      'show_foreign_keys'         => 'true',
+      'routes' => 'false',
+      'position_in_routes' => 'before',
+      'position_in_class' => 'before',
+      'position_in_test' => 'before',
+      'position_in_fixture' => 'before',
+      'position_in_factory' => 'before',
+      'position_in_serializer' => 'before',
+      'show_foreign_keys' => 'true',
       'show_complete_foreign_keys' => 'false',
-      'show_indexes'              => 'true',
-      'simple_indexes'            => 'false',
-      'model_dir'                 => 'app/models',
-      'root_dir'                  => '',
-      'include_version'           => 'false',
-      'require'                   => '',
-      'exclude_tests'             => 'true',
-      'exclude_fixtures'          => 'true',
-      'exclude_factories'         => 'false',
-      'exclude_serializers'       => 'true',
-      'exclude_scaffolds'         => 'true',
-      'exclude_controllers'       => 'true',
-      'exclude_helpers'           => 'true',
-      'exclude_sti_subclasses'    => 'false',
-      'ignore_model_sub_dir'      => 'false',
-      'ignore_columns'            => nil,
-      'ignore_routes'             => 'true',
-      'ignore_unknown_models'     => 'false',
-      'hide_limit_column_types'   => 'integer,boolean',
+      'show_indexes' => 'true',
+      'simple_indexes' => 'false',
+      'model_dir' => 'app/models',
+      'root_dir' => '',
+      'include_version' => 'false',
+      'require' => '',
+      'exclude_tests' => 'true',
+      'exclude_fixtures' => 'true',
+      'exclude_factories' => 'false',
+      'exclude_serializers' => 'true',
+      'exclude_scaffolds' => 'true',
+      'exclude_controllers' => 'true',
+      'exclude_helpers' => 'true',
+      'exclude_sti_subclasses' => 'false',
+      'ignore_model_sub_dir' => 'false',
+      'ignore_columns' => nil,
+      'ignore_routes' => 'true',
+      'ignore_unknown_models' => 'false',
+      'hide_limit_column_types' => 'integer,boolean',
       'hide_default_column_types' => 'json,jsonb,hstore',
-      'skip_on_db_migrate'        => 'false',
-      'format_bare'               => 'true',
-      'format_rdoc'               => 'false',
-      'format_markdown'           => 'false',
-      'sort'                      => 'false',
-      'force'                     => 'false',
-      'classified_sort'           => 'true',
-      'trace'                     => 'false',
-      'wrapper_open'              => nil,
-      'wrapper_close'             => nil,
-      'with_comment'              => true
+      'skip_on_db_migrate' => 'false',
+      'format_bare' => 'true',
+      'format_rdoc' => 'false',
+      'format_markdown' => 'false',
+      'sort' => 'false',
+      'force' => 'false',
+      'classified_sort' => 'true',
+      'trace' => 'false',
+      'wrapper_open' => nil,
+      'wrapper_close' => nil,
+      'with_comment' => true
     )
   end
 
diff --git a/lib/tasks/data_cleanup.rake b/lib/tasks/data_cleanup.rake
index a88334d721..81cbad941a 100644
--- a/lib/tasks/data_cleanup.rake
+++ b/lib/tasks/data_cleanup.rake
@@ -1,9 +1,10 @@
-require "data_cleanup"
+# frozen_string_literal: true
 
-namespace :data_cleanup do
+require 'data_cleanup'
 
-  desc "Check each record on the DB is valid and report"
-  task :find_invalid_records => :environment do
+namespace :data_cleanup do
+  desc 'Check each record on the DB is valid and report'
+  task find_invalid_records: :environment do
     DataCleanup.logger.info("\n== Finding invalid records =======================\n")
     models.each do |model|
       DataCleanup::ModelCheck.new(model).call
@@ -12,18 +13,18 @@ namespace :data_cleanup do
     DataCleanup::Reporting.report
   end
 
-  desc "Clean invalid records on the database"
-  task :clean_invalid_records => :environment do
+  desc 'Clean invalid records on the database'
+  task clean_invalid_records: :environment do
     DataCleanup.logger.info("\n== Cleaning invalid records =======================\n")
     Dir[rule_paths].each do |rule_path|
       load rule_path
-      klass_name = rule_path.split("rules/").last.gsub(".rb", '').classify
-      model_name = klass_name.split("::").first
-      opt, models = ARGV[1].to_s.split("=")
-      if opt.present? && opt =='INCLUDE'
-        next unless model_name.in?(models.split(","))
-      elsif opt.present? && opt =='EXCLUDE'
-        next if model_name.in?(models.split(","))
+      klass_name = rule_path.split('rules/').last.gsub('.rb', '').classify
+      model_name = klass_name.split('::').first
+      opt, models = ARGV[1].to_s.split('=')
+      if opt.present? && opt == 'INCLUDE'
+        next unless model_name.in?(models.split(','))
+      elsif opt.present? && opt == 'EXCLUDE'
+        next if model_name.in?(models.split(','))
       elsif opt.blank?
         # :noop:
       else
@@ -36,103 +37,108 @@ namespace :data_cleanup do
     end
   end
 
-  desc "Check records for validation errors"
-  task :find_known_invalidations => :environment do
+  desc 'Check records for validation errors'
+  task find_known_invalidations: :environment do
     models.each do |model|
       DataCleanup.display "Checking #{model.name} records"
-      if model.respond_to?(:_validate_callbacks)
-        model._validate_callbacks.to_a.collect(&:filter).each do |filter|
-          ids, msg   = [], ""
+      next unless model.respond_to?(:_validate_callbacks)
 
-          case filter.class.name
-          when 'ActiveRecord::Validations::PresenceValidator'
-            ids, msg = check_presence(model, filter)
+      model._validate_callbacks.to_a.collect(&:filter).each do |filter|
+        ids = []
+        msg = ''
 
-          when "ActiveRecord::Validations::UniquenessValidator"
-            ids, msg = check_uniqueness(model, filter)
+        case filter.class.name
+        when 'ActiveRecord::Validations::PresenceValidator'
+          ids, msg = check_presence(model, filter)
 
-          when "ActiveModel::Validations::InclusionValidator"
-            ids, msg = check_inclusion(model, filter)
+        when 'ActiveRecord::Validations::UniquenessValidator'
+          ids, msg = check_uniqueness(model, filter)
 
-          when "ActiveModel::Validations::FormatValidator"
-            ids, msg = check_format(model, filter)
+        when 'ActiveModel::Validations::InclusionValidator'
+          ids, msg = check_inclusion(model, filter)
 
-          when "ActiveModel::Validations::LengthValidator"
-            ids, msg = check_length(model, filter)
+        when 'ActiveModel::Validations::FormatValidator'
+          ids, msg = check_format(model, filter)
 
-          when "ActiveModel::Validations::NumericalityValidator"
-            ids, msg = check_numericality(model, filter)
+        when 'ActiveModel::Validations::LengthValidator'
+          ids, msg = check_length(model, filter)
 
-          when "ActiveModel::Validations::ConfirmationValidator"
-            # Skip
+        when 'ActiveModel::Validations::NumericalityValidator'
+          ids, msg = check_numericality(model, filter)
 
-          when "Dragonfly::Model::Validations::PropertyValidator"
-            # Skip
+        when 'ActiveModel::Validations::ConfirmationValidator'
+          # Skip
 
-          when "Symbol"
-            # Skip
+        when 'Dragonfly::Model::Validations::PropertyValidator'
+          # Skip
 
-          when "OrgLinksValidator"
-            ids, msg = check_local_validators(model, [:links], "OrgLinksValidator")
+        when 'Symbol'
+          # Skip
 
-          when "TemplateLinksValidator"
-            # Skip
-            ids, msg = check_local_validators(model, [:links], "TemplateLinksValidator")
+        when 'OrgLinksValidator'
+          ids, msg = check_local_validators(model, [:links], 'OrgLinksValidator')
 
-          when "EmailValidator"
-            # Skip
-            ids, msg = check_local_validators(model, filter.attributes, "EmailValidator")
+        when 'TemplateLinksValidator'
+          # Skip
+          ids, msg = check_local_validators(model, [:links], 'TemplateLinksValidator')
 
-          when "AfterValidator"
-            # Skip
-            ids, msg = check_local_validators(model, filter.attributes, "AfterValidator")
+        when 'EmailValidator'
+          # Skip
+          ids, msg = check_local_validators(model, filter.attributes, 'EmailValidator')
 
-          else
-            p "Unhandled validator type: #{filter.class.name}"
-            p filter.inspect
-          end
+        when 'AfterValidator'
+          # Skip
+          ids, msg = check_local_validators(model, filter.attributes, 'AfterValidator')
 
-          if msg.present?
-            DataCleanup.display msg, color: ids.any? ? :red : :green
-          end
+        else
+          p "Unhandled validator type: #{filter.class.name}"
+          p filter.inspect
+        end
+
+        if msg.present?
+          DataCleanup.display msg, color: ids.any? ? :red : :green
         end
       end
     end
   end
 
-  desc "Deactivate the roles and plan for any plan that no longer has an owner"
-  task :deactivate_orphaned_plans => :environment do
-    p "Deactiviating plans that no longer have a owner, coowner or editor"
-    Plan.all.each{ |plan| plan.deactivate! }
-    p "Done"
+  desc 'Deactivate the roles and plan for any plan that no longer has an owner'
+  task deactivate_orphaned_plans: :environment do
+    p 'Deactiviating plans that no longer have a owner, coowner or editor'
+    Plan.all.each(&:deactivate!)
+    p 'Done'
   end
 
   private
 
   def report_known_invalidations(results, model_name, validation_error)
-    DataCleanup.display "#{results.count} #{model_name.pluralize} with #{validation_error}", color: results.any? ? :red : :green
+    DataCleanup.display "#{results.count} #{model_name.pluralize} with #{validation_error}",
+                        color: results.any? ? :red : :green
   end
 
   def rule_paths
-    @rule_paths ||= Rails.root.join("lib", "data_cleanup", "rules", "*", "*.rb")
+    @rule_paths ||= Rails.root.join('lib', 'data_cleanup', 'rules', '*', '*.rb')
   end
 
   def models
-    Dir[Rails.root.join("app", "models", "*.rb")].map do |model_path|
-      model_path.split("/").last.gsub(".rb", "").classify.constantize
+    Dir[Rails.root.join('app', 'models', '*.rb')].map do |model_path|
+      model_path.split('/').last.gsub('.rb', '').classify.constantize
     end.sort_by(&:name)
   end
 
   def singular?(value)
     str = value.to_s
-    #p "#{str.pluralize} != #{str} && #{str.singularize} == #{str}"
+    # p "#{str.pluralize} != #{str} && #{str.singularize} == #{str}"
     str.pluralize != str && str.singularize == str
   end
 
+  # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+  # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
   def check_presence(klass, filter)
     table = klass.name.tableize
     instance = klass.new
-    ids, msg = [], ""
+    ids = []
+    msg = ''
     filter.attributes.map(&:to_s).each do |attr|
       join = attr.pluralize.tableize
 
@@ -141,7 +147,7 @@ namespace :data_cleanup do
         # Determine if the model is a child in the relationship
         if singular?(attr)
           ids = klass.joins("LEFT OUTER JOIN #{join} ON #{join}.id = #{table}.#{attr}_id")
-                         .where(join.to_sym => { id: nil })
+                     .where(join.to_sym => { id: nil })
           msg = "  #{ids.count} orphaned records due to nil or missing #{attr}"
         end
 
@@ -153,44 +159,52 @@ namespace :data_cleanup do
         # particular validation is handled elsewhere
 
       else
-        unless attr == "password"
+        unless attr == 'password'
           # Find any records where the field is blank or nil
-          if filter.options.present? && filter.options[:if].present?
-            ids = klass.where(attr.to_sym => [nil, ""]).select{ |r| r.send(filter.options[:if]) }.map(&:id)
-          else
-            ids = klass.where(attr.to_sym => [nil, ""])
-          end
+          ids = if filter.options.present? && filter.options[:if].present?
+                  klass.where(attr.to_sym => [nil, '']).select { |r| r.send(filter.options[:if]) }.map(&:id)
+                else
+                  klass.where(attr.to_sym => [nil, ''])
+                end
           msg = "  #{ids.count} records with a empty #{attr} field"
         end
       end
     end
     [ids, msg]
   end
+  # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+  # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
+  # rubocop:disable Metrics/AbcSize
   def check_uniqueness(klass, filter)
     instance = klass.new
-    group = [filter.attributes.map{ |a| instance.respond_to?("#{a}_id") ? "#{a}_id".to_sym : a }]
+    group = [filter.attributes.map { |a| instance.respond_to?("#{a}_id") ? "#{a}_id".to_sym : a }]
 
-    if filter.options[:scope].present?
-      group << filter.options[:scope]
-    end
+    group << filter.options[:scope] if filter.options[:scope].present?
     group = group.flatten.uniq
-    ids = klass.group(group).count.select{ |k, v| v > 1 }
+    ids = klass.group(group).count.select { |_k, v| v > 1 }
     [ids, "  #{ids.count} records that are not unique per (#{group.join(', ')})"]
   end
+  # rubocop:enable Metrics/AbcSize
 
+  # rubocop:disable Metrics/AbcSize
   def check_inclusion(klass, filter)
-    ids, msg = [], ""
+    ids = []
+    msg = ''
     if filter.options[:in].present?
       filter.attributes.each do |attr|
         ids << klass.where.not(attr.to_sym => filter.options[:in]).pluck(:id)
       end
       ids = ids.flatten.uniq
+      # rubocop:disable Layout/LineLength
       msg = "  #{ids.count} records that do not have a valid value for #{filter.attributes}, should be #{filter.options[:in]}"
+      # rubocop:enable Layout/LineLength
     end
     [ids, msg]
   end
+  # rubocop:enable Metrics/AbcSize
 
+  # rubocop:disable Metrics/AbcSize
   def check_format(klass, filter)
     ids = []
     if filter.options[:with].present?
@@ -199,8 +213,8 @@ namespace :data_cleanup do
         unless attr == :password
           # If this is the users.email field send it to the EmailValidator. Devise has its own Regex
           # but running a Regex query gets messy between different DB types
-          if klass.name == "User" && attr == :email
-            ids, msg = check_local_validators(klass, [attr], EmailValidator)
+          if klass.name == 'User' && attr == :email
+            ids, _msg = check_local_validators(klass, [attr], EmailValidator)
           else
             ids = klass.where.not(attr.to_sym => filter.options[:when]).pluck(:id)
           end
@@ -210,70 +224,76 @@ namespace :data_cleanup do
     end
     [ids.flatten.uniq, "  #{ids.count} records that do not have valid #{filter.attributes}"]
   end
+  # rubocop:enable Metrics/AbcSize
 
+  # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
   def check_length(klass, filter)
     ids = []
-    shoulda = ""
+    shoulda = ''
     filter.attributes.each do |attr|
-      unless [:password, :logo].include?(attr)
-        qry = ""
-        if filter.options[:minimum].present?
-          qry += "CHAR_LENGTH(#{attr}) < #{filter.options[:minimum]}"
-          shoulda += ">= #{filter.options[:maximum]}"
-        end
+      next if %i[password logo].include?(attr)
 
-        if filter.options[:maximum].present?
-          unless qry.blank?
-            qry += " OR "
-            should += " and "
-          end
-          qry += "CHAR_LENGTH(#{attr}) > #{filter.options[:maximum]}"
-          shoulda += "<= #{filter.options[:maximum]}"
-        end
+      qry = ''
+      if filter.options[:minimum].present?
+        qry += "CHAR_LENGTH(#{attr}) < #{filter.options[:minimum]}"
+        shoulda += ">= #{filter.options[:maximum]}"
+      end
 
+      if filter.options[:maximum].present?
         unless qry.blank?
-          ids << klass.where(qry).pluck(:id)
+          qry += ' OR '
+          shoulda += ' and '
         end
+        qry += "CHAR_LENGTH(#{attr}) > #{filter.options[:maximum]}"
+        shoulda += "<= #{filter.options[:maximum]}"
       end
+
+      ids << klass.where(qry).pluck(:id) unless qry.blank?
     end
     ids = ids.flatten.uniq
     [ids, "  #{ids.count} records that are an invalid length for fields #{filter.attributes} should be #{shoulda}"]
   end
+  # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
+  # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+  # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
   def check_numericality(klass, filter)
     filter.attributes.each do |attr|
-      qry = ""
-      shoulda = ""
+      qry = ''
+      shoulda = ''
       if filter.options[:only_integer].present?
         qry = "CEIL(#{attr}) != #{attr}"
-        shoulda = "been an integer"
+        shoulda = 'been an integer'
       end
       if filter.options[:greater_than].present?
-        qry += qry.blank? ? "" : " OR "
-        shoulda += shoulda.blank? ? "" : " and "
+        qry += qry.blank? ? '' : ' OR '
+        shoulda += shoulda.blank? ? '' : ' and '
         qry += "#{attr} <= #{filter.options[:greater_than]}"
         shoulda += " length > #{filter.options[:greater_than]}"
       end
       if filter.options[:less_than].present?
-        qry += qry.blank? ? "" : " OR "
-        shoulda += shoulda.blank? ? "" : " and "
+        qry += qry.blank? ? '' : ' OR '
+        shoulda += shoulda.blank? ? '' : ' and '
         qry += "#{attr} >= #{filter.options[:less_than]}"
         shoulda += " length < #{filter.options[:less_than]}"
       end
 
       ids = klass.where(qry).pluck(:id)
-      [ids, "  #{ids.count} records that are an invalid #{filter.attributes} because it should #{shoulda}"]
+      msg = "  #{ids.count} records that are an invalid #{filter.attributes} because it should #{shoulda}"
+      # rubocop:disable Lint/Void
+      [ids, msg]
+      # rubocop:enable Lint/Void
     end
   end
+  # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+  # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
   def check_local_validators(klass, attributes, validator)
     ids = []
     klass.all.each do |obj|
       obj.valid?
       attributes.each do |attr|
-        unless obj.errors[attr.to_sym].blank?
-          ids << obj.id
-        end
+        ids << obj.id unless obj.errors[attr.to_sym].blank?
       end
     end
     ids = ids.flatten.uniq
diff --git a/lib/tasks/doc.rake b/lib/tasks/doc.rake
index 96a0c4faa0..6031eb11dc 100644
--- a/lib/tasks/doc.rake
+++ b/lib/tasks/doc.rake
@@ -1,38 +1,41 @@
+# frozen_string_literal: true
+
 namespace :tomdoc do
-  desc "Removes the docs from the ./doc directory"
-  task :clear  do
-    FileUtils.rm_r(Rails.root.join("doc"))
+  desc 'Removes the docs from the ./doc directory'
+  task :clear do
+    FileUtils.rm_r(Rails.root.join('doc'))
   end
 
-  desc "Builds documentation in the ./doc directory"
+  desc 'Builds documentation in the ./doc directory'
   task :app do
-    puts "Please wait..."
+    puts 'Please wait...'
     options = []
     # Parse documentation as Tomdoc (https://tomdoc.org)
-    options << "--plugin tomdoc"
+    options << '--plugin tomdoc'
     # Specify which file to use for the main index (README)
-    options << "--readme README.md"
+    options << '--readme README.md'
     # Hides return types specified as 'void'.
-    options << "--hide-void-return"
+    options << '--hide-void-return'
     # Add a custom title to the HTML docs
     options << "--title 'DMP Roadmap'"
     # Include protected methods
-    options << "--protected"
+    options << '--protected'
     # Include private methods
-    options << "--private"
+    options << '--private'
     # Set methods with no Return value to 'void'
     options << "--default-return 'void'"
-    system("yard doc #{options.join(" ")}")
+    system("yard doc #{options.join(' ')}")
   end
 
-  desc "Builds documentation in the ./doc directory"
+  desc 'Builds documentation in the ./doc directory'
   task :open do
     `open doc/index.html`
   end
 end
 
-task tomdoc: ["tomdoc:clear", "tomdoc:app", "tomdoc:open"] do
+task tomdoc: ['tomdoc:clear', 'tomdoc:app', 'tomdoc:open'] do
+  # Not sure qwhat all this is for
 end
 
 # Clear Rails' default doc tasks first.
-task("doc:app").clear.enhance(["tomdoc:app"])
+task('doc:app').clear.enhance(['tomdoc:app'])
diff --git a/lib/tasks/factory_bot.rake b/lib/tasks/factory_bot.rake
index 1fd301c9a6..6da7af9ab7 100644
--- a/lib/tasks/factory_bot.rake
+++ b/lib/tasks/factory_bot.rake
@@ -1,13 +1,17 @@
+# frozen_string_literal: true
+
+require 'English'
+
 namespace :factory_bot do
-  desc "Verify that all FactoryBot factories are valid"
+  desc 'Verify that all FactoryBot factories are valid'
   task lint: :environment do
     if Rails.env.test?
       # DatabaseCleaner.cleaning do
-        FactoryBot.lint
+      FactoryBot.lint
       # end
     else
       system("bundle exec rails factory_bot:lint RAILS_ENV='test'")
-      exit $?.exitstatus
+      exit $CHILD_STATUS.exitstatus
     end
   end
 end
diff --git a/lib/tasks/gettext.rake b/lib/tasks/gettext.rake
index bc7ab8913d..f043d823af 100644
--- a/lib/tasks/gettext.rake
+++ b/lib/tasks/gettext.rake
@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 namespace :gettext do
   def files_to_translate
-    Dir.glob("{app,lib,config,locale}/**/*.{rb,erb,haml,slim,rhtml}")
+    Dir.glob('{app,lib,config,locale}/**/*.{rb,erb,haml,slim,rhtml}')
   end
 end
diff --git a/lib/tasks/initialize_data.rake b/lib/tasks/initialize_data.rake
index 8cd99d7b24..dc54975752 100644
--- a/lib/tasks/initialize_data.rake
+++ b/lib/tasks/initialize_data.rake
@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 namespace :initialize_data do
-  desc "Add RDA Question Type"
+  desc 'Add RDA Question Type'
   task rda_ques: :environment do
     rda_q_title = 'RDA Metadata Standards'
     # check if already in the database
     rda_q = QuestionFormat.find_by(title: rda_q_title)
     if rda_q.blank?
-      rda_q = QuestionFormat.new()
+      rda_q = QuestionFormat.new
       rda_q.title = rda_q_title
       puts 'Question format does not exist, adding'
     else
@@ -13,7 +15,7 @@ namespace :initialize_data do
     end
     rda_q.option_based = false # keeping this false as options not stored locally
     rda_q.formattype = QuestionFormat.formattypes[:rda_metadata]
-    rda_q.description = "https://rdamsc.bath.ac.uk/api/"
+    rda_q.description = 'https://rdamsc.bath.ac.uk/api/'
     if rda_q.save
       puts 'Sucessfully added/updated'
     else
diff --git a/lib/tasks/migrate.rake b/lib/tasks/migrate.rake
index c82a769360..0820c3fe74 100644
--- a/lib/tasks/migrate.rake
+++ b/lib/tasks/migrate.rake
@@ -1,14 +1,17 @@
-# These Tasks are for the early migrations of the codebase
+# frozen_string_literal: true
 
+# These Tasks are for the early migrations of the codebase
 namespace :migrate do
-
-  desc "migrate to 1.0"
+  # rubocop:disable Naming/VariableNumber
+  desc 'migrate to 1.0'
   task prep_for_1_0: :environment do
     # Convert existing orgs.target_url to the orgs.links JSON arrays
     Rake::Task['migrate:org_target_url_to_links'].execute
   end
+  # rubocop:enable Naming/VariableNumber
 
-  desc "migrate to 0.4"
+  # rubocop:disable Naming/VariableNumber
+  desc 'migrate to 0.4'
   task to_04: :environment do
     # Default all plans.visibility to the value specified in application.rb
     Rake::Task['migrate:init_plan_visibility'].execute
@@ -19,13 +22,14 @@ namespace :migrate do
     # Move users.shibboleth_id to the user_identifiers table
     Rake::Task['migrate:move_shibs'].execute
   end
+  # rubocop:enable Naming/VariableNumber
 
-  desc "TODO"
+  desc 'TODO'
   task permissions: :environment do
     User.update_user_permissions
   end
 
-  desc "perform entire data migration"
+  desc 'perform entire data migration'
   task setup: :environment do
     Rake::Task['db:drop'].execute
     Rake::Task['db:create'].execute
@@ -36,14 +40,13 @@ namespace :migrate do
     Rake::Task['migrate:permissions'].execute
   end
 
-  desc "perform all post-migration tasks"
+  desc 'perform all post-migration tasks'
   task cleanup: :environment do
     Rake::Task['migrate:fix_languages'].execute
     Rake::Task['migrate:single_published_template'].execute
   end
 
-
-  desc "seed database with default values for new data structures"
+  desc 'seed database with default values for new data structures'
   task seed: :environment do
     # seed roles to database
     roles = {
@@ -72,142 +75,141 @@ namespace :migrate do
         name: 'grant_api_to_orgs'
       }
     }
-    roles.each do |role, details|
-      if Role.where(name: details[:name]).empty?
-        role = Role.new
-        role.name = details[:name]
-        role.save!
-      end
+    roles.each do |_r, details|
+      next unless Role.where(name: details[:name]).empty?
+
+      role = Role.new
+      role.name = details[:name]
+      role.save!
     end
 
     # seed token permission types to database
     token_permission_types = {
-        'guidances' => {
-            description: "allows a user access to the guidances api endpoint"
-        },
-        'plans' => {
-            description: "allows a user access to the plans api endpoint"
-        },
-        'templates' => {
-            description: "allows a user access to the templates api endpoint"
-        },
-        'statistics' => {
-            description: "allows a user access to the statistics api endpoint"
-        }
+      'guidances' => {
+        description: 'allows a user access to the guidances api endpoint'
+      },
+      'plans' => {
+        description: 'allows a user access to the plans api endpoint'
+      },
+      'templates' => {
+        description: 'allows a user access to the templates api endpoint'
+      },
+      'statistics' => {
+        description: 'allows a user access to the statistics api endpoint'
+      }
     }
-    token_permission_types.each do |title,settings|
-      if TokenPermissionType.where(token_type: title).empty?
-        token_permission_type = TokenPermissionType.new
-        token_permission_type.token_type = title
-        token_permission_type.text_description = settings[:description]
-        token_permission_type.save!
-      end
+    token_permission_types.each do |title, settings|
+      next unless TokenPermissionType.where(token_type: title).empty?
+
+      token_permission_type = TokenPermissionType.new
+      token_permission_type.token_type = title
+      token_permission_type.text_description = settings[:description]
+      token_permission_type.save!
     end
 
     # seed languages to database
     languages = {
-        'English(GB)' => {
-          abbreviation: 'en_GB',
-          description: '',
-          name: 'English (GB)',
-          default_language: true
-        },
-        'English(US)' => {
-          abbreviation: 'en_US',
-          description: '',
-          name: 'English (US)',
-          default_language: false
-        },
-        'FR' => {
-          abbreviation: 'fr',
-          description: '',
-          name: 'Français',
-          default_language: false
-        },
-        'DE' => {
-            abbreviation: 'de',
-            description: '',
-            name: 'Deutsch',
-            default_language: false
-        },
-        'Español' => {
-          abbreviation: 'es',
-          description: '',
-          name: 'Español',
-          default_language: false
-        }
+      'English(GB)' => {
+        abbreviation: 'en_GB',
+        description: '',
+        name: 'English (GB)',
+        default_language: true
+      },
+      'English(US)' => {
+        abbreviation: 'en_US',
+        description: '',
+        name: 'English (US)',
+        default_language: false
+      },
+      'FR' => {
+        abbreviation: 'fr',
+        description: '',
+        name: 'Français',
+        default_language: false
+      },
+      'DE' => {
+        abbreviation: 'de',
+        description: '',
+        name: 'Deutsch',
+        default_language: false
+      },
+      'Español' => {
+        abbreviation: 'es',
+        description: '',
+        name: 'Español',
+        default_language: false
+      }
     }
 
-    languages.each do |l, details|
-      if Language.where(name: details[:name]).empty?
-        language = Language.new
-        language.abbreviation = details[:abbreviation]
-        language.description = details[:description]
-        language.name = details[:name]
-        language.default_language = details[:default_language]
-        language.save!
-      end
+    languages.each do |_l, details|
+      next unless Language.where(name: details[:name]).empty?
+
+      language = Language.new
+      language.abbreviation = details[:abbreviation]
+      language.description = details[:description]
+      language.name = details[:name]
+      language.default_language = details[:default_language]
+      language.save!
     end
 
     # seed regions to database
     regions = {
-        'UK' => {
-            abbreviation: 'uk',
-            description: 'default region',
-            name: 'UK',
-        },
-        'DE' => {
-            abbreviation: 'de',
-            description: '',
-            name: 'DE',
-        },
-        'Horizon2020' => {
-            abbreviation: 'horizon',
-            description: 'European super region',
-            name: 'Horizon2020',
-        }
+      'UK' => {
+        abbreviation: 'uk',
+        description: 'default region',
+        name: 'UK'
+      },
+      'DE' => {
+        abbreviation: 'de',
+        description: '',
+        name: 'DE'
+      },
+      'Horizon2020' => {
+        abbreviation: 'horizon',
+        description: 'European super region',
+        name: 'Horizon2020'
+      }
     }
 
-    regions.each do |l, details|
-      if Region.where(name: details[:name]).empty?
-        region = Region.new
-        region.abbreviation = details[:abbreviation]
-        region.description = details[:description]
-        region.name = details[:name]
-        region.save!
-      end
-    end
+    regions.each do |_l, details|
+      next unless Region.where(name: details[:name]).empty?
 
+      region = Region.new
+      region.abbreviation = details[:abbreviation]
+      region.description = details[:description]
+      region.name = details[:name]
+      region.save!
+    end
   end
 
-  desc "replaces languages in incorrect formats and seeds all correct formats"
+  desc 'replaces languages in incorrect formats and seeds all correct formats'
   task fix_languages: :environment do
     languages = [
       { abbreviation: 'en_GB',
         old_abbreviation: 'en-UK',
         description: '',
         name: 'English (GB)',
-        default_language: true},
+        default_language: true },
       { abbreviation: 'en_US',
         old_abbreviation: 'en-US',
         description: '',
         name: 'English (US)',
-        default_language: false},
+        default_language: false },
       { abbreviation: 'fr',
         old_abbreviation: 'fr',
         description: '',
         name: 'Français',
-        default_language: false},
+        default_language: false },
       { abbreviation: 'de',
         old_abbreviation: 'de',
         description: '',
         name: 'Deutsch',
-        default_language: false},
+        default_language: false },
       { abbreviation: 'es',
         old_abbreviation: 'es',
         description: '',
         name: 'Español',
-        default_language: false}
+        default_language: false }
     ]
 
     languages.each do |lang_data|
@@ -232,10 +234,9 @@ namespace :migrate do
         end
       end
     end
-
   end
 
-  desc "enforce single published version for templates"
+  desc 'enforce single published version for templates'
   task single_published_template: :environment do
     # for each group of versions of a template
     Template.all.pluck(:dmptemplate_id).uniq.each do |dmptemplate_id|
@@ -252,18 +253,18 @@ namespace :migrate do
     end
   end
 
-# Tasks required to migrate to 0.4.x
-# -----------------------------------------------
-  desc "Initialize plans.visibility to the default specified in application.rb"
+  # Tasks required to migrate to 0.4.x
+  # -----------------------------------------------
+  desc 'Initialize plans.visibility to the default specified in application.rb'
   task init_plan_visibility: :environment do
     default = Rails.configuration.x.plans.default_visibility.to_sym
-    Plan.all.each{ |p| p.update_attributes(visibility: default) unless p.visibility == default }
+    Plan.all.each { |p| p.update_attributes(visibility: default) unless p.visibility == default }
   end
 
-  desc "Move old plans.data_contact to data_contact_email and data_contact_phone"
+  desc 'Move old plans.data_contact to data_contact_email and data_contact_phone'
   task plan_data_contacts: :environment do
     email_regex = /([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})/i
-    phone_regex = /\+?[0-9\-\(\)]{7,}/i
+    phone_regex = /\+?[0-9\-()]{7,}/i
     Plan.where('data_contact IS NOT NULL').each do |p|
       email = p.data_contact[email_regex]
       phone = p.data_contact[phone_regex]
@@ -282,12 +283,12 @@ namespace :migrate do
     end
   end
 
-  desc "Move old ORCID from users table to user_identifiers"
+  desc 'Move old ORCID from users table to user_identifiers'
   task move_orcids: :environment do
     users = User.includes(:user_identifiers).where('users.orcid_id IS NOT NULL')
 
     # If we have users with orcid ids
-    if users.length > 0
+    if users.any?
       # If orcid isn't defined in the identifier_schemes table add it
       if IdentifierScheme.find_by(name: 'orcid').nil?
         IdentifierScheme.create!(name: 'orcid',
@@ -301,76 +302,78 @@ namespace :migrate do
 
       unless scheme.nil?
         users.each do |u|
-          if u.orcid_id.gsub('orcid.org/', '').match(/^[\d-]+/)
-            schemes = u.user_identifiers.collect{|i| i.identifier_scheme_id}
+          next unless u.orcid_id.gsub('orcid.org/', '').match(/^[\d-]+/)
+
+          schemes = u.user_identifiers.collect(&:identifier_scheme_id)
 
-            unless schemes.include?(scheme.id)
-              UserIdentifier.create(user: u, identifier_scheme: scheme,
-                                    identifier: u.orcid_id.gsub('orcid.org/', ''))
-            end
+          unless schemes.include?(scheme.id)
+            UserIdentifier.create(user: u, identifier_scheme: scheme,
+                                  identifier: u.orcid_id.gsub('orcid.org/', ''))
           end
         end
       end
     end
   end
 
-  desc "Move old Shibboleth Ids from users table to user_identifiers"
+  desc 'Move old Shibboleth Ids from users table to user_identifiers'
   task move_shibs: :environment do
     if Rails.configuration.x.shibboleth.enabled
       users = User.includes(:user_identifiers).where('users.shibboleth_id IS NOT NULL')
 
       # If we have users with orcid ids
-      if users.length > 0
+      if users.any?
         # If orcid isn't defined in the identifier_schemes table add it
         if IdentifierScheme.find_by(name: 'shibboleth').nil?
           IdentifierScheme.create!(name: 'shibboleth',
-                                   description: "Your institution credentials",
+                                   description: 'Your institution credentials',
                                    active: true)
         end
 
         scheme = IdentifierScheme.find_by(name: 'shibboleth')
 
+        # rubocop:disable Metrics/BlockNesting
         unless scheme.nil?
           users.each do |u|
-            schemes = u.user_identifiers.collect{|i| i.identifier_scheme_id}
+            schemes = u.user_identifiers.collect(&:identifier_scheme_id)
 
-            unless schemes.include?(scheme.id)
-# TODO: Add logic to move shib identifiers over
-#              UserIdentifier.create(user: u, identifier_scheme: scheme,
-#                                    identifier: u.orcid_id.gsub('orcid.org/', ''))
-            end
+            next if schemes.include?(scheme.id)
+            # TODO: Add logic to move shib identifiers over
+            #              UserIdentifier.create(user: u, identifier_scheme: scheme,
+            #                                    identifier: u.orcid_id.gsub('orcid.org/', ''))
           end
         end
+        # rubocop:enable Metrics/BlockNesting
       end
     end
   end
 
-  desc "remove duplicate annotations caused by bug"
+  desc 'remove duplicate annotations caused by bug'
   task remove_duplicate_annotations: :environment do
-    questions = Question.joins(:annotations).group("questions.id").having("count(annotations.id) > count(DISTINCT annotations.text)")
+    questions = Question.joins(:annotations)
+                        .group('questions.id')
+                        .having('count(annotations.id) > count(DISTINCT annotations.text)')
     questions.each do |q|
       # store already de-duplicated id's so we dont remove them in later iterations
       removed = []
       q.annotations.each do |a|
         removed << a.id
         conflicts = Annotation.where(question_id: a.question_id, text: a.text).where.not(id: removed)
-        conflicts.each {|c| c.destroy }
+        conflicts.each(&:destroy)
       end
     end
   end
 
-  desc "convert orgs.target_url to JSON array"
+  desc 'convert orgs.target_url to JSON array'
   task org_target_url_to_links: :environment do
     Org.all.each do |org|
-      if org.target_url.present?
-        org.links = [{link: org.target_url, text: ''}]
-        org.target_url = nil
+      next unless org.target_url.present?
 
-        # Running with validations off because Dragonfly will fail if it cannot find the
-        # org logos which live on the deployed instance
-        org.save!(validate: false)
-      end
+      org.links = [{ link: org.target_url, text: '' }]
+      org.target_url = nil
+
+      # Running with validations off because Dragonfly will fail if it cannot find the
+      # org logos which live on the deployed instance
+      org.save!(validate: false)
     end
   end
-
 end
diff --git a/lib/tasks/stat.rake b/lib/tasks/stat.rake
index 78522bcc3e..34bb9ef6ee 100644
--- a/lib/tasks/stat.rake
+++ b/lib/tasks/stat.rake
@@ -1,6 +1,7 @@
-namespace :stat do
+# frozen_string_literal: true
 
-  desc "Build all stats"
+namespace :stat do
+  desc 'Build all stats'
   task build: :environment do
     Rake::Task['stat:create:created_plan'].execute
     Rake::Task['stat:create:joined_user'].execute
@@ -13,65 +14,63 @@ namespace :stat do
   end
 
   task build_parallel: :environment do
-    tasks = ["stat:create:created_plan",
-             "stat:create:joined_user",
-             "stat:create:shared_plan",
-             "stat:create:exported_plan",
-             "stat:create_last_month:created_plan",
-             "stat:create_last_month:joined_user",
-             "stat:create_last_month:shared_plan",
-             "stat:create_last_month:exported_plan"]
-
-      Parallel.each(tasks, progress: "Building Stats", in_processes: 4) do |task|
-        Rake::Task[task].execute
-        task
-      end
-   end
+    tasks = ['stat:create:created_plan',
+             'stat:create:joined_user',
+             'stat:create:shared_plan',
+             'stat:create:exported_plan',
+             'stat:create_last_month:created_plan',
+             'stat:create_last_month:joined_user',
+             'stat:create_last_month:shared_plan',
+             'stat:create_last_month:exported_plan']
+
+    Parallel.each(tasks, progress: 'Building Stats', in_processes: 4) do |tsk|
+      Rake::Task[tsk].execute
+    end
+  end
 
   task build_last_month: :environment do
-    tasks = ["stat:create_last_month:created_plan",
-             "stat:create_last_month:joined_user",
-             "stat:create_last_month:shared_plan",
-             "stat:create_last_month:exported_plan"]
+    tasks = ['stat:create_last_month:created_plan',
+             'stat:create_last_month:joined_user',
+             'stat:create_last_month:shared_plan',
+             'stat:create_last_month:exported_plan']
 
-    tasks.each do |task|
-      Rake::Task[task].execute
+    tasks.each do |tsk|
+      Rake::Task[tsk].execute
     end
   end
 
   task build_last_month_parallel: :environment do
-    tasks = ["stat:create_last_month:created_plan",
-             "stat:create_last_month:joined_user",
-             "stat:create_last_month:shared_plan",
-             "stat:create_last_month:exported_plan"]
+    tasks = ['stat:create_last_month:created_plan',
+             'stat:create_last_month:joined_user',
+             'stat:create_last_month:shared_plan',
+             'stat:create_last_month:exported_plan']
 
-    Parallel.each(tasks) do |task|
-      Rake::Task[task].execute
+    Parallel.each(tasks) do |tsk|
+      Rake::Task[tsk].execute
       task
     end
   end
 
   namespace :create do
-    desc "Creates created plan stats for every org since they joined"
+    desc 'Creates created plan stats for every org since they joined'
     task created_plan: :environment do
       Org::CreateCreatedPlanService.call(threads: 2)
     end
 
-    desc "Creates joined user stats for every org since they joined"
+    desc 'Creates joined user stats for every org since they joined'
     task joined_user: :environment do
       Org::CreateJoinedUserService.call(threads: 2)
     end
 
-    desc "Creates shared plan stats for every org since they joined"
+    desc 'Creates shared plan stats for every org since they joined'
     task shared_plan: :environment do
       Org::CreateSharedPlanService.call(threads: 2)
     end
 
-    desc "Creates exported plan stats for every org since they joined"
+    desc 'Creates exported plan stats for every org since they joined'
     task exported_plan: :environment do
       Org::CreateExportedPlanService.call(threads: 2)
     end
-
   end
 
   namespace :create_last_month do
@@ -95,5 +94,4 @@ namespace :stat do
       Org::CreateLastMonthExportedPlanService.call(threads: 2)
     end
   end
-
 end
diff --git a/lib/tasks/upgrade.rake b/lib/tasks/upgrade.rake
index 4674bf3251..4eb4b85149 100644
--- a/lib/tasks/upgrade.rake
+++ b/lib/tasks/upgrade.rake
@@ -1,67 +1,69 @@
+# frozen_string_literal: true
+
 # Upgrade tasks for versions < 3.0. See https://github.com/DMPRoadmap/roadmap/releases for information
 # on how and when to run each task.
-
 require 'set'
-namespace :upgrade do
 
-  desc "upgrade to Rails 5, rename task after naming release"
+# rubocop:disable Naming/VariableNumber
+namespace :upgrade do
+  desc 'upgrade to Rails 5, rename task after naming release'
   task v2_3_0: :environment do
-    Rake::Task["upgrade:column_defaults"].execute
+    Rake::Task['upgrade:column_defaults'].execute
   end
 
-  desc "Upgrade to v2.2.0 Part 1"
+  desc 'Upgrade to v2.2.0 Part 1'
   task v2_2_0_part1: :environment do
-    p "Upgrading to v2.2.0 (part 1) ... A summary report will be generated when complete"
-    p "------------------------------------------------------------------------"
-    Rake::Task["upgrade:upgrade_2_2_0_identifier_schemes"].execute
-    Rake::Task["upgrade:upgrade_2_2_0_identifiers"].execute
-    Rake::Task["upgrade:upgrade_2_2_0_orgs"].execute
-    Rake::Task["upgrade:results_2_2_0_part1"].execute
+    p 'Upgrading to v2.2.0 (part 1) ... A summary report will be generated when complete'
+    p '------------------------------------------------------------------------'
+    Rake::Task['upgrade:upgrade_2_2_0_identifier_schemes'].execute
+    Rake::Task['upgrade:upgrade_2_2_0_identifiers'].execute
+    Rake::Task['upgrade:upgrade_2_2_0_orgs'].execute
+    Rake::Task['upgrade:results_2_2_0_part1'].execute
   end
 
-  desc "Upgrade to v2.2.0 Part 2"
+  desc 'Upgrade to v2.2.0 Part 2'
   task v2_2_0_part2: :environment do
-    p "Upgrading to v2.2.0 (part 2) ... A summary report will be generated when complete"
-    p "------------------------------------------------------------------------"
-    Rake::Task["upgrade:migrate_other_organisation_to_org"].execute
-    Rake::Task["upgrade:migrate_contributors"].execute
-    Rake::Task["upgrade:migrate_plan_org_and_funder"].execute
-    Rake::Task["upgrade:migrate_plan_grants"].execute
-    Rake::Task["upgrade:results_2_2_0_part2"].execute
+    p 'Upgrading to v2.2.0 (part 2) ... A summary report will be generated when complete'
+    p '------------------------------------------------------------------------'
+    Rake::Task['upgrade:migrate_other_organisation_to_org'].execute
+    Rake::Task['upgrade:migrate_contributors'].execute
+    Rake::Task['upgrade:migrate_plan_org_and_funder'].execute
+    Rake::Task['upgrade:migrate_plan_grants'].execute
+    Rake::Task['upgrade:results_2_2_0_part2'].execute
   end
 
-  desc "Upgrade to v2.1.6"
+  desc 'Upgrade to v2.1.6'
   task v2_1_6: :environment do
     Rake::Task['upgrade:add_versionable_id_to_question_options'].execute
   end
 
-  desc "Upgrade to v2.1.3"
+  desc 'Upgrade to v2.1.3'
   task v2_1_3: :environment do
     Rake::Task['upgrade:fill_blank_plan_identifiers'].execute
-    Rake::Task["upgrade:add_reviewer_perm"].execute
-    Rake::Task["upgrade:add_reviewer_to_existing_admin_perms"].execute
-    Rake::Task["upgrade:migrate_reviewer_roles"].execute
+    Rake::Task['upgrade:add_reviewer_perm'].execute
+    Rake::Task['upgrade:add_reviewer_to_existing_admin_perms'].execute
+    Rake::Task['upgrade:migrate_reviewer_roles'].execute
   end
 
-  desc "Upgrade to v2.1.2:"
+  desc 'Upgrade to v2.1.2:'
   task v2_1_2: :environment do
-    Rake::Task["upgrade:add_date_question_format"].execute
+    Rake::Task['upgrade:add_date_question_format'].execute
   end
 
-  desc "Upgrade to v2.1.0:"
+  desc 'Upgrade to v2.1.0:'
   task v2_1_0: :environment do
-    Rake::Task["data_cleanup:deactivate_orphaned_plans"].execute
+    Rake::Task['data_cleanup:deactivate_orphaned_plans'].execute
   end
 
-  desc "Upgrade to v2.0.0: Part 1"
+  desc 'Upgrade to v2.0.0: Part 1'
   task v2_0_0_part_1: :environment do
     Rake::Task['upgrade:add_default_values_v2_0_0'].execute
     Rake::Task['db:migrate'].execute
     Rake::Task['data_cleanup:find_known_invalidations'].execute
-    puts "If any invalid records were reported above you will need to correct them before running part 2."
+    puts 'If any invalid records were reported above you will need to correct them before running part 2.'
   end
 
-  desc "Upgrade to v2.0.0: Part 2"
+  desc 'Upgrade to v2.0.0: Part 2'
   task v2_0_0_part_2: :environment do
     Rake::Task['data_cleanup:clean_invalid_records'].execute
     Rake::Task['upgrade:add_versioning_id_to_templates'].execute
@@ -69,7 +71,7 @@ namespace :upgrade do
     Rake::Task['stat:build'].execute
   end
 
-  desc "Upgrade to v1.1.2"
+  desc 'Upgrade to v1.1.2'
   task v1_1_2: :environment do
     Rake::Task['upgrade:check_org_contact_emails'].execute
     Rake::Task['upgrade:check_for_guidance_multiple_themes'].execute
@@ -77,7 +79,7 @@ namespace :upgrade do
     Rake::Task['upgrade:add_other_org'].execute
   end
 
-  desc "Upgrade to 1.0"
+  desc 'Upgrade to 1.0'
   task v1_0_0: :environment do
     Rake::Task['upgrade:set_template_visibility'].execute
     Rake::Task['upgrade:set_org_links_defaults'].execute
@@ -86,13 +88,13 @@ namespace :upgrade do
     Rake::Task['upgrade:stats_api_org_admin'].execute
   end
 
-  desc "Bug fixes for version v0.3.3"
+  desc 'Bug fixes for version v0.3.3'
   task v0_3_3: :environment do
     Rake::Task['upgrade:fix_question_formats'].execute
     Rake::Task['upgrade:add_missing_token_permission_types'].execute
   end
 
-  desc "Add the missing formattype to the question_formats table"
+  desc 'Add the missing formattype to the question_formats table'
   task fix_question_formats: :environment do
     QuestionFormat.all.each do |qf|
       case qf.title.downcase
@@ -116,19 +118,19 @@ namespace :upgrade do
     end
 
     if QuestionFormat.find_by(formattype: QuestionFormat.formattypes[:date]).nil?
-      QuestionFormat.create!({ title: "Date", option_based: false, formattype: QuestionFormat.formattypes[:date] })
+      QuestionFormat.create!({ title: 'Date', option_based: false, formattype: QuestionFormat.formattypes[:date] })
     end
   end
 
-  desc "Add the missing token_permission_types"
+  desc 'Add the missing token_permission_types'
   task add_missing_token_permission_types: :environment do
     if TokenPermissionType.find_by(token_type: 'templates').nil?
-      TokenPermissionType.create!({token_type: 'templates',
-                                   text_description: 'allows a user access to the templates api endpoint'})
+      TokenPermissionType.create!({ token_type: 'templates',
+                                    text_description: 'allows a user access to the templates api endpoint' })
     end
     if TokenPermissionType.find_by(token_type: 'statistics').nil?
-      TokenPermissionType.create!({token_type: 'statistics',
-                                   text_description: 'allows a user access to the statistics api endpoint'})
+      TokenPermissionType.create!({ token_type: 'statistics',
+                                    text_description: 'allows a user access to the statistics api endpoint' })
     end
   end
 
@@ -140,17 +142,17 @@ namespace :upgrade do
     Template.default.update(visibility: Template.visibilities[:publicly_visible])
   end
 
-  desc "Set all orgs.links defaults"
+  desc 'Set all orgs.links defaults'
   task set_org_links_defaults: :environment do
-    Org.update_all(links: { 'org': [] })
+    Org.update_all(links: { org: [] })
   end
 
-  desc "Set all template.links defaults"
+  desc 'Set all template.links defaults'
   task set_template_links_defaults: :environment do
-    Template.update_all(links: {'funder':[],'sample_plan':[]})
+    Template.update_all(links: { funder: [], sample_plan: [] })
   end
 
-  desc "Sets completed for plans whose no. questions matches no. valid answers"
+  desc 'Sets completed for plans whose no. questions matches no. valid answers'
   task set_plan_complete: :environment do
     Plan.all.each do |p|
       if p.no_questions_matches_no_answers?
@@ -159,7 +161,7 @@ namespace :upgrade do
     end
   end
 
-  desc "Allow Statistics API Usage for Org Admin Users"
+  desc 'Allow Statistics API Usage for Org Admin Users'
   task stats_api_org_admin: :environment do
     Rake::Task['upgrade:add_missing_token_permission_types'].execute
     orgs = Org.where(is_other: false).select(:id)
@@ -173,122 +175,128 @@ namespace :upgrade do
     end
     users = User.joins(:perms).where(org_id: orgs).where(api_token: [nil, ''])
     users.each do |user|
-      if user.can_org_admin? && user.api_token.blank?
-        # Generate the tokens directly instead of via the User.keep_or_generate_token! method so that we do not spam users!!
-        user.api_token = loop do
-          random_token = SecureRandom.urlsafe_base64(nil, false)
-          break random_token unless User.exists?(api_token: random_token)
-        end
-        user.save!
+      next unless user.can_org_admin? && user.api_token.blank?
+
+      # Generate the tokens directly instead of via the User.keep_or_generate_token!
+      # method so that we do not spam users!!
+      user.api_token = loop do
+        random_token = SecureRandom.urlsafe_base64(nil, false)
+        break random_token unless User.exists?(api_token: random_token)
       end
+      user.save!
     end
   end
 
-
-  desc "Remove Duplicate Answers"
+  desc 'Remove Duplicate Answers'
   task remove_duplicate_answers: :environment do
     ## Concat Duplicate Answers
     ActiveRecord::Base.transaction do
-      plan_ids = ActiveRecord::Base.connection.select_all("SELECT a1.plan_id as plan_id FROM Answers a1 INNER JOIN Answers a2 ON a1.plan_id = a2.plan_id AND a1.question_id = a2.question_id WHERE a1.id > a2.id" ).to_a.map{|h| h["plan_id"]}.uniq
+      # rubocop:disable Layout/LineLength
+      plan_ids = ActiveRecord::Base.connection.select_all('SELECT a1.plan_id as plan_id FROM Answers a1 INNER JOIN Answers a2 ON a1.plan_id = a2.plan_id AND a1.question_id = a2.question_id WHERE a1.id > a2.id').to_a.map do |h|
+        h['plan_id']
+      end.uniq
+      # rubocop:enable Layout/LineLength
       plans = Plan.where(id: plan_ids)
       plans.each do |plan|
         plan.answers.pluck(:question_id).uniq.each do |question_id|
-          answers = Answer.where(plan_id: plan.id, question_id:  question_id).order(:updated_at)
-          if answers.length > 1 # Duplicates found
-            puts "found duplicate for plan:#{plan.id}\tquestion:#{question_id} \n\tanswers:[#{answers.map{|answer| answer.id}}]"
-            new_answer = Answer.new
-            new_answer.user_id = answers.last.user_id
-            new_answer.plan_id = plan.id
-            new_answer.question_id = question_id
-            new_answer.created_at = answers.last.created_at
-            num_text = 0
-            qf = answers.last.question.question_format
-            puts "\tquestion format #{qf.title}"
-            if qf.dropdown?
-              new_answer.question_options << answers.last.question_options.first
-              puts "\t adding option answers.last.question_options.first.text" unless answers.last.question_options.first.blank?
+          answers = Answer.where(plan_id: plan.id, question_id: question_id).order(:updated_at)
+          next unless answers.length > 1 # Duplicates found
+
+          puts "found duplicate for plan:#{plan.id}\tquestion:#{question_id} \n\tanswers:[#{answers.map(&:id)}]"
+          new_answer = Answer.new
+          new_answer.user_id = answers.last.user_id
+          new_answer.plan_id = plan.id
+          new_answer.question_id = question_id
+          new_answer.created_at = answers.last.created_at
+          num_text = 0
+          qf = answers.last.question.question_format
+          puts "\tquestion format #{qf.title}"
+          if qf.dropdown?
+            new_answer.question_options << answers.last.question_options.first
+            unless answers.last.question_options.first.blank?
+              puts "\t adding option answers.last.question_options.first.text"
             end
-            answers.reverse.each do |answer|
-              if num_text == 0 && answer.text.present? # case first present text
-                new_answer.text = answer.text
-                num_text += 1
-              end
-              if num_text == 1 && answer.text.present?
-                text = "<p><strong>ANSWER SAVED TWICE - REQUIRES MERGING</strong></p>"
-                text += new_answer.text
-                new_answer.text = text + "<p><strong>-------------</strong></p>" + answer.text
-              end
-              new_answer.save
-              new_answer.reload
-              answer.notes.each do |note|
-                note.answer_id = new_answer.id
-                note.save
-              end
-              answer.question_options.each do |op|
-                unless qf.dropdown?
-                  new_answer.question_options << op unless new_answer.question_options.any? {|aop| aop.id == op.id}
-                  puts "\t adding option #{op.text}"
-                end
-              end
-              answer.destroy
+          end
+          answers.reverse.each do |answer|
+            if num_text.zero? && answer.text.present? # case first present text
+              new_answer.text = answer.text
+              num_text += 1
+            end
+            if num_text == 1 && answer.text.present?
+              text = '<p><strong>ANSWER SAVED TWICE - REQUIRES MERGING</strong></p>'
+              text += new_answer.text
+              new_answer.text = "#{text}<p><strong>-------------</strong></p>#{answer.text}"
             end
             new_answer.save
-            puts "\tsaved new answer with text:\n#{new_answer.text}"
+            new_answer.reload
+            answer.notes.each do |note|
+              note.answer_id = new_answer.id
+              note.save
+            end
+            answer.question_options.each do |op|
+              unless qf.dropdown?
+                new_answer.question_options << op unless new_answer.question_options.any? { |aop| aop.id == op.id }
+                puts "\t adding option #{op.text}"
+              end
+            end
+            answer.destroy
           end
+          new_answer.save
+          puts "\tsaved new answer with text:\n#{new_answer.text}"
         end
       end
     end
   end
 
-  desc "Remove deprecated themes"
+  desc 'Remove deprecated themes'
   task theme_delete_deprecated: :environment do
-    if t = Theme.find_by(title:'Project Description') then t.destroy end
-    if t = Theme.find_by(title:'Project Name') then t.destroy end
-    if t = Theme.find_by(title:'ID') then t.destroy end
-    if t = Theme.find_by(title:'PI / Researcher') then t.destroy end
+    t.destroy if t == Theme.find_by(title: 'Project Description')
+    t.destroy if t == Theme.find_by(title: 'Project Name')
+    t.destroy if t == Theme.find_by(title: 'ID')
+    t.destroy if t == Theme.find_by(title: 'PI / Researcher')
   end
 
-  desc "Create new Theme list"
+  desc 'Create new Theme list'
   task theme_new_themes: :environment do
-    ["Data description", "Data collection", "Metadata & documentation", "Storage & security",
-     "Preservation", "Data sharing", "Related policies", "Data format", "Data volume",
-     "Ethics & privacy", "Intellectual Property Rights", "Data repository", "Roles & responsibilities",
-     "Budget"].each do |t|
+    ['Data description', 'Data collection', 'Metadata & documentation', 'Storage & security',
+     'Preservation', 'Data sharing', 'Related policies', 'Data format', 'Data volume',
+     'Ethics & privacy', 'Intellectual Property Rights', 'Data repository', 'Roles & responsibilities',
+     'Budget'].each do |t|
        Theme.create(title: t)
      end
   end
 
-  desc "Transform existing themes and their associations into new theme list"
+  desc 'Transform existing themes and their associations into new theme list'
   task theme_transform: :environment do
     ActiveRecord::Base.transaction do
       [
-        {'Budget':'Resourcing'},
-        {'Data collection':'Data Capture Methods'},
-        {'Data collection':'Data Quality'},
-        {'Data description':'Data Description'},
-        {'Data description':'Data Type'},
-        {'Data description':'Existing Data'},
-        {'Data description':'Relationship to Existing Data'},
-        {'Data format':'Data Format'},
-        {'Data repository':'Data Repository'},
-        {'Data sharing':'Expected Reuse'},
-        {'Data sharing':'Managed Access Procedures'},
-        {'Data sharing':'Method For Data Sharing'},
-        {'Data sharing':'Restrictions on Sharing'},
-        {'Data sharing':'Timeframe For Data Sharing'},
-        {'Data volume':'Data Volumes'},
-        {'Ethics & privacy':'Ethical Issues'},
-        {'Intellectual Property Rights':'IPR Ownership and Licencing'},
-        {'Metadata & documentation':'Discovery by Users'},
-        {'Metadata & documentation':'Documentation'},
-        {'Metadata & documentation':'Metadata '},  # there may be a whitespace here!
-        {'Preservation':'Data Selection'},
-        {'Preservation':'Period of Preservation'},
-        {'Preservation':'Preservation Plan'},
-        {'Related policies':'Related Policies'},
-        {'Roles & responsibilities':'Responsibilities'},
-        {'Storage & security':'Data Security'},
-        {'Storage & security':'Storage and Backup'},
+        { Budget: 'Resourcing' },
+        { 'Data collection': 'Data Capture Methods' },
+        { 'Data collection': 'Data Quality' },
+        { 'Data description': 'Data Description' },
+        { 'Data description': 'Data Type' },
+        { 'Data description': 'Existing Data' },
+        { 'Data description': 'Relationship to Existing Data' },
+        { 'Data format': 'Data Format' },
+        { 'Data repository': 'Data Repository' },
+        { 'Data sharing': 'Expected Reuse' },
+        { 'Data sharing': 'Managed Access Procedures' },
+        { 'Data sharing': 'Method For Data Sharing' },
+        { 'Data sharing': 'Restrictions on Sharing' },
+        { 'Data sharing': 'Timeframe For Data Sharing' },
+        { 'Data volume': 'Data Volumes' },
+        { 'Ethics & privacy': 'Ethical Issues' },
+        { 'Intellectual Property Rights': 'IPR Ownership and Licencing' },
+        { 'Metadata & documentation': 'Discovery by Users' },
+        { 'Metadata & documentation': 'Documentation' },
+        { 'Metadata & documentation': 'Metadata ' }, # there may be a whitespace here!
+        { Preservation: 'Data Selection' },
+        { Preservation: 'Period of Preservation' },
+        { Preservation: 'Preservation Plan' },
+        { 'Related policies': 'Related Policies' },
+        { 'Roles & responsibilities': 'Responsibilities' },
+        { 'Storage & security': 'Data Security' },
+        { 'Storage & security': 'Storage and Backup' }
       ].each do |pair|
         themeto   = Theme.find_by(title: pair.keys[0].to_s)
         themefrom = Theme.find_by(title: pair.values[0])
@@ -304,64 +312,63 @@ namespace :upgrade do
     end
   end
 
-  desc "Delete migrated themes and their associations"
+  desc 'Delete migrated themes and their associations'
   task theme_remove_migrated: :environment do
     ActiveRecord::Base.transaction do
-      ["Data Type", "Existing Data", "Relationship to Existing Data", "Data Quality", "Documentation",
-       "Discovery by Users", "Data Security", "Data Selection", "Period of Preservation",
-       "Expected Reuse", "Timeframe For Data Sharing", "Restrictions on Sharing",
-       "Managed Access Procedures", "Related Policies", "Data Description", "Data Volumes",
-       "Data Format", "Data Capture Methods", "Metadata ", "Ethical Issues",
-       "IPR Ownership and Licencing", "Storage and Backup", "Preservation Plan", "Data Repository",
-       "Method For Data Sharing", "Responsibilities", "Resourcing"].each do |t|
-         if deltheme = Theme.find_by(title: t) then deltheme.destroy end
+      ['Data Type', 'Existing Data', 'Relationship to Existing Data', 'Data Quality', 'Documentation',
+       'Discovery by Users', 'Data Security', 'Data Selection', 'Period of Preservation',
+       'Expected Reuse', 'Timeframe For Data Sharing', 'Restrictions on Sharing',
+       'Managed Access Procedures', 'Related Policies', 'Data Description', 'Data Volumes',
+       'Data Format', 'Data Capture Methods', 'Metadata ', 'Ethical Issues',
+       'IPR Ownership and Licencing', 'Storage and Backup', 'Preservation Plan', 'Data Repository',
+       'Method For Data Sharing', 'Responsibilities', 'Resourcing'].each do |t|
+         deltheme.destroy if deltheme == Theme.find_by(title: t)
        end
     end
   end
 
-  desc "Deduplicate multiple associations resulting from Theme merges"
+  desc 'Deduplicate multiple associations resulting from Theme merges'
   task theme_deduplicate_questions: :environment do
     ActiveRecord::Base.transaction do
       Question.all.each do |q|
-        themelist = []
-        if q.themes.present?
-          q.themes.each do |qt|
-            q.themes.delete(qt)
-            q.themes << qt
-          end
+        next unless q.themes.present?
+
+        q.themes.each do |qt|
+          q.themes.delete(qt)
+          q.themes << qt
         end
       end
     end
   end
 
   ############# Make sure there are no guidances with multiple themes before this step!! #############
-  desc "Concatenate Guidance which refers to the same Theme as a result of merges"
+  desc 'Concatenate Guidance which refers to the same Theme as a result of merges'
   task single_guidance_for_theme: :environment do
     ActiveRecord::Base.transaction do
       allthemes = Theme.all
       GuidanceGroup.all.each do |group|
-        if group.guidances.present?
-          allthemes.each do |theme|
-            themeguidances = group.guidances.joins(:themes).where('themes.id = ?', theme.id)
-            if themeguidances.present? && themeguidances.length >= 2
-              themeguidances.drop(1).each do |guidance|
-                themeguidances.first.text += '<p>——</p>' + guidance.text
-                guidance.destroy
-              end #themeguidances loop
-              themeguidances.first.save
-            end
-          end #allthemes loop
+        next unless group.guidances.present?
+
+        allthemes.each do |theme|
+          themeguidances = group.guidances.joins(:themes).where('themes.id = ?', theme.id)
+          next unless themeguidances.present? && themeguidances.length >= 2
+
+          themeguidances.drop(1).each do |guidance|
+            themeguidances.first.text += "<p>——</p>#{guidance.text}"
+            guidance.destroy
+          end
+          themeguidances.first.save
         end
-      end #GuidanceGroup loop
+      end
     end
   end
 
-  desc "Remove duplicated non customised template versions"
+  desc 'Remove duplicated non customised template versions'
   task remove_duplicated_non_customised_template_versions: :environment do
     templates = Template
-    .select(:id, :family_id, :version, :updated_at)
-    .group(:family_id, :version, :id)
-    .order(family_id: :asc, version: :asc, updated_at: :desc)
+                .select(:id, :family_id, :version, :updated_at)
+                .group(:family_id, :version, :id)
+                .order(family_id: :asc, version: :asc, updated_at: :desc)
 
     current_family_id = nil
     unique_versions = Set.new
@@ -371,9 +378,7 @@ namespace :upgrade do
         current_family_id = template.family_id
         unique_versions = Set.new
       end
-      if unique_versions.add?(template.version).nil?
-        duplicates << template
-      end
+      duplicates << template if unique_versions.add?(template.version).nil?
     end
     current_family_id = nil
     version_counter = nil
@@ -383,7 +388,8 @@ namespace :upgrade do
         version_counter = nil
       end
       num_plans = Plan.where(template_id: template.id).count
-      if num_plans > 0
+      # rubocop:disable Layout/LineLength
+      if num_plans.any?
         version_counter = version_counter.nil? ? -1 : version_counter - 1
         unsaved_template = Template.find(template.id)
         unsaved_template.version = version_counter
@@ -398,17 +404,18 @@ namespace :upgrade do
         Template.destroy(template.id)
         puts "template with id: #{template.id} has been REMOVED since it had no plans associated"
       end
+      # rubocop:enable Layout/LineLength
     end
-    puts "remove_duplicated_non_customised_template_versions DONE"
+    puts 'remove_duplicated_non_customised_template_versions DONE'
   end
-  desc "Remove duplicated customised template versions"
+  desc 'Remove duplicated customised template versions'
   task remove_duplicated_customised_template_versions: :environment do
     templates = Template
-    .select(:id, :customization_of, :version, :org_id, :updated_at)
-    .where('customization_of IS NOT NULL')
-    .group(:customization_of, :org_id, :version, :id)
-    .order(customization_of: :asc, org_id: :asc, version: :asc, updated_at: :desc)
-    generate_compound_key = lambda{ |customization_of, org_id| return "#{customization_of}_#{org_id}" }
+                .select(:id, :customization_of, :version, :org_id, :updated_at)
+                .where('customization_of IS NOT NULL')
+                .group(:customization_of, :org_id, :version, :id)
+                .order(customization_of: :asc, org_id: :asc, version: :asc, updated_at: :desc)
+    generate_compound_key = ->(customization_of, org_id) { return "#{customization_of}_#{org_id}" }
     current = nil
     unique_versions = Set.new
     duplicates = []
@@ -418,9 +425,7 @@ namespace :upgrade do
         current = key
         unique_versions = Set.new
       end
-      if unique_versions.add?(template.version).nil?
-        duplicates << template
-      end
+      duplicates << template if unique_versions.add?(template.version).nil?
     end
     current = nil
     version_counter = nil
@@ -431,7 +436,7 @@ namespace :upgrade do
         version_counter = nil
       end
       num_plans = Plan.where(template_id: template.id).count
-      if num_plans > 0
+      if num_plans.any?
         version_counter = version_counter.nil? ? -1 : version_counter - 1
         unsaved_template = Template.find(template.id)
         unsaved_template.version = version_counter
@@ -443,60 +448,59 @@ namespace :upgrade do
         puts "template with id: #{template.id} has been REMOVED since it has no plans associated"
       end
     end
-    puts "remove_duplicated_customised_template_versions DONE"
+    puts 'remove_duplicated_customised_template_versions DONE'
   end
-  desc "Remove duplicated template versions"
+  desc 'Remove duplicated template versions'
   task remove_duplicated_template_versions: :environment do
     Rake::Task['upgrade:remove_duplicated_non_customised_template_versions'].execute
     Rake::Task['upgrade:remove_duplicated_customised_template_versions'].execute
   end
 
-  desc "Org.contact_email is now required, sets any nil values to the helpdesk email defined in dmproadmap.rb initializer"
+  # rubocop:disable Layout/LineLength
+  desc 'Org.contact_email is now required, sets any nil values to the helpdesk email defined in dmproadmap.rb initializer'
   task check_org_contact_emails: :environment do
     email = Rails.configuration.x.organisation.helpdesk_email
     name = Rails.configuration.x.organisation.name
 
     if email.present? && name.present?
-      puts "Searching for Orgs with an undefined contact_email ..."
+      puts 'Searching for Orgs with an undefined contact_email ...'
       Org.where("contact_email IS NULL OR contact_email = ''").each do |org|
         puts "  Setting contact_email to #{email} for #{org.name}"
         org.update_attributes(contact_email: email, contact_name: name)
       end
     else
-      puts "No helpdesk_email and/or name found in your config/initializers/dmproadmap.rb. Please add them!"
-      puts "For example:"
-      puts "config.x.organisation.name = \"Curation Centre\""
-      puts "config.x.organisation.helpdesk_email = \"help@example.org\""
+      puts 'No helpdesk_email and/or name found in your config/initializers/dmproadmap.rb. Please add them!'
+      puts 'For example:'
+      puts 'config.x.organisation.name = "Curation Centre"'
+      puts 'config.x.organisation.helpdesk_email = "help@example.org"'
     end
-    puts "Search complete"
-    puts ""
+    puts 'Search complete'
+    puts ''
   end
+  # rubocop:enable Layout/LineLength
 
-  desc "The system now only allows for one theme selection per guidance, so check for violations"
+  desc 'The system now only allows for one theme selection per guidance, so check for violations'
   task check_for_guidance_multiple_themes: :environment do
-    puts "Searching for guidance with multiple theme selections (you will need to manually reconcile these records) ..."
-    ids = Guidance.select('guidances.id, count(themes.id) theme_count').
-      joins(:themes).group('guidances.id').
-      having('count(themes.id) > 1').pluck('guidances.id')
+    puts 'Searching for guidance with multiple theme selections (you will need to manually reconcile these records) ...'
+    ids = Guidance.select('guidances.id, count(themes.id) theme_count')
+                  .joins(:themes).group('guidances.id')
+                  .having('count(themes.id) > 1').pluck('guidances.id')
 
-    GuidanceGroup.joins(:guidances).includes(:org).where('guidances.id IN (?)', ids).
-      distinct.order('orgs.name, guidance_groups.name').each do |grp|
+    GuidanceGroup.joins(:guidances).includes(:org).where('guidances.id IN (?)', ids)
+                 .distinct.order('orgs.name, guidance_groups.name').each do |grp|
       puts "  #{grp.org.name} - Guidance group, '#{grp.name}', has guidance with multiple themes"
     end
-    puts "Search complete"
-    puts ""
+    puts 'Search complete'
+    puts ''
   end
-
-  desc "Remove admin preferences"
+  desc 'Remove admin preferences'
   task remove_admin_preferences: :environment do
     Pref.all.each do |p|
-      if p.settings.present?
-        if p.settings['email'].present?
-          if p.settings['email']['admin'].present?
-            p.settings['email'].delete('admin')
-            p.save!
-          end
-        end
+      next unless p.settings.present?
+
+      if p.settings['email'].present? && p.settings['email']['admin'].present?
+        p.settings['email'].delete('admin')
+        p.save!
       end
     end
   end
@@ -517,14 +521,14 @@ namespace :upgrade do
     else
       puts "Could not find the 'Other' org (is_other == true), adding 'Other' org"
       other_org = Org.create!({
-        name: 'Other Organisation',
-        abbreviation: 'OTHER',
-        org_type: Org.org_type_values_for(:organisation).min,
-        contact_email: email,
-        contact_name: name,
-        links: {"org": []},
-        is_other: true,
-      })
+                                name: 'Other Organisation',
+                                abbreviation: 'OTHER',
+                                org_type: Org.org_type_values_for(:organisation).min,
+                                contact_email: email,
+                                contact_name: name,
+                                links: { org: [] },
+                                is_other: true
+                              })
     end
 
     unaffiliated = User.where(org_id: nil)
@@ -535,8 +539,8 @@ namespace :upgrade do
     end
   end
 
-  desc "Apply default column values for v2.0.0"
-  task :add_default_values_v2_0_0 => :environment do
+  desc 'Apply default column values for v2.0.0'
+  task add_default_values_v2_0_0: :environment do
     results = GuidanceGroup.where(optional_subset: nil)
     puts "Found #{results.length} GuidanceGroups with a null optional_subset ... set values to false"
     results.update_all(optional_subset: false)
@@ -554,29 +558,26 @@ namespace :upgrade do
     results.update_all(is_other: false)
   end
 
-  desc "Add verisoning_id to published Templates"
-  task :add_versioning_id_to_templates => :environment do
+  desc 'Add verisoning_id to published Templates'
+  task add_versioning_id_to_templates: :environment do
     safe_require 'text'
     safe_require 'progress_bar'
 
     template_count = Template.latest_version.where(customization_of: nil)
-    .includes(phases: { sections: { questions: :annotations }})
-    .count
+                             .includes(phases: { sections: { questions: :annotations } })
+                             .count
     bar = ProgressBar.new(template_count)
 
-
     # Remove attr_readonly restrictions form these models
     Phase.attr_readonly.delete('versionable_id')
     Section.attr_readonly.delete('versionable_id')
     Question.attr_readonly.delete('versionable_id')
     Annotation.attr_readonly.delete('versionable_id')
 
-
     # Get each of the funder templates...
     Template.latest_version.where(customization_of: nil)
-    .includes(phases: { sections: { questions: :annotations }})
-    .each do |funder_template|
-
+            .includes(phases: { sections: { questions: :annotations } })
+            .each do |funder_template|
       bar.increment!(1)
 
       Rails.logger.info "Updating versionable_id for Template: #{funder_template.id}"
@@ -586,12 +587,9 @@ namespace :upgrade do
         funder_phase.update! versionable_id: SecureRandom.uuid
 
         Phase.joins(:template)
-        .where(templates: { customization_of: funder_template.family_id })
-        .where(number: funder_phase.number).each do |phase|
-
-          if fuzzy_match?(phase.title, funder_phase.title)
-            phase.update! versionable_id: funder_phase.versionable_id
-          end
+             .where(templates: { customization_of: funder_template.family_id })
+             .where(number: funder_phase.number).each do |phase|
+          phase.update! versionable_id: funder_phase.versionable_id if fuzzy_match?(phase.title, funder_phase.title)
         end
 
         funder_phase.sections.each do |funder_section|
@@ -599,16 +597,13 @@ namespace :upgrade do
           funder_section.update! versionable_id: SecureRandom.uuid
 
           Section.joins(:template).where(templates: {
-            customization_of: funder_template.family_id
-          }).each do |section|
-
+                                           customization_of: funder_template.family_id
+                                         }).each do |section|
             # Prefix the match text with the number. This will make it easier to match
             # Sections where the number hasn't changed
             text_a = "#{section.number} - #{section.description}"
             text_b = "#{funder_section.number} - #{funder_section.description}"
-            if fuzzy_match?(text_a, text_b)
-              section.update! versionable_id: funder_section.versionable_id
-            end
+            section.update! versionable_id: funder_section.versionable_id if fuzzy_match?(text_a, text_b)
           end
 
           funder_section.questions.each do |funder_question|
@@ -617,17 +612,14 @@ namespace :upgrade do
             funder_question.update! versionable_id: SecureRandom.uuid
 
             Question.joins(:template).where(templates: {
-              customization_of: funder_template.family_id
-            }).each do |question|
-
+                                              customization_of: funder_template.family_id
+                                            }).each do |question|
               # Prefix the match text with the number. This will make it easier to match
               # Questions where the number hasn't changed
               text_a = "#{question.number} - #{question.text}"
               text_b = "#{funder_question.number} - #{funder_question.text}"
 
-              if fuzzy_match?(text_a, text_b)
-                question.update! versionable_id: funder_question.versionable_id
-              end
+              question.update! versionable_id: funder_question.versionable_id if fuzzy_match?(text_a, text_b)
             end
 
             funder_question.annotations.each do |funder_annotation|
@@ -636,9 +628,8 @@ namespace :upgrade do
               funder_annotation.update! versionable_id: SecureRandom.uuid
 
               Annotation.joins(:template).where(templates: {
-                customization_of: funder_template.family_id,
-              }).where(type: funder_annotation.type).each do |ann|
-
+                                                  customization_of: funder_template.family_id
+                                                }).where(type: funder_annotation.type).each do |ann|
                 if fuzzy_match?(ann.text, funder_annotation.text)
                   ann.update! versionable_id: funder_annotation.versionable_id
                 end
@@ -651,10 +642,9 @@ namespace :upgrade do
 
     # Add versionable_id to any customized Sections...
     Section.joins(:template)
-    .includes(questions: :annotations)
-    .where(templates: { id: Template.latest_version.ids })
-    .where(versionable_id: nil, modifiable: true).each do |section|
-
+           .includes(questions: :annotations)
+           .where(templates: { id: Template.latest_version.ids })
+           .where(versionable_id: nil, modifiable: true).each do |section|
       section.update! versionable_id: SecureRandom.uuid
 
       section.questions.each do |question|
@@ -666,8 +656,8 @@ namespace :upgrade do
     end
   end
 
-  desc "Update Language abbreviations to use ISO format"
-  task :normalize_language_formats => :environment do
+  desc 'Update Language abbreviations to use ISO format'
+  task normalize_language_formats: :environment do
     Language.all.each do |language|
       val = LocaleService.to_i18n(string: language.abbreviation).to_s
       language.update(abbreviation: val)
@@ -684,40 +674,37 @@ namespace :upgrade do
     end
   end
 
-  desc "Adds the Date question format"
-  task :add_date_question_format => :environment do
+  desc 'Adds the Date question format'
+  task add_date_question_format: :environment do
     unless QuestionFormat.id_for(QuestionFormat.formattypes[:date]).present?
       QuestionFormat.create(
-        title: "Date field",
-        description: "Date field format",
+        title: 'Date field',
+        description: 'Date field format',
         option_based: false,
         formattype: QuestionFormat.formattypes[:date]
       )
     end
   end
 
-
-  desc "Fill blank or nil plan identifiers with plan_id"
+  desc 'Fill blank or nil plan identifiers with plan_id'
   task fill_blank_plan_identifiers: :environment do
-    Plan.where(identifier: ["",nil]).update_all('identifier = id')
+    Plan.where(identifier: ['', nil]).update_all('identifier = id')
   end
 
-  desc "Adds a new permission for plan reviewers"
+  desc 'Adds a new permission for plan reviewers'
   task add_reviewer_perm: :environment do
     perm_name = 'review_org_plans'
-    unless Perm.find_by(name: perm_name).present?
-      Perm.create(name: perm_name)
-    end
+    Perm.create(name: perm_name) unless Perm.find_by(name: perm_name).present?
   end
 
-  desc "adds the new reviewer perm to all existing admin perms"
+  desc 'adds the new reviewer perm to all existing admin perms'
   task add_reviewer_to_existing_admin_perms: :environment do
     Perm.change_org_details.users.each do |u|
       u.perms << Perm.review_plans
     end
   end
 
-  desc "remove the old reviewer roles and ensure these are marked feedback-enabled"
+  desc 'remove the old reviewer roles and ensure these are marked feedback-enabled'
   task migrate_reviewer_roles: :environment do
     # remove all roles with nil plan_id
     Role.reviewer.where(plan_id: nil).destroy_all
@@ -727,15 +714,13 @@ namespace :upgrade do
     Role.reviewer.destroy_all
   end
 
-  desc "generate versionable_ids for "
+  desc 'generate versionable_ids for '
   task add_versionable_id_to_question_options: :environment do
-
     QuestionOption.attr_readonly.delete('versionable_id')
 
     Template.latest_version.where(customization_of: nil)
-    .includes(phases: { sections: { questions: :question_options }})
-    .each do |uncustomized|
-
+            .includes(phases: { sections: { questions: :question_options } })
+            .each do |uncustomized|
       # update the versionable_id for the canonical and all customized templates
       uncustomized.question_options.each do |qo|
         vers_id = loop do
@@ -746,10 +731,10 @@ namespace :upgrade do
         text_a = "#{qo.number} - #{qo.text}"
 
         Question.joins(:question_options)
-        .where(questions: {versionable_id: qo.question.versionable_id})
-        .where.not(questions: {id: qo.question_id}) # ensure we exclude the current question
-        .includes(:question_options)
-        .each do |q_cust|
+                .where(questions: { versionable_id: qo.question.versionable_id })
+                .where.not(questions: { id: qo.question_id }) # ensure we exclude the current question
+                .includes(:question_options)
+                .each do |q_cust|
           q_cust.question_options.each do |qo_cust|
             text_b = "#{qo_cust.number} - #{qo_cust.text}"
 
@@ -761,250 +746,253 @@ namespace :upgrade do
         end
       end
     end
-
   end
 
   # -------------------------------------------------
   # TASKS FOR 2.2.0
-  desc "run all of the identifier_scheme changes"
+  desc 'run all of the identifier_scheme changes'
   task upgrade_2_2_0_identifier_schemes: :environment do
-    Rake::Task["upgrade:add_new_identifier_schemes"].execute
-    Rake::Task["upgrade:update_shibboleth_description"].execute
-    Rake::Task["upgrade:contextualize_identifier_schemes"].execute
+    Rake::Task['upgrade:add_new_identifier_schemes'].execute
+    Rake::Task['upgrade:update_shibboleth_description'].execute
+    Rake::Task['upgrade:contextualize_identifier_schemes'].execute
   end
-  desc "run all of the identifier changes"
+  desc 'run all of the identifier changes'
   task upgrade_2_2_0_identifiers: :environment do
-    Rake::Task["upgrade:convert_org_identifiers"].execute
-    p "--------------------------"
-    Rake::Task["upgrade:convert_user_identifiers"].execute
+    Rake::Task['upgrade:convert_org_identifiers'].execute
+    p '--------------------------'
+    Rake::Task['upgrade:convert_user_identifiers'].execute
   end
-  desc "run all of the org changes"
+  desc 'run all of the org changes'
   task upgrade_2_2_0_orgs: :environment do
-    Rake::Task["upgrade:default_orgs_to_managed"].execute
-    p "--------------------------"
-    Rake::Task["upgrade:retrieve_ror_fundref_ids"].execute
-  end
-
-    desc "add the ROR and Fundref identifier schemes"
-    task add_new_identifier_schemes: :environment do
-      unless IdentifierScheme.where(name: "fundref").any?
-        IdentifierScheme.create(
-          name: "fundref",
-          description: "Crossref Funder Registry (FundRef)",
-          active: true
-        )
-      end
-      unless IdentifierScheme.where(name: "ror").any?
-        IdentifierScheme.create(
-          name: "ror",
-          description: "Research Organization Registry (ROR)",
-          active: true
-        )
-      end
-    end
+    Rake::Task['upgrade:default_orgs_to_managed'].execute
+    p '--------------------------'
+    Rake::Task['upgrade:retrieve_ror_fundref_ids'].execute
+  end
 
-    desc "update the Shibboleth scheme description"
-    task update_shibboleth_description: :environment do
-      scheme = IdentifierScheme.where(name: "shibboleth")
-      if scheme.any?
-        scheme.first.update(description: "Institutional Sign In (Shibboleth)")
-      end
+  desc 'add the ROR and Fundref identifier schemes'
+  task add_new_identifier_schemes: :environment do
+    unless IdentifierScheme.where(name: 'fundref').any?
+      IdentifierScheme.create(
+        name: 'fundref',
+        description: 'Crossref Funder Registry (FundRef)',
+        active: true
+      )
     end
-
-    desc "Contextualize the Identifier Schemes (e.g. which ones are for orgs, etc."
-    task contextualize_identifier_schemes: :environment do
-      # Identifier schemes for multiple uses
-      shib = IdentifierScheme.find_or_initialize_by(name: "shibboleth")
-      shib.for_users = true
-      shib.for_orgs = true
-      shib.for_authentication = true
-      shib.save
-
-      orcid = IdentifierScheme.find_or_initialize_by(name: "orcid")
-      orcid.for_users = true
-      orcid.for_contributors = true
-      orcid.for_authentication = true
-      orcid.identifier_prefix = "https://orcid.org/"
-      orcid.save
-
-      # Org identifier schemes
-      ror = IdentifierScheme.find_or_initialize_by(name: "ror")
-      ror.for_orgs = true
-      ror.identifier_prefix = "https://ror.org/"
-      ror.save
-
-      fundref = IdentifierScheme.find_or_initialize_by(name: "fundref")
-      fundref.for_orgs = true
-      fundref.identifier_prefix = "https://doi.org/10.13039/"
-      fundref.save
+    unless IdentifierScheme.where(name: 'ror').any?
+      IdentifierScheme.create(
+        name: 'ror',
+        description: 'Research Organization Registry (ROR)',
+        active: true
+      )
     end
+  end
 
-    desc "migrate the old user_identifiers over to the polymorphic identifiers table"
-    task convert_user_identifiers: :environment do
-      p "Transferring existing user_identifiers over to the identifiers table"
-      p "this may take in excess of 10 minutes depending on the size of your users table ..."
-      identifiers = UserIdentifier.joins(:user, :identifier_scheme)
-      .includes(:user, :identifier_scheme)
-      .where.not(identifier: nil)
-      .where.not(identifier: '')
-
-      Parallel.map(identifiers, in_threads: 8) do |ui|
-        # Parallel has trouble with ActiveRecord lazy loading
-        require "org" unless Object.const_defined?("Org")
-        require "identifier" unless Object.const_defined?("Identifier")
-        require "identifier_scheme" unless Object.const_defined?("IdentifierScheme")
-        @reconnected ||= Identifier.connection.reconnect! || true
-
-        lookup = Identifier.where(identifiable_id: ui.user_id,
-                                  identifiable_type: "User",
-                                  identifier_scheme: ui.identifier_scheme)
-        next if lookup.present?
-
-        Identifier.create(identifier_scheme: ui.identifier_scheme, attrs: {}.to_json,
-                          identifiable: ui.user, value: ui.identifier)
-      end
+  desc 'update the Shibboleth scheme description'
+  task update_shibboleth_description: :environment do
+    scheme = IdentifierScheme.where(name: 'shibboleth')
+    scheme.first.update(description: 'Institutional Sign In (Shibboleth)') if scheme.any?
+  end
 
-      count = Identifier.where(identifiable_type: "User").length
-      p "Transfer complete. Orginal user_identifier count #{identifiers.length}, new identifiers count #{count}"
-      if identifiers.length > count
-        p ""
-        p "#{identifiers.length - count} records could not be transferred."
-        p "This is typically due to the fact that the new identifiers table will automatically"
-        p "prepend the identifier_scheme.identifier_prefix to the value For example: "
-        p "    '0000-0000-0000-0001' would become 'https://orcid.org/0000-0000-0000-0001'"
-        p "and your old user_identifiers table may have an entry for both versions"
-      end
+  desc 'Contextualize the Identifier Schemes (e.g. which ones are for orgs, etc.'
+  task contextualize_identifier_schemes: :environment do
+    # Identifier schemes for multiple uses
+    shib = IdentifierScheme.find_or_initialize_by(name: 'shibboleth')
+    shib.for_users = true
+    shib.for_orgs = true
+    shib.for_authentication = true
+    shib.save
+
+    orcid = IdentifierScheme.find_or_initialize_by(name: 'orcid')
+    orcid.for_users = true
+    orcid.for_contributors = true
+    orcid.for_authentication = true
+    orcid.identifier_prefix = 'https://orcid.org/'
+    orcid.save
+
+    # Org identifier schemes
+    ror = IdentifierScheme.find_or_initialize_by(name: 'ror')
+    ror.for_orgs = true
+    ror.identifier_prefix = 'https://ror.org/'
+    ror.save
+
+    fundref = IdentifierScheme.find_or_initialize_by(name: 'fundref')
+    fundref.for_orgs = true
+    fundref.identifier_prefix = 'https://doi.org/10.13039/'
+    fundref.save
+  end
+
+  desc 'migrate the old user_identifiers over to the polymorphic identifiers table'
+  task convert_user_identifiers: :environment do
+    p 'Transferring existing user_identifiers over to the identifiers table'
+    p 'this may take in excess of 10 minutes depending on the size of your users table ...'
+    identifiers = UserIdentifier.joins(:user, :identifier_scheme)
+                                .includes(:user, :identifier_scheme)
+                                .where.not(identifier: nil)
+                                .where.not(identifier: '')
+
+    Parallel.map(identifiers, in_threads: 8) do |ui|
+      # Parallel has trouble with ActiveRecord lazy loading
+      require 'org' unless Object.const_defined?('Org')
+      require 'identifier' unless Object.const_defined?('Identifier')
+      require 'identifier_scheme' unless Object.const_defined?('IdentifierScheme')
+      @reconnected ||= Identifier.connection.reconnect! || true
+
+      lookup = Identifier.where(identifiable_id: ui.user_id,
+                                identifiable_type: 'User',
+                                identifier_scheme: ui.identifier_scheme)
+      next if lookup.present?
+
+      Identifier.create(identifier_scheme: ui.identifier_scheme, attrs: {}.to_json,
+                        identifiable: ui.user, value: ui.identifier)
     end
 
-    desc "migrate the old org_identifiers over to the polymorphic identifiers table"
-    task convert_org_identifiers: :environment do
-      p "Transferring existing org_identifiers over to the identifiers table"
-      p "please wait ..."
-      identifiers = OrgIdentifier.joins(:org, :identifier_scheme)
-      .includes(:org, :identifier_scheme)
-      .where.not(identifier: nil)
-      .where.not(identifier: '')
-      .order(id: :desc)
-
-      Parallel.map(identifiers, in_threads: 8) do |oi|
-        # Parallel has trouble with ActiveRecord lazy loading
-        require "org" unless Object.const_defined?("Org")
-        require "identifier" unless Object.const_defined?("Identifier")
-        require "identifier_scheme" unless Object.const_defined?("IdentifierScheme")
-        @reconnected ||= Identifier.connection.reconnect! || true
-
-        lookup = Identifier.where(identifiable_id: oi.org_id,
-                                  identifiable_type: "Org",
-                                  identifier_scheme: oi.identifier_scheme)
-        next if lookup.present?
-
-        Identifier.create(identifier_scheme: oi.identifier_scheme, attrs: oi.attrs,
-                          identifiable: oi.org, value: oi.identifier)
-      end
-      count = Identifier.where(identifiable_type: "Org").length
-      p "Transfer complete. Orginal org_identifier count #{identifiers.length}, new identifiers count #{count}"
-      if identifiers.length > count
-        p ""
-        p "#{identifiers.length - count} records could not be transferred. Run the following query manually to identify them:"
-        p "  SELECT * FROM org_identifiers WHERE org_id NOT IN ("
-        p "    SELECT identifiers.identifiable_id FROM identifiers "
-        p "    WHERE identifiers.identifier_scheme_id = org_identifiers.identifier_scheme_id AND identifiable_type = 'Org'"
-        p "  );"
-        p "Then transfer them manually."
-      end
+    count = Identifier.where(identifiable_type: 'User').length
+    p "Transfer complete. Orginal user_identifier count #{identifiers.length}, new identifiers count #{count}"
+    if identifiers.length > count
+      p ''
+      p "#{identifiers.length - count} records could not be transferred."
+      p 'This is typically due to the fact that the new identifiers table will automatically'
+      p 'prepend the identifier_scheme.identifier_prefix to the value For example: '
+      p "    '0000-0000-0000-0001' would become 'https://orcid.org/0000-0000-0000-0001'"
+      p 'and your old user_identifiers table may have an entry for both versions'
     end
+  end
 
-    desc "Sets the new managed flag for all existing Orgs to managed = true"
-    task default_orgs_to_managed: :environment do
-      Org.all.update_all(managed: true)
+  desc 'migrate the old org_identifiers over to the polymorphic identifiers table'
+  task convert_org_identifiers: :environment do
+    p 'Transferring existing org_identifiers over to the identifiers table'
+    p 'please wait ...'
+    identifiers = OrgIdentifier.joins(:org, :identifier_scheme)
+                               .includes(:org, :identifier_scheme)
+                               .where.not(identifier: nil)
+                               .where.not(identifier: '')
+                               .order(id: :desc)
+
+    Parallel.map(identifiers, in_threads: 8) do |oi|
+      # Parallel has trouble with ActiveRecord lazy loading
+      require 'org' unless Object.const_defined?('Org')
+      require 'identifier' unless Object.const_defined?('Identifier')
+      require 'identifier_scheme' unless Object.const_defined?('IdentifierScheme')
+      @reconnected ||= Identifier.connection.reconnect! || true
+
+      lookup = Identifier.where(identifiable_id: oi.org_id,
+                                identifiable_type: 'Org',
+                                identifier_scheme: oi.identifier_scheme)
+      next if lookup.present?
+
+      Identifier.create(identifier_scheme: oi.identifier_scheme, attrs: oi.attrs,
+                        identifiable: oi.org, value: oi.identifier)
     end
+    count = Identifier.where(identifiable_type: 'Org').length
+    p "Transfer complete. Orginal org_identifier count #{identifiers.length}, new identifiers count #{count}"
+    # rubocop:disable Layout/LineLength
+    if identifiers.length > count
+      p ''
+      p "#{identifiers.length - count} records could not be transferred. Run the following query manually to identify them:"
+      p '  SELECT * FROM org_identifiers WHERE org_id NOT IN ('
+      p '    SELECT identifiers.identifiable_id FROM identifiers '
+      p "    WHERE identifiers.identifier_scheme_id = org_identifiers.identifier_scheme_id AND identifiable_type = 'Org'"
+      p '  );'
+      p 'Then transfer them manually.'
+    end
+    # rubocop:enable Layout/LineLength
+  end
 
-    desc "retrieves ROR ids for each of the Orgs defined in the database"
-    task retrieve_ror_fundref_ids: :environment do
-      ror = IdentifierScheme.find_by(name: "ror")
-      fundref = IdentifierScheme.find_by(name: "fundref")
-
-      out = CSV.generate do |csv|
-        csv << %w[org_id org_name ror_name ror_id fundref_id]
-
-        if ExternalApis::RorService.ping
-          p "Scanning ROR for each of your existing Orgs"
-          p "The results will be written to tmp/ror_fundref_ids.csv to facilitate review and any corrections that may need to be made."
-          p "The CSV file contains the Org name stored in your DB next to the ROR org name that was matched. Use these 2 values to determine if the match was valid."
-          p "You can use the ROR search page to find the correct match for any organizations that need to be corrected: https://ror.org/search"
-          p ""
-          orgs = Org.includes(identifiers: :identifier_scheme)
-          .where(is_other: false).order(:name)
-
-          orgs.each do |org|
-            # If the Org already has a ROR identifier skip it
-            next if org.identifiers.select { |id| id.identifier_scheme_id == ror.id }.any?
-
-            # The abbreviation sometimes causes weird results so strip it off
-            # in this instance
-            org_name = org.name.gsub(" (#{org.abbreviation})", "")
-            rslts = OrgSelection::SearchService.search_externally(search_term: org_name)
-            next unless rslts.any?
-
-            # Just use the first match that contains the search term
-            rslt = rslts.select { |rslt| rslt[:weight] <= 1 }.first
-            next unless rslt.present?
-
-            ror_id = rslt[:ror]
-            fundref_id = rslt[:fundref]
-
-            if ror_id.present?
-              ror_ident = Identifier.find_or_initialize_by(identifiable: org,
-                                                           identifier_scheme: ror)
-              ror_ident.value = "#{ror.identifier_prefix}#{ror_id}"
-              ror_ident.save
-              p "    #{org.name} -> ROR: #{ror_ident.value}, #{rslt[:name]}"
-            end
-            if fundref_id.present?
-              fr_ident = Identifier.find_or_initialize_by(identifiable: org,
-                                                          identifier_scheme: fundref)
-              fr_ident.value = "#{fundref.identifier_prefix}#{fundref_id}"
-              fr_ident.save
-              p "    #{org.name} -> FUNDRF: #{fr_ident.value}, #{rslt[:name]}"
-            end
+  desc 'Sets the new managed flag for all existing Orgs to managed = true'
+  task default_orgs_to_managed: :environment do
+    Org.all.update_all(managed: true)
+  end
 
-            if ror_id.present? || fundref_id.present?
-              csv << [org.id, org.name, rslt[:name], ror_ident&.value, fr_ident&.value]
-            end
+  desc 'retrieves ROR ids for each of the Orgs defined in the database'
+  task retrieve_ror_fundref_ids: :environment do
+    ror = IdentifierScheme.find_by(name: 'ror')
+    fundref = IdentifierScheme.find_by(name: 'fundref')
+
+    out = CSV.generate do |csv|
+      csv << %w[org_id org_name ror_name ror_id fundref_id]
+
+      if ExternalApis::RorService.ping
+        # rubocop:disable Layout/LineLength
+        p 'Scanning ROR for each of your existing Orgs'
+        p 'The results will be written to tmp/ror_fundref_ids.csv to facilitate review and any corrections that may need to be made.'
+        p 'The CSV file contains the Org name stored in your DB next to the ROR org name that was matched. Use these 2 values to determine if the match was valid.'
+        p 'You can use the ROR search page to find the correct match for any organizations that need to be corrected: https://ror.org/search'
+        p ''
+        # rubocop:enable Layout/LineLength
+        orgs = Org.includes(identifiers: :identifier_scheme)
+                  .where(is_other: false).order(:name)
+
+        orgs.each do |org|
+          # If the Org already has a ROR identifier skip it
+          next if org.identifiers.select { |id| id.identifier_scheme_id == ror.id }.any?
+
+          # The abbreviation sometimes causes weird results so strip it off
+          # in this instance
+          org_name = org.name.gsub(" (#{org.abbreviation})", '')
+          rslts = OrgSelection::SearchService.search_externally(search_term: org_name)
+          next unless rslts.any?
+
+          # Just use the first match that contains the search term
+          rslt = rslts.select { |r| r[:weight] <= 1 }.first
+          next unless rslt.present?
+
+          ror_id = rslt[:ror]
+          fundref_id = rslt[:fundref]
+
+          if ror_id.present?
+            ror_ident = Identifier.find_or_initialize_by(identifiable: org,
+                                                         identifier_scheme: ror)
+            ror_ident.value = "#{ror.identifier_prefix}#{ror_id}"
+            ror_ident.save
+            p "    #{org.name} -> ROR: #{ror_ident.value}, #{rslt[:name]}"
+          end
+          if fundref_id.present?
+            fr_ident = Identifier.find_or_initialize_by(identifiable: org,
+                                                        identifier_scheme: fundref)
+            fr_ident.value = "#{fundref.identifier_prefix}#{fundref_id}"
+            fr_ident.save
+            p "    #{org.name} -> FUNDRF: #{fr_ident.value}, #{rslt[:name]}"
+          end
+
+          if ror_id.present? || fundref_id.present?
+            csv << [org.id, org.name, rslt[:name], ror_ident&.value, fr_ident&.value]
           end
-        else
-          p "ROR appears to be offline or your configuration is invalid. Heartbeat check failed. Refer to the log for more information."
         end
+      else
+        # rubocop:disable Layout/LineLength
+        p 'ROR appears to be offline or your configuration is invalid. Heartbeat check failed. Refer to the log for more information.'
+        # rubocop:enable Layout/LineLength
       end
+    end
 
-      if out.present?
-        file = File.open("tmp/ror_fundref_ids.csv", "w")
-        file.puts out
-        file.close
-      end
+    if out.present?
+      file = File.open('tmp/ror_fundref_ids.csv', 'w')
+      file.puts out
+      file.close
     end
+  end
 
-  desc "Attempts to migrate other_organisation entries to Orgs"
+  desc 'Attempts to migrate other_organisation entries to Orgs'
   task migrate_other_organisation_to_org: :environment do
     is_other = Org.find_by(is_other: true)
     users = is_other.present? ? User.where(org: is_other) : []
 
     if is_other.present?
       p "Processing #{users.length} users attached to '#{is_other.name}' #{is_other.id}"
-      p "this may take more than 15 minutes depending on how many users are in your database"
+      p 'this may take more than 15 minutes depending on how many users are in your database'
     else
-      p "No is_other Org defined, so no orgs need to be created!"
+      p 'No is_other Org defined, so no orgs need to be created!'
     end
 
     # Unfortunately can't use the Parallel gem here because we can have collisions
     # when creating Orgs
     users.each do |user|
       # First lookup by email domain
-      term = user.email.split("@").last
+      term = user.email.split('@').last
 
       unless %w[gmail.com yahoo.com msn.com].include?(term)
         # Search the local Org table by its URL
-        matches = Org.where("orgs.target_url LIKE ?", "%#{term}%")
+        matches = Org.where('orgs.target_url LIKE ?', "%#{term}%")
         org = matches.first if matches.any?
 
         # by RorService if not already in the DB
@@ -1029,35 +1017,35 @@ namespace :upgrade do
         term = user.other_organisation
         matches = OrgSelection::SearchService.search_externally(search_term: term)
         # Only allow results that START WITH the search term
-        matches = matches.select { |result| result[:weight] == 0 }
+        matches = matches.select { |result| result[:weight].zero? }
         org = OrgSelection::HashToOrgService.to_org(hash: matches.first, allow_create: true) if matches.any?
-        org = create_org(org, matches.first)  if org.present? && org.valid?
+        org = create_org(org, matches.first) if org.present? && org.valid?
       end
 
       # Otherwise create the Org
       if org.nil? && user.other_organisation.present?
         name = user.other_organisation
         abbrev = OrgSelection::SearchService.name_without_alias(name: name)
-        .split(" ").map(&:first).join.upcase
+                                            .split.map(&:first).join.upcase
         org = Org.new(name: name, managed: false, is_other: false,
                       abbreviation: abbrev, language: Language.default)
         org.save if org.present? && org.valid?
       end
 
-      if org.present? && org.valid?
-        # Attach the user to the Org
-        p "  User id: #{user.id} - #{user.email} attaching to org_id: #{org.id} - #{org.name}"
-        user.update(org_id: org.id)
-      end
+      next unless org.present? && org.valid?
+
+      # Attach the user to the Org
+      p "  User id: #{user.id} - #{user.email} attaching to org_id: #{org.id} - #{org.name}"
+      user.update(org_id: org.id)
     end
 
     final = User.where(org: is_other).length
     p "Complete: #{users.length - final} users could not be processed. Left them attached to '#{is_other.name}'"
   end
 
-  desc "migrates any data_contact/principal_investigator information from plans table to contributors"
+  desc 'migrates any data_contact/principal_investigator information from plans table to contributors'
   task migrate_contributors: :environment do
-    orcid = IdentifierScheme.find_by(name: "orcid")
+    orcid = IdentifierScheme.find_by(name: 'orcid')
 
     # Loop through the plans and convert the Data Contact, owners and PI
     # into Contributors
@@ -1065,6 +1053,7 @@ namespace :upgrade do
 
     Parallel.map(plans, in_threads: 8) do |plan|
       next if plan.contributors.any?
+
       owner = plan.owner
 
       # Either use the Data Contact specified on the plan
@@ -1113,26 +1102,24 @@ namespace :upgrade do
       end
 
       plan.reload
-      if plan.contributors.length > 0
-        p "Processed Plan #{plan.id} - which now has #{plan.contributors.length} contributor(s)"
-      end
+      p "Processed Plan #{plan.id} - which now has #{plan.contributors.length} contributor(s)" if plan.contributors.any?
     end
   end
 
   desc "Attach Plans to their owner's Org and then back fill the Funder"
   task migrate_plan_org_and_funder: :environment do
     plans = Plan.includes(template: :org, roles: :user)
-    .joins(template: :org, roles: :user)
+                .joins(template: :org, roles: :user)
 
-    p "Attaching Plans to Orgs ... this can take in excess of 5 minutes depending on how many plans you have."
+    p 'Attaching Plans to Orgs ... this can take in excess of 5 minutes depending on how many plans you have.'
     Parallel.map(plans, in_threads: 8) do |plan|
       next if plan.org_id.present?
 
       # Parallel has trouble with ActiveRecord lazy loading
-      require "plan" unless Object.const_defined?("Plan")
-      require "role" unless Object.const_defined?("Role")
-      require "perm" unless Object.const_defined?("Perm")
-      require "user" unless Object.const_defined?("User")
+      require 'plan' unless Object.const_defined?('Plan')
+      require 'role' unless Object.const_defined?('Role')
+      require 'perm' unless Object.const_defined?('Perm')
+      require 'user' unless Object.const_defined?('User')
       @reconnected ||= Plan.connection.reconnect! || true
 
       next unless plan.owner.present? && plan.owner.org.present?
@@ -1140,14 +1127,14 @@ namespace :upgrade do
       plan.update(org_id: plan.owner.org.id, touch: false)
     end
 
-    p "Attaching Plans to Funders"
+    p 'Attaching Plans to Funders'
     Parallel.map(plans, in_threads: 8) do |plan|
       next if plan.funder_id.present?
 
       # Parallel has trouble with ActiveRecord lazy loading
-      require "plan" unless Object.const_defined?("Plan")
-      require "template" unless Object.const_defined?("Template")
-      require "org" unless Object.const_defined?("Org")
+      require 'plan' unless Object.const_defined?('Plan')
+      require 'template' unless Object.const_defined?('Template')
+      require 'org' unless Object.const_defined?('Org')
       @reconnected ||= Plan.connection.reconnect! || true
 
       next unless plan.funder_name.present? || plan.template.org.funder?
@@ -1162,24 +1149,24 @@ namespace :upgrade do
         end
 
         org = OrgSelection::HashToOrgService.to_org(hash: matches.first, allow_create: true) if matches.any?
-        org = create_org(org, matches.first)  if org.present? && org.valid?
+        org = create_org(org, matches.first) if org.present? && org.valid?
         funder_id = org.id if org.present?
       end
 
       plan.update(funder_id: funder_id, touch: false) if funder_id.present?
     end
-    p "Complete"
+    p 'Complete'
   end
 
-  desc "Migrate the Plans grant_number to an Identifier"
+  desc 'Migrate the Plans grant_number to an Identifier'
   task migrate_plan_grants: :environment do
-    plans = Plan.where.not(grant_number: nil).where.not(grant_number: "")
+    plans = Plan.where.not(grant_number: nil).where.not(grant_number: '')
 
-    p "Converting Plan.grant_number into Identifiers"
-    #Parallel.map(plans, in_threads: 8) do |plan|
+    p 'Converting Plan.grant_number into Identifiers'
+    # Parallel.map(plans, in_threads: 8) do |plan|
     plans.each do |plan|
       # Parallel has trouble with ActiveRecord lazy loading
-      require "plan" unless Object.const_defined?("Plan")
+      require 'plan' unless Object.const_defined?('Plan')
       @reconnected ||= Plan.connection.reconnect! || true
 
       identifier = Identifier.find_or_create_by(
@@ -1187,48 +1174,48 @@ namespace :upgrade do
       )
       plan.update(grant_id: identifier.id, touch: false)
     end
-    p "Complete"
+    p 'Complete'
   end
 
-  desc "Generate stats for all of the 2.2.0 upgrade scripts"
+  desc 'Generate stats for all of the 2.2.0 upgrade scripts'
   task results_2_2_0_part1: :environment do
-    ror = IdentifierScheme.find_by(name: "ror")
-    fundref = IdentifierScheme.find_by(name: "fundref")
+    ror = IdentifierScheme.find_by(name: 'ror')
+    fundref = IdentifierScheme.find_by(name: 'fundref')
     org_identifiers_migrated = Identifier.where(identifiable_type: 'Org')
-    .where.not(identifier_scheme: [ror, fundref])
-    .count
+                                         .where.not(identifier_scheme: [ror, fundref])
+                                         .count
     user_identifiers_migrated = Identifier.where(identifiable_type: 'User')
-    .where.not(identifier_scheme: [ror, fundref])
-    .count
+                                          .where.not(identifier_scheme: [ror, fundref])
+                                          .count
     rors_added = Identifier.where(identifiable_type: 'Org', identifier_scheme: ror).count
     fundrefs_added = Identifier.where(identifiable_type: 'Org', identifier_scheme: fundref).count
 
-    p "---------------------------------------------------------------"
-    p "Results of v2.2.0 part 1 upgrade:"
+    # rubocop:disable Layout/LineLength
+    p '---------------------------------------------------------------'
+    p 'Results of v2.2.0 part 1 upgrade:'
     p "    Added new IdentifierScheme: #{ror.id}, '#{ror.name}', '#{ror.description}'"
     p "    Added new IdentifierScheme: #{fundref.id}, '#{fundref.name}', '#{fundref.description}'"
-    p ""
+    p ''
     p "    Migrated #{number_with_delimiter(org_identifiers_migrated)} from org_identifiers to identifiers table."
     p "    Migrated #{number_with_delimiter(user_identifiers_migrated)} from user_identifiers to identifiers table."
-    p "      NOTE: org_identifier and user_identifiers tables are being deprecated and will be dropped in a future release."
-    p ""
+    p '      NOTE: org_identifier and user_identifiers tables are being deprecated and will be dropped in a future release.'
+    p ''
     p "    Assigned #{number_with_delimiter(rors_added)} ROR identifiers to your Orgs"
     p "    Assigned #{number_with_delimiter(fundrefs_added)} Crossref Funder identifiers to your Orgs"
-    p "      NOTE: Please refer to the tmp/ror_fundref_ids.csv file to see how the assigment worked."
-    p "            You should make any adjustments BEFORE running part 2 of the upgrade scripts!"
-    p "            For example ROR sometimes incorrectly matches Orgs. For example:"
+    p '      NOTE: Please refer to the tmp/ror_fundref_ids.csv file to see how the assigment worked.'
+    p '            You should make any adjustments BEFORE running part 2 of the upgrade scripts!'
+    p '            For example ROR sometimes incorrectly matches Orgs. For example:'
     p "               'University of Somewhere' may match to 'Univerity of Somewhere - Medical Center'"
-    p "            To correct any issues, please delete/insert/update the corresponding Identifier:"
+    p '            To correct any issues, please delete/insert/update the corresponding Identifier:'
     p "               delete from identifiers where identifiable_type = 'Org' and identifiable_id = [orgs.id];"
     p "               insert into identifiers (identifiable_type, identifier_scheme_id, attrs, identifiable_id, value) values ('Org', [identifier_scheme_id], '{}', [orgs.id], 'https://doi.org/10.13039/0000000000');"
     p "               update identifiers set `value` = 'https://ror.org/123456789' where identifiable_id = [orgs.id] and identifier_scheme_id = [identifier_scheme_id] and identifiable_type= 'Org';"
-    p "---------------------------------------------------------------"
+    p '---------------------------------------------------------------'
+    # rubocop:enable Layout/LineLength
   end
 
-  desc "Generate stats for all of the 2.2.0 upgrade scripts"
+  desc 'Generate stats for all of the 2.2.0 upgrade scripts'
   task results_2_2_0_part2: :environment do
-    ror = IdentifierScheme.find_by(name: "ror")
-    fundref = IdentifierScheme.find_by(name: "fundref")
     is_other = Org.find_by(is_other: true)
     unaffiliated = User.where(org_id: is_other.id).count
     unmanaged_orgs = Org.where(managed: false).count
@@ -1238,41 +1225,46 @@ namespace :upgrade do
     funders_converted = Plan.where.not(funder_id: nil).count
     grants_converted = Plan.where.not(grant_id: nil).count
 
-    p "---------------------------------------------------------------"
-    p "Results of v2.2.0 part 2 upgrade:"
+    # rubocop:disable Layout/LineLength
+    p '---------------------------------------------------------------'
+    p 'Results of v2.2.0 part 2 upgrade:'
     p "    Set #{number_with_delimiter(managed_orgs)} Orgs to 'managed: true' (all of your existing Orgs)"
-    p "      The is_other Org is deprecated. Users will not be added to this old default Org in the future."
-    p "      you should try to move any remaining users over to actual Orgs, this may require you to create "
-    p "      a new Org and attach the user to it."
-    p "        `SELECT id, email, other_organisation FROM users WHERE org_id = (SELECT orgs.id FROM orgs WHERE is_other = true);"
-    p "      NOTE: all code that checks for `is_other` will instead check `managed` in future releases."
-    p ""
+    p '      The is_other Org is deprecated. Users will not be added to this old default Org in the future.'
+    p '      you should try to move any remaining users over to actual Orgs, this may require you to create '
+    p '      a new Org and attach the user to it.'
+    p '        `SELECT id, email, other_organisation FROM users WHERE org_id = (SELECT orgs.id FROM orgs WHERE is_other = true);'
+    p '      NOTE: all code that checks for `is_other` will instead check `managed` in future releases.'
+    p ''
     p "    Added #{number_with_delimiter(unmanaged_orgs)} Orgs"
-    p "      NOTE: These Orgs were created from the Funders listed in plans.funder_name and also by examining"
+    p '      NOTE: These Orgs were created from the Funders listed in plans.funder_name and also by examining'
     p "            all of the users attached to the is_other Org (first checking the domain of the user's email"
-    p "            address and then the text value stored in other_organisation)."
-    p "            In the case of a User, the user was associated with that new Org"
+    p '            address and then the text value stored in other_organisation).'
+    p '            In the case of a User, the user was associated with that new Org'
     p "    Added #{number_with_delimiter(contributors_converted)} Contributor based on the old DataContact, PrincipalInvestigator and Plan Owner"
-    p "      NOTE: the old data_contact and principal_investigator fields on the plans table are deprecated and will be removed in a future release."
-    p ""
+    p '      NOTE: the old data_contact and principal_investigator fields on the plans table are deprecated and will be removed in a future release.'
+    p ''
     p "    Attached #{number_with_delimiter(orgs_converted)} Plans to an Org based on the Owner's Org"
     p "    Attached #{number_with_delimiter(funders_converted)} Plans to a Funder based on either the Template's Org (if it was a funder) or the name in funder_name field."
     p "    Migrate #{number_with_delimiter(grants_converted)} Plan grant_numbers to Identifiers"
-    p "      NOTE: funder_name and grant_number fields on the plans table are deprecated and will be dropped in a future release"
-    p ""
+    p '      NOTE: funder_name and grant_number fields on the plans table are deprecated and will be dropped in a future release'
+    p ''
     p "    #{number_with_delimiter(unaffiliated)} users are still associated with '#{is_other.name}' (is_other Org)."
-    p "---------------------------------------------------------------"
+    p '---------------------------------------------------------------'
+    # rubocop:enable Layout/LineLength
   end
 
-
-  desc "explicitly set some column-defaults in the database"
+  desc 'explicitly set some column-defaults in the database'
   task column_defaults: :environment do
-    Org.where(links:  nil).update_all(links: { "org": [] })
+    Org.where(links: nil).update_all(links: { org: [] })
     if Org.respond_to?(:feedback_email_subject)
-      Org.where(feedback_email_subject: nil).update_all(feedback_email_subject: Org.feedback_confirmation_default_subject)
-      Org.where(feedback_email_msg: nil).update_all(feedback_email_msg: Org.feedback_confirmation_default_message)
+      Org.where(feedback_email_subject: nil)
+         .update_all(feedback_email_subject: Org.feedback_confirmation_default_subject)
+
+      Org.where(feedback_email_msg: nil)
+         .update_all(feedback_email_msg: Org.feedback_confirmation_default_message)
     else
-      Org.where(feedback_msg: nil).update_all(feedback_msg: Org.feedback_confirmation_default_message)
+      Org.where(feedback_msg: nil)
+         .update_all(feedback_msg: Org.feedback_confirmation_default_message)
     end
     Org.where(language_id: nil).update_all(language_id: Language.default&.id)
   end
@@ -1284,22 +1276,22 @@ namespace :upgrade do
   end
 
   def safe_require(libname)
-    begin
-      require libname
-    rescue LoadError
-      puts "Please install the #{libname} gem locally and try again:
+    require libname
+  rescue LoadError
+    puts "Please install the #{libname} gem locally and try again:
             gem install #{libname}"
-      exit 1
-    end
+    exit 1
   end
 
   # Converts the names, email and phone into a Contributor and an
   # Identifier model
+  # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/ParameterLists
+  # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
   def to_contributor(plan, name, email, phone, identifier, org)
     return nil, nil unless name.present? || email.present?
 
     # If the name is not an array already split it up
-    orcid = IdentifierScheme.find_by(name: "orcid")
+    orcid = IdentifierScheme.find_by(name: 'orcid')
 
     # If no Org and/or identifier were nil try to look them up in the User table
     user = User.includes(:identifiers).where(email: email).first
@@ -1312,7 +1304,8 @@ namespace :upgrade do
       end
     end
 
-    contributor = Contributor.where("plan_id = ? AND (LOWER(email) = LOWER(?) OR LOWER(name) = LOWER(?))", plan.id, email, name).first
+    contributor = Contributor.where('plan_id = ? AND (LOWER(email) = LOWER(?) OR LOWER(name) = LOWER(?))', plan.id,
+                                    email, name).first
     unless contributor.present?
       contributor = Contributor.new(email: email, plan: plan)
       contributor.name = name
@@ -1329,8 +1322,10 @@ namespace :upgrade do
     id = Identifier.find_or_initialize_by(identifiable: contributor,
                                           identifier_scheme: orcid)
     id.value = orcid_id
-    return contributor, id
+    [contributor, id]
   end
+  # rubocop:enable Metrics/AbcSize, Metrics/MethodLength, Metrics/ParameterLists
+  # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
   def create_org(org, match)
     org.save
@@ -1346,5 +1341,5 @@ namespace :upgrade do
   def number_with_delimiter(number)
     number.to_s.reverse.gsub(/(\d{3})(?=\d)/, '\\1,').reverse
   end
-
 end
+# rubocop:enable Naming/VariableNumber
diff --git a/lib/tasks/utils/external_api.rake b/lib/tasks/utils/external_api.rake
index 7b363831f5..ac52210f6c 100644
--- a/lib/tasks/utils/external_api.rake
+++ b/lib/tasks/utils/external_api.rake
@@ -1,89 +1,88 @@
 # frozen_string_literal: true
 
-# rubocop:disable Metrics/BlockLength, Layout/LineLength
 namespace :external_api do
-  desc "Seed the Research Domain table with Field of Science categories"
+  desc 'Seed the Research Domain table with Field of Science categories'
   task add_field_of_science_to_research_domains: :environment do
     # TODO: If we can identify an external API authority for this information we should switch
     #       to fetch the list from there instead of the hard-coded list below which was derived from:
     #       https://www.oecd.org/science/inno/38235147.pdf
     [
       {
-        identifier: "1",
-        label: "Natural sciences",
+        identifier: '1',
+        label: 'Natural sciences',
         children: [
-          { identifier: "1.1", label: "Mathematics" },
-          { identifier: "1.2", label: "Computer and information sciences" },
-          { identifier: "1.3", label: "Physical sciences" },
-          { identifier: "1.4", label: "Chemical sciences" },
-          { identifier: "1.5", label: "Earth and related environmental sciences" },
-          { identifier: "1.6", label: "Biological sciences" },
-          { identifier: "1.7", label: "Other natural sciences" }
+          { identifier: '1.1', label: 'Mathematics' },
+          { identifier: '1.2', label: 'Computer and information sciences' },
+          { identifier: '1.3', label: 'Physical sciences' },
+          { identifier: '1.4', label: 'Chemical sciences' },
+          { identifier: '1.5', label: 'Earth and related environmental sciences' },
+          { identifier: '1.6', label: 'Biological sciences' },
+          { identifier: '1.7', label: 'Other natural sciences' }
         ]
       },
       {
-        identifier: "2",
-        label: "Engineering and Technology",
+        identifier: '2',
+        label: 'Engineering and Technology',
         children: [
-          { identifier: "2.1", label: "Civil engineering" },
-          { identifier: "2.2", label: "Electrical engineering, electronic engineering,  information engineering" },
-          { identifier: "2.3", label: "Mechanical engineering" },
-          { identifier: "2.4", label: "Chemical engineering" },
-          { identifier: "2.5", label: "Materials engineering" },
-          { identifier: "2.6", label: "Medical engineering" },
-          { identifier: "2.7", label: "Environmental engineering" },
-          { identifier: "2.8", label: "Environmental biotechnology" },
-          { identifier: "2.9", label: "Industrial Biotechnology" },
-          { identifier: "2.10", label: "Nano-technology" },
-          { identifier: "2.11", label: "Other engineering and technologies" }
+          { identifier: '2.1', label: 'Civil engineering' },
+          { identifier: '2.2', label: 'Electrical engineering, electronic engineering,  information engineering' },
+          { identifier: '2.3', label: 'Mechanical engineering' },
+          { identifier: '2.4', label: 'Chemical engineering' },
+          { identifier: '2.5', label: 'Materials engineering' },
+          { identifier: '2.6', label: 'Medical engineering' },
+          { identifier: '2.7', label: 'Environmental engineering' },
+          { identifier: '2.8', label: 'Environmental biotechnology' },
+          { identifier: '2.9', label: 'Industrial Biotechnology' },
+          { identifier: '2.10', label: 'Nano-technology' },
+          { identifier: '2.11', label: 'Other engineering and technologies' }
         ]
       },
       {
-        identifier: "3",
-        label: "Medical and Health Sciences",
+        identifier: '3',
+        label: 'Medical and Health Sciences',
         children: [
-          { identifier: "3.1", label: "Basic medicine" },
-          { identifier: "3.2", label: "Clinical medicine" },
-          { identifier: "3.3", label: "Health sciences" },
-          { identifier: "3.4", label: "Health biotechnology" },
-          { identifier: "3.5", label: "Other medical sciences" }
+          { identifier: '3.1', label: 'Basic medicine' },
+          { identifier: '3.2', label: 'Clinical medicine' },
+          { identifier: '3.3', label: 'Health sciences' },
+          { identifier: '3.4', label: 'Health biotechnology' },
+          { identifier: '3.5', label: 'Other medical sciences' }
         ]
       },
       {
-        identifier: "4",
-        label: "Agricultural Sciences",
+        identifier: '4',
+        label: 'Agricultural Sciences',
         children: [
-          { identifier: "4.1", label: "Agriculture, forestry, and fisheries" },
-          { identifier: "4.2", label: "Animal and dairy science" },
-          { identifier: "4.3", label: "Veterinary science" },
-          { identifier: "4.4", label: "Agricultural biotechnology" },
-          { identifier: "4.5", label: "Other agricultural sciences" }
+          { identifier: '4.1', label: 'Agriculture, forestry, and fisheries' },
+          { identifier: '4.2', label: 'Animal and dairy science' },
+          { identifier: '4.3', label: 'Veterinary science' },
+          { identifier: '4.4', label: 'Agricultural biotechnology' },
+          { identifier: '4.5', label: 'Other agricultural sciences' }
         ]
       },
       {
-        identifier: "5",
-        label: "Social Sciences",
+        identifier: '5',
+        label: 'Social Sciences',
         children: [
-          { identifier: "5.1", label: "Psychology" },
-          { identifier: "5.2", label: "Economics and business" },
-          { identifier: "5.3", label: "Educational sciences" },
-          { identifier: "5.4", label: "Sociology" },
-          { identifier: "5.5", label: "Law" },
-          { identifier: "5.6", label: "Political science" },
-          { identifier: "5.7", label: "Social and economic geography" },
-          { identifier: "5.8", label: "Media and communications" },
-          { identifier: "5.7", label: "Other social sciences" }
+          { identifier: '5.1', label: 'Psychology' },
+          { identifier: '5.2', label: 'Economics and business' },
+          { identifier: '5.3', label: 'Educational sciences' },
+          { identifier: '5.4', label: 'Sociology' },
+          { identifier: '5.5', label: 'Law' },
+          { identifier: '5.6', label: 'Political science' },
+          { identifier: '5.7', label: 'Social and economic geography' },
+          { identifier: '5.8', label: 'Media and communications' },
+          { identifier: '5.7', label: 'Other social sciences' }
         ]
       },
       {
-        identifier: "6",
-        label: "Humanities",
+        identifier: '6',
+        label: 'Humanities',
         children: [
-          { identifier: "6.1", label: "History and archaeology" },
-          { identifier: "6.2", label: "Languages and literature" },
-          { identifier: "6.3", label: "Philosophy, ethics and religion" },
-          { identifier: "6.4", label: "Art (arts, history of arts, performing arts, music)" },
-          { identifier: "6.5", label: "Other humanities" }
+          { identifier: '6.1', label: 'History and archaeology' },
+          { identifier: '6.2', label: 'Languages and literature' },
+          { identifier: '6.3', label: 'Philosophy, ethics and religion' },
+          { identifier: '6.4', label: 'Art (arts, history of arts, performing arts, music)' },
+          { identifier: '6.5', label: 'Other humanities' }
         ]
       }
     ].each do |fos|
@@ -98,4 +97,3 @@ namespace :external_api do
     end
   end
 end
-# rubocop:enable Metrics/BlockLength, Layout/LineLength
diff --git a/lib/tasks/utils/language.rake b/lib/tasks/utils/language.rake
index d8efeeca5a..df726b9731 100644
--- a/lib/tasks/utils/language.rake
+++ b/lib/tasks/utils/language.rake
@@ -1,25 +1,22 @@
 # frozen_string_literal: true
 
-# rubocop:disable Metrics/BlockLength
 namespace :translatable do
-  desc "Add the specified language to the database"
+  desc 'Add the specified language to the database'
   task :add_language_to_db, %i[code name is_default] => [:environment] do |_t, args|
     if args[:code].present? && args[:name].present?
       if Language.find_by(abbreviation: args[:code]).present?
-        puts "That language already exists!"
+        puts 'That language already exists!'
       else
-        Language.create!(abbreviation: args[:code], description: "", name: args[:name],
+        Language.create!(abbreviation: args[:code], description: '', name: args[:name],
                          default_language: (args[:is_default] == 1))
-        puts "Language added"
+        puts 'Language added'
       end
     else
-      # rubocop:disable Layout/LineLength
-      puts "You must provide a ISO-639 language code, name: e.g. `rails translatable:add_language[ja,日本語]`"
-      # rubocop:enable Layout/LineLength
+      puts 'You must provide a ISO-639 language code, name: e.g. `rails translatable:add_language[ja,日本語]`'
     end
   end
 
-  desc "Remove the specified language from the database"
+  desc 'Remove the specified language from the database'
   task :remove_language_from_db, [:code] => [:environment] do |_t, args|
     if args[:code].present?
       lang = Language.find_by(abbreviation: args[:code])
@@ -32,13 +29,12 @@ namespace :translatable do
         Org.where(language_id: lang.id)
            .update_all(language_id: default.present? ? default.id : nil)
         lang.destroy
-        puts "The language has been removed."
+        puts 'The language has been removed.'
       else
-        puts "That language is not registered!"
+        puts 'That language is not registered!'
       end
     else
-      puts "You must provide the ISO-639 language code: e.g. `translatable:remove_language[ja]`"
+      puts 'You must provide the ISO-639 language code: e.g. `translatable:remove_language[ja]`'
     end
   end
 end
-# rubocop:enable Metrics/BlockLength
diff --git a/lib/tasks/utils/templates.rake b/lib/tasks/utils/templates.rake
index 2764c2ed9e..da9c5bdef6 100644
--- a/lib/tasks/utils/templates.rake
+++ b/lib/tasks/utils/templates.rake
@@ -1,19 +1,19 @@
 # frozen_string_literal: true
 
-# rubocop:disable Layout/LineLength, Metrics/BlockLength, Metrics/AbcSize
+# rubocop:disable Layout/LineLength, Metrics/AbcSize
 namespace :templates do
-  desc "Repair Templates whose descendents have NIL versionable_id values"
+  desc 'Repair Templates whose descendents have NIL versionable_id values'
   task fix_templates_with_nil_versionable_ids: :environment do
-    p "Attempting to repair versionable_ids"
+    p 'Attempting to repair versionable_ids'
 
-    safe_require "text"
+    safe_require 'text'
 
     # Remove attr_readonly restrictions form these models
-    Phase.attr_readonly.delete("versionable_id")
-    Section.attr_readonly.delete("versionable_id")
-    Question.attr_readonly.delete("versionable_id")
-    QuestionOption.attr_readonly.delete("versionable_id")
-    Annotation.attr_readonly.delete("versionable_id")
+    Phase.attr_readonly.delete('versionable_id')
+    Section.attr_readonly.delete('versionable_id')
+    Question.attr_readonly.delete('versionable_id')
+    QuestionOption.attr_readonly.delete('versionable_id')
+    Annotation.attr_readonly.delete('versionable_id')
 
     # Get each of the latest versions of the non-customized templates
     Template.latest_version.where(customization_of: nil)
@@ -216,8 +216,8 @@ namespace :templates do
 
     related_records.each do |record|
       # Use the Number, Title and or Text to try and match the items
-      text_a = [original[:number], original[:title], original[:text]].compact.join(" - ")
-      text_b = [record[:number], record[:title], record[:text]].compact.join(" - ")
+      text_a = [original[:number], original[:title], original[:text]].compact.join(' - ')
+      text_b = [record[:number], record[:title], record[:text]].compact.join(' - ')
 
       if fuzzy_match?(text_a, text_b)
         p "#{' ' * spaces} ** Using versionable_id from more recent version for #{record.class.name} #{record.id}"
@@ -229,6 +229,7 @@ namespace :templates do
     end
   end
 
+  # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
   def find_related_versionable_id(original_template:, record:)
     # rubocop:disable Style/NestedTernaryOperator
     spaces = record.is_a?(Phase) ? 4 : (record.is_a?(Section) ? 6 : (record.is_a?(Question) ? 8 : 10))
@@ -240,8 +241,8 @@ namespace :templates do
         next unless obj.versionable_id.present? && version.nil?
 
         # Use the Number, Title and or Text to try and match the items
-        text_a = [obj[:number], obj[:title], obj[:text]].compact.join(" - ")
-        text_b = [record[:number], record[:title], record[:text]].compact.join(" - ")
+        text_a = [obj[:number], obj[:title], obj[:text]].compact.join(' - ')
+        text_b = [record[:number], record[:title], record[:text]].compact.join(' - ')
 
         if fuzzy_match?(text_a, text_b)
           p "#{' ' * spaces} ** Using versionable_id from more recent version for #{obj.class.name} #{obj.id} - #{obj.versionable_id}"
@@ -254,5 +255,6 @@ namespace :templates do
     end
     version
   end
+  # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 end
-# rubocop:enable Layout/LineLength, Metrics/BlockLength, Metrics/AbcSize
+# rubocop:enable Layout/LineLength, Metrics/AbcSize
diff --git a/lib/tasks/v3.rake b/lib/tasks/v3.rake
index f52555dc34..6cba4c62ee 100644
--- a/lib/tasks/v3.rake
+++ b/lib/tasks/v3.rake
@@ -1,22 +1,24 @@
+# frozen_string_literal: true
+
 # Upgrade tasks for 3.x versions. See https://github.com/DMPRoadmap/roadmap/releases for information
 # on how and when to run each task.
 
+# rubocop:disable Naming/VariableNumber
 namespace :v3 do
-
-  desc "Upgrade from v2.2.0 to v3.0.0"
+  desc 'Upgrade from v2.2.0 to v3.0.0'
   task upgrade_3_0_0: :environment do
-    Rake::Task["v3:ensure_default_languages"].execute
-    Rake::Task["v3:ensure_feedback_defaults"].execute
-    Rake::Task["v3:fix_funder_ids"].execute
+    Rake::Task['v3:ensure_default_languages'].execute
+    Rake::Task['v3:ensure_feedback_defaults'].execute
+    Rake::Task['v3:fix_funder_ids'].execute
   end
 
-  desc "Upgrade from v3.0.0 to v3.1.0"
+  desc 'Upgrade from v3.0.0 to v3.1.0'
   task upgrade_3_1_0: :environment do
-    Rake::Task["mime_types:load"].execute
+    Rake::Task['mime_types:load'].execute
   end
 
   # Set any records with a nil `language_id` to the default language
-  desc "Change nil language_id entries into the default language"
+  desc 'Change nil language_id entries into the default language'
   task ensure_default_languages: :environment do
     dflt = Language.default
 
@@ -36,7 +38,7 @@ namespace :v3 do
   end
 
   # Set any records with a nil `feedback_email_[subject|message]` to the default
-  desc "Change nil feedback_email_subject and feedback_email_message to the defaults"
+  desc 'Change nil feedback_email_subject and feedback_email_message to the defaults'
   task ensure_feedback_defaults: :environment do
     include FeedbacksHelper
 
@@ -49,12 +51,12 @@ namespace :v3 do
   end
 
   # E.G. change 'https://api.crossref.org/funders/100000060' to 'https://doi.org/10.13039/100000060'
-  desc "Corrects the Crossref funder ids which were originally set to the URL instead of the DOI"
+  desc 'Corrects the Crossref funder ids which were originally set to the URL instead of the DOI'
   task fix_funder_ids: :environment do
-    scheme = IdentifierScheme.where(name: "fundref").first
+    scheme = IdentifierScheme.where(name: 'fundref').first
 
-    incorrect_prefix = "https://api.crossref.org/funders/"
-    correct_prefix = "https://doi.org/10.13039/"
+    incorrect_prefix = 'https://api.crossref.org/funders/'
+    correct_prefix = 'https://doi.org/10.13039/'
 
     if scheme.present?
       scheme.update(identifier_prefix: correct_prefix) unless scheme.identifier_prefix == correct_prefix
@@ -67,5 +69,5 @@ namespace :v3 do
       end
     end
   end
-
 end
+# rubocop:enable Naming/VariableNumber
diff --git a/lib/unique_random.rb b/lib/unique_random.rb
index 8779548d2a..bea381085e 100644
--- a/lib/unique_random.rb
+++ b/lib/unique_random.rb
@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
+# Helper method for generating a unique value and checking the DB
 module UniqueRandom
-
-  def unique_random(field_name:, prefix: "", suffix: "", length: nil)
+  def unique_random(field_name:, prefix: '', suffix: '', length: nil)
     loop do
       rand = SecureRandom.urlsafe_base64(length, false)
       constructed = "#{prefix}#{rand}#{suffix}"
@@ -16,5 +16,4 @@ def unique_uuid(field_name:)
       break uuid unless exists?(field_name.to_sym => uuid)
     end
   end
-
 end
diff --git a/package.json b/package.json
index c4d44892ea..ec10795639 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "@rails/actioncable": "^6.0.3-1",
     "@rails/activestorage": "^6.0.3-1",
     "@rails/ujs": "^6.0.3-1",
-    "@rails/webpacker": "5.1.1",
+    "@rails/webpacker": "5.4.3",
     "bootstrap": "^3.4.1",
     "bootstrap-3-typeahead": "^4.0.2",
     "bootstrap-sass": "^3.3.7",
@@ -66,7 +66,7 @@
     "karma-jquery": "^0.2.4",
     "karma-json-fixtures-preprocessor": "^0.0.6",
     "karma-webpack": "^4.0.2",
-    "webpack-dev-server": "^3.11.0"
+    "webpack-dev-server": "^4.7.3"
   },
   "resolutions": {
     "webpack": "^4.42.1"
diff --git a/spec/controllers/answers_controller_spec.rb b/spec/controllers/answers_controller_spec.rb
index 11f443a934..da21453009 100644
--- a/spec/controllers/answers_controller_spec.rb
+++ b/spec/controllers/answers_controller_spec.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe AnswersController, type: :controller do
-
   include RolesHelper
 
   before(:each) do
@@ -21,15 +20,15 @@
     ActionMailer::Base.deliveries = []
   end
 
-  describe "POST /answers/create_or_update", js: true do
-    context "standard question type (no question_options and not RDA metadata)" do
+  describe 'POST /answers/create_or_update', js: true do
+    context 'standard question type (no question_options and not RDA metadata)' do
       before(:each) do
         @question = create(:question, :textarea, section: @section)
         @args = { text: Faker::Lorem.paragraph, user_id: @user.id,
                   question_id: @question.id, plan_id: @plan.id }
       end
 
-      it "succeeds in creating" do
+      it 'succeeds in creating' do
         post :create_or_update, params: { answer: @args }
         answer = Answer.all.last
         expect(answer.present?).to eql(true)
@@ -39,19 +38,19 @@
 
         json = JSON.parse(response.body).with_indifferent_access
         expect(json[:plan].present?).to eql(true)
-        expect(json[:plan][:progress]).to eql("")
+        expect(json[:plan][:progress]).to eql('')
         expect(json[:plan][:id]).to eql(@plan.id)
         expect(json[:question].present?).to eql(true)
         expect(json[:question][:answer_lock_version]).to eql(answer.lock_version)
-        expect(json[:question][:answer_status]).to eql("")
-        expect(json[:question][:form]).to eql("")
+        expect(json[:question][:answer_status]).to eql('')
+        expect(json[:question][:form]).to eql('')
         expect(json[:question][:id]).to eql(@question.id)
         expect(json[:question][:locking]).to eql(nil)
         expect(json[:section_data].present?).to eql(true)
         expect(json[:qn_data].present?).to eql(true)
         # TODO: add validations on content of qn_data and section_data
       end
-      it "succeeds in updating" do
+      it 'succeeds in updating' do
         answer = create(:answer, plan: @plan, question: @question)
         @args[:lock_version] = answer.lock_version
         post :create_or_update, params: { answer: @args }
@@ -61,32 +60,32 @@
 
         json = JSON.parse(response.body).with_indifferent_access
         expect(json[:plan].present?).to eql(true)
-        expect(json[:plan][:progress]).to eql("")
+        expect(json[:plan][:progress]).to eql('')
         expect(json[:plan][:id]).to eql(@plan.id)
         expect(json[:question].present?).to eql(true)
         expect(json[:question][:answer_lock_version]).to eql(answer.lock_version)
-        expect(json[:question][:answer_status]).to eql("")
-        expect(json[:question][:form]).to eql("")
+        expect(json[:question][:answer_status]).to eql('')
+        expect(json[:question][:form]).to eql('')
         expect(json[:question][:id]).to eql(@question.id)
         expect(json[:question][:locking]).to eql(nil)
         expect(json[:section_data].present?).to eql(true)
         expect(json[:qn_data].present?).to eql(true)
       end
-      it "fails" do
+      it 'fails' do
         Answer.any_instance.stubs(:present?).returns(false)
         post :create_or_update, params: { answer: @args }
-        expect(response.body).to eql("")
+        expect(response.body).to eql('')
       end
     end
 
-    context "RDA metadata question type" do
+    context 'RDA metadata question type' do
       before(:each) do
         @question = create(:question, :rda_metadata, section: @section)
-        @args = { text: Faker::Lorem.paragraph, standards: { foo: "bar" },
+        @args = { text: Faker::Lorem.paragraph, standards: { foo: 'bar' },
                   user_id: @user.id, question_id: @question.id, plan_id: @plan.id }
       end
 
-      it "succeeds in creating" do
+      it 'succeeds in creating' do
         post :create_or_update, params: { answer: @args }
         answer = Answer.all.last
         expect(answer.present?).to eql(true)
@@ -96,18 +95,18 @@
 
         json = JSON.parse(response.body).with_indifferent_access
         expect(json[:plan].present?).to eql(true)
-        expect(json[:plan][:progress]).to eql("")
+        expect(json[:plan][:progress]).to eql('')
         expect(json[:plan][:id]).to eql(@plan.id)
         expect(json[:question].present?).to eql(true)
         expect(json[:question][:answer_lock_version]).to eql(answer.lock_version)
-        expect(json[:question][:answer_status]).to eql("")
-        expect(json[:question][:form]).to eql("")
+        expect(json[:question][:answer_status]).to eql('')
+        expect(json[:question][:form]).to eql('')
         expect(json[:question][:id]).to eql(@question.id)
         expect(json[:question][:locking]).to eql(nil)
         expect(json[:section_data].present?).to eql(true)
         expect(json[:qn_data].present?).to eql(true)
       end
-      it "succeeds in updating" do
+      it 'succeeds in updating' do
         answer = create(:answer, plan: @plan, question: @question)
         @args[:lock_version] = answer.lock_version
         post :create_or_update, params: { answer: @args }
@@ -119,25 +118,25 @@
 
         json = JSON.parse(response.body).with_indifferent_access
         expect(json[:plan].present?).to eql(true)
-        expect(json[:plan][:progress]).to eql("")
+        expect(json[:plan][:progress]).to eql('')
         expect(json[:plan][:id]).to eql(@plan.id)
         expect(json[:question].present?).to eql(true)
         expect(json[:question][:answer_lock_version]).to eql(answer.lock_version)
-        expect(json[:question][:answer_status]).to eql("")
-        expect(json[:question][:form]).to eql("")
+        expect(json[:question][:answer_status]).to eql('')
+        expect(json[:question][:form]).to eql('')
         expect(json[:question][:id]).to eql(@question.id)
         expect(json[:question][:locking]).to eql(nil)
         expect(json[:section_data].present?).to eql(true)
         expect(json[:qn_data].present?).to eql(true)
       end
-      it "fails" do
+      it 'fails' do
         Answer.any_instance.stubs(:present?).returns(false)
         post :create_or_update, params: { answer: @args }
-        expect(response.body).to eql("")
+        expect(response.body).to eql('')
       end
     end
 
-    context "question with question_options" do
+    context 'question with question_options' do
       before(:each) do
         @question = create(:question, :radiobuttons, section: @section, options: 2)
         @args = { text: Faker::Lorem.paragraph, user_id: @user.id,
@@ -145,7 +144,7 @@
                   question_option_ids: [@question.question_options.first.id] }
       end
 
-      it "succeeds in creating" do
+      it 'succeeds in creating' do
         post :create_or_update, params: { answer: @args }
         answer = Answer.all.last
         expect(answer.present?).to eql(true)
@@ -155,18 +154,18 @@
 
         json = JSON.parse(response.body).with_indifferent_access
         expect(json[:plan].present?).to eql(true)
-        expect(json[:plan][:progress]).to eql("")
+        expect(json[:plan][:progress]).to eql('')
         expect(json[:plan][:id]).to eql(@plan.id)
         expect(json[:question].present?).to eql(true)
         expect(json[:question][:answer_lock_version]).to eql(answer.lock_version)
-        expect(json[:question][:answer_status]).to eql("")
-        expect(json[:question][:form]).to eql("")
+        expect(json[:question][:answer_status]).to eql('')
+        expect(json[:question][:form]).to eql('')
         expect(json[:question][:id]).to eql(@question.id)
         expect(json[:question][:locking]).to eql(nil)
         expect(json[:section_data].present?).to eql(true)
         expect(json[:qn_data].present?).to eql(true)
       end
-      it "succeeds in updating" do
+      it 'succeeds in updating' do
         answer = create(:answer, plan: @plan, question: @question)
         @args[:lock_version] = answer.lock_version
         post :create_or_update, params: { answer: @args }
@@ -178,25 +177,25 @@
 
         json = JSON.parse(response.body).with_indifferent_access
         expect(json[:plan].present?).to eql(true)
-        expect(json[:plan][:progress]).to eql("")
+        expect(json[:plan][:progress]).to eql('')
         expect(json[:plan][:id]).to eql(@plan.id)
         expect(json[:question].present?).to eql(true)
         expect(json[:question][:answer_lock_version]).to eql(answer.lock_version)
-        expect(json[:question][:answer_status]).to eql("")
-        expect(json[:question][:form]).to eql("")
+        expect(json[:question][:answer_status]).to eql('')
+        expect(json[:question][:form]).to eql('')
         expect(json[:question][:id]).to eql(@question.id)
         expect(json[:question][:locking]).to eql(nil)
         expect(json[:section_data].present?).to eql(true)
         expect(json[:qn_data].present?).to eql(true)
       end
-      it "fails" do
+      it 'fails' do
         Answer.any_instance.stubs(:present?).returns(false)
         post :create_or_update, params: { answer: @args }
-        expect(response.body).to eql("")
+        expect(response.body).to eql('')
       end
     end
 
-    it "fails due to Plan not found" do
+    it 'fails due to Plan not found' do
       @question = create(:question, :textarea, section: @section)
       @args = { text: Faker::Lorem.paragraph, user_id: @user.id,
                 question_id: @question.id }
@@ -205,5 +204,4 @@
       expect(json[:msg].present?).to eql(true)
     end
   end
-
 end
diff --git a/spec/controllers/concerns/org_selectable_spec.rb b/spec/controllers/concerns/org_selectable_spec.rb
index c7e3a2dfed..45a62b6b24 100644
--- a/spec/controllers/concerns/org_selectable_spec.rb
+++ b/spec/controllers/concerns/org_selectable_spec.rb
@@ -1,15 +1,14 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe OrgSelectable do
-
   before(:each) do
+    # rubocop:disable Lint/ConstantDefinitionInBlock
     class StubController < ApplicationController
-
       include OrgSelectable
-
     end
+    # rubocop:enable Lint/ConstantDefinitionInBlock
 
     @controller = StubController.new
 
@@ -31,72 +30,69 @@ class StubController < ApplicationController
     Object.send :remove_const, :StubController
   end
 
-  context "private methods" do
-
-    describe "#org_from_params(params:)" do
-      it "returns nil if params[:org_id] is not present" do
+  context 'private methods' do
+    describe '#org_from_params(params:)' do
+      it 'returns nil if params[:org_id] is not present' do
         expect(@controller.send(:org_from_params, params_in: {})).to eql(nil)
       end
-      it "returns nil if the params[:org_id] could not be converted" do
+      it 'returns nil if the params[:org_id] could not be converted' do
         @controller.stubs(:org_hash_from_params).returns({})
         expect(@controller.send(:org_from_params, params_in: {})).to eql(nil)
       end
-      it "returns an Org" do
+      it 'returns an Org' do
         rslt = @controller.send(:org_from_params, params_in: @params)
         expect(rslt.is_a?(Org)).to eql(true)
       end
     end
 
-    describe "#identifiers_from_params(params:)" do
-      it "returns an empty array if params[:org_id] is not present" do
+    describe '#identifiers_from_params(params:)' do
+      it 'returns an empty array if params[:org_id] is not present' do
         rslt = @controller.send(:identifiers_from_params, params_in: {})
         expect(rslt).to eql([])
       end
-      it "returns an empty array if params[:org_id] could not be converted" do
+      it 'returns an empty array if params[:org_id] could not be converted' do
         @controller.stubs(:org_hash_from_params).returns({})
         rslt = @controller.send(:identifiers_from_params, params_in: {})
         expect(rslt).to eql([])
       end
-      it "returns an Array of identifiers" do
+      it 'returns an Array of identifiers' do
         rslt = @controller.send(:identifiers_from_params, params_in: @params)
         expect(rslt.is_a?(Array)).to eql(true)
         expect(rslt.first.is_a?(Identifier)).to eql(true)
       end
     end
 
-    describe "#org_hash_from_params(params:)" do
-      it "returns an empty hash is there is a JSON parse error" do
+    describe '#org_hash_from_params(params:)' do
+      it 'returns an empty hash is there is a JSON parse error' do
         JSON.expects(:parse).raises(JSON::ParserError)
         rslt = @controller.send(:org_hash_from_params, params_in: @params)
         expect(rslt).to eql({})
       end
-      it "logs JSON parse error" do
+      it 'logs JSON parse error' do
         JSON.expects(:parse).raises(JSON::ParserError)
         Rails.logger.expects(:error).at_least(2)
         @controller.send(:org_hash_from_params, params_in: @params)
       end
-      it "returns the hash" do
+      it 'returns the hash' do
         rslt = @controller.send(:org_hash_from_params, params_in: @params)
         expect(rslt).to eql(JSON.parse(@params[:org_id]))
       end
     end
 
-    describe "#remove_org_selection_params(params:)" do
+    describe '#remove_org_selection_params(params:)' do
       before(:each) do
         @rslt = @controller.send(:remove_org_selection_params,
                                  params_in: @params)
       end
-      it "removes the org_selector params" do
+      it 'removes the org_selector params' do
         expect(@rslt[:org_id].present?).to eql(false)
         expect(@rslt[:org_name].present?).to eql(false)
         expect(@rslt[:org_sources].present?).to eql(false)
         expect(@rslt[:org_crosswalk].present?).to eql(false)
       end
-      it "does not remove other params" do
+      it 'does not remove other params' do
         expect(@rslt[:other_param].present?).to eql(true)
       end
     end
-
   end
-
 end
diff --git a/spec/controllers/contributors_controller_spec.rb b/spec/controllers/contributors_controller_spec.rb
index 2645261250..5e94b66f95 100644
--- a/spec/controllers/contributors_controller_spec.rb
+++ b/spec/controllers/contributors_controller_spec.rb
@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe ContributorsController, type: :controller do
-
   before(:each) do
-    @scheme = create(:identifier_scheme, name: "orcid")
+    @scheme = create(:identifier_scheme, name: 'orcid')
     @org = create(:org, managed: true)
     @plan = create(:plan, :creator, org: @org)
     @user = @plan.owner
@@ -21,23 +20,23 @@
           name: @org.name,
           ror: Faker::Lorem.word
         }.to_json,
-        identifiers_attributes: { "0": {
+        identifiers_attributes: { '0': {
           identifier_scheme_id: @scheme.id,
           value: SecureRandom.uuid
         } }
       }
     }
     @roles = Contributor.new.all_roles
-    @params_hash[:contributor][@roles.sample.to_sym] = "1"
+    @params_hash[:contributor][@roles.sample.to_sym] = '1'
     @controller = described_class.new
   end
 
-  context "actions" do
+  context 'actions' do
     before(:each) do
       sign_in(@user)
     end
 
-    it "GET plans/:plan_id/contributors (:index)" do
+    it 'GET plans/:plan_id/contributors (:index)' do
       get :index, params: { plan_id: @plan.id }
       expect(response).to render_template(:index)
       expect(assigns(:plan)).to eql(@plan)
@@ -45,7 +44,7 @@
       expect(assigns(:contributors).first).to eql(@contributor)
     end
 
-    it "GET plans/:plan_id/contributors/new (:new)" do
+    it 'GET plans/:plan_id/contributors/new (:new)' do
       get :new, params: { plan_id: @plan.id }
       expect(response).to render_template(:new)
       expect(assigns(:plan)).to eql(@plan)
@@ -53,14 +52,14 @@
       expect(assigns(:contributor).plan).to eql(@plan)
     end
 
-    it "GET plans/:plan_id/contributors/:id/edit (:edit)" do
+    it 'GET plans/:plan_id/contributors/:id/edit (:edit)' do
       get :edit, params: { plan_id: @plan.id, id: @contributor.id }
       expect(response).to render_template(:edit)
       expect(assigns(:plan)).to eql(@plan)
       expect(assigns(:contributor)).to eql(@contributor)
     end
 
-    it "POST plans/:plan_id/contributors (:create)" do
+    it 'POST plans/:plan_id/contributors (:create)' do
       post :create, params: @params_hash.merge({ plan_id: @plan.id })
       expect(response).to redirect_to(plan_contributors_url(@plan))
       contrib = Contributor.last
@@ -76,19 +75,19 @@
 
       # Verify that the corrrect roles were assigned
       contrib.all_roles.each do |role|
-        expect(contrib.send(:"#{role}?")).to eql(params[:"#{role}"] == "1")
+        expect(contrib.send(:"#{role}?")).to eql(params[:"#{role}"] == '1')
       end
 
       # Verify that the Org was attached
       expect(contrib.org).to eql(@org)
 
       # Verify that the ORCID was saved
-      expected = params[:identifiers_attributes][:"0"][:value]
+      expected = params[:identifiers_attributes][:'0'][:value]
       expect(contrib.identifiers.first.identifier_scheme).to eql(@scheme)
       expect(contrib.identifiers.first.value.ends_with?(expected)).to eql(true)
     end
 
-    it "PUT plans/:plan_id/contributors/:id (:update)" do
+    it 'PUT plans/:plan_id/contributors/:id (:update)' do
       put :update, params: @params_hash.merge({ plan_id: @plan.id, id: @contributor.id })
       @contributor.reload
       params = @params_hash[:contributor]
@@ -102,65 +101,63 @@
 
       # Verify that the corrrect roles were assigned
       @contributor.all_roles.each do |role|
-        expect(@contributor.send(:"#{role}?")).to eql(params[:"#{role}"] == "1")
+        expect(@contributor.send(:"#{role}?")).to eql(params[:"#{role}"] == '1')
       end
 
       # Verify that the Org was attached
       expect(@contributor.org).to eql(@org)
 
       # Verify that the ORCID was saved
-      expected = params[:identifiers_attributes][:"0"][:value]
+      expected = params[:identifiers_attributes][:'0'][:value]
       expect(@contributor.identifiers.first.identifier_scheme).to eql(@scheme)
       expect(@contributor.identifiers.first.value.ends_with?(expected)).to eql(true)
     end
 
-    it "DELETE plans/:plan_id/contributors/:id (:destroy)" do
+    it 'DELETE plans/:plan_id/contributors/:id (:destroy)' do
       id = @contributor.id
       delete :destroy, params: @params_hash.merge({ plan_id: @plan.id, id: @contributor.id })
       expect(Contributor.where(id: id).any?).to eql(false)
     end
-
   end
 
-  context "private methods(hash:)" do
-
-    describe "#translate_roles" do
-      it "converts integer to boolean" do
+  context 'private methods(hash:)' do
+    describe '#translate_roles' do
+      it 'converts integer to boolean' do
         roles = @controller.send(:translate_roles, hash: @params_hash[:contributor])
         expect([true, false].include?(roles[@roles.first])).to eql(true)
       end
-      it "leaves non-role integers alone" do
-        @params_hash[:contributor][:non_role] = "1"
+      it 'leaves non-role integers alone' do
+        @params_hash[:contributor][:non_role] = '1'
         roles = @controller.send(:translate_roles, hash: @params_hash[:contributor])
-        expect(roles[:non_role]).to eql("1")
+        expect(roles[:non_role]).to eql('1')
       end
     end
 
-    describe "#process_org(hash:)" do
-      it "returns the hash as is if no :org_id is present" do
+    describe '#process_org(hash:)' do
+      it 'returns the hash as is if no :org_id is present' do
         @params_hash[:contributor].delete(:org_id)
         hash = @controller.send(:process_org, hash: @params_hash[:contributor])
         expect(hash).to eql(@params_hash[:contributor])
       end
-      it "with no restrict_orgs defined, returns the hash if the org could not be converted" do
+      it 'with no restrict_orgs defined, returns the hash if the org could not be converted' do
         Rails.configuration.x.application.restrict_orgs = nil
         @controller.stubs(:org_from_params).returns(nil)
         hash = @controller.send(:process_org, hash: @params_hash[:contributor])
         expect(hash).to eql(@params_hash[:contributor])
       end
-      it "with restrict_orgs=false, returns the hash if the org could not be converted" do
+      it 'with restrict_orgs=false, returns the hash if the org could not be converted' do
         Rails.configuration.x.application.restrict_orgs = false
         @controller.stubs(:org_from_params).returns(nil)
         hash = @controller.send(:process_org, hash: @params_hash[:contributor])
         expect(hash).to eql(@params_hash[:contributor])
       end
-      it "with restrict_orgs=true, returns hash if the org could not be converted" do
+      it 'with restrict_orgs=true, returns hash if the org could not be converted' do
         Rails.configuration.x.application.restrict_orgs = true
         @controller.stubs(:org_from_params).returns(nil)
         hash = @controller.send(:process_org, hash: @params_hash[:contributor])
         expect(hash).to eql(@params_hash[:contributor])
       end
-      it "sets the org_id to the idea of the org" do
+      it 'sets the org_id to the idea of the org' do
         new_org = create(:org)
         @controller.stubs(:org_from_params).returns(new_org)
         hash = @controller.send(:process_org, hash: @params_hash[:contributor])
@@ -168,52 +165,48 @@
       end
     end
 
-    context "callbacks" do
-
-      describe "#fetch_plan" do
-        it "assigns the plan instance variable" do
+    context 'callbacks' do
+      describe '#fetch_plan' do
+        it 'assigns the plan instance variable' do
           get :index, params: { plan_id: @plan.id }
           expect(assigns(:plan)).to eql(@plan)
         end
-        it "redirects to :root if no plan found" do
+        it 'redirects to :root if no plan found' do
           get :index, params: { plan_id: 99_999 }
           expect(response).to have_http_status(:redirect)
           expect(response).to redirect_to(root_url)
         end
       end
 
-      describe "#fetch_contributor" do
-        it "is not triggered on POST :create" do
+      describe '#fetch_contributor' do
+        it 'is not triggered on POST :create' do
           described_class.any_instance.expects(:fetch_contributor).at_most(0)
           post :create, params: @params_hash.merge({ plan_id: @plan.id })
         end
-        it "is not triggered on GET :index" do
+        it 'is not triggered on GET :index' do
           described_class.any_instance.expects(:fetch_contributor).at_most(0)
           get :index, params: { plan_id: @plan.id }
         end
-        it "is not triggered on GET :new" do
+        it 'is not triggered on GET :new' do
           described_class.any_instance.expects(:fetch_contributor).at_most(0)
           get :new, params: { plan_id: @plan.id }
         end
-        it "assigns the contributor instance variable" do
+        it 'assigns the contributor instance variable' do
           get :edit, params: { plan_id: @plan.id, id: @contributor.id }
           expect(assigns(:contributor)).to eql(@contributor)
         end
-        it "redirects to :index if no contributor found" do
+        it 'redirects to :index if no contributor found' do
           get :edit, params: { plan_id: @plan.id, id: 99_999 }
           expect(response).to have_http_status(:redirect)
           expect(response).to redirect_to(plan_contributors_url(@plan))
         end
-        it "redirects to :index if contributor does not belong to the plan" do
+        it 'redirects to :index if contributor does not belong to the plan' do
           contrib = create(:contributor, plan: create(:plan))
           get :edit, params: { plan_id: @plan.id, id: contrib.id }
           expect(response).to have_http_status(:redirect)
           expect(response).to redirect_to(plan_contributors_url(@plan))
         end
       end
-
     end
-
   end
-
 end
diff --git a/spec/controllers/guidance_groups_controller_spec.rb b/spec/controllers/guidance_groups_controller_spec.rb
index b22dbf36e6..c0e7738b82 100644
--- a/spec/controllers/guidance_groups_controller_spec.rb
+++ b/spec/controllers/guidance_groups_controller_spec.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe GuidanceGroupsController, type: :controller do
-
   before(:each) do
     @org = create(:org, managed: true)
     @user = create(:user, :org_admin, org: @org)
@@ -14,26 +13,26 @@
     sign_in(@user)
   end
 
-  it "GET /org/admin/guidancegroup/:id/admin_new (:admin_new)" do
+  it 'GET /org/admin/guidancegroup/:id/admin_new (:admin_new)' do
     get :admin_new, params: { id: @org.id }
-    expect(response).to render_template("guidance_groups/admin_new")
+    expect(response).to render_template('guidance_groups/admin_new')
     gg = assigns(:guidance_group)
     expect(gg.new_record?).to eql(true)
     expect(gg.org_id).to eql(@org.id)
   end
 
-  it "GET /org/admin/guidancegroup/:id/admin_edit (:admin_edit)" do
+  it 'GET /org/admin/guidancegroup/:id/admin_edit (:admin_edit)' do
     get :admin_edit, params: { id: @guidance_group.id }
-    expect(response).to render_template("guidance_groups/admin_edit")
+    expect(response).to render_template('guidance_groups/admin_edit')
     expect(assigns(:guidance_group)).to eql(@guidance_group)
   end
 
-  describe "POST /org/admin/guidancegroup/:id/admin_create (:admin_create)" do
-    it "succeeds" do
+  describe 'POST /org/admin/guidancegroup/:id/admin_create (:admin_create)' do
+    it 'succeeds' do
       args = { name: Faker::Lorem.sentence, published: Faker::Boolean.boolean,
                optional_subset: Faker::Boolean.boolean, org_id: @org.id }
       post :admin_create, params: { id: @org.id, guidance_group: args }
-      expect(response).to render_template("guidance_groups/admin_edit")
+      expect(response).to render_template('guidance_groups/admin_edit')
       expect(flash[:notice].present?).to eql(true)
       gg = assigns(:guidance_group)
       expect(gg.id).not_to eql(@guidance_group.id)
@@ -42,20 +41,20 @@
       expect(gg.optional_subset).to eql(args[:optional_subset])
       expect(gg.org_id).to eql(args[:org_id])
     end
-    it "fails" do
+    it 'fails' do
       args = { name: nil }
       post :admin_create, params: { id: @org.id, guidance_group: args }
-      expect(response).to render_template("guidance_groups/admin_new")
+      expect(response).to render_template('guidance_groups/admin_new')
       expect(flash[:alert].present?).to eql(true)
     end
   end
 
-  describe "PUT /org/admin/guidancegroup/:id/admin_update (:admin_update)" do
-    it "succeeds" do
+  describe 'PUT /org/admin/guidancegroup/:id/admin_update (:admin_update)' do
+    it 'succeeds' do
       args = { name: Faker::Lorem.sentence, published: Faker::Boolean.boolean,
                optional_subset: Faker::Boolean.boolean }
       put :admin_update, params: { id: @guidance_group.id, guidance_group: args }
-      expect(response).to render_template("guidance_groups/admin_edit")
+      expect(response).to render_template('guidance_groups/admin_edit')
       expect(flash[:notice].present?).to eql(true)
       gg = assigns(:guidance_group)
       expect(gg.id).to eql(@guidance_group.id)
@@ -64,27 +63,27 @@
       expect(gg.optional_subset).to eql(args[:optional_subset])
       expect(gg.org_id).to eql(@org.id)
     end
-    it "fails" do
+    it 'fails' do
       args = { name: nil }
       put :admin_update, params: { id: @guidance_group.id, guidance_group: args }
-      expect(response).to render_template("guidance_groups/admin_edit")
+      expect(response).to render_template('guidance_groups/admin_edit')
       expect(flash[:alert].present?).to eql(true)
     end
   end
 
-  describe "PUT /org/admin/guidancegroup/:id/admin_update_publish (:admin_update_publish)" do
+  describe 'PUT /org/admin/guidancegroup/:id/admin_update_publish (:admin_update_publish)' do
     before(:each) do
       @guidance_group.update(published: false)
     end
 
-    it "succeeds" do
+    it 'succeeds' do
       args = { published: true }
       put :admin_update_publish, params: { id: @guidance_group.id, guidance_group: args }
       expect(response).to redirect_to(admin_index_guidance_path)
       expect(flash[:notice].present?).to eql(true)
       expect(@guidance_group.reload.published?).to eql(true)
     end
-    it "fails" do
+    it 'fails' do
       GuidanceGroup.any_instance.stubs(:update).returns(false)
       args = { published: false }
       put :admin_update_publish, params: { id: @guidance_group.id, guidance_group: args }
@@ -94,19 +93,19 @@
     end
   end
 
-  describe "PUT /org/admin/guidancegroup/:id/admin_update_unpublish (:admin_update_unpublish)" do
+  describe 'PUT /org/admin/guidancegroup/:id/admin_update_unpublish (:admin_update_unpublish)' do
     before(:each) do
       @guidance_group.update(published: true)
     end
 
-    it "succeeds" do
+    it 'succeeds' do
       args = { published: false }
       put :admin_update_unpublish, params: { id: @guidance_group.id, guidance_group: args }
       expect(response).to redirect_to(admin_index_guidance_path)
       expect(flash[:notice].present?).to eql(true)
       expect(@guidance_group.reload.published?).to eql(false)
     end
-    it "fails" do
+    it 'fails' do
       GuidanceGroup.any_instance.stubs(:update).returns(false)
       args = { published: true }
       put :admin_update_unpublish, params: { id: @guidance_group.id, guidance_group: args }
@@ -116,19 +115,18 @@
     end
   end
 
-  describe "DELETE /org/admin/guidancegroup/:id/admin_destroy (:admin_destroy)" do
-    it "succeeds" do
+  describe 'DELETE /org/admin/guidancegroup/:id/admin_destroy (:admin_destroy)' do
+    it 'succeeds' do
       delete :admin_destroy, params: { id: @guidance_group.id }
       expect(response).to redirect_to(admin_index_guidance_path)
       expect(flash[:notice].present?).to eql(true)
       expect(GuidanceGroup.where(id: @guidance_group.id).any?).to eql(false)
     end
-    it "fails" do
+    it 'fails' do
       GuidanceGroup.any_instance.stubs(:destroy).returns(false)
       delete :admin_destroy, params: { id: @guidance_group.id }
       expect(response).to redirect_to(admin_index_guidance_path)
       expect(flash[:alert].present?).to eql(true)
     end
   end
-
 end
diff --git a/spec/controllers/guidances_controller_spec.rb b/spec/controllers/guidances_controller_spec.rb
index 14e421910b..0c6c082736 100644
--- a/spec/controllers/guidances_controller_spec.rb
+++ b/spec/controllers/guidances_controller_spec.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe GuidancesController, type: :controller do
-
   before(:each) do
     @org = create(:org, managed: true)
     @user = create(:user, :org_admin, org: @org)
@@ -15,34 +14,34 @@
     sign_in(@user)
   end
 
-  it "GET /org/admin/guidance/:id/admin_index" do
+  it 'GET /org/admin/guidance/:id/admin_index' do
     get :admin_index, params: { id: @org.id }
-    expect(response).to render_template("guidances/admin_index")
+    expect(response).to render_template('guidances/admin_index')
     ggs = assigns(:guidance_groups)
     gs = assigns(:guidances)
     expect(ggs.include?(@guidance_group)).to eql(true)
     expect(gs.include?(@guidance)).to eql(true)
   end
 
-  it "GET /org/admin/guidance/:id/admin_new (:admin_new)" do
+  it 'GET /org/admin/guidance/:id/admin_new (:admin_new)' do
     get :admin_new, params: { id: @org.id }
-    expect(response).to render_template("guidances/new_edit")
+    expect(response).to render_template('guidances/new_edit')
     g = assigns(:guidance)
     expect(g.new_record?).to eql(true)
   end
 
-  it "GET /org/admin/guidance/:id/admin_edit (:admin_edit)" do
+  it 'GET /org/admin/guidance/:id/admin_edit (:admin_edit)' do
     get :admin_edit, params: { id: @guidance.id }
-    expect(response).to render_template("guidances/new_edit")
+    expect(response).to render_template('guidances/new_edit')
     expect(assigns(:guidance)).to eql(@guidance)
   end
 
-  describe "POST /org/admin/guidance/:id/admin_create (:admin_create)" do
-    it "succeeds" do
+  describe 'POST /org/admin/guidance/:id/admin_create (:admin_create)' do
+    it 'succeeds' do
       args = { text: Faker::Lorem.paragraph, published: Faker::Boolean.boolean,
                guidance_group_id: @guidance_group.id, theme_ids: [@theme.id] }
       post :admin_create, params: { id: @org.id, guidance: args }
-      expect(response).to render_template("guidances/new_edit")
+      expect(response).to render_template('guidances/new_edit')
       expect(flash[:notice].present?).to eql(true)
       g = assigns(:guidance)
       expect(g.id).not_to eql(@guidance.id)
@@ -51,13 +50,13 @@
       expect(g.guidance_group_id).to eql(args[:guidance_group_id])
       expect(g.themes.first).to eql(@theme)
     end
-    it "fails" do
+    it 'fails' do
       args = { text: nil, guidance_group_id: nil }
       post :admin_create, params: { id: @org.id, guidance: args }
-      expect(response).to render_template("guidances/new_edit")
+      expect(response).to render_template('guidances/new_edit')
       expect(flash[:alert].present?).to eql(true)
     end
-    it "publishes the GuidanceGroup" do
+    it 'publishes the GuidanceGroup' do
       @guidance_group.update(published: false)
       args = { text: Faker::Lorem.paragraph, published: true,
                guidance_group_id: @guidance_group.id, theme_ids: [@theme.id] }
@@ -66,14 +65,14 @@
     end
   end
 
-  describe "PUT /org/admin/guidance/:id/admin_update (:admin_update)" do
-    it "succeeds" do
+  describe 'PUT /org/admin/guidance/:id/admin_update (:admin_update)' do
+    it 'succeeds' do
       theme = create(:theme)
       gg = create(:guidance_group, org_id: @org.id)
       args = { text: Faker::Lorem.paragraph, published: Faker::Boolean.boolean,
                guidance_group_id: gg.id, theme_ids: [theme.id] }
       put :admin_update, params: { id: @guidance.id, guidance: args }
-      expect(response).to render_template("guidances/new_edit")
+      expect(response).to render_template('guidances/new_edit')
       expect(flash[:notice].present?).to eql(true)
       g = assigns(:guidance)
       expect(g.id).to eql(@guidance.id)
@@ -82,13 +81,13 @@
       expect(g.guidance_group_id).to eql(gg.id)
       expect(g.themes.first).to eql(theme)
     end
-    it "fails" do
+    it 'fails' do
       args = { text: nil, guidance_group_id: nil }
       put :admin_update, params: { id: @guidance.id, guidance: args }
-      expect(response).to render_template("guidances/new_edit")
+      expect(response).to render_template('guidances/new_edit')
       expect(flash[:alert].present?).to eql(true)
     end
-    it "publishes the GuidanceGroup" do
+    it 'publishes the GuidanceGroup' do
       @guidance_group.update(published: false)
       args = { text: Faker::Lorem.paragraph, published: true,
                guidance_group_id: @guidance_group.id, theme_ids: [@theme.id] }
@@ -97,19 +96,19 @@
     end
   end
 
-  describe "PUT /org/admin/guidance/:id/admin_update_publish (:admin_publish)" do
+  describe 'PUT /org/admin/guidance/:id/admin_update_publish (:admin_publish)' do
     before(:each) do
       @guidance.update(published: false)
     end
 
-    it "succeeds" do
+    it 'succeeds' do
       args = { published: true }
       put :admin_publish, params: { id: @guidance.id, guidance: args }
       expect(response).to redirect_to(admin_index_guidance_path)
       expect(flash[:notice].present?).to eql(true)
       expect(@guidance.reload.published?).to eql(true)
     end
-    it "fails" do
+    it 'fails' do
       Guidance.any_instance.stubs(:update_attributes).returns(false)
       args = { published: false }
       put :admin_publish, params: { id: @guidance.id, guidance: args }
@@ -117,7 +116,7 @@
       expect(flash[:alert].present?).to eql(true)
       expect(@guidance.reload.published?).to eql(false)
     end
-    it "publishes the GuidanceGroup" do
+    it 'publishes the GuidanceGroup' do
       @guidance_group.update(published: false)
       args = { published: true }
       put :admin_publish, params: { id: @guidance.id, guidance: args }
@@ -125,19 +124,19 @@
     end
   end
 
-  describe "PUT /org/admin/guidance/:id/admin_update_unpublish (:admin_unpublish)" do
+  describe 'PUT /org/admin/guidance/:id/admin_update_unpublish (:admin_unpublish)' do
     before(:each) do
       @guidance.update(published: true)
     end
 
-    it "succeeds" do
+    it 'succeeds' do
       args = { published: false }
       put :admin_unpublish, params: { id: @guidance.id, guidance: args }
       expect(response).to redirect_to(admin_index_guidance_path)
       expect(flash[:notice].present?).to eql(true)
       expect(@guidance.reload.published?).to eql(false)
     end
-    it "fails" do
+    it 'fails' do
       Guidance.any_instance.stubs(:update_attributes).returns(false)
       args = { published: true }
       put :admin_unpublish, params: { id: @guidance.id, guidance: args }
@@ -145,13 +144,13 @@
       expect(flash[:alert].present?).to eql(true)
       expect(@guidance.reload.published?).to eql(true)
     end
-    it "unpublishes the GuidanceGroup if there is no other published guidance" do
+    it 'unpublishes the GuidanceGroup if there is no other published guidance' do
       Guidance.where.not(id: @guidance.id).destroy_all
       @guidance_group.update(published: true)
       delete :admin_destroy, params: { id: @guidance.id }
       expect(@guidance_group.reload.published).to eql(false)
     end
-    it "does not unpublish the GuidanceGroup if there is other published guidance" do
+    it 'does not unpublish the GuidanceGroup if there is other published guidance' do
       create(:guidance, guidance_group_id: @guidance_group.id, published: true)
       @guidance_group.update(published: true)
       delete :admin_destroy, params: { id: @guidance.id }
@@ -159,31 +158,30 @@
     end
   end
 
-  describe "DELETE /org/admin/guidance/:id/admin_destroy (:admin_destroy)" do
-    it "succeeds" do
+  describe 'DELETE /org/admin/guidance/:id/admin_destroy (:admin_destroy)' do
+    it 'succeeds' do
       delete :admin_destroy, params: { id: @guidance.id }
       expect(response).to redirect_to(admin_index_guidance_path)
       expect(flash[:notice].present?).to eql(true)
       expect(Guidance.where(id: @guidance.id).any?).to eql(false)
     end
-    it "fails" do
+    it 'fails' do
       Guidance.any_instance.stubs(:destroy).returns(false)
       delete :admin_destroy, params: { id: @guidance.id }
       expect(response).to redirect_to(admin_index_guidance_path)
       expect(flash[:alert].present?).to eql(true)
     end
-    it "unpublishes the GuidanceGroup if there is no other published guidance" do
+    it 'unpublishes the GuidanceGroup if there is no other published guidance' do
       Guidance.where.not(id: @guidance.id).destroy_all
       @guidance_group.update(published: true)
       delete :admin_destroy, params: { id: @guidance.id }
       expect(@guidance_group.reload.published).to eql(false)
     end
-    it "does not unpublish the GuidanceGroup if there is other published guidance" do
+    it 'does not unpublish the GuidanceGroup if there is other published guidance' do
       create(:guidance, guidance_group_id: @guidance_group.id, published: true)
       @guidance_group.update(published: true)
       delete :admin_destroy, params: { id: @guidance.id }
       expect(@guidance_group.reload.published).to eql(true)
     end
   end
-
 end
diff --git a/spec/controllers/notes_controller_spec.rb b/spec/controllers/notes_controller_spec.rb
index 4f5acb03cb..d6667d1354 100644
--- a/spec/controllers/notes_controller_spec.rb
+++ b/spec/controllers/notes_controller_spec.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe NotesController, type: :controller do
-
   include RolesHelper
 
   before(:each) do
@@ -22,13 +21,13 @@
     ActionMailer::Base.deliveries = []
   end
 
-  describe "POST /notes", js: true do
+  describe 'POST /notes', js: true do
     before(:each) do
       @args = { text: Faker::Lorem.paragraph, user_id: @user.id,
                 answer_id: @answer.id, plan_id: @plan.id, question_id: @question.id }
     end
 
-    it "succeeds" do
+    it 'succeeds' do
       @controller.expects(:render_to_string).at_least(2)
       post :create, params: { note: @args }
       json = JSON.parse(response.body).with_indifferent_access
@@ -42,18 +41,18 @@
       expect(note.answer_id).to eql(@answer.id)
       expect(note.archived).to eql(false)
     end
-    it "fails" do
+    it 'fails' do
       Note.any_instance.stubs(:save).returns(false)
       post :create, params: { note: @args }
       json = JSON.parse(response.body).with_indifferent_access
       expect(json[:msg].present?).to eql(true)
     end
-    it "raises a Pundit::NotAuthorizedError if not authorized" do
+    it 'raises a Pundit::NotAuthorizedError if not authorized' do
       Plan.any_instance.stubs(:readable_by?).returns(false)
       @controller.expects(:raise).at_least(1)
       post :create, params: { note: @args }
     end
-    it "sends out emails" do
+    it 'sends out emails' do
       commenter = create(:user)
       create(:role, :commenter, plan_id: @plan.id, user: commenter)
       sign_out(@user)
@@ -63,13 +62,13 @@
     end
   end
 
-  describe "PUT /notes/:id", js: true do
+  describe 'PUT /notes/:id', js: true do
     before(:each) do
       @note = create(:note, user: @user, answer: @answer)
       @args = { text: Faker::Lorem.paragraph, user_id: @user.id, answer_id: @answer.id }
     end
 
-    it "succeeds" do
+    it 'succeeds' do
       @controller.expects(:render_to_string).at_least(2)
       put :update, params: { id: @note.id, note: @args }
       json = JSON.parse(response.body).with_indifferent_access
@@ -79,7 +78,7 @@
       expect(json[:title][:id]).to eql(@question.id.to_s)
       expect(@note.reload.text).to eql(@args[:text])
     end
-    it "fails" do
+    it 'fails' do
       Note.any_instance.stubs(:update).returns(false)
       put :update, params: { id: @note.id, note: @args }
       json = JSON.parse(response.body).with_indifferent_access
@@ -87,13 +86,13 @@
     end
   end
 
-  describe "PATCH /notes/:id/archive", js: true do
+  describe 'PATCH /notes/:id/archive', js: true do
     before(:each) do
       @note = create(:note, user: @user, answer: @answer)
       @args = { archived_by: @user }
     end
 
-    it "succeeds" do
+    it 'succeeds' do
       @controller.expects(:render_to_string).at_least(2)
       put :archive, params: { id: @note.id, note: @args }
       json = JSON.parse(response.body).with_indifferent_access
@@ -104,12 +103,11 @@
       expect(@note.reload.archived).to eql(true)
       expect(@note.reload.archived_by).to eql(@user.id)
     end
-    it "fails" do
+    it 'fails' do
       Note.any_instance.stubs(:update).returns(false)
       put :archive, params: { id: @note.id, note: @args }
       json = JSON.parse(response.body).with_indifferent_access
       expect(json[:msg].present?).to eql(true)
     end
   end
-
 end
diff --git a/spec/controllers/orgs_controller_spec.rb b/spec/controllers/orgs_controller_spec.rb
index d070636928..f2d9400adc 100644
--- a/spec/controllers/orgs_controller_spec.rb
+++ b/spec/controllers/orgs_controller_spec.rb
@@ -1,27 +1,26 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe OrgsController, type: :controller do
-
   include Mocks::FormFieldJsonValues
 
   before(:each) do
     @name = Faker::Company.name
     @org = create(:org)
     @user = create(:user, :super_admin, org: @org)
-    @logo = Rack::Test::UploadedFile.new "spec/support/mocks/logo_file.png", "image/png"
+    @logo = Rack::Test::UploadedFile.new 'spec/support/mocks/logo_file.png', 'image/png'
 
     @controller = OrgsController.new
   end
 
-  it "GET /org/admin/:id/admin_edit" do
+  it 'GET /org/admin/:id/admin_edit' do
     sign_in(@user)
     get :admin_edit, params: { id: @org.id }
-    expect(response).to render_template("orgs/admin_edit")
+    expect(response).to render_template('orgs/admin_edit')
   end
 
-  describe "PUT /org/admin/:id/admin_update" do
+  describe 'PUT /org/admin/:id/admin_update' do
     before(:each) do
       other_org = build(:org, name: Faker::Movies::StarWars.unique.planet)
       @args = { name: Faker::Movies::StarWars.unique.planet,
@@ -40,7 +39,7 @@
       sign_in(@user)
     end
 
-    it "succeeds" do
+    it 'succeeds' do
       @args.delete(:feedback_enabled)
       put :admin_update, params: { id: @org.id, org_links: @link_args, org: @args }
       expect(response).to redirect_to("#{admin_edit_org_path(@org)}#profile")
@@ -53,12 +52,12 @@
       expect(@org.funder?).to eql(@args[:funder])
       expect(@org.institution?).to eql(@args[:institution])
       expect(@org.organisation?).to eql(@args[:organisation])
-      expect(@org.managed).to eql(@args[:managed] == "1")
+      expect(@org.managed).to eql(@args[:managed] == '1')
       expect(@org.links.to_json).to eql(@link_args)
-      expect(@org.logo_name).to eql("logo_file.png")
+      expect(@org.logo_name).to eql('logo_file.png')
       expect(@org.logo_uid.present?).to eql(true)
     end
-    it "succeeds for feedback changes" do
+    it 'succeeds for feedback changes' do
       put :admin_update, params: { id: @org.id, org: @args }
       expect(response).to redirect_to("#{admin_edit_org_path(@org)}#feedback")
       expect(flash[:notice].present?).to eql(true)
@@ -66,11 +65,11 @@
       expect(@org.feedback_enabled).to eql(@args[:feedback_enabled])
       expect(@org.feedback_msg).to eql(@args[:feedback_msg])
     end
-    it "updates the shibboleth entityID if super_admin and enabled" do
+    it 'updates the shibboleth entityID if super_admin and enabled' do
       @args.delete(:feedback_enabled)
       Rails.configuration.x.shibboleth.use_filtered_discovery_service = true
-      scheme = create(:identifier_scheme, name: "shibboleth")
-      @args[:identifiers_attributes] = { "0": { identifier_scheme_id: scheme.id,
+      scheme = create(:identifier_scheme, name: 'shibboleth')
+      @args[:identifiers_attributes] = { '0': { identifier_scheme_id: scheme.id,
                                                 value: SecureRandom.uuid } }
       put :admin_update, params: { id: @org.id, org: @args }
       expect(response).to redirect_to("#{admin_edit_org_path(@org)}#profile")
@@ -78,36 +77,36 @@
       identifier = @org.reload.identifiers.last
       expect(identifier.present?).to eql(true)
       expect(identifier.identifier_scheme).to eql(scheme)
-      expected = @args[:identifiers_attributes][:"0"][:value]
+      expected = @args[:identifiers_attributes][:'0'][:value]
       expect(identifier.value.end_with?(expected)).to eql(true)
     end
-    it "fails" do
+    it 'fails' do
       put :admin_update, params: { id: @org.id, org: { name: nil } }
       expect(response).to redirect_to("#{admin_edit_org_path(@org)}#profile")
       expect(flash[:alert].present?).to eql(true)
     end
   end
 
-  describe "GET /orgs/shibboleth_ds" do
+  describe 'GET /orgs/shibboleth_ds' do
     before(:each) do
-      shib = create(:identifier_scheme, name: "shibboleth")
+      shib = create(:identifier_scheme, name: 'shibboleth')
       @identifier = create(:identifier, identifier_scheme: shib,
                                         identifiable: @org, value: SecureRandom.uuid)
     end
 
-    it "succeeds" do
+    it 'succeeds' do
       get :shibboleth_ds
-      expect(response).to render_template("orgs/shibboleth_ds")
+      expect(response).to render_template('orgs/shibboleth_ds')
       expect(assigns(:user).new_record?).to eql(true)
       expect(assigns(:orgs).any?).to eql(true)
       expect(assigns(:orgs).include?(@org)).to eql(true)
     end
-    it "redirects to the dashboard if user is logged in" do
+    it 'redirects to the dashboard if user is logged in' do
       sign_in(@user)
       get :shibboleth_ds
       expect(response).to redirect_to(root_path)
     end
-    it "redirects to the user omniauth path if no Orgs have shib entityIDs" do
+    it 'redirects to the user omniauth path if no Orgs have shib entityIDs' do
       @identifier.destroy
       get :shibboleth_ds
       expect(response).to redirect_to(user_shibboleth_omniauth_authorize_path)
@@ -115,26 +114,26 @@
     end
   end
 
-  describe "POST /orgs/shibboleth_ds" do
+  describe 'POST /orgs/shibboleth_ds' do
     before(:each) do
-      shib = create(:identifier_scheme, name: "shibboleth")
+      shib = create(:identifier_scheme, name: 'shibboleth')
       @identifier = create(:identifier, identifier_scheme: shib,
                                         identifiable: @org, value: SecureRandom.uuid)
     end
 
-    it "succeeds" do
+    it 'succeeds' do
       post :shibboleth_ds_passthru, params: { org_id: @org.id }
       url = @controller.send(:shib_login_url)
       target = @controller.send(:shib_callback_url)
       expected = "#{url}?#{target}&entityID=#{@identifier.value}"
       expect(response).to redirect_to(expected)
     end
-    it "receives no [:org_id] information" do
+    it 'receives no [:org_id] information' do
       post :shibboleth_ds_passthru, params: {}
       expect(response).to redirect_to(shibboleth_ds_path)
       expect(flash[:notice].present?).to eql(true)
     end
-    it "is for an Org that does not have a shibboleth entityID defined" do
+    it 'is for an Org that does not have a shibboleth entityID defined' do
       @identifier.destroy
       post :shibboleth_ds_passthru, params: { org_id: @org.id }
       expect(response).to redirect_to(shibboleth_ds_path)
@@ -142,49 +141,48 @@
     end
   end
 
-  describe "POST /orgs" do
+  describe 'POST /orgs' do
     before(:each) do
       uri = URI.parse(Faker::Internet.url)
       @hash = { id: uri.to_s, name: "#{@name} (#{uri.host})", sort_name: @name,
                 score: 0, weight: 1 }
     end
 
-    it "returns an empty array if the search term is blank" do
+    it 'returns an empty array if the search term is blank' do
       OrgSelection::SearchService.stubs(:search_locally).returns([@hash])
-      post :search, params: { org: { name: "" } }, format: :js
+      post :search, params: { org: { name: '' } }, format: :js
       expect(JSON.parse(response.body)).to eql([])
     end
 
-    it "returns an empty array if the search term is less than 3 characters" do
+    it 'returns an empty array if the search term is less than 3 characters' do
       OrgSelection::SearchService.stubs(:search_locally).returns([@hash])
-      post :search, params: { org: { name: "Fo" } }, format: :js
+      post :search, params: { org: { name: 'Fo' } }, format: :js
       expect(JSON.parse(response.body)).to eql([])
     end
 
-    it "assigns the orgs variable" do
+    it 'assigns the orgs variable' do
       OrgSelection::SearchService.stubs(:search_locally).returns([@hash])
       post :search, params: { org: { name: Faker::Lorem.sentence } }, format: :js
       json = JSON.parse(response.body)
       expect(json.length).to eql(1)
-      expect(json.first["sort_name"]).to eql(@name)
+      expect(json.first['sort_name']).to eql(@name)
     end
 
-    it "calls search_locally by default" do
+    it 'calls search_locally by default' do
       OrgSelection::SearchService.expects(:search_locally).at_least(1)
       post :search, params: { org: { name: Faker::Lorem.sentence } }, format: :js
     end
 
-    it "calls search_externally when query string contains type=external" do
+    it 'calls search_externally when query string contains type=external' do
       OrgSelection::SearchService.expects(:search_externally).at_least(1)
-      post :search, params: { org: { name: Faker::Lorem.sentence }, type: "external" },
+      post :search, params: { org: { name: Faker::Lorem.sentence }, type: 'external' },
                     format: :js
     end
 
-    it "calls search_combined when query string contains type=combined" do
+    it 'calls search_combined when query string contains type=combined' do
       OrgSelection::SearchService.expects(:search_combined).at_least(1)
-      post :search, params: { org: { name: Faker::Lorem.sentence }, type: "combined" },
+      post :search, params: { org: { name: Faker::Lorem.sentence }, type: 'combined' },
                     format: :js
     end
   end
-
 end
diff --git a/spec/controllers/registrations_controller_spec.rb b/spec/controllers/registrations_controller_spec.rb
index 281deef10b..cd8b194cae 100644
--- a/spec/controllers/registrations_controller_spec.rb
+++ b/spec/controllers/registrations_controller_spec.rb
@@ -1,22 +1,19 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe RegistrationsController, type: :controller do
-
   before(:each) do
     @org = create(:org, is_other: false)
     @user = create(:user, org: @org)
   end
 
-  context "private methods" do
-
+  context 'private methods' do
     before(:each) do
       @controller = described_class.new
     end
 
-    describe "#handle_org(attrs:)" do
-
+    describe '#handle_org(attrs:)' do
       before(:each) do
         @params = ActionController::Parameters.new({
                                                      org_id: {
@@ -30,22 +27,20 @@
         @controller.stubs(:org_from_params).returns(build(:org))
       end
 
-      it "returns nil if the params are not present" do
+      it 'returns nil if the params are not present' do
         rslt = @controller.send(:handle_org, attrs: nil)
         expect(rslt).to eql(nil)
       end
-      it "returns the params if the params[:org_id] is not present" do
+      it 'returns the params if the params[:org_id] is not present' do
         rslt = @controller.send(:handle_org, attrs: {})
         expect(rslt).to eql({})
       end
-      it "saved the org if it was a new record" do
+      it 'saved the org if it was a new record' do
         count = Org.all.length
         @controller.stubs(:org_from_params).returns(create(:org))
         @controller.send(:handle_org, attrs: @params)
         expect(Org.all.length).to eql(count + 1)
       end
     end
-
   end
-
 end
diff --git a/spec/controllers/super_admin/orgs_controller_spec.rb b/spec/controllers/super_admin/orgs_controller_spec.rb
index 764655da06..b114102249 100644
--- a/spec/controllers/super_admin/orgs_controller_spec.rb
+++ b/spec/controllers/super_admin/orgs_controller_spec.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe SuperAdmin::OrgsController, type: :controller do
-
   before(:each) do
     @scheme = create(:identifier_scheme)
     tpt = create(:token_permission_type)
@@ -29,57 +28,56 @@
     sign_in(@user)
   end
 
-  describe "POST /super_admin/:id/merge_analyze", js: true do
+  describe 'POST /super_admin/:id/merge_analyze', js: true do
     before(:each) do
       @params = {
-        "id": @from_org.id,
+        id: @from_org.id,
         # Send over the Org typehead json in the org.id field so the service can unpackage it
-        "org": { "id": { "id": @to_org.id, "name": @to_org.name }.to_json }
+        org: { id: { id: @to_org.id, name: @to_org.name }.to_json }
       }
     end
 
-    it "fails if user is not a super admin" do
+    it 'fails if user is not a super admin' do
       sign_in(create(:user))
       post :merge_analyze, params: @params
-      expect(response.code).to eql("302")
+      expect(response.code).to eql('302')
       expect(response).to redirect_to(plans_path)
       expect(flash[:alert].present?).to eql(true)
     end
-    it "succeeds in analyzing the Orgs" do
+    it 'succeeds in analyzing the Orgs' do
       post :merge_analyze, params: @params, format: :js
-      expect(response.code).to eql("200")
+      expect(response.code).to eql('200')
       expect(assigns(:org)).to eql(@from_org)
       expect(assigns(:target_org)).to eql(@to_org)
       expect(response).to render_template(:merge_analyze)
     end
   end
 
-  describe "POST /super_admin/:id/merge_commit", js: true do
-    context "standard question type (no question_options and not RDA metadata)" do
+  describe 'POST /super_admin/:id/merge_commit', js: true do
+    context 'standard question type (no question_options and not RDA metadata)' do
       before(:each) do
-        @params = { "id": @from_org.id, "org": { "target_org": @to_org.id } }
+        @params = { id: @from_org.id, org: { target_org: @to_org.id } }
       end
 
-      it "fails if user is not a super admin" do
+      it 'fails if user is not a super admin' do
         sign_in(create(:user))
         post :merge_commit, params: @params
-        expect(response.code).to eql("302")
+        expect(response.code).to eql('302')
         expect(response).to redirect_to(plans_path)
         expect(flash[:alert].present?).to eql(true)
       end
-      it "fails if :target_org is not found" do
+      it 'fails if :target_org is not found' do
         @params[:org][:target_org] = 9999
         post :merge_commit, params: @params, format: :js
-        expect(response.code).to eql("302")
+        expect(response.code).to eql('302')
         expect(response).to redirect_to(admin_edit_org_path(@from_org))
         expect(flash[:alert].present?).to eql(true)
       end
-      it "succeeds and redirects properly" do
+      it 'succeeds and redirects properly' do
         post :merge_commit, params: @params, format: :js
-        expect(response.code).to eql("302")
+        expect(response.code).to eql('302')
         expect(response).to redirect_to(super_admin_orgs_path)
       end
     end
   end
-
 end
diff --git a/spec/controllers/usage_controller_spec.rb b/spec/controllers/usage_controller_spec.rb
index 1e5cd5a6ee..047fa40d60 100644
--- a/spec/controllers/usage_controller_spec.rb
+++ b/spec/controllers/usage_controller_spec.rb
@@ -1,55 +1,55 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe UsageController, type: :controller do
   before(:each) do
     @date = Date.today.last_month.end_of_month
     @org = create(:org, :organisation)
-    @details = { "by_template": [stat_details], "using_template": [] }
+    @details = { by_template: [stat_details], using_template: [] }
     @plan_stat = create(:stat_created_plan, date: @date, org: @org, details: @details)
     @user_stat = create(:stat_joined_user, date: @date, org: @org)
 
     sign_in(create(:user, :super_admin, org: @org))
   end
 
-  describe "GET /usage (aka index)" do
+  describe 'GET /usage (aka index)' do
     before(:each) do
       get :index
     end
-    it "assigns the correct user stats (@users_per_month)" do
+    it 'assigns the correct user stats (@users_per_month)' do
       expect(assigns(:users_per_month)).to eql(obj_to_hash(obj: @user_stat))
     end
-    it "assigns the correct plan stats" do
+    it 'assigns the correct plan stats' do
       expect(assigns(:plans_per_month)).to eql(obj_to_hash(obj: @plan_stat))
     end
-    it "assigns the correct total users" do
+    it 'assigns the correct total users' do
       expect(assigns(:total_org_users)).to eql(@user_stat.count)
     end
-    it "assigns the correct total plans" do
+    it 'assigns the correct total plans' do
       expect(assigns(:total_org_plans)).to eql(@plan_stat.count)
     end
   end
 
-  describe "POST /usage_plans_by_template" do
+  describe 'POST /usage_plans_by_template' do
     before(:each) do
       # Skipping the prior month because it was already created above
       (2..12).each do |i|
         date = Date.today.months_ago(i).end_of_month
-        details = { "by_template": [stat_details] }
+        details = { by_template: [stat_details] }
         create(:stat_created_plan, date: date, org: @org, details: details)
       end
       @annual = StatCreatedPlan.all.order(date: :desc)
     end
-    describe "test for each date range" do
+    describe 'test for each date range' do
       [1, 3, 6, 9, 12].each do |months|
         context "last #{months} months" do
           before(:each) do
-            @date = Date.today.months_ago(months).end_of_month.strftime("%Y-%m-%d")
+            @date = Date.today.months_ago(months).end_of_month.strftime('%Y-%m-%d')
             post :plans_by_template, params: { usage: { template_plans_range: @date } },
                                      format: :js
           end
-          it "returns the expected data" do
+          it 'returns the expected data' do
             # Controller returns results in date ascending order so resort the
             # records after extracting the ones we want first
             expected = @annual[0..months - 1].sort { |a, b| a.date <=> b.date }
@@ -61,67 +61,67 @@
     end
   end
 
-  describe "GET /usage_global_statistics" do
+  describe 'GET /usage_global_statistics' do
     before(:each) do
       get :global_statistics
     end
-    it "assigns the correct csv data" do
-      csvified_name = @org.name.include?(",") ? "\"#{@org.name}\"" : @org.name
+    it 'assigns the correct csv data' do
+      csvified_name = @org.name.include?(',') ? "\"#{@org.name}\"" : @org.name
       expected = "Org name,Total users,Total plans\n" \
                  "#{csvified_name},#{@user_stat.count},#{@plan_stat.count}\n"
-      expect(response.content_type).to eq("text/csv")
+      expect(response.content_type).to eq('text/csv')
       expect(response.body).to eql(expected)
     end
   end
 
-  describe "GET /usage_yearly_users" do
+  describe 'GET /usage_yearly_users' do
     before(:each) do
       get :yearly_users
     end
-    it "assigns the correct csv data" do
+    it 'assigns the correct csv data' do
       expected = "Month,No. Users joined\n" \
                  "#{@date.strftime('%b-%y')},#{@user_stat.count}\n" \
                  "Total,#{@user_stat.count}\n"
-      expect(response.content_type).to eq("text/csv")
+      expect(response.content_type).to eq('text/csv')
       expect(response.body).to eql(expected)
     end
   end
 
-  describe "GET /usage_yearly_plans" do
+  describe 'GET /usage_yearly_plans' do
     before(:each) do
       get :yearly_plans
     end
-    it "assigns the correct csv data" do
+    it 'assigns the correct csv data' do
       expected = "Month,No. Completed Plans\n" \
                  "#{@date.strftime('%b-%y')},#{@plan_stat.count}\n" \
                  "Total,#{@plan_stat.count}\n"
-      expect(response.content_type).to eq("text/csv")
+      expect(response.content_type).to eq('text/csv')
       expect(response.body).to eql(expected)
     end
   end
 
-  describe "GET /usage_all_plans_by_template" do
+  describe 'GET /usage_all_plans_by_template' do
     before(:each) do
       get :all_plans_by_template
     end
-    it "assigns the correct csv data" do
+    it 'assigns the correct csv data' do
       name = @details[:by_template].first[:name]
       count = @details[:by_template].first[:count]
       expected = "Date,#{name},Count\n" \
                  "#{@date.strftime('%b %Y')},#{count},#{@plan_stat.count}\n"
-      expect(response.content_type).to eq("text/csv")
+      expect(response.content_type).to eq('text/csv')
       expect(response.body).to eql(expected)
     end
   end
 
   def obj_to_hash(obj:)
-    hash = { "count": obj.count, "date": obj.date.strftime("%Y-%m-%d") }
-    hash["by_template"] = obj.details.fetch("by_template", []) if obj.details.present?
-    hash["using_template"] = obj.details.fetch("using_template", []) if obj.details.present?
+    hash = { count: obj.count, date: obj.date.strftime('%Y-%m-%d') }
+    hash['by_template'] = obj.details.fetch('by_template', []) if obj.details.present?
+    hash['using_template'] = obj.details.fetch('using_template', []) if obj.details.present?
     [hash.to_json]
   end
 
   def stat_details
-    { "name": Faker::Lorem.unique.sentence, "count": Faker::Number.number(digits: 2) }
+    { name: Faker::Lorem.unique.sentence, count: Faker::Number.number(digits: 2) }
   end
 end
diff --git a/spec/csvable_spec.rb b/spec/csvable_spec.rb
index b19263657d..2ca17c3d12 100644
--- a/spec/csvable_spec.rb
+++ b/spec/csvable_spec.rb
@@ -1,31 +1,31 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Csvable do
-  describe ".from_array_of_hashes" do
+  describe '.from_array_of_hashes' do
     let(:data) do
       [
-        { column1: "value row1.1", column2: "value row1.2" },
-        { column1: "value row2.1", column2: "value row2.2" },
-        { column1: "value row3.1", column2: "value row3.2" }
+        { column1: 'value row1.1', column2: 'value row1.2' },
+        { column1: 'value row2.1', column2: 'value row2.2' },
+        { column1: 'value row3.1', column2: 'value row3.2' }
       ]
     end
 
-    it "returns empty string" do
+    it 'returns empty string' do
       stringified_csv = described_class.from_array_of_hashes([])
 
       expect(stringified_csv).to be_empty
     end
 
-    it "first row describes columns" do
+    it 'first row describes columns' do
       stringified_csv = described_class.from_array_of_hashes(data)
 
       header = /[^\n]+/.match(stringified_csv)[0]
-      expect("Column1,Column2").to eq(header)
+      expect('Column1,Column2').to eq(header)
     end
 
-    it "returns each hash within the array" do
+    it 'returns each hash within the array' do
       stringified_csv = described_class.from_array_of_hashes(data)
 
       output = <<~HERE
diff --git a/spec/factories/languages.rb b/spec/factories/languages.rb
index 5989c87d25..2a31e6654c 100644
--- a/spec/factories/languages.rb
+++ b/spec/factories/languages.rb
@@ -19,9 +19,9 @@
     default_language { false }
     trait :with_dialect do
       abbreviation do
-        pre = ("a".."z").to_a.shuffle.take(2).join
-        suf = ("A".."Z").to_a.shuffle.take(2).join
-        [pre, suf].join("_")
+        pre = ('a'..'z').to_a.shuffle.take(2).join
+        suf = ('A'..'Z').to_a.shuffle.take(2).join
+        [pre, suf].join('_')
       end
     end
   end
diff --git a/spec/factories/orgs.rb b/spec/factories/orgs.rb
index d8ac259607..04515cc482 100644
--- a/spec/factories/orgs.rb
+++ b/spec/factories/orgs.rb
@@ -34,7 +34,7 @@
 FactoryBot.define do
   factory :org do
     name { Faker::Company.unique.name }
-    links { { "org" => [] } }
+    links { { 'org' => [] } }
     abbreviation { SecureRandom.hex(4) }
     feedback_enabled { false }
     region { Region.first || create(:region) }
diff --git a/spec/factories/perms.rb b/spec/factories/perms.rb
index 15cfd220c7..b13dd723fc 100644
--- a/spec/factories/perms.rb
+++ b/spec/factories/perms.rb
@@ -15,47 +15,47 @@
     name { Faker::Company.catch_phrase }
 
     trait :add_organisations do
-      name { "add_organisations" }
+      name { 'add_organisations' }
       initialize_with { Perm.find_or_create_by(name: name) }
     end
 
     trait :change_org_affiliation do
-      name { "change_org_affiliation" }
+      name { 'change_org_affiliation' }
       initialize_with { Perm.find_or_create_by(name: name) }
     end
 
     trait :grant_permissions do
-      name { "grant_permissions" }
+      name { 'grant_permissions' }
       initialize_with { Perm.find_or_create_by(name: name) }
     end
 
     trait :modify_templates do
-      name { "modify_templates" }
+      name { 'modify_templates' }
       initialize_with { Perm.find_or_create_by(name: name) }
     end
 
     trait :modify_guidance do
-      name { "modify_guidance" }
+      name { 'modify_guidance' }
       initialize_with { Perm.find_or_create_by(name: name) }
     end
 
     trait :use_api do
-      name { "use_api" }
+      name { 'use_api' }
       initialize_with { Perm.find_or_create_by(name: name) }
     end
 
     trait :change_org_details do
-      name { "change_org_details" }
+      name { 'change_org_details' }
       initialize_with { Perm.find_or_create_by(name: name) }
     end
 
     trait :grant_api_to_orgs do
-      name { "grant_api_to_orgs" }
+      name { 'grant_api_to_orgs' }
       initialize_with { Perm.find_or_create_by(name: name) }
     end
 
     trait :review_org_plans do
-      name { "review_org_plans" }
+      name { 'review_org_plans' }
       initialize_with { Perm.find_or_create_by(name: name) }
     end
   end
diff --git a/spec/factories/plans.rb b/spec/factories/plans.rb
index 20bfbdd9a3..36cdd56af2 100644
--- a/spec/factories/plans.rb
+++ b/spec/factories/plans.rb
@@ -69,19 +69,19 @@
       end
     end
     trait :organisationally_visible do
-      visibility { "organisationally_visible" }
+      visibility { 'organisationally_visible' }
     end
 
     trait :publicly_visible do
-      visibility { "publicly_visible" }
+      visibility { 'publicly_visible' }
     end
 
     trait :is_test do
-      visibility { "is_test" }
+      visibility { 'is_test' }
     end
 
     trait :privately_visible do
-      visibility { "privately_visible" }
+      visibility { 'privately_visible' }
     end
 
     after(:create) do |plan, evaluator|
@@ -91,6 +91,5 @@
     after(:create) do |plan, evaluator|
       plan.guidance_groups << create_list(:guidance_group, evaluator.guidance_groups)
     end
-
   end
 end
diff --git a/spec/factories/prefs.rb b/spec/factories/prefs.rb
index 3f3fba9501..28ac91da04 100644
--- a/spec/factories/prefs.rb
+++ b/spec/factories/prefs.rb
@@ -11,6 +11,6 @@
 
 FactoryBot.define do
   factory :pref do
-
+    # Not sure why this is empty
   end
 end
diff --git a/spec/factories/question_formats.rb b/spec/factories/question_formats.rb
index 40ef34fee1..63dc8c70d6 100644
--- a/spec/factories/question_formats.rb
+++ b/spec/factories/question_formats.rb
@@ -16,7 +16,7 @@
 FactoryBot.define do
   factory :question_format do
     title { Faker::Lorem.words(number: 3).join }
-    description { "http://test.host" }
+    description { 'http://test.host' }
     formattype { QuestionFormat::FORMAT_TYPES.sample }
 
     # Ensures duplicates aren't created
@@ -26,50 +26,50 @@
     end
 
     trait :textarea do
-      title { "Text area" }
-      formattype { "textarea" }
+      title { 'Text area' }
+      formattype { 'textarea' }
       option_based { false }
     end
 
     trait :textfield do
-      title { "Text field" }
-      formattype { "textfield" }
+      title { 'Text field' }
+      formattype { 'textfield' }
       option_based { false }
     end
 
     trait :radiobuttons do
-      title { "Radio buttons" }
-      formattype { "radiobuttons" }
+      title { 'Radio buttons' }
+      formattype { 'radiobuttons' }
       option_based { true }
     end
 
     trait :checkbox do
-      title { "Check box" }
-      formattype { "checkbox" }
+      title { 'Check box' }
+      formattype { 'checkbox' }
       option_based { true }
     end
 
     trait :dropdown do
-      title { "Drop down" }
-      formattype { "dropdown" }
+      title { 'Drop down' }
+      formattype { 'dropdown' }
       option_based { true }
     end
 
     trait :multiselectbox do
-      title { "Multi select box" }
-      formattype { "multiselectbox" }
+      title { 'Multi select box' }
+      formattype { 'multiselectbox' }
       option_based { true }
     end
 
     trait :date do
-      title { "Date" }
-      formattype { "date" }
+      title { 'Date' }
+      formattype { 'date' }
       option_based { false }
     end
 
     trait :rda_metadata do
-      title { "RDA Metadata" }
-      formattype { "rda_metadata" }
+      title { 'RDA Metadata' }
+      formattype { 'rda_metadata' }
       option_based { false }
     end
 
@@ -80,6 +80,5 @@
     trait :option_based_false do
       option_based { false }
     end
-
   end
 end
diff --git a/spec/factories/stat_created_plan.rb b/spec/factories/stat_created_plan.rb
index e57e2103b1..22fce95ccd 100644
--- a/spec/factories/stat_created_plan.rb
+++ b/spec/factories/stat_created_plan.rb
@@ -19,6 +19,6 @@
     date { Date.today }
     org { create(:org) }
     count { Faker::Number.number(digits: 10) }
-    details { "{\"by_template\":[]}" }
+    details { '{"by_template":[]}' }
   end
 end
diff --git a/spec/factories/templates.rb b/spec/factories/templates.rb
index bb2d7d0a41..3b38a95f93 100644
--- a/spec/factories/templates.rb
+++ b/spec/factories/templates.rb
@@ -37,7 +37,7 @@
     org
     title { Faker::Lorem.sentence }
     description { Faker::Lorem.paragraph }
-    locale { "en_GB" }
+    locale { 'en_GB' }
     is_default { false }
     published { false }
     archived { false }
@@ -82,6 +82,5 @@
                                             sections: evaluator.sections,
                                             questions: evaluator.questions)
     end
-
   end
 end
diff --git a/spec/factories/themes.rb b/spec/factories/themes.rb
index 1603c2d9d8..8a5d7b8982 100644
--- a/spec/factories/themes.rb
+++ b/spec/factories/themes.rb
@@ -16,6 +16,6 @@
   factory :theme do
     title { Faker::Lorem.sentence }
     description { Faker::Lorem.paragraph }
-    locale { "en_GB" }
+    locale { 'en_GB' }
   end
 end
diff --git a/spec/factories/users.rb b/spec/factories/users.rb
index 4d4ff58807..765898e944 100644
--- a/spec/factories/users.rb
+++ b/spec/factories/users.rb
@@ -58,7 +58,7 @@
     firstname    { Faker::Name.unique.first_name }
     surname      { Faker::Name.unique.last_name }
     email        { Faker::Internet.unique.safe_email }
-    password     { "password" }
+    password     { 'password' }
     accept_terms { true }
 
     trait :org_admin do
diff --git a/spec/features/annotations/annotations_editing_spec.rb b/spec/features/annotations/annotations_editing_spec.rb
index d5f91acf23..e3b5b8d68f 100644
--- a/spec/features/annotations/annotations_editing_spec.rb
+++ b/spec/features/annotations/annotations_editing_spec.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-require "rails_helper"
-
-RSpec.feature "Annotations::Editing", type: :feature do
+require 'rails_helper'
 
+RSpec.feature 'Annotations::Editing', type: :feature do
   let!(:funder) { create(:org, :funder) }
 
   let!(:org) { create(:org, :school, :organisation) }
@@ -18,7 +17,7 @@
 
   let!(:annotation) do
     create(:annotation, question: question, org: org,
-                        text: "Foo bar", type: "example_answer")
+                        text: 'Foo bar', type: 'example_answer')
   end
 
   let!(:user) { create(:user, org: org) }
@@ -31,58 +30,57 @@
     visit org_admin_templates_path
   end
 
-  scenario "Admin changes an Annotation of a draft Template", :js do
-    click_link "Customisable Templates"
+  scenario 'Admin changes an Annotation of a draft Template', :js do
+    click_link 'Customisable Templates'
     within("#template_#{template.id}") do
-      click_button "Actions"
+      click_button 'Actions'
     end
     expect do
-      click_link "Customise"
+      click_link 'Customise'
     end.to change { Template.count }.by(1)
 
     # New Template created
     template = Template.last
-    click_link "Customise phase"
+    click_link 'Customise phase'
 
     click_link section.title
 
     within("fieldset#fields_annotation_#{template.annotation_ids.last}") do
       id = "question_annotations_attributes_annotation_#{template.annotation_ids.last}_text"
-      tinymce_fill_in(id, with: "Noo bar")
+      tinymce_fill_in(id, with: 'Noo bar')
     end
 
     # NOTE: This is question 2, since Annotation was copied upon clicking "Customise"
     within("#edit_question_#{template.question_ids.last}") do
       # Expect it to destroy the newly cleared Annotation
-      expect { click_button "Save" }.not_to change { Annotation.count }
+      expect { click_button 'Save' }.not_to change { Annotation.count }
     end
-    expect(annotation.text).to eql("Foo bar")
-    expect(Annotation.order("created_at").last.text).to eql("Noo bar")
+    expect(annotation.text).to eql('Foo bar')
+    expect(Annotation.order('created_at').last.text).to eql('Noo bar')
     expect(page).not_to have_errors
   end
 
   scenario "Admin sets a Template's question annotation to blank string", :js do
-    click_link "Customisable Templates"
+    click_link 'Customisable Templates'
     within("#template_#{template.id}") do
-      click_button "Actions"
+      click_button 'Actions'
     end
     expect do
-      click_link "Customise"
+      click_link 'Customise'
     end.to change { Template.count }.by(1)
     template = Template.last
-    click_link "Customise phase"
+    click_link 'Customise phase'
     click_link section.title
     # NOTE: This is annotation 2, since Annotation was copied upon clicking "Customise"
     within("fieldset#fields_annotation_#{template.annotation_ids.last}") do
       id = "question_annotations_attributes_annotation_#{template.annotation_ids.last}_text"
-      tinymce_fill_in(:"#{id}", with: " ")
+      tinymce_fill_in(:"#{id}", with: ' ')
     end
     # NOTE: This is question 2, since Annotation was copied upon clicking "Customise"
     within("#edit_question_#{template.question_ids.last}") do
       # Expect it to destroy the newly cleared Annotation
-      expect { click_button "Save" }.to change { Annotation.count }.by(-1)
+      expect { click_button 'Save' }.to change { Annotation.count }.by(-1)
     end
     expect(page).not_to have_errors
   end
-
 end
diff --git a/spec/features/feedback_requests_spec.rb b/spec/features/feedback_requests_spec.rb
index 830375ac69..91da633e09 100644
--- a/spec/features/feedback_requests_spec.rb
+++ b/spec/features/feedback_requests_spec.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-require "rails_helper"
-
-RSpec.describe "FeedbackRequests", type: :feature do
+require 'rails_helper'
 
+RSpec.describe 'FeedbackRequests', type: :feature do
   include Webmocks
 
   let!(:plan) { create(:plan, :organisationally_visible) }
@@ -25,24 +24,23 @@
     ActionMailer::Base.deliveries = []
   end
 
-  scenario "User requests feedback for Plan", :js do
+  scenario 'User requests feedback for Plan', :js do
     # Actions
     click_link plan.title
     expect(current_path).to eql(plan_path(plan))
 
     # Click "Request feedback" tab
-    within("ul.nav.nav-tabs") do
-      click_link "Request feedback"
+    within('ul.nav.nav-tabs') do
+      click_link 'Request feedback'
     end
 
     # Click "Request feedback" button within panel
-    within("div.panel") do
-      click_link "Request feedback"
+    within('div.panel') do
+      click_link 'Request feedback'
     end
 
     # Expectations
     expect(plan.reload).to be_feedback_requested
     expect(ActionMailer::Base.deliveries).to have_exactly(1).item
   end
-
 end
diff --git a/spec/features/locales_spec.rb b/spec/features/locales_spec.rb
index 7afff076be..bdbb6d0aa4 100644
--- a/spec/features/locales_spec.rb
+++ b/spec/features/locales_spec.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-require "rails_helper"
-
-RSpec.feature "Locales", type: :feature, js: true do
+require 'rails_helper'
 
+RSpec.feature 'Locales', type: :feature, js: true do
   before(:each) do
     # Clear out the default defined in the locales support file
     Language.destroy_all
@@ -13,20 +12,20 @@
     [
       Language.where(
         default_language: true,
-        name: "English",
-        abbreviation: "en-GB"
+        name: 'English',
+        abbreviation: 'en-GB'
       ).first_or_create,
 
       Language.where(
         default_language: false,
-        name: "German",
-        abbreviation: "de"
+        name: 'German',
+        abbreviation: 'de'
       ).first_or_create,
 
       Language.where(
         default_language: false,
-        name: "Portugese",
-        abbreviation: "pt-BR"
+        name: 'Portugese',
+        abbreviation: 'pt-BR'
       ).first_or_create
 
     ]
@@ -39,6 +38,7 @@
     I18n.available_locales = locales
     I18n.locale = locales.first
     sign_in(user)
+    visit root_path
   end
 
   after do
@@ -47,37 +47,34 @@
     I18n.default_locale = locales.first
   end
 
-  context "when new locale has no region" do
-
-    scenario "user changes their locale" do
+  context 'when new locale has no region' do
+    scenario 'user changes their locale' do
       create_plan_text = I18n.with_locale(:de) do
-        _("Create plan")
+        _('Create plan')
       end
-      click_link "Language"
+
+      click_link 'Language'
       expect(current_path).to eql(plans_path)
       expect(page).not_to have_text(create_plan_text)
 
-      click_link "German"
+      click_link 'German'
       expect(current_path).to eql(plans_path)
       expect(page).to have_text(create_plan_text)
     end
-
   end
 
-  context "when new locale has region" do
-
-    scenario "user changes their locale" do
-      create_plan_text = I18n.with_locale("pt-BR") do
-        _("Create plan")
+  context 'when new locale has region' do
+    scenario 'user changes their locale' do
+      create_plan_text = I18n.with_locale('pt-BR') do
+        _('Create plan')
       end
-      click_link "Language"
+      click_link 'Language'
       expect(current_path).to eql(plans_path)
       expect(page).not_to have_text(create_plan_text)
 
-      click_link "Portugese"
+      click_link 'Portugese'
       expect(current_path).to eql(plans_path)
       expect(page).to have_text(create_plan_text)
     end
-
   end
 end
diff --git a/spec/features/plans/exports_spec.rb b/spec/features/plans/exports_spec.rb
index 16169cb70f..4feec44845 100644
--- a/spec/features/plans/exports_spec.rb
+++ b/spec/features/plans/exports_spec.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-require "rails_helper"
-
-RSpec.describe "PlansExports", type: :feature, js: true do
+require 'rails_helper'
 
+RSpec.describe 'PlansExports', type: :feature, js: true do
   let!(:template) { create(:template, phases: 2) }
   let!(:org) { create(:org, managed: true, is_other: false) }
   let!(:user) { create(:user, org: org) }
@@ -17,7 +16,7 @@
     sign_in(user)
   end
 
-  scenario "User downloads plan from organisational plans portion of the dashboard" do
+  scenario 'User downloads plan from organisational plans portion of the dashboard' do
     new_plan  = create(:plan, :publicly_visible, template: template)
     new_phase = create(:phase, template: template, sections: 2)
     new_phase.sections do |sect|
@@ -35,99 +34,99 @@
     find(:css, "a[href*=\"/#{new_plan.id}/export.pdf\"]", visible: false).click
   end
 
-  scenario "User downloads public plan belonging to other User" do
+  scenario 'User downloads public plan belonging to other User' do
     new_plan = create(:plan, :publicly_visible, template: template)
     create(:role, :creator, plan: new_plan)
     sign_in(user)
     within("#plan_#{plan.id}") do
-      click_button("Actions")
-      click_link "Download"
+      click_button('Actions')
+      click_link 'Download'
     end
-    select("html")
-    new_window = window_opened_by { click_button "Download Plan" }
+    select('html')
+    new_window = window_opened_by { click_button 'Download Plan' }
     within_window new_window do
       expect(page.source).to have_text(plan.title)
     end
   end
 
-  scenario "User downloads org plan belonging to User in same org" do
+  scenario 'User downloads org plan belonging to User in same org' do
     new_plan = create(:plan, :organisationally_visible, template: template)
     create(:role, :creator, plan: new_plan, user: create(:user, org: org))
     sign_in(user)
     within("#plan_#{plan.id}") do
-      click_button("Actions")
-      click_link "Download"
+      click_button('Actions')
+      click_link 'Download'
     end
-    select("html")
-    new_window = window_opened_by { click_button "Download Plan" }
+    select('html')
+    new_window = window_opened_by { click_button 'Download Plan' }
     within_window new_window do
       expect(page.source).to have_text(plan.title)
     end
   end
 
-  scenario "User downloads org plan belonging to User in other org" do
+  scenario 'User downloads org plan belonging to User in other org' do
     new_plan = create(:plan, :organisationally_visible, template: template)
     create(:role, :creator, plan: new_plan)
     sign_in(create(:user))
     expect(page).not_to have_text(new_plan.title)
   end
 
-  scenario "User attempts to download private plan belonging to User in same" do
+  scenario 'User attempts to download private plan belonging to User in same' do
     new_plan = create(:plan, :privately_visible, template: template)
     create(:role, :creator, plan: new_plan)
     sign_in(create(:user))
     expect(page).not_to have_text(new_plan.title)
   end
 
-  scenario "User downloads their plan as HTML" do
+  scenario 'User downloads their plan as HTML' do
     within("#plan_#{plan.id}") do
-      click_button("Actions")
-      click_link "Download"
+      click_button('Actions')
+      click_link 'Download'
     end
-    select("html")
-    new_window = window_opened_by { click_button "Download Plan" }
+    select('html')
+    new_window = window_opened_by { click_button 'Download Plan' }
     within_window new_window do
       expect(page.source).to have_text(plan.title)
     end
   end
 
-  scenario "User downloads their plan as PDF" do
+  scenario 'User downloads their plan as PDF' do
     within("#plan_#{plan.id}") do
-      click_button("Actions")
-      click_link "Download"
+      click_button('Actions')
+      click_link 'Download'
     end
-    select("pdf")
-    click_button "Download Plan"
+    select('pdf')
+    click_button 'Download Plan'
     expect(page.source).to have_text(plan.title)
   end
 
-  scenario "User downloads their plan as CSV" do
+  scenario 'User downloads their plan as CSV' do
     within("#plan_#{plan.id}") do
-      click_button("Actions")
-      click_link "Download"
+      click_button('Actions')
+      click_link 'Download'
     end
-    select("csv")
-    click_button "Download Plan"
+    select('csv')
+    click_button 'Download Plan'
     expect(page.source).to have_text(plan.title)
   end
 
-  scenario "User downloads their plan as text" do
+  scenario 'User downloads their plan as text' do
     within("#plan_#{plan.id}") do
-      click_button("Actions")
-      click_link "Download"
+      click_button('Actions')
+      click_link 'Download'
     end
-    select("text")
-    click_button "Download Plan"
+    select('text')
+    click_button 'Download Plan'
     expect(page.source).to have_text(plan.title)
   end
 
-  scenario "User downloads their plan as docx" do
+  scenario 'User downloads their plan as docx' do
     within("#plan_#{plan.id}") do
-      click_button("Actions")
-      click_link "Download"
+      click_button('Actions')
+      click_link 'Download'
     end
-    select("docx")
-    click_button "Download Plan"
+    select('docx')
+    click_button 'Download Plan'
     expect(page.source).to have_text(plan.title)
   end
 end
diff --git a/spec/features/plans_spec.rb b/spec/features/plans_spec.rb
index 9c5d1ba918..c8e5d5ed28 100644
--- a/spec/features/plans_spec.rb
+++ b/spec/features/plans_spec.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-require "rails_helper"
-
-RSpec.describe "Plans", type: :feature do
+require 'rails_helper'
 
+RSpec.describe 'Plans', type: :feature do
   before do
     @default_template = create(:template, :default, :published)
     @org = create(:org)
@@ -29,19 +28,19 @@
     #     )
   end
 
-  xit "User creates a new Plan", :js do
+  xit 'User creates a new Plan', :js do
     # TODO: Revisit this after we start refactoring/building out or tests for
     #       the new create plan workflow. For some reason the plans/new.js isn't
     #       firing here but works fine in the UI with manual testing
     # Action
-    click_link "Create plan"
-    fill_in :plan_title, with: "My test plan"
+    click_link 'Create plan'
+    fill_in :plan_title, with: 'My test plan'
     fill_in :org_org_name, with: @research_org.name
     choose_suggestion(@research_org.name)
 
     fill_in :funder_org_name, with: @funding_org.name
     choose_suggestion(@funding_org.name)
-    click_button "Create plan"
+    click_button 'Create plan'
 
     # Expectations
     expect(@user.plans).to be_one
@@ -55,29 +54,28 @@
     expect(page).to have_css("input[type=text][value='#{@plan.title}']")
 
     within "#edit_plan_#{@plan.id}" do
-      fill_in "Grant number", with: "Innodia"
-      fill_in "Project abstract", with: "Plan abstract..."
-      fill_in "ID", with: "ABCDEF"
-      fill_in "ORCID iD", with: "My ORCID"
-      fill_in "Phone", with: "07787 000 0000"
-      click_button "Save"
+      fill_in 'Grant number', with: 'Innodia'
+      fill_in 'Project abstract', with: 'Plan abstract...'
+      fill_in 'ID', with: 'ABCDEF'
+      fill_in 'ORCID iD', with: 'My ORCID'
+      fill_in 'Phone', with: '07787 000 0000'
+      click_button 'Save'
     end
 
     # Reload the plan to get the latest from memory
     @plan.reload
 
     expect(current_path).to eql(overview_plan_path(@plan))
-    expect(@plan.title).to eql("My test plan")
+    expect(@plan.title).to eql('My test plan')
     expect(@plan.org_id).to eql(@research_org.id)
     expect(@plan.funder_id).to eql(@funding_org.id)
-    expect(@plan.grant_number).to eql("115797")
-    expect(@plan.description).to eql("Plan abstract...")
-    expect(@plan.identifier).to eql("ABCDEF")
-    name = [@user.firstname, @user.surname].join(" ")
+    expect(@plan.grant_number).to eql('115797')
+    expect(@plan.description).to eql('Plan abstract...')
+    expect(@plan.identifier).to eql('ABCDEF')
+    name = [@user.firstname, @user.surname].join(' ')
     expect(@plan.principal_investigator).to eql(name)
-    expect(@plan.principal_investigator_identifier).to eql("My ORCID")
+    expect(@plan.principal_investigator_identifier).to eql('My ORCID')
     expect(@plan.principal_investigator_email).to eql(@user.email)
-    expect(@plan.principal_investigator_phone).to eql("07787 000 0000")
+    expect(@plan.principal_investigator_phone).to eql('07787 000 0000')
   end
-
 end
diff --git a/spec/features/questions/checkbox_questions_spec.rb b/spec/features/questions/checkbox_questions_spec.rb
index fbcff9d1c1..9e8a3b658b 100644
--- a/spec/features/questions/checkbox_questions_spec.rb
+++ b/spec/features/questions/checkbox_questions_spec.rb
@@ -1,11 +1,8 @@
 # frozen_string_literal: true
 
-require "rails_helper"
-
-require "rails_helper"
-
-RSpec.describe "Questions::Check box questions" do
+require 'rails_helper'
 
+RSpec.describe 'Questions::Check box questions', type: :feature do
   before do
     @default_template  = create(:template, :default, :published)
     @phase             = create(:phase, template: @default_template)
@@ -19,30 +16,29 @@
     sign_in(@user)
   end
 
-  scenario "User answers a check box question", :js do
+  scenario 'User answers a check box question', :js do
     # Setup
     visit overview_plan_path(@plan)
 
     # Action
-    click_link "Write plan"
+    click_link 'Write plan'
 
     # Expectations
     expect(current_path).to eql(edit_plan_path(@plan))
     # 4 sections x 3 questions
-    expect(page).to have_text("0/1 answered")
+    expect(page).to have_text('0/1 answered')
 
     # Action
     find("#section-panel-#{@section.id}").click
     # Fill in the answer form...
     within("#answer-form-#{@question.id}") do
       check @question.question_options.first.text
-      click_button "Save"
+      click_button 'Save'
     end
 
     # Expectations
-    expect(page).to have_text "Answered just now"
-    expect(page).to have_text "1/1 answered"
+    expect(page).to have_text 'Answered just now'
+    expect(page).to have_text '1/1 answered'
     expect(Answer.where(question_id: @question.id)).to be_any
   end
-
 end
diff --git a/spec/features/questions/dropdown_questions_spec.rb b/spec/features/questions/dropdown_questions_spec.rb
index 07c11c6ae4..d9c5a52ca5 100644
--- a/spec/features/questions/dropdown_questions_spec.rb
+++ b/spec/features/questions/dropdown_questions_spec.rb
@@ -1,11 +1,8 @@
 # frozen_string_literal: true
 
-require "rails_helper"
-
-require "rails_helper"
-
-RSpec.describe "Questions::Dropdown questions" do
+require 'rails_helper'
 
+RSpec.describe 'Questions::Dropdown questions', type: :feature do
   before do
     @default_template  = create(:template, :default, :published)
     @phase             = create(:phase, template: @default_template)
@@ -19,31 +16,30 @@
     sign_in(@user)
   end
 
-  scenario "User answers a dropdown select question", :js do
+  scenario 'User answers a dropdown select question', :js do
     # Setup
     visit overview_plan_path(@plan)
 
     # Action
-    click_link "Write plan"
+    click_link 'Write plan'
 
     # Expectations
     expect(current_path).to eql(edit_plan_path(@plan))
     # 4 sections x 3 questions
-    expect(page).to have_text("0/1 answered")
+    expect(page).to have_text('0/1 answered')
 
     # Action
     find("#section-panel-#{@section.id}").click
     # Fill in the answer form...
     within("#answer-form-#{@question.id}") do
       select @question.question_options.first.text
-      click_button "Save"
+      click_button 'Save'
       sleep(0.2)
     end
 
     # Expectations
-    expect(page).to have_text "Answered just now"
-    expect(page).to have_text "1/1 answered"
+    expect(page).to have_text 'Answered just now'
+    expect(page).to have_text '1/1 answered'
     expect(Answer.where(question_id: @question.id)).to be_any
   end
-
 end
diff --git a/spec/features/questions/radiobuttons_questions_spec.rb b/spec/features/questions/radiobuttons_questions_spec.rb
index 89a104e96d..c41a51aec1 100644
--- a/spec/features/questions/radiobuttons_questions_spec.rb
+++ b/spec/features/questions/radiobuttons_questions_spec.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-require "rails_helper"
-
-RSpec.describe "Questions::Tadio button questions" do
+require 'rails_helper'
 
+RSpec.describe 'Questions::Tadio button questions', type: :feature do
   before do
     @default_template  = create(:template, :default, :published)
     @phase             = create(:phase, template: @default_template)
@@ -17,31 +16,30 @@
     sign_in(@user)
   end
 
-  scenario "User answers a radio button question", :js do
+  scenario 'User answers a radio button question', :js do
     # Setup
     visit overview_plan_path(@plan)
 
     # Action
-    click_link "Write plan"
+    click_link 'Write plan'
 
     # Expectations
     expect(current_path).to eql(edit_plan_path(@plan))
     # 4 sections x 3 questions
-    expect(page).to have_text("0/1 answered")
+    expect(page).to have_text('0/1 answered')
 
     # Action
     find("#section-panel-#{@section.id}").click
     # Fill in the answer form...
     within("#answer-form-#{@question.id}") do
       choose @question.question_options.first.text
-      click_button "Save"
+      click_button 'Save'
       sleep(0.2)
     end
 
     # Expectations
-    expect(page).to have_text "Answered just now"
-    expect(page).to have_text "1/1 answered"
+    expect(page).to have_text 'Answered just now'
+    expect(page).to have_text '1/1 answered'
     expect(Answer.where(question_id: @question.id)).to be_any
   end
-
 end
diff --git a/spec/features/questions/textarea_questions_spec.rb b/spec/features/questions/textarea_questions_spec.rb
index 5d29603ca3..2b9ed8c874 100644
--- a/spec/features/questions/textarea_questions_spec.rb
+++ b/spec/features/questions/textarea_questions_spec.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-require "rails_helper"
-
-RSpec.describe "Questions::Text area questions" do
+require 'rails_helper'
 
+RSpec.describe 'Questions::Text area questions', type: :feature do
   before do
     @default_template  = create(:template, :default, :published)
     @phase             = create(:phase, template: @default_template)
@@ -17,31 +16,30 @@
     sign_in(@user)
   end
 
-  scenario "User answers a Text Area question", :js do
+  scenario 'User answers a Text Area question', :js do
     # Setup
     visit overview_plan_path(@plan)
 
     # Action
-    click_link "Write plan"
+    click_link 'Write plan'
 
     # Expectations
     expect(current_path).to eql(edit_plan_path(@plan))
     # 4 sections x 3 questions
-    expect(page).to have_text("0/1 answered")
+    expect(page).to have_text('0/1 answered')
 
     # Action
     find("#section-panel-#{@section.id}").click
     # Fill in the answer form...
     within("#answer-form-#{@question.id}") do
-      tinymce_fill_in "answer-text-#{@question.id}", with: "My test answer"
-      click_button "Save"
+      tinymce_fill_in "answer-text-#{@question.id}", with: 'My test answer'
+      click_button 'Save'
       sleep(0.2)
     end
 
     # Expectations
-    expect(page).to have_text "Answered just now"
-    expect(page).to have_text "1/1 answered"
+    expect(page).to have_text 'Answered just now'
+    expect(page).to have_text '1/1 answered'
     expect(Answer.where(question_id: @question.id)).to be_any
   end
-
 end
diff --git a/spec/features/questions/textfield_questions_spec.rb b/spec/features/questions/textfield_questions_spec.rb
index 19f1bdec36..2d3476a9e4 100644
--- a/spec/features/questions/textfield_questions_spec.rb
+++ b/spec/features/questions/textfield_questions_spec.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-require "rails_helper"
-
-RSpec.describe "Questions::Text Field questions" do
+require 'rails_helper'
 
+RSpec.describe 'Questions::Text Field questions', type: :feature do
   before do
     @default_template  = create(:template, :default, :published)
     @phase             = create(:phase, template: @default_template)
@@ -17,31 +16,30 @@
     sign_in(@user)
   end
 
-  scenario "User answers a Text field question", :js do
+  scenario 'User answers a Text field question', :js do
     # Setup
     visit overview_plan_path(@plan)
 
     # Action
-    click_link "Write plan"
+    click_link 'Write plan'
 
     # Expectations
     expect(current_path).to eql(edit_plan_path(@plan))
     # 4 sections x 3 questions
-    expect(page).to have_text("0/1 answered")
+    expect(page).to have_text('0/1 answered')
 
     # Action
     find("#section-panel-#{@section.id}").click
     # Fill in the answer form...
     within("#answer-form-#{@question.id}") do
-      fill_in :answer_text, with: "My test answer"
-      click_button "Save"
+      fill_in :answer_text, with: 'My test answer'
+      click_button 'Save'
       sleep(0.2)
     end
 
     # Expectations
-    expect(page).to have_text "Answered just now"
-    expect(page).to have_text "1/1 answered"
+    expect(page).to have_text 'Answered just now'
+    expect(page).to have_text '1/1 answered'
     expect(Answer.where(question_id: @question.id)).to be_any
   end
-
 end
diff --git a/spec/features/registrations_spec.rb b/spec/features/registrations_spec.rb
index fbbb1bbc50..6f9b5fdfd9 100644
--- a/spec/features/registrations_spec.rb
+++ b/spec/features/registrations_spec.rb
@@ -1,30 +1,29 @@
 # frozen_string_literal: true
 
-require "rails_helper"
-
-RSpec.describe "Registrations", type: :feature do
+require 'rails_helper'
 
+RSpec.describe 'Registrations', type: :feature do
   let!(:org) { create(:org) }
   let!(:language) { Language.default || create(:language, default_language: true) }
 
   let(:user_attributes) { attributes_for(:user) }
 
-  scenario "User creates a new acccount", :js do
+  scenario 'User creates a new acccount', :js do
     # Setup
     visit root_path
 
     # Action
-    click_link "Create account"
-    within("#create-account-form") do
-      fill_in "First Name", with: user_attributes[:firstname]
-      fill_in "Last Name", with: user_attributes[:surname]
-      fill_in "Email", with: user_attributes[:email]
-      select_an_org("#new_user_org_name", org)
-      fill_in "Password", with: user_attributes[:password]
-      check "Show password"
-      check "I accept the terms and conditions"
+    click_link 'Create account'
+    within('#create-account-form') do
+      fill_in 'First Name', with: user_attributes[:firstname]
+      fill_in 'Last Name', with: user_attributes[:surname]
+      fill_in 'Email', with: user_attributes[:email]
+      select_an_org('#new_user_org_name', org)
+      fill_in 'Password', with: user_attributes[:password]
+      check 'Show password'
+      check 'I accept the terms and conditions'
     end
-    click_button "Create account"
+    click_button 'Create account'
 
     # Expectations
     expect(current_path).to eql(plans_path)
@@ -32,26 +31,25 @@
     expect(page).to have_text(user_attributes[:surname])
   end
 
-  scenario "User attempts to create a new acccount with invalid atts", :js do
+  scenario 'User attempts to create a new acccount with invalid atts', :js do
     # Setup
     visit root_path
 
     # Action
-    click_link "Create account"
-    within("#create-account-form") do
-      fill_in "First Name", with: user_attributes[:firstname]
-      fill_in "Last Name", with: user_attributes[:surname]
-      fill_in "Email", with: "invalid-email"
-      select_an_org("#new_user_org_name", org)
-      fill_in "Password", with: user_attributes[:password]
-      check "Show password"
-      check "I accept the terms and conditions"
+    click_link 'Create account'
+    within('#create-account-form') do
+      fill_in 'First Name', with: user_attributes[:firstname]
+      fill_in 'Last Name', with: user_attributes[:surname]
+      fill_in 'Email', with: 'invalid-email'
+      select_an_org('#new_user_org_name', org)
+      fill_in 'Password', with: user_attributes[:password]
+      check 'Show password'
+      check 'I accept the terms and conditions'
     end
-    click_button "Create account"
+    click_button 'Create account'
 
     # Expectations
     expect(current_path).to eql(root_path)
     expect(User.count).to be_zero
   end
-
 end
diff --git a/spec/features/sessions_spec.rb b/spec/features/sessions_spec.rb
index 82892abfd9..9fb3d7682e 100644
--- a/spec/features/sessions_spec.rb
+++ b/spec/features/sessions_spec.rb
@@ -1,19 +1,18 @@
 # frozen_string_literal: true
 
-require "rails_helper"
-
-RSpec.feature "Sessions", type: :feature do
+require 'rails_helper'
 
+RSpec.feature 'Sessions', type: :feature do
   let(:user) { create(:user) }
 
-  scenario "User signs in successfully with email and password", :js do
+  scenario 'User signs in successfully with email and password', :js do
     # Setup
     visit root_path
 
     # Action
     fill_in :signin_user_email, with: user.email
     fill_in :signin_user_password, with: user.password
-    click_button "Sign in"
+    click_button 'Sign in'
 
     # Expectation
     expect(current_path).to eql(plans_path)
@@ -21,20 +20,19 @@
     expect(page).to have_text(user.surname)
   end
 
-  scenario "User fails sign in with email and password", :js do
+  scenario 'User fails sign in with email and password', :js do
     # Setup
     visit root_path
 
     # Action
     fill_in :signin_user_email, with: user.email
-    fill_in :signin_user_password, with: "rong-password"
-    click_button "Sign in"
+    fill_in :signin_user_password, with: 'rong-password'
+    click_button 'Sign in'
 
     # Expectation
     expect(current_path).to eql(root_path)
     expect(page).not_to have_text(user.firstname)
     expect(page).not_to have_text(user.surname)
-    expect(page).to have_text("Error")
+    expect(page).to have_text('Error')
   end
-
 end
diff --git a/spec/features/super_admins/merge_org_spec.rb b/spec/features/super_admins/merge_org_spec.rb
index 3f2558b88a..f4c3fbad27 100644
--- a/spec/features/super_admins/merge_org_spec.rb
+++ b/spec/features/super_admins/merge_org_spec.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-require "rails_helper"
-
-RSpec.describe "SuperAdmins Merge Orgs", type: :feature, js: true do
+require 'rails_helper'
 
+RSpec.describe 'SuperAdmins Merge Orgs', type: :feature, js: true do
   before do
     Org.destroy_all
     @scheme = create(:identifier_scheme)
@@ -28,55 +27,54 @@
     sign_in(@user)
   end
 
-  scenario "Super admin merges an Org into another Org" do
+  scenario 'Super admin merges an Org into another Org' do
     org_name = @from_org.name
-    click_link "Admin"
+    click_link 'Admin'
     sleep(0.5)
-    click_link "Organisations"
+    click_link 'Organisations'
 
     fill_in(:search, with: @from_org.name)
-    click_button "Search"
+    click_button 'Search'
     sleep(0.5)
 
     first("#org-#{@from_org.id}-actions").click
     first("a[href=\"/org/admin/#{@from_org.id}/admin_edit\"]").click
 
-    click_link "Merge"
+    click_link 'Merge'
     sleep(0.3)
-    expect(page).to have_text("Merge Organisations")
-    find("#org_org_name").click
+    expect(page).to have_text('Merge Organisations')
+    find('#org_org_name').click
     fill_in(:org_org_name, with: @to_org.name[0..6])
     sleep(0.5)
     choose_suggestion(@to_org.name)
 
-    click_button "Analyze"
+    click_button 'Analyze'
     # Wait for response
     sleep(0.3)
-    expect(page).to have_text("Summary:")
+    expect(page).to have_text('Summary:')
 
-    click_button "Merge records"
+    click_button 'Merge records'
     # Wait for redirect
     sleep(0.3)
-    expect(page).to have_text("Organisations")
-    expect(page).to have_text("Successfully merged")
+    expect(page).to have_text('Organisations')
+    expect(page).to have_text('Successfully merged')
 
     # Make sure that the correct org was deleted
     expect(Org.where(name: org_name).any?).to eql(false)
     expect(Org.where(name: @to_org.name).any?).to eql(true)
 
     # Make sure the Org we merged is no longer findable
-    find("#search").click
+    find('#search').click
     fill_in(:search, with: org_name)
-    click_button "Search"
+    click_button 'Search'
     sleep(0.3)
-    expect(page).to have_text("There are no records associated")
+    expect(page).to have_text('There are no records associated')
 
     # Make sure the Org we merged into is findable
-    find("#search").click
+    find('#search').click
     fill_in(:search, with: @to_org.name)
-    click_button "Search"
+    click_button 'Search'
     sleep(0.3)
     expect(page).to have_text(@to_org.name)
   end
-
 end
diff --git a/spec/features/super_admins/org_swaps_spec.rb b/spec/features/super_admins/org_swaps_spec.rb
index 48ad75874b..edf90939c6 100644
--- a/spec/features/super_admins/org_swaps_spec.rb
+++ b/spec/features/super_admins/org_swaps_spec.rb
@@ -1,34 +1,32 @@
 # frozen_string_literal: true
 
-require "rails_helper"
-
-RSpec.describe "SuperAdmins OrgSwaps", type: :feature, js: true do
+require 'rails_helper'
 
+RSpec.describe 'SuperAdmins OrgSwaps', type: :feature, js: true do
   before do
     @org1, @org2 = *create_list(:org, 2)
   end
 
-  scenario "Org admin attempts to change to new org" do
+  scenario 'Org admin attempts to change to new org' do
     @user = create(:user, :org_admin, org: @org1)
     sign_in(@user)
-    click_link "Admin"
-    click_link "Templates"
-    expect(page).not_to have_text("Change affiliation")
+    click_link 'Admin'
+    click_link 'Templates'
+    expect(page).not_to have_text('Change affiliation')
   end
 
-  scenario "Super admin changes to new org" do
+  scenario 'Super admin changes to new org' do
     @user = create(:user, :super_admin, org: @org1)
     sign_in(@user)
-    click_link "Admin"
-    click_link "Templates"
-    find("#superadmin_user_org_name").click
+    click_link 'Admin'
+    click_link 'Templates'
+    find('#superadmin_user_org_name').click
     fill_in(:superadmin_user_org_name, with: @org2.name[0..4])
     choose_suggestion(@org2.name)
-    click_button "Change affiliation"
+    click_button 'Change affiliation'
     expect(current_path).to eql(org_admin_templates_path)
     expect(page).to have_text(@org2.name)
     expect(page).not_to have_text(@org1.name)
     expect(@user.reload.org).to eql(@org2)
   end
-
 end
diff --git a/spec/features/super_admins/orgs_spec.rb b/spec/features/super_admins/orgs_spec.rb
index 6d15f7750f..06f6a61b34 100644
--- a/spec/features/super_admins/orgs_spec.rb
+++ b/spec/features/super_admins/orgs_spec.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-require "rails_helper"
-
-RSpec.describe "SuperAdmins Orgs", type: :feature, js: true do
+require 'rails_helper'
 
+RSpec.describe 'SuperAdmins Orgs', type: :feature, js: true do
   include LinksHelper
 
   before do
@@ -12,37 +11,36 @@
     sign_in(@user)
   end
 
-  scenario "Super admin submits invalid data" do
-    click_link "Admin"
-    click_link "Organisations"
-    click_link "Create Organisation"
-    expect(page).to have_text("New organisation")
-    click_button "Save"
+  scenario 'Super admin submits invalid data' do
+    click_link 'Admin'
+    click_link 'Organisations'
+    click_link 'Create Organisation'
+    expect(page).to have_text('New organisation')
+    click_button 'Save'
     expect(current_path).to eql(super_admin_orgs_path)
-    expect(page).to have_text("Error: Unable to create the organisation.")
+    expect(page).to have_text('Error: Unable to create the organisation.')
   end
 
-  scenario "Super admin adds links" do
-    click_link "Admin"
-    click_link "Organisations"
+  scenario 'Super admin adds links' do
+    click_link 'Admin'
+    click_link 'Organisations'
     # Edit the first org in the table
-    find("table .dropdown-toggle").click
-    find(".dropdown-menu > li > a").click
-    nbr_links = all(".link").length
+    find('table .dropdown-toggle').click
+    find('.dropdown-menu > li > a').click
+    nbr_links = all('.link').length
     add_link
-    expect(all(".link").length).to eql(nbr_links + 1)
+    expect(all('.link').length).to eql(nbr_links + 1)
   end
 
-  scenario "Super admin removes links" do
-    click_link "Admin"
-    click_link "Organisations"
+  scenario 'Super admin removes links' do
+    click_link 'Admin'
+    click_link 'Organisations'
     # Edit the first org in the table
-    find("table .dropdown-toggle").click
-    find(".dropdown-menu > li > a").click
+    find('table .dropdown-toggle').click
+    find('.dropdown-menu > li > a').click
     add_link
-    nbr_links = all(".link").length
+    nbr_links = all('.link').length
     remove_link
-    expect(all(".link").length).to eql(nbr_links - 1)
+    expect(all('.link').length).to eql(nbr_links - 1)
   end
-
 end
diff --git a/spec/features/templates/templates_copying_spec.rb b/spec/features/templates/templates_copying_spec.rb
index 16c0e27a2a..6910c47c5d 100644
--- a/spec/features/templates/templates_copying_spec.rb
+++ b/spec/features/templates/templates_copying_spec.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-require "rails_helper"
-
-RSpec.feature "Templates::Copying", type: :feature do
+require 'rails_helper'
 
+RSpec.feature 'Templates::Copying', type: :feature do
   let!(:org) { create(:org, :funder, :organisation) }
 
   let!(:parent_template) do
@@ -24,14 +23,14 @@
     visit org_admin_templates_path
   end
 
-  scenario "Admin copies an existing Template", :js do
+  scenario 'Admin copies an existing Template', :js do
     # Setup
     click_link org.name
 
     # Action
     within("#template_#{parent_template.id}") do
-      click_button "Actions"
-      click_link "Copy"
+      click_button 'Actions'
+      click_link 'Copy'
     end
 
     # Expectations
@@ -42,5 +41,4 @@
     expect(new_template.sections).to have_exactly(4).items
     expect(new_template.questions).to have_exactly(8).items
   end
-
 end
diff --git a/spec/features/templates/templates_editings_spec.rb b/spec/features/templates/templates_editings_spec.rb
index 13b00d9591..bc84511cd7 100644
--- a/spec/features/templates/templates_editings_spec.rb
+++ b/spec/features/templates/templates_editings_spec.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-require "rails_helper"
-
-RSpec.feature "Templates::Editing", type: :feature do
+require 'rails_helper'
 
+RSpec.feature 'Templates::Editing', type: :feature do
   let!(:default_template) { create(:template, :default, :published) }
 
   let!(:funder) { create(:org, :funder) }
@@ -26,29 +25,28 @@
   end
 
   scenario "Admin edits a Template's existing question", :js do
-    click_link "Customisable Templates"
+    click_link 'Customisable Templates'
     within("#template_#{template.id}") do
-      click_button "Actions"
+      click_button 'Actions'
     end
-    click_link "Customise"
+    click_link 'Customise'
     # New template created
     template = Template.last
     within("#phase_#{template.phase_ids.first}") do
-      click_link "Customise phase"
+      click_link 'Customise phase'
     end
     click_link template.sections.first.title
     within("#edit_question_#{template.question_ids.first}") do
       # rubocop:disable Lint/UselessAssignment, Style/PerlBackrefs
       textarea_id = page.body.match(/question_annotations_attributes_annotation_(\d+)_text/)
-      tinymce_fill_in(:"question_annotations_attributes_annotation_#{$1}_text", with: "Foo bar")
+      tinymce_fill_in(:"question_annotations_attributes_annotation_#{$1}_text", with: 'Foo bar')
       # rubocop:enable Lint/UselessAssignment, Style/PerlBackrefs
-      click_button "Save"
+      click_button 'Save'
     end
     # Make sure annotation has been updated
-    expect(Question.find(template.question_ids.first).annotations.first.text).to eql("Foo bar")
+    expect(Question.find(template.question_ids.first).annotations.first.text).to eql('Foo bar')
     # Make sure blank records are not created for empty annotation form
     expect(Question.find(template.question_ids.first).annotations.count).to eql(1)
     expect(page).not_to have_errors
   end
-
 end
diff --git a/spec/features/templates/templates_upgrade_customisations_spec.rb b/spec/features/templates/templates_upgrade_customisations_spec.rb
index 2d2c6fa522..0ab34a6f99 100644
--- a/spec/features/templates/templates_upgrade_customisations_spec.rb
+++ b/spec/features/templates/templates_upgrade_customisations_spec.rb
@@ -1,10 +1,9 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
-RSpec.feature "Templates::UpgradeCustomisations", type: :feature do
-
-  let(:funder) { create(:org, :funder, name: "The funder org") }
+RSpec.feature 'Templates::UpgradeCustomisations', type: :feature do
+  let(:funder) { create(:org, :funder, name: 'The funder org') }
 
   let(:org) { create(:org, :organisation, name: "The User's org") }
 
@@ -14,7 +13,7 @@
 
   let(:funder_template) do
     create(:template, :default, :publicly_visible, :published,
-           org: funder, title: "Funder Template")
+           org: funder, title: 'Funder Template')
   end
 
   before do
@@ -28,59 +27,59 @@
     user.perms << create(:perm, :change_org_affiliation)
   end
 
-  scenario "Admin upgrades customizations from funder Template", :js do
+  scenario 'Admin upgrades customizations from funder Template', :js do
     # pending "Need S3 travis working to debug this test on Travis"
     sign_in user
     visit org_admin_templates_path
 
     # Customise a Template that belongs to another funder Org
-    click_link("Customisable Templates")
+    click_link('Customisable Templates')
 
-    click_button "Actions"
-    expect { click_link "Customise" }.to change { Template.count }.by(1)
+    click_button 'Actions'
+    expect { click_link 'Customise' }.to change { Template.count }.by(1)
 
     customized_template = Template.last
 
     # click_link "View all templates"
     visit customisable_org_admin_templates_path
 
-    expect(page).to have_text("Unpublished")
+    expect(page).to have_text('Unpublished')
 
     # Publish our customisation
-    click_button "Actions"
-    click_link "Publish"
+    click_button 'Actions'
+    click_link 'Publish'
     expect(customized_template.reload.published?).to eql(true)
 
     # Move to the other funder Org's Templates
     fill_in(:superadmin_user_org_name, with: funder.name)
     choose_suggestion(funder.name)
-    click_button("Change affiliation")
+    click_button('Change affiliation')
 
     # Edit the original Template
     click_link "#{funder.name} Templates"
 
-    expect(page).to have_text("Published")
-    click_button "Actions"
-    click_link "Edit"
+    expect(page).to have_text('Published')
+    click_button 'Actions'
+    click_link 'Edit'
 
     click_link(funder_template.phases.first.title)
 
-    click_link "Add a new section"
-    within("#new_section_new_section") do
-      fill_in :new_section_section_title, with: "Cool New section title"
-      tinymce_fill_in :new_section_section_description, with: "New section Description"
-      expect { click_button("Save") }.to change { Section.count }.by(3)
+    click_link 'Add a new section'
+    within('#new_section_new_section') do
+      fill_in :new_section_section_title, with: 'Cool New section title'
+      tinymce_fill_in :new_section_section_description, with: 'New section Description'
+      expect { click_button('Save') }.to change { Section.count }.by(3)
     end
 
     within("#section-#{Section.last.id}") do
-      within(".new-question-button") do
-        click_link("Add Question")
+      within('.new-question-button') do
+        click_link('Add Question')
       end
-      expect(page).to have_css("#new_question_new_question")
-      within("#new_question_new_question") do
-        expect(find("#new_question_question_text")).to be_present
-        fill_in :new_question_question_text, with: "Text for this specific question"
-        expect { click_button("Save") }.to change { Question.count }.by(1)
+      expect(page).to have_css('#new_question_new_question')
+      within('#new_question_new_question') do
+        expect(find('#new_question_question_text')).to be_present
+        fill_in :new_question_question_text, with: 'Text for this specific question'
+        expect { click_button('Save') }.to change { Question.count }.by(1)
       end
     end
 
@@ -88,31 +87,30 @@
 
     visit organisational_org_admin_templates_path
 
-    click_button "Actions"
-    click_link "Publish changes"
+    click_button 'Actions'
+    click_link 'Publish changes'
     expect(new_funder_template.reload.published?).to eql(true)
 
     # Go back to the original Org...
 
     fill_in(:superadmin_user_org_name, with: org.name)
     choose_suggestion(org.name)
-    click_button("Change affiliation")
+    click_button('Change affiliation')
 
-    click_link "Customisable Templates"
+    click_link 'Customisable Templates'
 
-    expect(page).to have_text("Original funder template has changed")
+    expect(page).to have_text('Original funder template has changed')
 
-    click_button "Actions"
-    click_link "Transfer customisation"
+    click_button 'Actions'
+    click_link 'Transfer customisation'
 
     new_customized_template = Template.last
 
-    expect(page).to have_text("Customisations are published")
+    expect(page).to have_text('Customisations are published')
 
     expect(funder_template.sections).to have(2).items
     expect(customized_template.sections).to have(2).items
     expect(new_customized_template.sections).to have(3).items
     expect(new_funder_template.sections).to have(3).items
   end
-
 end
diff --git a/spec/features/templates_spec.rb b/spec/features/templates_spec.rb
index b10b636787..96b199fba3 100644
--- a/spec/features/templates_spec.rb
+++ b/spec/features/templates_spec.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-require "rails_helper"
-
-RSpec.describe "Templates", type: :feature do
+require 'rails_helper'
 
+RSpec.describe 'Templates', type: :feature do
   before do
     @org      = create(:org)
     @template = create(:template, org: @org, phases: 2)
@@ -14,24 +13,24 @@
     sign_in(@user)
   end
 
-  scenario "Org admin edits a template", :js do
+  scenario 'Org admin edits a template', :js do
     # Action
-    click_link "Admin"
-    click_link "Templates"
+    click_link 'Admin'
+    click_link 'Templates'
 
     # Expectations
     expect(current_path).to eql(organisational_org_admin_templates_path)
 
     # Action
-    click_button "Actions"
-    click_link "Edit"
+    click_button 'Actions'
+    click_link 'Edit'
 
     # Expectations
     expect(current_path).to eql(edit_org_admin_template_path(@template))
 
     # Action
     within "#phase_#{@phase.id}" do
-      click_link "Edit phase"
+      click_link 'Edit phase'
     end
 
     # Expectations
@@ -42,19 +41,18 @@
     # Open the panel for a new Section
     find("a[href='#new_section']").click
 
-    within "#collapseSectionNew" do
-      fill_in :new_section_section_title, with: "My new section"
+    within '#collapseSectionNew' do
+      fill_in :new_section_section_title, with: 'My new section'
       tinymce_fill_in :new_section_section_description,
-                      with: "This is the description of my new section"
-      click_button "Save"
+                      with: 'This is the description of my new section'
+      click_button 'Save'
     end
 
     # Expectations
     last_section = @template.phases.first.sections.order(:created_at).last
     expect(@template.sections.count).to eql(5)
-    expect(last_section.title).to eql("My new section")
-    expect(last_section.description).to match("This is the description of my new section")
-    expect(last_section.description).to match("<p>")
+    expect(last_section.title).to eql('My new section')
+    expect(last_section.description).to match('This is the description of my new section')
+    expect(last_section.description).to match('<p>')
   end
-
 end
diff --git a/spec/helpers/identifier_helper_spec.rb b/spec/helpers/identifier_helper_spec.rb
index 2eda39f15e..59fef4938a 100644
--- a/spec/helpers/identifier_helper_spec.rb
+++ b/spec/helpers/identifier_helper_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 describe IdentifierHelper do
   include IdentifierHelper
@@ -9,9 +9,9 @@
     @user_scheme = create(:identifier_scheme, for_users: true)
   end
 
-  describe "#id_for_display(id:, with_scheme_name)" do
+  describe '#id_for_display(id:, with_scheme_name)' do
     before(:each) do
-      @none = _("None defined")
+      @none = _('None defined')
       url = Faker::Internet.url
       @user_scheme.identifier_prefix = url
       val = "#{url}/#{Faker::Lorem.word}"
@@ -19,36 +19,35 @@
                                         value: val)
     end
 
-    it "defaults to showing the scheme name" do
+    it 'defaults to showing the scheme name' do
       rslt = id_for_display(id: @identifier)
       expect(rslt.include?(@user_scheme.identifier_prefix)).to eql(true)
     end
-    it "does not display the scheme name if flag is set" do
+    it 'does not display the scheme name if flag is set' do
       rslt = id_for_display(id: @identifier, with_scheme_name: false)
       expect(rslt.include?(@user_scheme.name)).to eql(false)
     end
-    it "returns the correct text when the identifier is new" do
+    it 'returns the correct text when the identifier is new' do
       id = build(:identifier)
       rslt = id_for_display(id: id)
       expect(rslt).to eql(@none)
     end
-    it "returns the correct text when the identifier is blank" do
-      @identifier.value = ""
+    it 'returns the correct text when the identifier is blank' do
+      @identifier.value = ''
       rslt = id_for_display(id: @identifier)
       expect(rslt).to eql(@none)
     end
-    it "returns the value when the scheme has no identifier_prefix" do
+    it 'returns the value when the scheme has no identifier_prefix' do
       val = Faker::Lorem.word
       @user_scheme.identifier_prefix = nil
       @user_scheme.save
       @identifier.value = val
       rslt = id_for_display(id: @identifier)
-      expect(rslt).to eql(@user_scheme.description + ": " + val)
+      expect(rslt).to eql("#{@user_scheme.description}: #{val}")
     end
-    it "returns the value as a link when the scheme has a identifier_prefix" do
+    it 'returns the value as a link when the scheme has a identifier_prefix' do
       rslt = id_for_display(id: @identifier)
       expect(rslt.include?(@identifier.value)).to eql(true)
     end
   end
-
 end
diff --git a/spec/helpers/usage_helper_spec.rb b/spec/helpers/usage_helper_spec.rb
index 84ddd9274d..859a37f15d 100644
--- a/spec/helpers/usage_helper_spec.rb
+++ b/spec/helpers/usage_helper_spec.rb
@@ -1,26 +1,26 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 describe UsageHelper do
   include UsageHelper
 
-  context "chart data preparation" do
-    describe "#prep_data_for_yearly_users_chart" do
-      it "defers to #default_chart_prep" do
+  context 'chart data preparation' do
+    describe '#prep_data_for_yearly_users_chart' do
+      it 'defers to #default_chart_prep' do
         expects(:default_chart_prep).with(data: nil)
         prep_data_for_yearly_users_chart(data: nil)
       end
     end
 
-    describe "#prep_data_for_yearly_plans_chart" do
-      it "properly formats the data " do
+    describe '#prep_data_for_yearly_plans_chart' do
+      it 'properly formats the data ' do
         expects(:default_chart_prep).with(data: nil)
         prep_data_for_yearly_plans_chart(data: nil)
       end
     end
 
-    describe "#prep_data_for_template_plans_chart" do
+    describe '#prep_data_for_template_plans_chart' do
       # chart.js expects the following JSON format for the plans by template
       # chart (referred to as stacked on the chart.js site):
       #
@@ -37,15 +37,15 @@
       #     }
       #   ]
       # }
-      it "returns an empty hash if no data was available" do
+      it 'returns an empty hash if no data was available' do
         expected = {
-          "labels": [Date.today.last_month.end_of_month.strftime("%b-%y")],
-          "datasets": []
+          labels: [Date.today.last_month.end_of_month.strftime('%b-%y')],
+          datasets: []
         }
         expect(prep_data_for_template_plans_chart(data: nil)).to eql(expected.to_json)
       end
 
-      context "with data" do
+      context 'with data' do
         before(:each) do
           @template1 = { name: Faker::Lorem.unique.word, count: Faker::Number.number(digits: 1) }
           @template2 = { name: Faker::Lorem.unique.word, count: Faker::Number.number(digits: 1) }
@@ -55,45 +55,45 @@
           # Mock some Stat records
           @data = [
             build(:stat_created_plan, date: @last_month,
-                                      details: { "by_template": [@template1] }).to_json,
+                                      details: { by_template: [@template1] }).to_json,
             build(:stat_created_plan, date: @two_months,
-                                      details: { "by_template": [@template2] }).to_json
+                                      details: { by_template: [@template2] }).to_json
           ]
 
           @json = JSON.parse(prep_data_for_template_plans_chart(data: @data))
-          @first = @json["datasets"].first
-          @second = @json["datasets"].last
+          @first = @json['datasets'].first
+          @second = @json['datasets'].last
         end
 
-        it "sorts the results by date descending" do
+        it 'sorts the results by date descending' do
           expected = [
             prep_date_for_charts(date: @last_month),
             prep_date_for_charts(date: @two_months)
           ]
-          expect(@json["labels"]).to eql(expected)
+          expect(@json['labels']).to eql(expected)
         end
 
-        it "properly organizes the data for template 1" do
-          expect(@first["label"]).to eql(@template1[:name])
-          expect(@first["backgroundColor"].starts_with?("rgb")).to eql(true)
-          @first["data"].each do |hash|
-            case hash["y"]
+        it 'properly organizes the data for template 1' do
+          expect(@first['label']).to eql(@template1[:name])
+          expect(@first['backgroundColor'].starts_with?('rgb')).to eql(true)
+          @first['data'].each do |hash|
+            case hash['y']
             when prep_date_for_charts(date: @last_month)
-              expect(hash["x"]).to eql(@template1[:count])
+              expect(hash['x']).to eql(@template1[:count])
             else
-              expect(hash["x"]).to eql(0)
+              expect(hash['x']).to eql(0)
             end
           end
         end
-        it "properly organizes the data for template 2" do
-          expect(@second["label"]).to eql(@template2[:name])
-          expect(@second["backgroundColor"].starts_with?("rgb")).to eql(true)
-          @second["data"].each do |hash|
-            case hash["y"]
+        it 'properly organizes the data for template 2' do
+          expect(@second['label']).to eql(@template2[:name])
+          expect(@second['backgroundColor'].starts_with?('rgb')).to eql(true)
+          @second['data'].each do |hash|
+            case hash['y']
             when prep_date_for_charts(date: @two_months)
-              expect(hash["x"]).to eql(@template2[:count])
+              expect(hash['x']).to eql(@template2[:count])
             else
-              expect(hash["x"]).to eql(0)
+              expect(hash['x']).to eql(0)
             end
           end
         end
@@ -101,7 +101,7 @@
     end
   end
 
-  describe "#plans_per_template_ranges" do
+  describe '#plans_per_template_ranges' do
     [1, 3, 6, 9, 12].each do |months|
       it "returns an option for #{months} ago" do
         date = Date.today.months_ago(months).end_of_month
@@ -110,34 +110,34 @@
     end
   end
 
-  describe "#default_chart_prep" do
+  describe '#default_chart_prep' do
     # chart.js expects the following JSON format for a standard bar chart:
     #
     # {
     #   "Dec-19": 3,
     #   "Oct-19": 1
     # }
-    it "converts a StatCreatedPlan" do
-      data = build(:stat_created_plan, details: { "by_template": [] })
+    it 'converts a StatCreatedPlan' do
+      data = build(:stat_created_plan, details: { by_template: [] })
       expected = { "#{prep_date_for_charts(date: data.date)}": data.count }.to_json
       expect(default_chart_prep(data: [data.to_json])).to eql(JSON.parse(expected))
     end
-    it "converts a StatJoinedUser" do
+    it 'converts a StatJoinedUser' do
       data = build(:stat_joined_user)
       expected = { "#{prep_date_for_charts(date: data.date)}": data.count }.to_json
       expect(default_chart_prep(data: [data.to_json])).to eql(JSON.parse(expected))
     end
   end
 
-  describe "#prep_date_for_charts" do
-    it "converts the date" do
+  describe '#prep_date_for_charts' do
+    it 'converts the date' do
       rslt = prep_date_for_charts(date: Date.today.to_s)
-      expect(rslt).to eql(Date.today.strftime("%b-%y"))
+      expect(rslt).to eql(Date.today.strftime('%b-%y'))
     end
   end
 
-  describe "#random_rgb" do
-    it "returns a random RGB value" do
+  describe '#random_rgb' do
+    it 'returns a random RGB value' do
       rgb_regex = /^rgb\((\d{1,3}),(\d{1,3}),(\d{1,3})\)$/
       expect(random_rgb =~ rgb_regex).to eql(0)
     end
diff --git a/spec/mixins/versionable_model.rb b/spec/mixins/versionable_model.rb
index b7489378db..66c6ce883f 100644
--- a/spec/mixins/versionable_model.rb
+++ b/spec/mixins/versionable_model.rb
@@ -1,28 +1,24 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
-UUID_REGEX ||= /\A[\w\d]{8}(-[\w\d]{4}){3}-[\w\d]{12}\Z/i.freeze
-
-shared_examples_for "VersionableModel" do
-
-  context "attributes" do
+UUID_REGEX = /\A[\w\d]{8}(-[\w\d]{4}){3}-[\w\d]{12}\Z/i.freeze
 
+shared_examples_for 'VersionableModel' do
+  context 'attributes' do
     it { is_expected.to have_readonly_attribute(:versionable_id) }
-
   end
 
-  context "#versionable_id" do
-
+  context '#versionable_id' do
     before do
       subject.valid?
     end
 
-    it "is set on validation" do
+    it 'is set on validation' do
       expect(subject.versionable_id).to be_present
     end
 
-    it "is set to a random UUID" do
+    it 'is set to a random UUID' do
       expect(subject.versionable_id).to match(UUID_REGEX)
     end
 
@@ -30,7 +26,5 @@
       subject.versionable_id = SecureRandom.uuid
       expect { subject.valid? }.not_to change { subject.versionable_id }
     end
-
   end
-
 end
diff --git a/spec/models/annotation_spec.rb b/spec/models/annotation_spec.rb
index 0f9c11d210..7dcb82741d 100644
--- a/spec/models/annotation_spec.rb
+++ b/spec/models/annotation_spec.rb
@@ -1,13 +1,11 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Annotation, type: :model do
+  it_behaves_like 'VersionableModel'
 
-  it_behaves_like "VersionableModel"
-
-  context "validations" do
-
+  context 'validations' do
     subject { build(:annotation) }
 
     it { is_expected.to validate_presence_of(:text) }
@@ -17,63 +15,53 @@
     it { is_expected.to validate_presence_of(:question) }
 
     it { is_expected.to validate_presence_of(:type) }
-
   end
 
-  describe "#to_s" do
-
+  describe '#to_s' do
     let!(:annotation) { build(:annotation) }
 
     subject { annotation.to_s }
 
     it { is_expected.to eql(annotation.text) }
-
   end
 
-  describe "#deep_copy" do
-
-    context "when question_id option is nil" do
-
+  describe '#deep_copy' do
+    context 'when question_id option is nil' do
       before do
         @annotation = create(:annotation)
         @new_annotation = @annotation.deep_copy
       end
 
-      it "creates a different record" do
+      it 'creates a different record' do
         expect(@new_annotation).not_to eql(@annotation)
       end
 
-      it "copies the text attribute" do
+      it 'copies the text attribute' do
         expect(@new_annotation.text).to eql(@annotation.text)
       end
 
-      it "copies the type attribute" do
+      it 'copies the type attribute' do
         expect(@new_annotation.type).to eql(@annotation.type)
       end
 
-      it "copies the org_id attribute" do
+      it 'copies the org_id attribute' do
         expect(@new_annotation.org_id).to eql(@annotation.org_id)
       end
 
-      it "sets question_id to nil" do
+      it 'sets question_id to nil' do
         expect(@new_annotation.question_id).to be_nil
       end
-
     end
 
-    context "when question_id option is set" do
-
+    context 'when question_id option is set' do
       before do
         @annotation = create(:annotation)
         @new_annotation = @annotation.deep_copy(question_id: 1)
       end
 
-      it "sets question_id to nil" do
+      it 'sets question_id to nil' do
         expect(@new_annotation.question_id).to eql(1)
       end
-
     end
-
   end
-
 end
diff --git a/spec/models/answer_spec.rb b/spec/models/answer_spec.rb
index 6548a381e9..17050840cd 100644
--- a/spec/models/answer_spec.rb
+++ b/spec/models/answer_spec.rb
@@ -1,10 +1,9 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Answer, type: :model do
-
-  context "validations" do
+  context 'validations' do
     subject { build(:answer) }
 
     it { is_expected.to validate_presence_of(:plan) }
@@ -16,132 +15,108 @@
     it {
       is_expected.to validate_uniqueness_of(:question)
         .scoped_to(:plan_id)
-        .with_message("must be unique")
+        .with_message('must be unique')
     }
   end
 
-  describe ".deep_copy" do
-
+  describe '.deep_copy' do
     let!(:answer) { build(:answer) }
 
     subject { Answer.deep_copy(answer) }
 
-    it "creates a new record" do
+    it 'creates a new record' do
       expect(subject).not_to eql(answer)
     end
 
-    it "copies the lock_version attribute" do
+    it 'copies the lock_version attribute' do
       expect(subject.lock_version).to eql(answer.lock_version)
     end
 
-    it "copies the text attribute" do
+    it 'copies the text attribute' do
       expect(subject.text).to eql(answer.text)
     end
 
-    it "copies the plan_id attribute" do
+    it 'copies the plan_id attribute' do
       expect(subject.plan_id).to eql(answer.plan_id)
     end
 
-    it "copies the question_id attribute" do
+    it 'copies the question_id attribute' do
       expect(subject.question_id).to eql(answer.question_id)
     end
 
-    it "copies the user_id attribute" do
+    it 'copies the user_id attribute' do
       expect(subject.user_id).to eql(answer.user_id)
     end
   end
 
-  describe "#options_selected?" do
-
+  describe '#options_selected?' do
     let!(:answer) { create(:answer) }
 
     let!(:question_option) { create(:question_option) }
 
     subject { answer.options_selected?(question_option.id) }
 
-    context "when answer has QuestionOption" do
-
+    context 'when answer has QuestionOption' do
       before do
         answer.question_options << question_option
       end
 
       it { is_expected.to eql(true) }
-
     end
 
     context "when answer doesn't have QuestionOption" do
-
       it { is_expected.to eql(false) }
-
     end
-
   end
 
-  describe "#answered?" do
-
+  describe '#answered?' do
     subject { answer.answered? }
 
-    describe "text based answer" do
-
-      context "when text is nil" do
-
+    describe 'text based answer' do
+      context 'when text is nil' do
         let!(:answer) { build(:answer, text: nil) }
 
         it { is_expected.to eql(false) }
-
       end
 
       context "when text is ''" do
-
-        let!(:answer) { build(:answer, text: "") }
+        let!(:answer) { build(:answer, text: '') }
 
         it { is_expected.to eql(false) }
-
       end
 
-      context "when text is plain text" do
-
-        let!(:answer) { build(:answer, text: "Foo bar") }
+      context 'when text is plain text' do
+        let!(:answer) { build(:answer, text: 'Foo bar') }
 
         it { is_expected.to eql(true) }
-
       end
 
-      context "when text is empty html" do
-
-        let!(:answer) { build(:answer, text: "<p><br/></p>") }
+      context 'when text is empty html' do
+        let!(:answer) { build(:answer, text: '<p><br/></p>') }
 
         it { is_expected.to eql(false) }
-
       end
 
-      context "when text is html text" do
-
-        let!(:answer) { build(:answer, text: "<p>Foo bar</p>") }
+      context 'when text is html text' do
+        let!(:answer) { build(:answer, text: '<p>Foo bar</p>') }
 
         it { is_expected.to eql(true) }
-
       end
-
     end
 
-    describe "option based question" do
-
+    describe 'option based question' do
       let!(:answer) { create(:answer) }
 
-      context "question present, question format is option and options empty" do
-
+      context 'question present, question format is option and options empty' do
         before do
           answer.question.update(question_format:
                                    create(:question_format, option_based: true))
         end
 
         it { is_expected.to eql(false) }
-
       end
 
-      context "question present, question format is option and options present" do
-
+      context 'question present, question format is option and options present' do
         before do
           answer.question.update(question_format:
                                    create(:question_format, option_based: true))
@@ -150,51 +125,41 @@
         end
 
         it { is_expected.to eql(true) }
-
       end
 
-      context "question present, question format not option and text empty" do
-
+      context 'question present, question format not option and text empty' do
         before do
           answer.question.update(question_format:
                                    create(:question_format, option_based: false))
 
-          answer.text = ""
+          answer.text = ''
         end
 
         it { is_expected.to eql(false) }
-
       end
 
-      context "question present, question format not option and text present" do
-
+      context 'question present, question format not option and text present' do
         before do
           answer.question.update(question_format:
                                    create(:question_format, option_based: false))
 
-          answer.text = "This is an answer"
+          answer.text = 'This is an answer'
         end
 
         it { is_expected.to eql(true) }
-
       end
 
-      context "question absent" do
-
+      context 'question absent' do
         before do
           answer.update(question: nil)
         end
 
         it { is_expected.to eql(false) }
-
       end
-
     end
-
   end
 
-  describe "#non_archived_notes" do
-
+  describe '#non_archived_notes' do
     before do
       @answer         = create(:answer)
       @notes          = create_list(:note, 3, answer: @answer, archived: false)
@@ -204,117 +169,97 @@
 
     subject { @answer.non_archived_notes }
 
-    it "includes the non-archived notes" do
+    it 'includes the non-archived notes' do
       @notes.each do |note|
         expect(subject).to include(note)
       end
     end
 
-    it "excludes the archived notes" do
+    it 'excludes the archived notes' do
       @archived_notes.each do |note|
         expect(subject).not_to include(note)
       end
     end
 
-    it "excludes notes belonging to other Answers" do
+    it 'excludes notes belonging to other Answers' do
       @other_notes.each do |note|
         expect(subject).not_to include(note)
       end
     end
-
   end
 
-  describe "#answer_hash" do
-
+  describe '#answer_hash' do
     let!(:answer) { build(:answer) }
 
-    let(:default_json) { { "standards" => {}, "text" => "" } }
+    let(:default_json) { { 'standards' => {}, 'text' => '' } }
 
     subject { answer.answer_hash }
 
-    context "when text is nil" do
-
+    context 'when text is nil' do
       before do
         answer.text = nil
       end
 
       it { is_expected.to eql(default_json) }
-
     end
 
-    context "when text is blank" do
-
+    context 'when text is blank' do
       before do
-        answer.text = ""
+        answer.text = ''
       end
 
       it { is_expected.to eql(default_json) }
-
     end
 
-    context "when text is valid JSON" do
-
+    context 'when text is valid JSON' do
       before do
-        answer.text = { name: "foo", bar: "baz" }.to_json
+        answer.text = { name: 'foo', bar: 'baz' }.to_json
       end
 
-      it { is_expected.to eql({ "name" => "foo", "bar" => "baz" }) }
-
+      it { is_expected.to eql({ 'name' => 'foo', 'bar' => 'baz' }) }
     end
 
-    context "when text is HTML" do
-
+    context 'when text is HTML' do
       before do
-        answer.text = "<p>foo bar</p>"
+        answer.text = '<p>foo bar</p>'
       end
 
       it { is_expected.to eql(default_json) }
-
     end
-
   end
 
-  describe "#update_answer_hash" do
-
+  describe '#update_answer_hash' do
     let!(:answer) { build(:answer) }
 
     subject { answer.answer_hash }
 
-    context "when standards parameter is present" do
-
+    context 'when standards parameter is present' do
       before do
-        answer.update_answer_hash({ foo: "bar" })
+        answer.update_answer_hash({ foo: 'bar' })
       end
 
-      it { is_expected.to eql({ "standards" => { "foo" => "bar" }, "text" => "" }) }
-
+      it { is_expected.to eql({ 'standards' => { 'foo' => 'bar' }, 'text' => '' }) }
     end
 
-    context "when both params are absent" do
-
+    context 'when both params are absent' do
       before do
         answer.update_answer_hash
       end
 
-      it { is_expected.to eql({ "standards" => {}, "text" => "" }) }
-
+      it { is_expected.to eql({ 'standards' => {}, 'text' => '' }) }
     end
 
-    context "when both params are present" do
-
+    context 'when both params are present' do
       before do
-        answer.update_answer_hash({ foo: "bar" }, "baz")
+        answer.update_answer_hash({ foo: 'bar' }, 'baz')
       end
 
       it {
         is_expected.to eql({
-                             "standards" => { "foo" => "bar" },
-                             "text" => "baz"
+                             'standards' => { 'foo' => 'bar' },
+                             'text' => 'baz'
                            })
       }
-
     end
-
   end
-
 end
diff --git a/spec/models/api_client_spec.rb b/spec/models/api_client_spec.rb
index 68fe7089f2..a2e5ad7404 100644
--- a/spec/models/api_client_spec.rb
+++ b/spec/models/api_client_spec.rb
@@ -1,11 +1,9 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe ApiClient, type: :model do
-
-  context "validations" do
-
+  context 'validations' do
     it { is_expected.to validate_presence_of(:name) }
     it { is_expected.to validate_presence_of(:contact_email) }
 
@@ -17,54 +15,51 @@
       subject.client_secret = Faker::Lorem.word
       is_expected.to validate_uniqueness_of(:name)
         .case_insensitive
-        .with_message("must be unique")
+        .with_message('must be unique')
     }
 
     # Email format validation
     it {
-      is_expected.to allow_values("one@example.com", "foo-bar@ed.ac.uk")
+      is_expected.to allow_values('one@example.com', 'foo-bar@ed.ac.uk')
         .for(:contact_email)
     }
     it {
-      is_expected.not_to allow_values("example.com", "foo bar@ed.ac.uk")
+      is_expected.not_to allow_values('example.com', 'foo bar@ed.ac.uk')
         .for(:contact_email)
     }
-
   end
 
-  context "Associations" do
+  context 'Associations' do
     it { is_expected.to belong_to(:org).optional }
   end
 
-  context "Instance Methods" do
+  context 'Instance Methods' do
     before(:each) do
       @client = build(:api_client)
     end
 
-    describe "#to_s" do
-      it "should return the name" do
+    describe '#to_s' do
+      it 'should return the name' do
         expect(@client.to_s).to eql(@client.name)
       end
 
-      it "should return the name through interpolation" do
+      it 'should return the name through interpolation' do
         expect(@client.to_s).to eql(@client.name)
       end
     end
 
-    describe "#authenticate" do
-      it "returns false if no secret is specified" do
+    describe '#authenticate' do
+      it 'returns false if no secret is specified' do
         expect(@client.authenticate(secret: nil)).to eql(false)
       end
 
-      it "returns false if the secrets do not match" do
+      it 'returns false if the secrets do not match' do
         expect(@client.authenticate(secret: SecureRandom.uuid)).to eql(false)
       end
 
-      it "returns true if the secrets match" do
+      it 'returns true if the secrets match' do
         expect(@client.authenticate(secret: @client.client_secret)).to eql(true)
       end
     end
-
   end
-
 end
diff --git a/spec/models/concerns/date_rangeable_spec.rb b/spec/models/concerns/date_rangeable_spec.rb
index 9059b06ce9..8bb995bd60 100644
--- a/spec/models/concerns/date_rangeable_spec.rb
+++ b/spec/models/concerns/date_rangeable_spec.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe DateRangeable do
-
   # Using the Plan model for testing this Concern
   before(:each) do
     @plans_in_range = [
@@ -15,49 +14,46 @@
     @plan_after = create(:plan, created_at: Date.today, updated_at: Date.today)
   end
 
-  context "class methods" do
-
-    describe "#date_range?(term:)" do
+  context 'class methods' do
+    describe '#date_range?(term:)' do
       it "returns true the 'Oct 2019' format" do
-        expect(Plan.date_range?(term: "Jan 19")).to eql(true)
-        expect(Plan.date_range?(term: "Jan 2019")).to eql(true)
-        expect(Plan.date_range?(term: "January 2019")).to eql(true)
-        expect(Plan.date_range?(term: Date.today.strftime("%b %Y"))).to eql(true)
+        expect(Plan.date_range?(term: 'Jan 19')).to eql(true)
+        expect(Plan.date_range?(term: 'Jan 2019')).to eql(true)
+        expect(Plan.date_range?(term: 'January 2019')).to eql(true)
+        expect(Plan.date_range?(term: Date.today.strftime('%b %Y'))).to eql(true)
       end
-      it "returns false for others" do
-        expect(Plan.date_range?(term: "01 19")).to eql(false)
-        expect(Plan.date_range?(term: "01 2019")).to eql(false)
-        expect(Plan.date_range?(term: "1st Jan 2019")).to eql(false)
-        expect(Plan.date_range?(term: "01-01-2019")).to eql(false)
-        expect(Plan.date_range?(term: "01/01/2019")).to eql(false)
-        expect(Plan.date_range?(term: "2019-01-01")).to eql(false)
-        expect(Plan.date_range?(term: "2019-01-01 00:00:01")).to eql(false)
+      it 'returns false for others' do
+        expect(Plan.date_range?(term: '01 19')).to eql(false)
+        expect(Plan.date_range?(term: '01 2019')).to eql(false)
+        expect(Plan.date_range?(term: '1st Jan 2019')).to eql(false)
+        expect(Plan.date_range?(term: '01-01-2019')).to eql(false)
+        expect(Plan.date_range?(term: '01/01/2019')).to eql(false)
+        expect(Plan.date_range?(term: '2019-01-01')).to eql(false)
+        expect(Plan.date_range?(term: '2019-01-01 00:00:01')).to eql(false)
       end
     end
 
-    describe "#by_date_range(field, term)" do
+    describe '#by_date_range(field, term)' do
       before(:each) do
-        @term = (Date.today - 31.days).strftime("%b %Y")
+        @term = (Date.today - 31.days).strftime('%b %Y')
       end
 
-      it "searches by the specified field" do
+      it 'searches by the specified field' do
         expect(Plan.by_date_range(:created_at, @term).length).to eql(2)
         expect(Plan.by_date_range(:updated_at, @term).length).to eql(2)
       end
-      it "returns the expected records" do
+      it 'returns the expected records' do
         results = Plan.by_date_range(:created_at, @term)
         results.each { |r| expect(@plans_in_range.include?(r)).to eql(true) }
       end
-      it "does not return records from a prior month" do
+      it 'does not return records from a prior month' do
         results = Plan.by_date_range(:created_at, @term)
         expect(results.include?(@plan_prior)).to eql(false)
       end
-      it "does not return records from a later month" do
+      it 'does not return records from a later month' do
         results = Plan.by_date_range(:created_at, @term)
         expect(results.include?(@plan_after)).to eql(false)
       end
     end
-
   end
-
 end
diff --git a/spec/models/concerns/identifiable_spec.rb b/spec/models/concerns/identifiable_spec.rb
index 60869bcdbf..bf9e37321b 100644
--- a/spec/models/concerns/identifiable_spec.rb
+++ b/spec/models/concerns/identifiable_spec.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Identifiable do
-
   # Using the Org model for testing this Concern
   before(:each) do
     @org = create(:org)
@@ -13,32 +12,31 @@
     @id2 = create(:identifier, identifier_scheme: @scheme2, identifiable: @org)
   end
 
-  context "class methods" do
-
-    describe "#from_identifiers(array:)" do
-      it "returns nil if array is not present" do
+  context 'class methods' do
+    describe '#from_identifiers(array:)' do
+      it 'returns nil if array is not present' do
         expect(Org.from_identifiers(array: nil)).to eql(nil)
       end
-      it "returns nil if array is empty" do
+      it 'returns nil if array is empty' do
         expect(Org.from_identifiers(array: [])).to eql(nil)
       end
-      it "returns nil if the identifier scheme does not exist" do
+      it 'returns nil if the identifier scheme does not exist' do
         array = [{ name: SecureRandom.uuid, value: Faker::Lorem.word }]
         expect(Org.from_identifiers(array: array)).to eql(nil)
       end
-      it "returns nil if no matches were found" do
+      it 'returns nil if no matches were found' do
         array = [{ name: @scheme1.name, value: SecureRandom.uuid }]
         expect(Org.from_identifiers(array: array)).to eql(nil)
       end
-      it "returns the identifiable object" do
+      it 'returns the identifiable object' do
         array = [{ name: @scheme1.name, value: @id1.value }]
         expect(Org.from_identifiers(array: array)).to eql(@org)
       end
-      it "does not return matching identifiable from another object" do
+      it 'does not return matching identifiable from another object' do
         array = [{ name: @scheme1.name, value: @id1.value }]
         expect(User.from_identifiers(array: array)).to eql(nil)
       end
-      it "returns the first identifiable object if multiple matches" do
+      it 'returns the first identifiable object if multiple matches' do
         array = [
           { name: @scheme2.name, value: @id2.value },
           { name: @scheme1.name, value: @id1.value }
@@ -46,54 +44,50 @@
         expect(Org.from_identifiers(array: array)).to eql(@org)
       end
     end
-
   end
 
-  context "instance methods" do
-
-    describe "#identifier_for_scheme(scheme:)" do
-      it "returns nil if no identifier was found" do
+  context 'instance methods' do
+    describe '#identifier_for_scheme(scheme:)' do
+      it 'returns nil if no identifier was found' do
         scheme3 = create(:identifier_scheme)
         expect(@org.identifier_for_scheme(scheme: scheme3)).to eql(nil)
       end
-      it "returns nil if identifier scheme does not exist" do
+      it 'returns nil if identifier scheme does not exist' do
         expect(@org.identifier_for_scheme(scheme: SecureRandom.uuid)).to eql(nil)
       end
-      it "returns the identifier if passed the scheme name" do
+      it 'returns the identifier if passed the scheme name' do
         expect(@org.identifier_for_scheme(scheme: @scheme1.name)).to eql(@id1)
       end
-      it "returns the identifier if passed the identifier scheme" do
+      it 'returns the identifier if passed the identifier scheme' do
         expect(@org.identifier_for_scheme(scheme: @scheme1)).to eql(@id1)
       end
     end
 
-    describe "#consolidate_identifiers!(array:)" do
-      it "returns the existing identifiers if array is not present" do
+    describe '#consolidate_identifiers!(array:)' do
+      it 'returns the existing identifiers if array is not present' do
         expect(@org.consolidate_identifiers!(array: nil)).to eql(false)
       end
-      it "returns the existing identifiers if array is empty" do
+      it 'returns the existing identifiers if array is empty' do
         expect(@org.consolidate_identifiers!(array: [])).to eql(false)
       end
-      it "ignores items in array if they are not identifiers" do
+      it 'ignores items in array if they are not identifiers' do
         array = [build(:org)]
         original = @org.identifiers
         @org.consolidate_identifiers!(array: array)
         expect(@org.identifiers).to eql(original)
       end
-      it "does not replace an existing identifier" do
-        array = [build(:identifier, identifier_scheme: @scheme1, value: "Foo")]
+      it 'does not replace an existing identifier' do
+        array = [build(:identifier, identifier_scheme: @scheme1, value: 'Foo')]
         @org.consolidate_identifiers!(array: array)
         expect(@org.identifier_for_scheme(scheme: @scheme1).value).to eql(@id1.value)
       end
-      it "adds the new identifier" do
+      it 'adds the new identifier' do
         scheme3 = create(:identifier_scheme)
-        array = [build(:identifier, identifier_scheme: scheme3, value: "Foo")]
+        array = [build(:identifier, identifier_scheme: scheme3, value: 'Foo')]
         @org.consolidate_identifiers!(array: array)
         expected = @org.identifier_for_scheme(scheme: scheme3).value
-        expect(expected.ends_with?("Foo")).to eql(true)
+        expect(expected.ends_with?('Foo')).to eql(true)
       end
     end
-
   end
-
 end
diff --git a/spec/models/condition_spec.rb b/spec/models/condition_spec.rb
index 5a4e0d2f0c..f5b8d10d45 100644
--- a/spec/models/condition_spec.rb
+++ b/spec/models/condition_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Condition, type: :model do
   pending "add some examples to (or delete) #{__FILE__}"
diff --git a/spec/models/contributor_spec.rb b/spec/models/contributor_spec.rb
index 0b70b3c46f..440fd34ecb 100644
--- a/spec/models/contributor_spec.rb
+++ b/spec/models/contributor_spec.rb
@@ -1,75 +1,72 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Contributor, type: :model do
-
-  context "validations" do
-
+  context 'validations' do
     it { is_expected.to validate_presence_of(:roles) }
 
-    it "should validate that roles is greater than zero" do
+    it 'should validate that roles is greater than zero' do
       subject.name = Faker::Books::Dune.character
       subject.email = Faker::Internet.email
       is_expected.to validate_numericality_of(:roles)
-        .with_message("You must specify at least one role.")
+        .with_message('You must specify at least one role.')
     end
 
-    describe "#name_or_email_presence" do
+    describe '#name_or_email_presence' do
       before(:each) do
         @contributor = build(:contributor, plan: create(:plan), investigation: true)
       end
 
-      it "is invalid if both the name and email are blank" do
+      it 'is invalid if both the name and email are blank' do
         @contributor.name = nil
         @contributor.email = nil
         expect(@contributor.valid?).to eql(false)
         expect(@contributor.errors[:name].present?).to eql(true)
         expect(@contributor.errors[:email].present?).to eql(true)
       end
-      it "is valid if a name is present" do
+      it 'is valid if a name is present' do
         @contributor.email = nil
         expect(@contributor.valid?).to eql(true)
       end
-      it "is valid if an email is present" do
+      it 'is valid if an email is present' do
         @contributor.name = nil
         expect(@contributor.valid?).to eql(true)
       end
     end
-
   end
 
-  context "associations" do
+  context 'associations' do
     it { is_expected.to belong_to(:org).optional }
     it { is_expected.to belong_to(:plan).optional }
     it { is_expected.to have_many(:identifiers) }
   end
 
-  describe "==(other)" do
+  describe '==(other)' do
     before(:each) do
       @contributor = build(:contributor)
     end
 
-    it "returns false if :other is not a Contributor" do
+    it 'returns false if :other is not a Contributor' do
       expect(@contributor == build(:org)).to eql(false)
     end
     it "returns false if the associated Plan's do not match" do
       expect(@contributor == create(:contributor, plan: create(:plan))).to eql(false)
     end
-    it "returns false if the email or ORCID or name do not match" do
+    it 'returns false if the email or ORCID or name do not match' do
       contributor = build(:contributor)
       expect(@contributor == contributor).to eql(false)
     end
-    it "returns true on an email match" do
+    it 'returns true on an email match' do
       contributor = build(:contributor, email: @contributor.email)
       expect(@contributor == contributor).to eql(true)
     end
-    it "returns true on a name match" do
+    it 'returns true on a name match' do
       contributor = build(:contributor, name: @contributor.name)
       expect(@contributor == contributor).to eql(true)
     end
-    it "returns true on an ORCID match" do
-      scheme = create(:identifier_scheme, name: "orcid")
+    it 'returns true on an ORCID match' do
+      scheme = create(:identifier_scheme, name: 'orcid')
       orcid = build(:identifier, identifier_scheme: scheme)
       @contributor.identifiers << orcid
       contributor = build(:contributor, identifiers: [orcid])
@@ -77,9 +74,9 @@
     end
   end
 
-  describe "merge(other)" do
+  describe 'merge(other)' do
     before(:each) do
-      @scheme = create(:identifier_scheme, name: "orcid")
+      @scheme = create(:identifier_scheme, name: 'orcid')
       @contributor = build(:contributor, org: build(:org), investigation: true)
       @contributor.identifiers << build(:identifier, identifier_scheme: @scheme)
 
@@ -87,7 +84,7 @@
       @new_contributor.identifiers << build(:identifier, identifier_scheme: @scheme)
     end
 
-    it "retains the existing values" do
+    it 'retains the existing values' do
       original = @contributor.clone
       @contributor = @contributor.merge(@new_contributor)
       expect(@contributor.org).to eql(original.org)
@@ -100,43 +97,42 @@
       expect(@contributor.identifiers.length).to eql(original.identifiers.length)
       expect(@contributor.identifiers.first.value).to eql(original.identifiers.first.value)
     end
-    it "appends the :org" do
+    it 'appends the :org' do
       @contributor.org = nil
       expect(@contributor.merge(@new_contributor).org).to eql(@new_contributor.org)
     end
-    it "appends the :email" do
+    it 'appends the :email' do
       @contributor.email = nil
       expect(@contributor.merge(@new_contributor).email).to eql(@new_contributor.email)
     end
-    it "appends the :name" do
+    it 'appends the :name' do
       @contributor.name = nil
       expect(@contributor.merge(@new_contributor).name).to eql(@new_contributor.name)
     end
-    it "appends the :phone" do
+    it 'appends the :phone' do
       @contributor.phone = nil
       expect(@contributor.merge(@new_contributor).phone).to eql(@new_contributor.phone)
     end
-    it "appends the identifiers" do
+    it 'appends the identifiers' do
       @contributor.identifiers = [build(:identifier, identifier_scheme: nil)]
       results = @contributor.merge(@new_contributor).identifiers
       expect(results.length).to eql(2)
       expect(results.include?(@new_contributor.identifiers.first)).to eql(true)
     end
-    it "appends the :investigation role" do
+    it 'appends the :investigation role' do
       @contributor.investigation = false
       @new_contributor.investigation = true
       expect(@contributor.merge(@new_contributor).investigation?).to eql(true)
     end
-    it "appends the :data_curation role" do
+    it 'appends the :data_curation role' do
       @contributor.data_curation = false
       @new_contributor.data_curation = true
       expect(@contributor.merge(@new_contributor).data_curation?).to eql(true)
     end
-    it "appends the :project_administration role" do
+    it 'appends the :project_administration role' do
       @contributor.project_administration = false
       @new_contributor.project_administration = true
       expect(@contributor.merge(@new_contributor).project_administration?).to eql(true)
     end
   end
-
 end
diff --git a/spec/models/department_spec.rb b/spec/models/department_spec.rb
index 334251fcb8..9d79776f5a 100644
--- a/spec/models/department_spec.rb
+++ b/spec/models/department_spec.rb
@@ -1,32 +1,27 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Department, type: :model do
-
-  context "validations" do
-
+  context 'validations' do
     it { is_expected.to validate_presence_of(:org) }
 
     it { is_expected.to validate_presence_of(:name) }
 
     it { is_expected.to allow_value(nil).for(:code) }
 
-    it "validates uniqueness of name" do
+    it 'validates uniqueness of name' do
       org = create(:org)
       subject = create(:department, org_id: org.id)
       expect(subject).to validate_uniqueness_of(:name)
         .scoped_to(:org_id)
-        .with_message("must be unique")
+        .with_message('must be unique')
     end
-
   end
 
-  context "associations" do
-
+  context 'associations' do
     it { is_expected.to belong_to :org }
 
     it { is_expected.to have_many :users }
-
   end
 end
diff --git a/spec/models/exported_plan_spec.rb b/spec/models/exported_plan_spec.rb
index 6c7dd8e5b0..b1dcbdcdd7 100644
--- a/spec/models/exported_plan_spec.rb
+++ b/spec/models/exported_plan_spec.rb
@@ -1,10 +1,9 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Org, type: :model do
-
-  context "instance methods" do
+  context 'instance methods' do
     before(:each) do
       plan = create(:plan)
       @owner = create(:user)
@@ -12,23 +11,20 @@
       @exported = build(:exported_plan, plan: plan)
     end
 
-    describe "#orcid" do
-      it "returns an empty string if the owner is nil" do
+    describe '#orcid' do
+      it 'returns an empty string if the owner is nil' do
         @exported.user = nil
-        expect(@exported.orcid).to eql("")
+        expect(@exported.orcid).to eql('')
       end
-      it "returns an empty string if the owner has no ORCID identifier" do
-
-        expect(@exported.orcid).to eql("")
+      it 'returns an empty string if the owner has no ORCID identifier' do
+        expect(@exported.orcid).to eql('')
       end
-      it "returns the ORCID identifier" do
-        scheme = build(:identifier_scheme, name: "orcid")
+      it 'returns the ORCID identifier' do
+        scheme = build(:identifier_scheme, name: 'orcid')
         identifier = build(:identifier, :for_user, identifier_scheme: scheme)
         @exported.owner.identifiers << identifier
         expect(@exported.orcid).to eql(identifier.value)
       end
     end
-
   end
-
 end
diff --git a/spec/models/guidance_group_spec.rb b/spec/models/guidance_group_spec.rb
index 2d2dbde30a..9e6912080d 100644
--- a/spec/models/guidance_group_spec.rb
+++ b/spec/models/guidance_group_spec.rb
@@ -1,11 +1,9 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe GuidanceGroup, type: :model do
-
-  context "validations" do
-
+  context 'validations' do
     it { is_expected.to validate_presence_of(:name) }
 
     it { is_expected.to validate_presence_of(:org) }
@@ -17,35 +15,28 @@
     it { is_expected.to allow_value(false).for(:optional_subset) }
 
     it { is_expected.to allow_value(false).for(:published) }
-
   end
 
-  context "associations" do
-
+  context 'associations' do
     it { is_expected.to belong_to :org }
 
     it { is_expected.to have_many :guidances }
-
   end
 
-  describe ".can_view?" do
-
+  describe '.can_view?' do
     let!(:user) { create(:user) }
 
     let!(:guidance_group) { create(:guidance_group) }
 
     subject { GuidanceGroup.can_view?(user, guidance_group) }
 
-    context "when owned by an Org which the user is a member" do
-
+    context 'when owned by an Org which the user is a member' do
       let!(:guidance_group) { create(:guidance_group, org: user.org) }
 
       it { is_expected.to eql(true) }
-
     end
 
-    context "when owned by a curation center" do
-
+    context 'when owned by a curation center' do
       let!(:org) do
         create(:org,
                abbreviation: Rails.configuration.x.organisation.abbreviation)
@@ -54,78 +45,63 @@
       let!(:guidance_group) { create(:guidance_group, org: org) }
 
       it { is_expected.to eql(true) }
-
     end
 
-    context "when owned by a institution org" do
-
+    context 'when owned by a institution org' do
       let!(:guidance_group) do
         create(:guidance_group, org: create(:org, :institution))
       end
 
       it { is_expected.to eql(false) }
-
     end
 
-    context "when owned by a funder org" do
-
+    context 'when owned by a funder org' do
       let!(:guidance_group) do
         create(:guidance_group, org: create(:org, :funder))
       end
 
       it { is_expected.to eql(true) }
-
     end
 
-    context "when owned by a organisation org" do
-
+    context 'when owned by a organisation org' do
       let!(:guidance_group) do
         create(:guidance_group, org: create(:org, :organisation))
       end
 
       it { is_expected.to eql(false) }
-
     end
 
-    context "when owned by a research_institute org" do
-
+    context 'when owned by a research_institute org' do
       let!(:guidance_group) do
         create(:guidance_group, org: create(:org, :research_institute))
       end
 
       it { is_expected.to eql(false) }
-
     end
 
-    context "when owned by a project org" do
-
+    context 'when owned by a project org' do
       let!(:guidance_group) do
         create(:guidance_group, org: create(:org, :project))
       end
 
       it { is_expected.to eql(false) }
-
     end
 
-    context "when owned by a school org" do
-
+    context 'when owned by a school org' do
       let!(:guidance_group) do
         create(:guidance_group, org: create(:org, :school))
       end
 
       it { is_expected.to eql(false) }
-
     end
   end
 
-  describe ".all_viewable" do
-
+  describe '.all_viewable' do
     let!(:user) { create(:user) }
 
     subject { GuidanceGroup.all_viewable(user) }
 
-    context "when is owned by managing curation center" do
-
+    context 'when is owned by managing curation center' do
       let!(:org) do
         create(:org,
                abbreviation: Rails.configuration.x.organisation.abbreviation)
@@ -133,85 +109,72 @@
 
       let!(:guidance_group) { create(:guidance_group, org: org) }
 
-      it "includes guidance group" do
+      it 'includes guidance group' do
         expect(subject).to include(guidance_group)
       end
-
     end
 
-    context "when is owned by institution Org" do
-
+    context 'when is owned by institution Org' do
       let!(:org) { create(:org, :institution) }
 
       let!(:guidance_group) { create(:guidance_group, org: org) }
 
-      it "excludes guidance group" do
+      it 'excludes guidance group' do
         expect(subject).not_to include(guidance_group)
       end
-
     end
 
-    context "when is owned by funder Org" do
-
+    context 'when is owned by funder Org' do
       let!(:org) { create(:org, :funder) }
 
       let!(:guidance_group) { create(:guidance_group, org: org) }
 
-      it "includes guidance group" do
+      it 'includes guidance group' do
         expect(subject).to include(guidance_group)
       end
-
     end
 
-    context "when is owned by organisation Org" do
-
+    context 'when is owned by organisation Org' do
       let!(:org) { create(:org, :organisation) }
 
       let!(:guidance_group) { create(:guidance_group, org: org) }
 
-      it "excludes guidance group" do
+      it 'excludes guidance group' do
         expect(subject).not_to include(guidance_group)
       end
-
     end
 
-    context "when is owned by research_institute Org" do
-
+    context 'when is owned by research_institute Org' do
       let!(:org) { create(:org, :research_institute) }
 
       let!(:guidance_group) { create(:guidance_group, org: org) }
 
-      it "excludes guidance group" do
+      it 'excludes guidance group' do
         expect(subject).not_to include(guidance_group)
       end
-
     end
 
-    context "when is owned by project Org" do
-
+    context 'when is owned by project Org' do
       let!(:org) { create(:org, :project) }
 
       let!(:guidance_group) { create(:guidance_group, org: org) }
 
-      it "excludes guidance group" do
+      it 'excludes guidance group' do
         expect(subject).not_to include(guidance_group)
       end
-
     end
 
-    context "when is owned by school Org" do
-
+    context 'when is owned by school Org' do
       let!(:org) { create(:org, :school) }
 
       let!(:guidance_group) { create(:guidance_group, org: org) }
 
-      it "excludes guidance group" do
+      it 'excludes guidance group' do
         expect(subject).not_to include(guidance_group)
       end
-
     end
 
-    context ":merge!(to_be_merged:)" do
+    context ':merge!(to_be_merged:)' do
       before(:each) do
         org = create(:org)
         @guidance_group = create(:guidance_group, org: org)
@@ -219,11 +182,11 @@
                                                 guidances: [create(:guidance)])
       end
 
-      it "returns false if to_be_merged is not a GuidanceGroup" do
+      it 'returns false if to_be_merged is not a GuidanceGroup' do
         result = @guidance_group.merge!(to_be_merged: build(:user))
         expect(result).to eql(@guidance_group)
       end
-      it "occurs inside a transaction" do
+      it 'occurs inside a transaction' do
         GuidanceGroup.any_instance.stubs(:save).returns(false)
         result = @guidance_group.merge!(to_be_merged: @to_be_merged)
         expect(result).to eql(nil)
@@ -232,23 +195,22 @@
         expect(@to_be_merged.reload.new_record?).to eql(false)
         expect(@to_be_merged.guidances.length).not_to eql(0)
       end
-      it "merges associated :plans" do
+      it 'merges associated :plans' do
         expected = @guidance_group.plans.length + @to_be_merged.plans.length
         @guidance_group.merge!(to_be_merged: @to_be_merged)
         expect(@guidance_group.plans.length).to eql(expected)
       end
-      it "merges associated :guidances" do
+      it 'merges associated :guidances' do
         expected = @guidance_group.guidances.length + @to_be_merged.guidances.length
         @guidance_group.merge!(to_be_merged: @to_be_merged)
         expect(@guidance_group.guidances.length).to eql(expected)
       end
-      it "removes the :to_be_merged GuidanceGroup" do
+      it 'removes the :to_be_merged GuidanceGroup' do
         original_id = @to_be_merged.id
         expect(@guidance_group.merge!(to_be_merged: @to_be_merged)).to eql(@guidance_group)
         expect(Guidance.where(guidance_group_id: original_id).any?).to eql(false)
         expect(GuidanceGroup.find_by(id: original_id).present?).to eql(false)
       end
     end
-
   end
 end
diff --git a/spec/models/guidance_spec.rb b/spec/models/guidance_spec.rb
index e089494db1..47fe08668c 100644
--- a/spec/models/guidance_spec.rb
+++ b/spec/models/guidance_spec.rb
@@ -1,66 +1,54 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Guidance, type: :model do
-
-  context "validations" do
-
+  context 'validations' do
     it { is_expected.to validate_presence_of(:text) }
 
     it { is_expected.to validate_presence_of(:guidance_group) }
 
-    context "if published" do
-
+    context 'if published' do
       before { subject.expects(:published?).returns(true) }
       it { is_expected.to validate_presence_of(:themes) }
-
     end
 
     it { is_expected.to allow_value(true).for(:published) }
 
     it { is_expected.to allow_value(false).for(:published) }
-
   end
 
-  context "associations" do
-
+  context 'associations' do
     it { is_expected.to belong_to :guidance_group }
 
     it do
       is_expected.to have_and_belong_to_many(:themes)
-        .join_table("themes_in_guidance")
+        .join_table('themes_in_guidance')
     end
   end
 
-  describe ".can_view?" do
-
+  describe '.can_view?' do
     let!(:user) { create(:user) }
 
     subject { Guidance.can_view?(user, @guidance.id) }
 
-    context "when guidance_id is invalid" do
-
+    context 'when guidance_id is invalid' do
       before do
         @guidance = Guidance.new(guidance_group: create(:guidance_group))
       end
 
       it { is_expected.to eql(false) }
-
     end
 
     context "when guidance's group is nil" do
-
       before do
         @guidance = Guidance.new
       end
 
       it { is_expected.to eql(false) }
-
     end
 
-    context "when owned by a curation center" do
-
+    context 'when owned by a curation center' do
       before do
         @org = create(:org,
                       abbreviation: Rails.configuration.x.organisation.abbreviation)
@@ -69,11 +57,9 @@
       end
 
       it { is_expected.to eql(true) }
-
     end
 
-    context "when owned by a institution org" do
-
+    context 'when owned by a institution org' do
       before do
         @org            = create(:org, :institution)
         @guidance_group = create(:guidance_group, org: @org)
@@ -81,11 +67,9 @@
       end
 
       it { is_expected.to eql(false) }
-
     end
 
-    context "when owned by a funder org" do
-
+    context 'when owned by a funder org' do
       before do
         @org            = create(:org, :funder)
         @guidance_group = create(:guidance_group, org: @org)
@@ -93,11 +77,9 @@
       end
 
       it { is_expected.to eql(true) }
-
     end
 
-    context "when owned by a organisation org" do
-
+    context 'when owned by a organisation org' do
       before do
         @org            = create(:org, :organisation)
         @guidance_group = create(:guidance_group, org: @org)
@@ -105,11 +87,9 @@
       end
 
       it { is_expected.to eql(false) }
-
     end
 
-    context "when owned by a research_institute org" do
-
+    context 'when owned by a research_institute org' do
       before do
         @org            = create(:org, :research_institute)
         @guidance_group = create(:guidance_group, org: @org)
@@ -117,11 +97,9 @@
       end
 
       it { is_expected.to eql(false) }
-
     end
 
-    context "when owned by a project org" do
-
+    context 'when owned by a project org' do
       before do
         @org            = create(:org, :project)
         @guidance_group = create(:guidance_group, org: @org)
@@ -129,11 +107,9 @@
       end
 
       it { is_expected.to eql(false) }
-
     end
 
-    context "when owned by a school org" do
-
+    context 'when owned by a school org' do
       before do
         @org            = create(:org, :school)
         @guidance_group = create(:guidance_group, org: @org)
@@ -141,11 +117,9 @@
       end
 
       it { is_expected.to eql(false) }
-
     end
 
-    context "when owned by an Org which the user is a member" do
-
+    context 'when owned by an Org which the user is a member' do
       before do
         @org            = user.org
         @guidance_group = create(:guidance_group, org: @org)
@@ -153,19 +127,15 @@
       end
 
       it { is_expected.to eql(true) }
-
     end
-
   end
 
-  describe ".all_viewable" do
-
+  describe '.all_viewable' do
     let!(:user) { create(:user) }
 
     subject { Guidance.all_viewable(user) }
 
-    context "when is owned by managing curation center" do
-
+    context 'when is owned by managing curation center' do
       before do
         @org = create(:org,
                       abbreviation: Rails.configuration.x.organisation.abbreviation)
@@ -173,144 +143,121 @@
         @guidance       = create(:guidance, guidance_group: @guidance_group)
       end
 
-      it "includes guidance" do
+      it 'includes guidance' do
         expect(subject).to include(@guidance)
       end
-
     end
 
-    context "when is owned by institution Org" do
-
+    context 'when is owned by institution Org' do
       before do
         @org = create(:org, :institution)
         @guidance_group = create(:guidance_group, org: @org)
         @guidance       = create(:guidance, guidance_group: @guidance_group)
       end
 
-      it "excludes guidance" do
+      it 'excludes guidance' do
         expect(subject).not_to include(@guidance)
       end
-
     end
 
-    context "when is owned by funder Org" do
-
+    context 'when is owned by funder Org' do
       before do
         @org = create(:org, :funder)
         @guidance_group = create(:guidance_group, org: @org)
         @guidance       = create(:guidance, guidance_group: @guidance_group)
       end
 
-      it "includes guidance" do
+      it 'includes guidance' do
         expect(subject).to include(@guidance)
       end
-
     end
 
-    context "when is owned by organisation Org" do
-
+    context 'when is owned by organisation Org' do
       before do
         @org = create(:org, :organisation)
         @guidance_group = create(:guidance_group, org: @org)
         @guidance       = create(:guidance, guidance_group: @guidance_group)
       end
 
-      it "excludes guidance" do
+      it 'excludes guidance' do
         expect(subject).not_to include(@guidance)
       end
-
     end
 
-    context "when is owned by research_institute Org" do
-
+    context 'when is owned by research_institute Org' do
       before do
         @org = create(:org, :research_institute)
         @guidance_group = create(:guidance_group, org: @org)
         @guidance       = create(:guidance, guidance_group: @guidance_group)
       end
 
-      it "excludes guidance" do
+      it 'excludes guidance' do
         expect(subject).not_to include(@guidance)
       end
-
     end
 
-    context "when is owned by project Org" do
-
+    context 'when is owned by project Org' do
       before do
         @org = create(:org, :project)
         @guidance_group = create(:guidance_group, org: @org)
         @guidance       = create(:guidance, guidance_group: @guidance_group)
       end
 
-      it "excludes guidance" do
+      it 'excludes guidance' do
         expect(subject).not_to include(@guidance)
       end
-
     end
 
-    context "when is owned by school Org" do
-
+    context 'when is owned by school Org' do
       before do
         @org = create(:org, :school)
         @guidance_group = create(:guidance_group, org: @org)
         @guidance       = create(:guidance, guidance_group: @guidance_group)
       end
 
-      it "excludes guidance" do
+      it 'excludes guidance' do
         expect(subject).not_to include(@guidance)
       end
-
     end
 
     context "when is owned by User's Org'" do
-
       before do
         @org = user.org
         @guidance_group = create(:guidance_group, org: @org)
         @guidance       = create(:guidance, guidance_group: @guidance_group)
       end
 
-      it "includes guidance" do
+      it 'includes guidance' do
         expect(subject).to include(@guidance)
       end
-
     end
   end
 
-  describe "#in_group_belonging_to?" do
-
+  describe '#in_group_belonging_to?' do
     let!(:org) { create(:org) }
 
     subject { guidance.in_group_belonging_to?(org.id) }
 
-    context "when guidance_group is nil" do
-
+    context 'when guidance_group is nil' do
       let!(:guidance) { Guidance.new }
 
       it { is_expected.to eql(false) }
-
     end
 
-    context "when guidance group belongs to given Org" do
-
+    context 'when guidance group belongs to given Org' do
       let!(:guidance_group) { create(:guidance_group, org: org) }
 
       let!(:guidance) { create(:guidance, guidance_group: guidance_group) }
 
       it { is_expected.to eql(true) }
-
     end
 
     context "when guidance group doesn't belong to given Org" do
-
       let!(:guidance_group) { create(:guidance_group) }
 
       let!(:guidance) { create(:guidance, guidance_group: guidance_group) }
 
       it { is_expected.to eql(false) }
-
     end
   end
-
 end
diff --git a/spec/models/identifier_scheme_spec.rb b/spec/models/identifier_scheme_spec.rb
index 579beb043b..c16a17a6e9 100644
--- a/spec/models/identifier_scheme_spec.rb
+++ b/spec/models/identifier_scheme_spec.rb
@@ -1,78 +1,75 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe IdentifierScheme, type: :model do
-
-  context "validations" do
+  context 'validations' do
     it { is_expected.to validate_presence_of(:name) }
 
     it { is_expected.to validate_length_of(:name).is_at_most(30) }
 
-    it { is_expected.to allow_value("foo").for(:name) }
+    it { is_expected.to allow_value('foo').for(:name) }
 
-    it { is_expected.not_to allow_value("012").for(:name) }
+    it { is_expected.not_to allow_value('012').for(:name) }
 
     it { is_expected.to_not allow_value(nil).for(:name) }
   end
 
-  context "associations" do
+  context 'associations' do
     it { is_expected.to have_many :identifiers }
   end
 
-  context "scopes" do
+  context 'scopes' do
     before(:each) do
       @scheme = create(:identifier_scheme, for_users: true, active: true)
     end
 
-    describe "#active" do
-      it "returns active identifier schemes" do
+    describe '#active' do
+      it 'returns active identifier schemes' do
         expect(described_class.active.first).to eql(@scheme)
       end
-      it "does not return inactive identifier schemes" do
+      it 'does not return inactive identifier schemes' do
         @scheme.update(active: false)
         expect(described_class.active.first).to eql(nil)
       end
     end
 
-    describe "#by_name scope" do
-      it "is case insensitive" do
+    describe '#by_name scope' do
+      it 'is case insensitive' do
         rslt = described_class.by_name(@scheme.name.upcase).first
         expect(rslt).to eql(@scheme)
       end
 
-      it "returns the IdentifierScheme" do
+      it 'returns the IdentifierScheme' do
         rslt = described_class.by_name(@scheme.name).first
         expect(rslt).to eql(@scheme)
       end
 
-      it "returns empty ActiveRecord results if nothing is found" do
+      it 'returns empty ActiveRecord results if nothing is found' do
         rslts = described_class.by_name(Faker::Lorem.sentence)
         expect(rslts.empty?).to eql(true)
       end
     end
   end
 
-  context "instance methods" do
+  context 'instance methods' do
     before(:each) do
       @scheme = build(:identifier_scheme)
     end
 
-    describe "#name=(value)" do
-      it "allows single word names" do
-        @scheme.name = "foo"
-        expect(@scheme.name).to eql("foo")
+    describe '#name=(value)' do
+      it 'allows single word names' do
+        @scheme.name = 'foo'
+        expect(@scheme.name).to eql('foo')
       end
-      it "removes no alpha characters" do
-        @scheme.name = " foo bar- "
-        expect(@scheme.name).to eql("foobar")
+      it 'removes no alpha characters' do
+        @scheme.name = ' foo bar- '
+        expect(@scheme.name).to eql('foobar')
       end
-      it "sets everything to lower case" do
-        @scheme.name = "FoO"
-        expect(@scheme.name).to eql("foo")
+      it 'sets everything to lower case' do
+        @scheme.name = 'FoO'
+        expect(@scheme.name).to eql('foo')
       end
     end
-
   end
-
 end
diff --git a/spec/models/identifier_spec.rb b/spec/models/identifier_spec.rb
index 18e00e2fcf..ed6f26a516 100644
--- a/spec/models/identifier_spec.rb
+++ b/spec/models/identifier_spec.rb
@@ -1,37 +1,36 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Identifier, type: :model do
-
-  context "validations" do
+  context 'validations' do
     it { is_expected.to validate_presence_of(:value) }
 
     it { is_expected.to validate_presence_of(:identifiable) }
 
-    describe "uniqueness" do
+    describe 'uniqueness' do
       before(:each) do
         @org = create(:org)
       end
 
-      it "prevents duplicate value when identifier_scheme is nil" do
+      it 'prevents duplicate value when identifier_scheme is nil' do
         create(:identifier_scheme)
         create(:identifier, identifiable: @org, identifier_scheme: nil,
-                            value: "foo")
+                            value: 'foo')
         id = build(:identifier, identifiable: @org, identifier_scheme: nil,
-                                value: "foo")
+                                value: 'foo')
         expect(id.valid?).to eql(false)
         expect(id.errors[:value].present?).to eql(true)
       end
-      it "allows a duplicate value for the identifier_scheme" do
+      it 'allows a duplicate value for the identifier_scheme' do
         scheme = create(:identifier_scheme)
         create(:identifier, identifiable: @org, identifier_scheme: scheme,
-                            value: "foo")
+                            value: 'foo')
         id = build(:identifier, identifiable: create(:org),
-                                identifier_scheme: scheme, value: "foo")
+                                identifier_scheme: scheme, value: 'foo')
         expect(id.valid?).to eql(true)
       end
-      it "prevents multiple identifiers per identifier_scheme" do
+      it 'prevents multiple identifiers per identifier_scheme' do
         scheme = create(:identifier_scheme)
         create(:identifier, identifiable: @org, identifier_scheme: scheme,
                             value: Faker::Lorem.word)
@@ -40,14 +39,14 @@
         expect(id.valid?).to eql(false)
         expect(id.errors[:identifier_scheme].present?).to eql(true)
       end
-      it "does not apply if the value is unique and identifier_scheme is nil" do
+      it 'does not apply if the value is unique and identifier_scheme is nil' do
         create(:identifier, identifiable: @org, identifier_scheme: nil,
                             value: Faker::Lorem.word)
         id = build(:identifier, identifiable: @org, identifier_scheme: nil,
                                 value: Faker::Number.number.to_s)
         expect(id.valid?).to eql(true)
       end
-      it "does not prevent identifiers for same scheme but different identifiables" do
+      it 'does not prevent identifiers for same scheme but different identifiables' do
         scheme = create(:identifier_scheme)
         create(:identifier, identifiable: @org, identifier_scheme: scheme,
                             value: Faker::Lorem.word)
@@ -56,171 +55,170 @@
                                 value: Faker::Number.number.to_s)
         expect(id.valid?).to eql(true)
       end
-      it "does not prevent same value for different schemes and identifiables" do
+      it 'does not prevent same value for different schemes and identifiables' do
         scheme = create(:identifier_scheme)
         create(:identifier, identifiable: @org, identifier_scheme: scheme,
-                            value: "foo")
+                            value: 'foo')
         id = build(:identifier, identifiable: create(:org),
                                 identifier_scheme: create(:identifier_scheme),
-                                value: "foo")
+                                value: 'foo')
         expect(id.valid?).to eql(true)
       end
     end
   end
 
-  context "associations" do
+  context 'associations' do
     it { is_expected.to belong_to(:identifiable) }
 
     it { is_expected.to belong_to(:identifier_scheme).optional }
   end
 
-  context "scopes" do
-    describe "#by_scheme_name" do
+  context 'scopes' do
+    describe '#by_scheme_name' do
       before(:each) do
         @scheme = create(:identifier_scheme)
         @scheme2 = create(:identifier_scheme)
         @id = create(:identifier, :for_plan, identifier_scheme: @scheme)
         @id2 = create(:identifier, :for_plan, identifier_scheme: @scheme2)
 
-        @rslts = described_class.by_scheme_name(@scheme.name, "Plan")
+        @rslts = described_class.by_scheme_name(@scheme.name, 'Plan')
       end
 
-      it "returns the correct identifier" do
+      it 'returns the correct identifier' do
         expect(@rslts.include?(@id)).to eql(true)
       end
-      it "does not return the identifier for the other scheme" do
+      it 'does not return the identifier for the other scheme' do
         expect(@rslts.include?(@id2)).to eql(false)
       end
     end
   end
 
-  describe "#attrs=" do
+  describe '#attrs=' do
     let!(:identifier) { create(:identifier) }
 
-    it "when hash is a Hash sets attrs to a String of JSON" do
-      identifier.attrs = { foo: "bar" }
-      expect(identifier.attrs).to eql({ "foo": "bar" }.to_json)
+    it 'when hash is a Hash sets attrs to a String of JSON' do
+      identifier.attrs = { foo: 'bar' }
+      expect(identifier.attrs).to eql({ foo: 'bar' }.to_json)
     end
 
-    it "when hash is nil sets attrs to empty JSON object" do
+    it 'when hash is nil sets attrs to empty JSON object' do
       identifier.attrs = nil
       expect(identifier.attrs).to eql({}.to_json)
     end
 
-    it "when hash is a String sets attrs to empty JSON object" do
-      identifier.attrs = ""
+    it 'when hash is a String sets attrs to empty JSON object' do
+      identifier.attrs = ''
       expect(identifier.attrs).to eql({}.to_json)
     end
   end
 
-  describe "#identifier_format" do
+  describe '#identifier_format' do
     it "returns 'orcid' for identifiers associated with the orcid identifier_scheme" do
-      scheme = build(:identifier_scheme, name: "orcid")
+      scheme = build(:identifier_scheme, name: 'orcid')
       id = build(:identifier, identifier_scheme: scheme)
-      expect(id.identifier_format).to eql("orcid")
+      expect(id.identifier_format).to eql('orcid')
     end
     it "returns 'ror' for identifiers associated with the ror identifier_scheme" do
-      scheme = build(:identifier_scheme, name: "ror")
+      scheme = build(:identifier_scheme, name: 'ror')
       id = build(:identifier, identifier_scheme: scheme)
-      expect(id.identifier_format).to eql("ror")
+      expect(id.identifier_format).to eql('ror')
     end
     it "returns 'fundref' for identifiers associated with the fundref identifier_scheme" do
-      scheme = build(:identifier_scheme, name: "fundref")
+      scheme = build(:identifier_scheme, name: 'fundref')
       id = build(:identifier, identifier_scheme: scheme)
-      expect(id.identifier_format).to eql("fundref")
+      expect(id.identifier_format).to eql('fundref')
     end
     it "returns 'ark' for identifiers whose value contains 'ark:'" do
-      scheme = build(:identifier_scheme, name: "ror")
+      scheme = build(:identifier_scheme, name: 'ror')
       val = "#{scheme.identifier_prefix}ark:#{Faker::Lorem.word}"
       id = create(:identifier, value: val)
-      expect(id.identifier_format).to eql("ark")
+      expect(id.identifier_format).to eql('ark')
     end
     it "returns 'doi' for identifiers whose value matches the doi format" do
-      scheme = build(:identifier_scheme, name: "ror")
+      scheme = build(:identifier_scheme, name: 'ror')
       val = "#{scheme.identifier_prefix}doi:10.1234/123abc98"
       id = create(:identifier, value: val)
-      expect(id.identifier_format).to eql("doi"), "expected url containing 'doi:' to be a doi"
+      expect(id.identifier_format).to eql('doi'), "expected url containing 'doi:' to be a doi"
 
       val = "#{scheme.identifier_prefix}10.1234/123abc98"
       id = create(:identifier, value: val)
-      expect(id.identifier_format).to eql("doi"), "expected url not containing 'doi:' to be a doi"
+      expect(id.identifier_format).to eql('doi'), "expected url not containing 'doi:' to be a doi"
     end
     it "returns 'url' for identifiers whose value matches a URL format" do
-      scheme = build(:identifier_scheme, name: "ror")
+      scheme = build(:identifier_scheme, name: 'ror')
       id = create(:identifier, value: "#{scheme.identifier_prefix}#{Faker::Lorem.word}")
-      expect(id.identifier_format).to eql("url")
+      expect(id.identifier_format).to eql('url')
 
       id = create(:identifier, value: "#{scheme.identifier_prefix}#{Faker::Lorem.word}")
-      expect(id.identifier_format).to eql("url")
+      expect(id.identifier_format).to eql('url')
     end
     it "returns 'other' for all other identifier values" do
       scheme = build(:identifier_scheme, identifier_prefix: nil)
       id = create(:identifier, value: Faker::Lorem.word, identifier_scheme: scheme)
-      expect(id.identifier_format).to eql("other"), "expected alpha characters to return 'other'"
+      expect(id.identifier_format).to eql('other'), "expected alpha characters to return 'other'"
 
       id = create(:identifier, value: Faker::Number.number, identifier_scheme: scheme)
-      expect(id.identifier_format).to eql("other"), "expected numeric characters to return 'other'"
+      expect(id.identifier_format).to eql('other'), "expected numeric characters to return 'other'"
 
       id = create(:identifier, value: SecureRandom.uuid, identifier_scheme: scheme)
-      expect(id.identifier_format).to eql("other"), "expected UUID to return 'other'"
+      expect(id.identifier_format).to eql('other'), "expected UUID to return 'other'"
     end
   end
 
-  describe "#value_without_scheme_prefix" do
+  describe '#value_without_scheme_prefix' do
     before(:each) do
       @scheme = create(:identifier_scheme, identifier_prefix: Faker::Internet.url)
       @without = Faker::Lorem.word
       @val = "#{@scheme.identifier_prefix}/#{@without}"
     end
 
-    it "returns the value as is if no identifier scheme is present" do
+    it 'returns the value as is if no identifier scheme is present' do
       id = create(:identifier, value: @val, identifier_scheme: nil)
       expect(id.value_without_scheme_prefix).to eql(@val)
     end
-    it "returns the value as is if no identifier scheme has no prefix" do
+    it 'returns the value as is if no identifier scheme has no prefix' do
       @scheme.identifier_prefix = nil
       id = create(:identifier, value: @val, identifier_scheme: @scheme)
       expect(id.value_without_scheme_prefix).to eql(@val)
     end
-    it "returns the value without the identifier scheme prefix" do
+    it 'returns the value without the identifier scheme prefix' do
       id = create(:identifier, value: @val, identifier_scheme: @scheme)
       expect(id.value_without_scheme_prefix).to eql(@without)
     end
   end
 
-  describe "#value=(val)" do
+  describe '#value=(val)' do
     before(:each) do
       @scheme = create(:identifier_scheme, identifier_prefix: Faker::Internet.url)
     end
 
-    it "returns the value if the identifier_scheme is not present" do
+    it 'returns the value if the identifier_scheme is not present' do
       val = Faker::Lorem.word
       id = build(:identifier, value: val, identifier_scheme: nil)
       expect(id.value).to eql(val)
     end
-    it "returns the value if the identifier_scheme has no prefix" do
+    it 'returns the value if the identifier_scheme has no prefix' do
       val = Faker::Lorem.word
       @scheme.identifier_prefix = nil
       id = build(:identifier, value: val, identifier_scheme: @scheme)
       expect(id.value).to eql(val)
     end
-    it "returns the value if the value is already a URL" do
+    it 'returns the value if the value is already a URL' do
       val = "#{@scheme.identifier_prefix}/#{Faker::Lorem.word}"
       id = build(:identifier, value: val, identifier_scheme: @scheme)
       expect(id.value).to eql(val)
     end
-    it "appends the identifier scheme prefix to the value" do
+    it 'appends the identifier scheme prefix to the value' do
       val = Faker::Lorem.word
       id = build(:identifier, value: val, identifier_scheme: @scheme)
       expected = @scheme.identifier_prefix
       expect(id.value.starts_with?(expected)).to eql(true)
     end
-    it "appends the identifier scheme prefix to the value even if its a URL" do
+    it 'appends the identifier scheme prefix to the value even if its a URL' do
       val = Faker::Internet.url
       id = build(:identifier, value: val, identifier_scheme: @scheme)
       expected = @scheme.identifier_prefix
       expect(id.value.starts_with?(expected)).to eql(true)
     end
   end
-
 end
diff --git a/spec/models/language_spec.rb b/spec/models/language_spec.rb
index d123221d96..c46a5e0cd4 100644
--- a/spec/models/language_spec.rb
+++ b/spec/models/language_spec.rb
@@ -1,16 +1,14 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Language, type: :model do
-
   before(:each) do
     # The default language is created in the locales support file
     Language.destroy_all
   end
 
-  context "validations" do
-
+  context 'validations' do
     subject { build(:language) }
 
     it { is_expected.to validate_presence_of(:name) }
@@ -19,131 +17,107 @@
 
     it { is_expected.to validate_presence_of(:abbreviation) }
 
-    it "is expected to validate uniquenss of abbreviation" do
+    it 'is expected to validate uniquenss of abbreviation' do
       @language = build(:language, abbreviation: create(:language).abbreviation)
       expect(@language).not_to be_valid
       expect(@language).to have(1).errors_on(:abbreviation)
     end
 
-    it { is_expected.to allow_values("en", "en-GB").for(:abbreviation) }
-
+    it { is_expected.to allow_values('en', 'en-GB').for(:abbreviation) }
   end
 
-  context "associations" do
-
+  context 'associations' do
     it { is_expected.to have_many :users }
 
     it { is_expected.to have_many :orgs }
-
   end
 
-  describe ".sorted_by_abbreviation" do
-
+  describe '.sorted_by_abbreviation' do
     before do
-      create(:language, abbreviation: "aa")
-      create(:language, abbreviation: "ab")
-      create(:language, abbreviation: "ac")
+      create(:language, abbreviation: 'aa')
+      create(:language, abbreviation: 'ab')
+      create(:language, abbreviation: 'ac')
     end
 
-    it "sorts Languages by abbreviation in alphabetical order" do
-      l1 = Language.find_by(abbreviation: "aa")
+    it 'sorts Languages by abbreviation in alphabetical order' do
+      l1 = Language.find_by(abbreviation: 'aa')
       expect(Language.sorted_by_abbreviation.first).to eql(l1)
 
-      l2 = Language.find_by(abbreviation: "ab")
+      l2 = Language.find_by(abbreviation: 'ab')
       expect(Language.sorted_by_abbreviation.second).to eql(l2)
 
-      l3 = Language.find_by(abbreviation: "ac")
+      l3 = Language.find_by(abbreviation: 'ac')
       expect(Language.sorted_by_abbreviation.third).to eql(l3)
     end
-
   end
 
-  describe ".default" do
-
+  describe '.default' do
     subject { Language.default }
 
-    context "when langauge is default_language" do
-
+    context 'when langauge is default_language' do
       let!(:language) { create(:language, default_language: true) }
 
       it { is_expected.to eql(language) }
-
     end
 
-    context "when language is not default_language" do
-
+    context 'when language is not default_language' do
       let!(:language) { create(:language, default_language: false) }
 
       it { is_expected.not_to eql(language) }
-
     end
-
   end
 
-  describe ".id_for" do
+  describe '.id_for' do
+    subject { Language.id_for('fu') }
 
-    subject { Language.id_for("fu") }
+    context 'when abbreviation is valid' do
+      let!(:language) { create(:language, abbreviation: 'fu') }
 
-    context "when abbreviation is valid" do
-
-      let!(:language) { create(:language, abbreviation: "fu") }
-
-      it "returns the id for language with that abbreviation" do
+      it 'returns the id for language with that abbreviation' do
         expect(subject).to eql(language.id)
       end
-
     end
 
-    context "when abbreviation is invalid" do
-
-      it "returns empty array" do
+    context 'when abbreviation is invalid' do
+      it 'returns empty array' do
         expect(subject).to be_empty
       end
-
     end
-
   end
 
-  describe "#abbreviation" do
-
-    context "when region is present" do
-
-      it "forces the hyphenated format" do
-        @language = Language.new(name: "Esperanto", abbreviation: "hh_XX")
+  describe '#abbreviation' do
+    context 'when region is present' do
+      it 'forces the hyphenated format' do
+        @language = Language.new(name: 'Esperanto', abbreviation: 'hh_XX')
         @language.valid?
-        expect(@language.abbreviation).to eql("hh-XX")
+        expect(@language.abbreviation).to eql('hh-XX')
       end
 
-      it "downcases the language component" do
-        @language = Language.new(name: "Esperanto", abbreviation: "HH_XX")
+      it 'downcases the language component' do
+        @language = Language.new(name: 'Esperanto', abbreviation: 'HH_XX')
         @language.valid?
-        expect(@language.abbreviation).to start_with("hh")
+        expect(@language.abbreviation).to start_with('hh')
       end
 
-      it "upcases the region" do
-        @language = Language.new(name: "Esperanto", abbreviation: "hh_xx")
+      it 'upcases the region' do
+        @language = Language.new(name: 'Esperanto', abbreviation: 'hh_xx')
         @language.valid?
-        expect(@language.abbreviation).to end_with("XX")
+        expect(@language.abbreviation).to end_with('XX')
       end
-
     end
 
-    context "when region is absent" do
-
-      it "downases the given value" do
-        @language = Language.new(name: "Esperanto", abbreviation: "HH")
+    context 'when region is absent' do
+      it 'downases the given value' do
+        @language = Language.new(name: 'Esperanto', abbreviation: 'HH')
         @language.valid?
-        expect(@language.abbreviation).to eql("hh")
+        expect(@language.abbreviation).to eql('hh')
       end
 
       it "doesn't change well-formatted values" do
-        @language = Language.new(name: "Esperanto", abbreviation: "hh")
+        @language = Language.new(name: 'Esperanto', abbreviation: 'hh')
         @language.valid?
-        expect(@language.abbreviation).to eql("hh")
+        expect(@language.abbreviation).to eql('hh')
       end
-
     end
-
   end
-
 end
diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb
index 7e71314c1e..a5e9dee05c 100644
--- a/spec/models/note_spec.rb
+++ b/spec/models/note_spec.rb
@@ -1,11 +1,9 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Note, type: :model do
-
-  context "validations" do
-
+  context 'validations' do
     it { is_expected.to validate_presence_of(:text) }
 
     it { is_expected.to validate_presence_of(:answer) }
@@ -15,15 +13,11 @@
     it { is_expected.to allow_values(true, false).for(:archived) }
 
     it { is_expected.not_to allow_value(nil).for(:archived) }
-
   end
 
-  context "associations" do
-
+  context 'associations' do
     it { is_expected.to belong_to :answer }
 
     it { is_expected.to belong_to :user }
-
   end
-
 end
diff --git a/spec/models/notification_spec.rb b/spec/models/notification_spec.rb
index 65c731419f..7db8c926ef 100644
--- a/spec/models/notification_spec.rb
+++ b/spec/models/notification_spec.rb
@@ -1,11 +1,9 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Notification, type: :model do
-
-  context "validations" do
-
+  context 'validations' do
     it { is_expected.to validate_presence_of(:notification_type) }
 
     it { is_expected.to validate_presence_of(:title) }
@@ -33,26 +31,21 @@
     it { is_expected.to allow_value(2.days.from_now).for(:expires_at) }
 
     it { is_expected.not_to allow_value(Date.today).for(:expires_at) }
-
   end
 
-  describe ".active" do
-
+  describe '.active' do
     subject { Notification.active }
 
-    context "when enabled and now is before starts_at" do
-
+    context 'when enabled and now is before starts_at' do
       let!(:notification) do
         create(:notification, starts_at: 1.week.from_now,
                               enabled: true)
       end
 
       it { is_expected.not_to include(notification) }
-
     end
 
-    context "when enabled and now lies between starts_at and expires_at" do
-
+    context 'when enabled and now lies between starts_at and expires_at' do
       let!(:notification) do
         record = build(:notification, starts_at: 1.day.ago,
                                       expires_at: 1.day.from_now,
@@ -62,21 +55,17 @@
       end
 
       it { is_expected.to include(notification) }
-
     end
 
-    context "when enabled and now is after expires_at" do
-
+    context 'when enabled and now is after expires_at' do
       let!(:notification) do
         create(:notification, starts_at: 1.week.from_now, enabled: true)
       end
 
       it { is_expected.not_to include(notification) }
-
     end
 
-    context "when disabled and now lies between starts_at and expires_at" do
-
+    context 'when disabled and now lies between starts_at and expires_at' do
       let!(:notification) do
         record = build(:notification, starts_at: 1.day.ago,
                                       expires_at: 1.day.from_now)
@@ -85,15 +74,11 @@
       end
 
       it { is_expected.not_to include(notification) }
-
     end
-
   end
 
-  describe ".active_per_user" do
-
-    context "when User is present and Notification is general" do
-
+  describe '.active_per_user' do
+    context 'when User is present and Notification is general' do
       let!(:notification) { create(:notification, :active) }
 
       let!(:user) { create(:user) }
@@ -101,11 +86,9 @@
       subject { Notification.active_per_user(user) }
 
       it { is_expected.to include(notification) }
-
     end
 
-    context "when User is present and Notification belongs to User" do
-
+    context 'when User is present and Notification belongs to User' do
       let!(:user) { create(:user) }
 
       let!(:notification) { create(:notification, :active) }
@@ -117,11 +100,9 @@
       subject { Notification.active_per_user(user) }
 
       it { is_expected.not_to include(notification) }
-
     end
 
-    context "when User is nil and Notification is dismissable" do
-
+    context 'when User is nil and Notification is dismissable' do
       let!(:user) { nil }
 
       let!(:notification) { create(:notification, :active, :dismissable) }
@@ -129,11 +110,9 @@
       subject { Notification.active_per_user(user) }
 
       it { is_expected.not_to include(notification) }
-
     end
 
-    context "when User is nil and Notification is not dismissable" do
-
+    context 'when User is nil and Notification is not dismissable' do
       let!(:user) { nil }
 
       let!(:notification) { create(:notification, :active) }
@@ -141,11 +120,9 @@
       subject { Notification.active_per_user(user) }
 
       it { is_expected.to include(notification) }
-
     end
 
-    context "when User is present and Notification is disabled" do
-
+    context 'when User is present and Notification is disabled' do
       let!(:notification) { create(:notification, :active, enabled: false) }
 
       let!(:user) { create(:user) }
@@ -153,11 +130,9 @@
       subject { Notification.active_per_user(user) }
 
       it { is_expected.not_to include(notification) }
-
     end
 
-    context "when User is nil and Notification is not dismissable or enabled" do
-
+    context 'when User is nil and Notification is not dismissable or enabled' do
       let!(:user) { nil }
 
       let!(:notification) { create(:notification) }
@@ -165,14 +140,11 @@
       subject { Notification.active_per_user(user) }
 
       it { is_expected.not_to include(notification) }
-
     end
   end
 
-  describe "#acknowledged?" do
-
-    context "when dismissable, user present, and already acknowledged" do
-
+  describe '#acknowledged?' do
+    context 'when dismissable, user present, and already acknowledged' do
       let!(:notification) { create(:notification, :dismissable) }
 
       let!(:user) { create(:user) }
@@ -184,11 +156,9 @@
       end
 
       it { is_expected.to eql(true) }
-
     end
 
-    context "when not dismissable, user present, and already acknowledged" do
-
+    context 'when not dismissable, user present, and already acknowledged' do
       let!(:notification) { create(:notification) }
 
       let!(:user) { create(:user) }
@@ -200,11 +170,9 @@
       end
 
       it { is_expected.to eql(false) }
-
     end
 
-    context "when dismissable, user absent" do
-
+    context 'when dismissable, user absent' do
       let!(:notification) { create(:notification, :dismissable) }
 
       let!(:user) { nil }
@@ -212,11 +180,9 @@
       subject { notification.acknowledged?(user) }
 
       it { is_expected.to eql(false) }
-
     end
 
-    context "when dismissable, user absent, and not already acknowledged" do
-
+    context 'when dismissable, user absent, and not already acknowledged' do
       let!(:notification) { create(:notification, :dismissable) }
 
       let!(:user) { nil }
@@ -224,11 +190,9 @@
       subject { notification.acknowledged?(user) }
 
       it { is_expected.to eql(false) }
-
     end
 
-    context "when not dismissable, user absent, and not already acknowledged" do
-
+    context 'when not dismissable, user absent, and not already acknowledged' do
       let!(:notification) { create(:notification) }
 
       let!(:user) { nil }
@@ -236,9 +200,6 @@
       subject { notification.acknowledged?(user) }
 
       it { is_expected.to eql(false) }
-
     end
-
   end
-
 end
diff --git a/spec/models/org_spec.rb b/spec/models/org_spec.rb
index f22eb20722..5e412f74d6 100644
--- a/spec/models/org_spec.rb
+++ b/spec/models/org_spec.rb
@@ -1,17 +1,15 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Org, type: :model do
-
-  context "validations" do
-
+  context 'validations' do
     it { is_expected.to validate_presence_of(:name) }
 
     it {
-      subject.name = "DMP Company"
+      subject.name = 'DMP Company'
       is_expected.to validate_uniqueness_of(:name)
-        .with_message("must be unique")
+        .with_message('must be unique')
     }
 
     it { is_expected.to validate_presence_of(:abbreviation) }
@@ -22,7 +20,7 @@
 
     it { is_expected.to allow_values(0, 1).for(:managed) }
 
-    it "validates presence of contact_email if feedback_enabled" do
+    it 'validates presence of contact_email if feedback_enabled' do
       subject.feedback_enabled = true
       is_expected.to validate_presence_of(:contact_email)
     end
@@ -42,8 +40,7 @@
     #
   end
 
-  context "associations" do
-
+  context 'associations' do
     it { should belong_to(:language) }
 
     it { should belong_to(:region).optional }
@@ -56,10 +53,7 @@
 
     it { should have_many(:annotations) }
 
-    # rubocop:disable Layout/LineLength
-    it { should have_and_belong_to_many(:token_permission_types).join_table("org_token_permissions") }
-    # rubocop:enable Layout/LineLength
-
+    it { should have_and_belong_to_many(:token_permission_types).join_table('org_token_permissions') }
     it { should have_many(:identifiers) }
 
     it { should have_many(:plans) }
@@ -67,45 +61,40 @@
     it { should have_many(:funded_plans) }
   end
 
-  context "scopes" do
+  context 'scopes' do
     before(:each) do
       @managed = create(:org, managed: true)
       @unmanaged = create(:org, managed: false)
     end
 
-    describe ".default_orgs" do
+    describe '.default_orgs' do
       subject { Org.default_orgs }
 
-      context "when Org has same abbr as dmproadmap.rb initializer setting" do
-
+      context 'when Org has same abbr as dmproadmap.rb initializer setting' do
         let!(:org) do
           abbrev = Rails.configuration.x.organisation.abbreviation
           create(:org, abbreviation: abbrev)
-
         end
 
         it { is_expected.to include(org) }
-
       end
 
       context "when Org doesn't have same abbr as dmproadmap.rb initializer setting" do
-
-        let!(:org) { create(:org, abbreviation: "foo-bar") }
+        let!(:org) { create(:org, abbreviation: 'foo-bar') }
 
         it { is_expected.not_to include(org) }
-
       end
     end
 
-    describe "#managed" do
-      it "returns only the managed orgs" do
+    describe '#managed' do
+      it 'returns only the managed orgs' do
         rslts = described_class.managed
         expect(rslts.include?(@managed)).to eql(true)
         expect(rslts.include?(@unmanaged)).to eql(false)
       end
     end
-    describe "#unmanaged" do
-      it "returns only the un-managed orgs" do
+    describe '#unmanaged' do
+      it 'returns only the un-managed orgs' do
         rslts = described_class.unmanaged
         expect(rslts.include?(@managed)).to eql(false)
         expect(rslts.include?(@unmanaged)).to eql(true)
@@ -113,263 +102,214 @@
     end
   end
 
-  describe "#locale" do
-
+  describe '#locale' do
     let!(:org) { build(:org) }
 
     subject { org.locale }
 
-    context "language present" do
-
+    context 'language present' do
       it { is_expected.to be_present }
-
     end
   end
 
-  describe "#org_type_to_s" do
-
+  describe '#org_type_to_s' do
     subject { org.org_type_to_s }
 
-    context "no organisation present" do
-
+    context 'no organisation present' do
       let!(:org) { build(:org) }
 
-      it { is_expected.to eql("None") }
-
+      it { is_expected.to eql('None') }
     end
 
-    context "organisation present" do
-
-      context "when single organisation type and organisation type is Institution" do
-
+    context 'organisation present' do
+      context 'when single organisation type and organisation type is Institution' do
         let!(:org) { build(:org, :institution) }
 
-        it { is_expected.to eql("Institution") }
-
+        it { is_expected.to eql('Institution') }
       end
 
-      context "when single organisation type and organisation type is Funder" do
-
+      context 'when single organisation type and organisation type is Funder' do
         let!(:org) { build(:org, :funder) }
 
-        it { is_expected.to eql("Funder") }
-
+        it { is_expected.to eql('Funder') }
       end
 
-      context "when single organisation type and organisation type is Organisation" do
-
+      context 'when single organisation type and organisation type is Organisation' do
         let!(:org) { build(:org, :organisation) }
 
-        it { is_expected.to eql("Organisation") }
-
+        it { is_expected.to eql('Organisation') }
       end
 
-      context "when single organisation type and organisation type is Research Institute" do
-
+      context 'when single organisation type and organisation type is Research Institute' do
         let!(:org) { build(:org, :research_institute) }
 
-        it { is_expected.to eql("Research Institute") }
-
+        it { is_expected.to eql('Research Institute') }
       end
 
-      context "when single organisation type and organisation type is Project" do
-
+      context 'when single organisation type and organisation type is Project' do
         let!(:org) { build(:org, :project) }
 
-        it { is_expected.to eql("Project") }
-
+        it { is_expected.to eql('Project') }
       end
 
-      context "when single organisation type and organisation type is School" do
-
+      context 'when single organisation type and organisation type is School' do
         let!(:org) { build(:org, :school) }
 
-        it { is_expected.to eql("School") }
-
+        it { is_expected.to eql('School') }
       end
 
-      context "when organisation has multiple organisation types" do
-
+      context 'when organisation has multiple organisation types' do
         let!(:org) { build(:org, :funder, :school) }
 
-        it { is_expected.to include("Funder", "School") }
-
+        it { is_expected.to include('Funder', 'School') }
       end
-
     end
   end
 
-  describe "#funder_only?" do
-
+  describe '#funder_only?' do
     let!(:org) { build(:org) }
 
     subject { org.funder_only? }
 
-    context "when organistation type is only Funder" do
-
+    context 'when organistation type is only Funder' do
       before do
         org.funder = true
       end
 
       it { is_expected.to be true }
-
     end
 
-    context "when multiple organistation types present" do
-
+    context 'when multiple organistation types present' do
       before do
         org.institution = true
         org.funder = true
       end
 
       it { is_expected.to be false }
-
     end
   end
 
-  describe "#to_s" do
+  describe '#to_s' do
     let!(:org) { build(:org) }
 
     subject { org.to_s }
 
     it { is_expected.to_not be_blank }
-
   end
 
-  describe "short_name" do
-
+  describe 'short_name' do
     let!(:org) { build(:org) }
 
     subject { org.short_name }
 
-    context "when abbreviation present" do
-
+    context 'when abbreviation present' do
       it { is_expected.to_not be_blank }
-
     end
 
-    context "when abbreviation absent" do
-
+    context 'when abbreviation absent' do
       before do
         org.abbreviation = nil
       end
 
       it { is_expected.to_not be_blank }
-
     end
   end
 
-  describe "#published_templates" do
-
+  describe '#published_templates' do
     let!(:org) { build(:org) }
 
     subject { org.published_templates }
 
-    context "when template is published" do
-
+    context 'when template is published' do
       before do
         @template = create(:template, published: true, org: org)
       end
 
       it { is_expected.to include(@template) }
-
     end
 
-    context "when template is not published" do
+    context 'when template is not published' do
       before do
         @template = create(:template, published: false, org: org)
       end
 
       it { is_expected.not_to include(@template) }
-
     end
   end
 
-  describe "#org_admins" do
-
+  describe '#org_admins' do
     let!(:org) { create(:org) }
     let!(:user) { create(:user, org: org) }
 
     subject { org.org_admins }
 
-    context "when user belongs to Org with perms absent" do
-
+    context 'when user belongs to Org with perms absent' do
       before do
         @perm = create(:perm)
         user.org = org
       end
 
       it { is_expected.to be_empty }
-
     end
 
-    context "when user belongs to Org with grant_permissions perm" do
-
+    context 'when user belongs to Org with grant_permissions perm' do
       before do
         @perm = build(:perm)
-        @perm.name = "grant_permissions"
+        @perm.name = 'grant_permissions'
         user.perms << @perm
       end
 
       it { is_expected.to_not be_empty }
     end
 
-    context "when user belongs to Org with modify_templates perm" do
-
+    context 'when user belongs to Org with modify_templates perm' do
       before do
         @perm = build(:perm)
-        @perm.name = "modify_templates"
+        @perm.name = 'modify_templates'
         user.perms << @perm
       end
 
       it { is_expected.to_not be_empty }
     end
 
-    context "when user belongs to Org with modify_guidance perm" do
-
+    context 'when user belongs to Org with modify_guidance perm' do
       before do
         @perm = build(:perm)
-        @perm.name = "modify_guidance"
+        @perm.name = 'modify_guidance'
         user.perms << @perm
       end
 
       it { is_expected.to_not be_empty }
     end
 
-    context "when user belongs to Org with change_org_details perm present " do
-
+    context 'when user belongs to Org with change_org_details perm present ' do
       before do
         @perm = build(:perm)
-        @perm.name = "change_org_details"
+        @perm.name = 'change_org_details'
         user.perms << @perm
       end
 
       it { is_expected.to_not be_empty }
-
     end
   end
 
-  describe "#plans" do
-
+  describe '#plans' do
     let!(:org) { create(:org) }
     let!(:plan) { create(:plan, org: org) }
     let!(:user) { create(:user, org: org) }
 
     subject { org.plans }
 
-    context "when user belongs to Org and plan owner with role :creator" do
-
+    context 'when user belongs to Org and plan owner with role :creator' do
       before do
         create(:role, :creator, user: user, plan: plan)
         plan.add_user!(user.id, :creator)
       end
 
       it { is_expected.to include(plan) }
-
     end
 
-    context "when user belongs to Org and plan user with role :administrator" do
-
+    context 'when user belongs to Org and plan user with role :administrator' do
       before do
         plan.add_user!(user.id, :administrator)
       end
@@ -377,63 +317,51 @@
       it {
         is_expected.to include(plan)
       }
-
     end
 
-    context "user belongs to Org and plan user with role :editor, but not :creator and :admin" do
-
+    context 'user belongs to Org and plan user with role :editor, but not :creator and :admin' do
       before do
         plan.add_user!(user.id, :editor)
       end
 
       it { is_expected.to include(plan) }
-
     end
 
-    context "user belongs to Org and plan user with role :commenter, but not :creator and :admin" do
-
+    context 'user belongs to Org and plan user with role :commenter, but not :creator and :admin' do
       before do
         plan.add_user!(user.id, :commenter)
       end
 
       it { is_expected.to include(plan) }
-
     end
 
-    context "user belongs to Org and plan user with role :reviewer, but not :creator and :admin" do
-
+    context 'user belongs to Org and plan user with role :reviewer, but not :creator and :admin' do
       before do
         plan.add_user!(user.id, :reviewer)
       end
 
       it { is_expected.to include(plan) }
-
     end
-
   end
 
-  describe "#org_admin_plans" do
-
+  describe '#org_admin_plans' do
     Rails.configuration.x.plans.org_admins_read_all = true
     let!(:org) { create(:org) }
-    let!(:plan) { create(:plan, org: org, visibility: "publicly_visible") }
+    let!(:plan) { create(:plan, org: org, visibility: 'publicly_visible') }
     let!(:user) { create(:user, org: org) }
 
     subject { org.org_admin_plans }
 
-    context "when user belongs to Org and plan owner with role :creator" do
-
+    context 'when user belongs to Org and plan owner with role :creator' do
       before do
         create(:role, :creator, user: user, plan: plan)
         plan.add_user!(user.id, :creator)
       end
 
       it { is_expected.to include(plan) }
-
     end
 
-    context "when user belongs to Org and plan user with role :administrator" do
-
+    context 'when user belongs to Org and plan user with role :administrator' do
       before do
         plan.add_user!(user.id, :administrator)
       end
@@ -441,115 +369,95 @@
       it {
         is_expected.to include(plan)
       }
-
     end
 
-    context "user belongs to Org and plan user with role :editor, but not :creator and :admin" do
-
+    context 'user belongs to Org and plan user with role :editor, but not :creator and :admin' do
       before do
         plan.add_user!(user.id, :editor)
       end
 
       it { is_expected.to include(plan) }
-
     end
 
-    context "user belongs to Org and plan user with role :commenter, but not :creator and :admin" do
-
+    context 'user belongs to Org and plan user with role :commenter, but not :creator and :admin' do
       before do
         plan.add_user!(user.id, :commenter)
       end
 
       it { is_expected.to include(plan) }
-
     end
 
-    context "user belongs to Org and plan user with role :reviewer, but not :creator and :admin" do
-
+    context 'user belongs to Org and plan user with role :reviewer, but not :creator and :admin' do
       before do
         plan.add_user!(user.id, :reviewer)
       end
 
       it { is_expected.to include(plan) }
-
     end
 
-    context "read_all is false, visibility private and user org_admin" do
-
+    context 'read_all is false, visibility private and user org_admin' do
       before do
         Rails.configuration.x.plans.org_admins_read_all = false
         @perm = build(:perm)
-        @perm.name = "grant_permissions"
+        @perm.name = 'grant_permissions'
         user.perms << @perm
         plan.privately_visible!
       end
 
       it { is_expected.not_to include(plan) }
-
     end
 
-    context "read_all is false, visibility public and user org_admin" do
-
+    context 'read_all is false, visibility public and user org_admin' do
       before do
         Rails.configuration.x.plans.org_admins_read_all = false
         @perm = build(:perm)
-        @perm.name = "grant_permissions"
+        @perm.name = 'grant_permissions'
         user.perms << @perm
         plan.publicly_visible!
       end
 
       it { is_expected.to include(plan) }
-
     end
-
   end
 
-  context "#grant_api!" do
-
+  context '#grant_api!' do
     let!(:org) { create(:org) }
     let(:token_permission_type) { create(:token_permission_type) }
 
     subject { org.grant_api!(token_permission_type) }
 
-    context "when :token_permission_type does not belong to token_permission_types" do
-
+    context 'when :token_permission_type does not belong to token_permission_types' do
       it { is_expected.to include(token_permission_type) }
-
     end
 
-    context "when :token_permission_type belongs to token_permission_types" do
-
+    context 'when :token_permission_type belongs to token_permission_types' do
       before do
-
         org.token_permission_types << token_permission_type
-
       end
 
       it {
         is_expected.to be nil
         expect(org.token_permission_types).to include(token_permission_type)
       }
-
     end
-
   end
 
-  describe "#links" do
-    it "returns the contents of the field" do
-      links = { "org": [{
-        "link": Faker::Internet.url,
-        "text": Faker::Lorem.word
+  describe '#links' do
+    it 'returns the contents of the field' do
+      links = { org: [{
+        link: Faker::Internet.url,
+        text: Faker::Lorem.word
       }] }
       org = build(:org, links: links)
       expect(org.links).to eql(JSON.parse(links.to_json))
     end
     it "defaults to {'org': }" do
       org = build(:org)
-      expect(org.links).to eql(JSON.parse({ "org": [] }.to_json))
+      expect(org.links).to eql(JSON.parse({ org: [] }.to_json))
     end
   end
 
-  context ":merge!(to_be_merged:)" do
+  context ':merge!(to_be_merged:)' do
     before(:each) do
       @scheme = create(:identifier_scheme)
       tpt = create(:token_permission_type)
@@ -570,11 +478,11 @@
       @to_be_merged.reload
     end
 
-    it "returns false if to_be_merged is not an Org" do
+    it 'returns false if to_be_merged is not an Org' do
       result = @org.merge!(to_be_merged: build(:user))
       expect(result).to eql(@org)
     end
-    it "occurs inside a transaction" do
+    it 'occurs inside a transaction' do
       Org.any_instance.stubs(:save).returns(false)
       result = @org.merge!(to_be_merged: @to_be_merged)
       expect(result).to eql(nil)
@@ -583,71 +491,71 @@
       expect(@to_be_merged.reload.new_record?).to eql(false)
       expect(@to_be_merged.annotations.length).not_to eql(0)
     end
-    it "merges attributes" do
+    it 'merges attributes' do
       original = @to_be_merged.dup
       org = @org.merge!(to_be_merged: @to_be_merged)
       expect(org.links).to eql(original.links)
     end
-    it "merges associated :annotations" do
+    it 'merges associated :annotations' do
       expected = @org.annotations.length + @to_be_merged.annotations.length
       @org.merge!(to_be_merged: @to_be_merged)
       expect(@org.annotations.length).to eql(expected)
     end
-    it "merges associated :departments" do
+    it 'merges associated :departments' do
       expected = @org.departments.length + @to_be_merged.departments.length
       @org.merge!(to_be_merged: @to_be_merged)
       expect(@org.departments.length).to eql(expected)
     end
-    it "merges associated :funded_plans" do
+    it 'merges associated :funded_plans' do
       expected = @org.funded_plans.length + @to_be_merged.funded_plans.length
       @org.merge!(to_be_merged: @to_be_merged)
       expect(@org.funded_plans.length).to eql(expected)
     end
-    it "merges associated :guidances" do
+    it 'merges associated :guidances' do
       expected = (@org.guidance_groups.first&.guidances&.length || 0) +
                  @to_be_merged.guidance_groups.first.guidances.length
       @org.merge!(to_be_merged: @to_be_merged)
       expect(@org.guidance_groups.first.guidances.length).to eql(expected)
     end
-    it "merges associated :identifiers" do
+    it 'merges associated :identifiers' do
       expected = @org.identifiers.length + @to_be_merged.identifiers.length
       @org.merge!(to_be_merged: @to_be_merged)
       expect(@org.identifiers.length).to eql(expected)
     end
-    it "merges associated :plans" do
+    it 'merges associated :plans' do
       expected = @org.plans.length + @to_be_merged.plans.length
       @org.merge!(to_be_merged: @to_be_merged)
       expect(@org.plans.length).to eql(expected)
     end
-    it "merges associated :templates" do
+    it 'merges associated :templates' do
       expected = @org.templates.length + @to_be_merged.templates.length
       @org.merge!(to_be_merged: @to_be_merged)
       expect(@org.templates.length).to eql(expected)
     end
-    it "merges associated :token_permission_types" do
+    it 'merges associated :token_permission_types' do
       expected = (@org.token_permission_types | @to_be_merged.token_permission_types).length
       @org.merge!(to_be_merged: @to_be_merged)
       expect(@org.token_permission_types.length).to eql(expected)
     end
-    it "merges associated :tracker" do
+    it 'merges associated :tracker' do
       expected = @to_be_merged.tracker.code
       @org.merge!(to_be_merged: @to_be_merged)
       expect(@org.tracker.code).to eql(expected)
     end
-    it "merges associated :users" do
+    it 'merges associated :users' do
       expected = @org.users.length + @to_be_merged.users.length
       @org.merge!(to_be_merged: @to_be_merged)
       expect(@org.users.length).to eql(expected)
     end
-    it "removes the :to_be_merged Org" do
+    it 'removes the :to_be_merged Org' do
       original_id = @to_be_merged.id
       expect(@org.merge!(to_be_merged: @to_be_merged)).to eql(@org)
       expect(Org.find_by(id: original_id).present?).to eql(false)
     end
   end
 
-  context "private methods" do
-    describe ":merge_attributes!(to_be_merged:)" do
+  context 'private methods' do
+    describe ':merge_attributes!(to_be_merged:)' do
       before(:each) do
         @org = create(:org, :organisation, is_other: false, managed: false,
                                            feedback_enabled: false, contact_email: nil,
@@ -660,10 +568,10 @@
                                               language: create(:language))
       end
 
-      it "returns false unless Org is an Org" do
+      it 'returns false unless Org is an Org' do
         expect(@org.send(:merge_attributes!, to_be_merged: create(:user))).to eql(false)
       end
-      it "merges the correct attributes" do
+      it 'merges the correct attributes' do
         original = @to_be_merged.dup
         org = @org.merge!(to_be_merged: @to_be_merged)
         expect(org.managed?).to eql(original.managed?)
@@ -675,7 +583,7 @@
         expect(org.feedback_enabled).to eql(original.feedback_enabled)
         expect(org.feedback_msg).to eql(original.feedback_msg)
       end
-      it "does not merge the attributes it should not merge" do
+      it 'does not merge the attributes it should not merge' do
         original = @to_be_merged.dup
         org = @org.merge!(to_be_merged: @to_be_merged)
         expect(org.abbreviation).not_to eql(original.abbreviation)
@@ -687,7 +595,7 @@
       end
     end
 
-    describe ":merge_departments!(to_be_merged:)" do
+    describe ':merge_departments!(to_be_merged:)' do
       before(:each) do
         @org = create(:org)
         @to_be_merged = create(:org)
@@ -695,18 +603,18 @@
         @to_be_merged.reload
       end
 
-      it "returns false unless the specified Org is an Org" do
+      it 'returns false unless the specified Org is an Org' do
         expect(@org.send(:merge_departments!, to_be_merged: create(:user))).to eql(false)
       end
-      it "returns false unless the specified Org has department" do
+      it 'returns false unless the specified Org has department' do
         expect(@org.send(:merge_departments!, to_be_merged: create(:org))).to eql(false)
       end
-      it "merges :departments that are not already associated" do
+      it 'merges :departments that are not already associated' do
         @org.send(:merge_departments!, to_be_merged: @to_be_merged)
         @org.reload
         expect(@org.departments.map(&:name).include?(@department.name)).to eql(true)
       end
-      it "does not merge :departments that have the same name" do
+      it 'does not merge :departments that have the same name' do
         create(:department, name: @department.name.downcase, org: @org)
         @org.reload
         @org.send(:merge_departments!, to_be_merged: @to_be_merged)
@@ -714,7 +622,7 @@
       end
     end
 
-    describe ":merge_guidance_groups!(to_be_merged:)" do
+    describe ':merge_guidance_groups!(to_be_merged:)' do
       before(:each) do
         @guidance = create(:guidance)
         @gg = create(:guidance_group, guidances: [@guidance])
@@ -722,10 +630,10 @@
         @to_be_merged = create(:org, guidance_groups: [@gg])
       end
 
-      it "returns false unless the specified Org is an Org" do
+      it 'returns false unless the specified Org is an Org' do
         expect(@org.send(:merge_guidance_groups!, to_be_merged: create(:user))).to eql(false)
       end
-      it "returns false unless the specified Org has :guidance_groups" do
+      it 'returns false unless the specified Org has :guidance_groups' do
         expect(@org.send(:merge_guidance_groups!, to_be_merged: create(:org))).to eql(false)
       end
       it "merges into the Org's existing :guidance_group" do
@@ -736,7 +644,7 @@
         expect(@org.guidance_groups.length).to eql(1)
         expect(@org.guidance_groups.first.guidances.include?(@guidance)).to eql(true)
       end
-      it "creates a new :guidance_group if the Org does not have one" do
+      it 'creates a new :guidance_group if the Org does not have one' do
         @org.send(:merge_guidance_groups!, to_be_merged: @to_be_merged)
         @org = @org.reload
         expect(@org.guidance_groups.include?(@gg)).to eql(false)
@@ -745,32 +653,31 @@
       end
     end
 
-    describe ":merge_token_permission_types!(to_be_merged:)" do
+    describe ':merge_token_permission_types!(to_be_merged:)' do
       before(:each) do
         @tpt = create(:token_permission_type)
         @org = create(:org)
         @to_be_merged = create(:org, token_permission_types: [@tpt])
       end
 
-      it "returns false unless the specified Org is an Org" do
+      it 'returns false unless the specified Org is an Org' do
         expect(@org.send(:merge_token_permission_types!, to_be_merged: create(:user))).to eql(false)
       end
-      it "returns false unless the specified Org has token_permission_types" do
+      it 'returns false unless the specified Org has token_permission_types' do
         o = create(:org)
         # when org is created tpt gets assigned by default so need to scrub for this test
         o.token_permission_types = []
         expect(@org.send(:merge_token_permission_types!, to_be_merged: o)).to eql(false)
       end
-      it "merges :token_permission_types that are not already associated" do
+      it 'merges :token_permission_types that are not already associated' do
         @org.send(:merge_token_permission_types!, to_be_merged: @to_be_merged)
         expect(@org.token_permission_types.include?(@tpt)).to eql(true)
       end
-      it "does not merge :token_permission_types that are already associated" do
+      it 'does not merge :token_permission_types that are already associated' do
         @org.update(token_permission_types: [@tpt])
         @org.send(:merge_token_permission_types!, to_be_merged: @to_be_merged)
         expect(@org.token_permission_types.length).to eql(1)
       end
     end
   end
-
 end
diff --git a/spec/models/perm_spec.rb b/spec/models/perm_spec.rb
index 0356dd7603..c590af447b 100644
--- a/spec/models/perm_spec.rb
+++ b/spec/models/perm_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 def recreate_all
   # create records..
@@ -20,25 +20,20 @@ def recreate_all
 end
 
 RSpec.describe Perm, type: :model do
-
-  context "validations" do
-
+  context 'validations' do
     it { is_expected.to validate_presence_of(:name) }
 
     it {
       is_expected.to validate_uniqueness_of(:name)
-        .with_message("must be unique")
+        .with_message('must be unique')
     }
   end
 
-  context "associations" do
-
+  context 'associations' do
     it { is_expected.to have_and_belong_to_many(:users) }
-
   end
 
-  describe ".add_orgs" do
-
+  describe '.add_orgs' do
     before(:each) do
       recreate_all
     end
@@ -46,57 +41,39 @@ def recreate_all
     subject { Perm.add_orgs }
 
     context "when name is 'add_orgs'" do
-
-      it { is_expected.to eql(Perm.find_by_name("add_organisations")) }
-
+      it { is_expected.to eql(Perm.find_by_name('add_organisations')) }
     end
 
     context "when name is 'change_affiliation'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("change_org_affiliation")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('change_org_affiliation')) }
     end
 
     context "when name is 'grant_permissions'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("grant_permissions")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('grant_permissions')) }
     end
 
     context "when name is 'modify_templates'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("modify_templates")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('modify_templates')) }
     end
 
     context "when name is 'modify_guidance'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("modify_guidance")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('modify_guidance')) }
     end
 
     context "when name is 'use_api'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("use_api")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('use_api')) }
     end
 
     context "when name is 'change_org_details'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("change_org_details")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('change_org_details')) }
     end
 
     context "when name is 'grant_api'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("grant_api_to_orgs")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('grant_api_to_orgs')) }
     end
-
   end
 
-  describe ".change_affiliation" do
-
+  describe '.change_affiliation' do
     before(:each) do
       recreate_all
     end
@@ -104,57 +81,39 @@ def recreate_all
     subject { Perm.change_affiliation }
 
     context "when name is 'add_orgs'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("add_organisations")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('add_organisations')) }
     end
 
     context "when name is 'change_affiliation'" do
-
-      it { is_expected.to eql(Perm.find_by_name("change_org_affiliation")) }
-
+      it { is_expected.to eql(Perm.find_by_name('change_org_affiliation')) }
     end
 
     context "when name is 'grant_permissions'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("grant_permissions")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('grant_permissions')) }
     end
 
     context "when name is 'modify_templates'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("modify_templates")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('modify_templates')) }
     end
 
     context "when name is 'modify_guidance'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("modify_guidance")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('modify_guidance')) }
     end
 
     context "when name is 'use_api'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("use_api")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('use_api')) }
     end
 
     context "when name is 'change_org_details'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("change_org_details")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('change_org_details')) }
     end
 
     context "when name is 'grant_api'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("grant_api_to_orgs")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('grant_api_to_orgs')) }
     end
-
   end
 
-  describe ".grant_permissions" do
-
+  describe '.grant_permissions' do
     before(:each) do
       recreate_all
     end
@@ -162,57 +121,39 @@ def recreate_all
     subject { Perm.grant_permissions }
 
     context "when name is 'add_orgs'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("add_organisations")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('add_organisations')) }
     end
 
     context "when name is 'change_affiliation'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("change_org_affiliation")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('change_org_affiliation')) }
     end
 
     context "when name is 'grant_permissions'" do
-
-      it { is_expected.to eql(Perm.find_by_name("grant_permissions")) }
-
+      it { is_expected.to eql(Perm.find_by_name('grant_permissions')) }
     end
 
     context "when name is 'modify_templates'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("modify_templates")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('modify_templates')) }
     end
 
     context "when name is 'modify_guidance'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("modify_guidance")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('modify_guidance')) }
     end
 
     context "when name is 'use_api'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("use_api")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('use_api')) }
     end
 
     context "when name is 'change_org_details'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("change_org_details")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('change_org_details')) }
     end
 
     context "when name is 'grant_api'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("grant_api_to_orgs")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('grant_api_to_orgs')) }
     end
-
   end
 
-  describe ".modify_templates" do
-
+  describe '.modify_templates' do
     before(:each) do
       recreate_all
     end
@@ -220,57 +161,39 @@ def recreate_all
     subject { Perm.modify_templates }
 
     context "when name is 'add_orgs'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("add_organisations")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('add_organisations')) }
     end
 
     context "when name is 'change_affiliation'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("change_org_affiliation")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('change_org_affiliation')) }
     end
 
     context "when name is 'grant_permissions'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("grant_permissions")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('grant_permissions')) }
     end
 
     context "when name is 'modify_templates'" do
-
-      it { is_expected.to eql(Perm.find_by_name("modify_templates")) }
-
+      it { is_expected.to eql(Perm.find_by_name('modify_templates')) }
     end
 
     context "when name is 'modify_guidance'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("modify_guidance")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('modify_guidance')) }
     end
 
     context "when name is 'use_api'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("use_api")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('use_api')) }
     end
 
     context "when name is 'change_org_details'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("change_org_details")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('change_org_details')) }
     end
 
     context "when name is 'grant_api'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("grant_api_to_orgs")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('grant_api_to_orgs')) }
     end
-
   end
 
-  describe ".modify_guidance" do
-
+  describe '.modify_guidance' do
     before(:each) do
       recreate_all
     end
@@ -278,57 +201,39 @@ def recreate_all
     subject { Perm.modify_guidance }
 
     context "when name is 'add_orgs'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("add_organisations")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('add_organisations')) }
     end
 
     context "when name is 'change_affiliation'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("change_org_affiliation")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('change_org_affiliation')) }
     end
 
     context "when name is 'grant_permissions'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("grant_permissions")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('grant_permissions')) }
     end
 
     context "when name is 'modify_templates'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("modify_templates")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('modify_templates')) }
     end
 
     context "when name is 'modify_guidance'" do
-
-      it { is_expected.to eql(Perm.find_by_name("modify_guidance")) }
-
+      it { is_expected.to eql(Perm.find_by_name('modify_guidance')) }
     end
 
     context "when name is 'use_api'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("use_api")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('use_api')) }
     end
 
     context "when name is 'change_org_details'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("change_org_details")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('change_org_details')) }
     end
 
     context "when name is 'grant_api'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("grant_api_to_orgs")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('grant_api_to_orgs')) }
     end
-
   end
 
-  describe ".use_api" do
-
+  describe '.use_api' do
     before(:each) do
       recreate_all
     end
@@ -336,57 +241,39 @@ def recreate_all
     subject { Perm.use_api }
 
     context "when name is 'add_orgs'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("add_organisations")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('add_organisations')) }
     end
 
     context "when name is 'change_affiliation'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("change_org_affiliation")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('change_org_affiliation')) }
     end
 
     context "when name is 'grant_permissions'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("grant_permissions")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('grant_permissions')) }
     end
 
     context "when name is 'modify_templates'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("modify_templates")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('modify_templates')) }
     end
 
     context "when name is 'modify_guidance'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("modify_guidance")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('modify_guidance')) }
     end
 
     context "when name is 'use_api'" do
-
-      it { is_expected.to eql(Perm.find_by_name("use_api")) }
-
+      it { is_expected.to eql(Perm.find_by_name('use_api')) }
     end
 
     context "when name is 'change_org_details'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("change_org_details")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('change_org_details')) }
     end
 
     context "when name is 'grant_api'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("grant_api_to_orgs")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('grant_api_to_orgs')) }
     end
-
   end
 
-  describe ".change_org_details" do
-
+  describe '.change_org_details' do
     before(:each) do
       recreate_all
     end
@@ -394,57 +281,39 @@ def recreate_all
     subject { Perm.change_org_details }
 
     context "when name is 'add_orgs'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("add_organisations")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('add_organisations')) }
     end
 
     context "when name is 'change_affiliation'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("change_org_affiliation")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('change_org_affiliation')) }
     end
 
     context "when name is 'grant_permissions'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("grant_permissions")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('grant_permissions')) }
     end
 
     context "when name is 'modify_templates'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("modify_templates")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('modify_templates')) }
     end
 
     context "when name is 'modify_guidance'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("modify_guidance")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('modify_guidance')) }
     end
 
     context "when name is 'use_api'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("use_api")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('use_api')) }
     end
 
     context "when name is 'change_org_details'" do
-
-      it { is_expected.to eql(Perm.find_by_name("change_org_details")) }
-
+      it { is_expected.to eql(Perm.find_by_name('change_org_details')) }
     end
 
     context "when name is 'grant_api'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("grant_api_to_orgs")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('grant_api_to_orgs')) }
     end
-
   end
 
-  describe ".grant_api" do
-
+  describe '.grant_api' do
     before(:each) do
       recreate_all
     end
@@ -452,52 +321,35 @@ def recreate_all
     subject { Perm.grant_api }
 
     context "when name is 'add_orgs'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("add_organisations")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('add_organisations')) }
     end
 
     context "when name is 'change_affiliation'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("change_org_affiliation")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('change_org_affiliation')) }
     end
 
     context "when name is 'grant_permissions'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("grant_permissions")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('grant_permissions')) }
     end
 
     context "when name is 'modify_templates'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("modify_templates")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('modify_templates')) }
     end
 
     context "when name is 'modify_guidance'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("modify_guidance")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('modify_guidance')) }
     end
 
     context "when name is 'use_api'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("use_api")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('use_api')) }
     end
 
     context "when name is 'change_org_details'" do
-
-      it { is_expected.not_to eql(Perm.find_by_name("change_org_details")) }
-
+      it { is_expected.not_to eql(Perm.find_by_name('change_org_details')) }
     end
 
     context "when name is 'grant_api'" do
-
-      it { is_expected.to eql(Perm.find_by_name("grant_api_to_orgs")) }
-
+      it { is_expected.to eql(Perm.find_by_name('grant_api_to_orgs')) }
     end
   end
-
 end
diff --git a/spec/models/phase_spec.rb b/spec/models/phase_spec.rb
index dddc4f8acb..a89ae70e1a 100644
--- a/spec/models/phase_spec.rb
+++ b/spec/models/phase_spec.rb
@@ -1,33 +1,30 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Phase, type: :model do
+  it_behaves_like 'VersionableModel'
 
-  it_behaves_like "VersionableModel"
-
-  context "validations" do
+  context 'validations' do
     it { is_expected.to validate_presence_of(:title) }
 
     it { is_expected.to validate_presence_of(:number) }
 
     it { is_expected.to validate_presence_of(:template) }
 
-    it "validates uniqueness of number" do
+    it 'validates uniqueness of number' do
       subject.versionable_id = SecureRandom.uuid
       expect(subject).to validate_uniqueness_of(:number)
         .scoped_to(:template_id)
-        .with_message("must be unique")
+        .with_message('must be unique')
     end
 
     it { is_expected.to allow_values(true, false).for(:modifiable) }
 
     it { is_expected.not_to allow_value(nil).for(:modifiable) }
-
   end
 
-  context "associations" do
-
+  context 'associations' do
     it { is_expected.to belong_to(:template) }
 
     it { is_expected.to have_one :prefix_section }
@@ -37,11 +34,9 @@
     it { is_expected.to have_many :template_sections }
 
     it { is_expected.to have_many :suffix_sections }
-
   end
 
-  describe ".titles" do
-
+  describe '.titles' do
     let!(:phase) { create(:phase) }
 
     let!(:template) { phase.template }
@@ -53,35 +48,32 @@
       @strange_phases = create_list(:phase, 2)
     end
 
-    it "returns related phases" do
+    it 'returns related phases' do
       @related_phases.each do |phase|
         expect(subject).to include(phase)
       end
     end
 
-    it "excludes phases of different Templates" do
+    it 'excludes phases of different Templates' do
       @strange_phases.each do |phase|
         expect(subject).not_to include(phase)
       end
     end
-
   end
 
-  describe "#deep_copy" do
-
+  describe '#deep_copy' do
     let!(:phase) { create(:phase, modifiable: false) }
 
     let!(:options) { {} }
 
     subject { phase.deep_copy(options) }
 
-    context "when no options are provided" do
-
+    context 'when no options are provided' do
       before do
         create_list(:section, 2, phase: phase)
       end
 
-      it "checks number of sections" do
+      it 'checks number of sections' do
         expect(subject.sections.size).to eql(phase.sections.size)
       end
 
@@ -89,82 +81,70 @@
         expect(subject).to be_a_new_record
       end
 
-      it "copies the description attribute" do
+      it 'copies the description attribute' do
         expect(subject.description).to eql(phase.description)
       end
 
-      it "copies the modifiable attribute" do
+      it 'copies the modifiable attribute' do
         expect(subject.modifiable).to eql(phase.modifiable)
       end
 
-      it "copies the number attribute" do
+      it 'copies the number attribute' do
         expect(subject.number).to eql(phase.number)
       end
 
-      it "copies the title attribute" do
+      it 'copies the title attribute' do
         expect(subject.title).to eql(phase.title)
       end
 
-      it "sets template_id to nil" do
+      it 'sets template_id to nil' do
         expect(subject.template_id).to be_nil
       end
 
-      it "duplicates the sections belonging to the Phase" do
+      it 'duplicates the sections belonging to the Phase' do
         expect(subject.sections.count).to eql(subject.sections.count)
       end
-
     end
 
-    context "when modifiable option is true" do
-
+    context 'when modifiable option is true' do
       let!(:options) { { modifiable: true } }
 
-      it "sets the modifiable flag to true" do
+      it 'sets the modifiable flag to true' do
         expect(subject.modifiable).to eql(true)
       end
-
     end
 
-    context "when template_id option is present" do
-
+    context 'when template_id option is present' do
       let!(:options) { { template_id: create(:template).id } }
 
-      it "sets the template_id to new value" do
+      it 'sets the template_id to new value' do
         expect(subject.template_id).to eql(options[:template_id])
       end
-
     end
 
-    context "when save option is true" do
-
+    context 'when save option is true' do
       let!(:options) { { save: true } }
 
-      it "persists the record" do
+      it 'persists the record' do
         expect(subject).to be_persisted
       end
-
     end
-
   end
 
-  describe "#num_answered_questions" do
-
+  describe '#num_answered_questions' do
     let!(:phase) { create(:phase) }
 
     subject { phase.num_answered_questions(plan) }
 
-    context "when plan is nil" do
-
+    context 'when plan is nil' do
       let!(:plan) { nil }
 
-      it "returns 0" do
+      it 'returns 0' do
         expect(subject).to be_zero
       end
-
     end
 
-    context "when plan is present" do
-
+    context 'when plan is present' do
       let!(:phase) { create(:phase, template: template) }
 
       let!(:section) { create(:section, phase: phase) }
@@ -175,7 +155,7 @@
 
       before do
         question = create(:question, section: section)
-        create(:answer, question: question, plan: plan, text: "")
+        create(:answer, question: question, plan: plan, text: '')
 
         question = create(:question, section: section)
         create(:answer, question: question, plan: plan)
@@ -187,12 +167,10 @@
       it "returns the sum of Plan's Phase's num_answered_questions" do
         expect(subject).to eql(2)
       end
-
     end
   end
 
-  describe "#num_questions" do
-
+  describe '#num_questions' do
     let!(:phase) { create(:phase) }
 
     before do
@@ -201,9 +179,8 @@
       end
     end
 
-    it "returns the number of related questions" do
+    it 'returns the number of related questions' do
       expect(phase.num_questions).to eql(4)
     end
   end
-
 end
diff --git a/spec/models/plan_spec.rb b/spec/models/plan_spec.rb
index 2f8f38c2de..2d9ef05a8e 100644
--- a/spec/models/plan_spec.rb
+++ b/spec/models/plan_spec.rb
@@ -1,14 +1,13 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 describe Plan do
-
   include IdentifierHelper
   include RolesHelper
   include TemplateHelper
 
-  context "validations" do
+  context 'validations' do
     it { is_expected.to validate_presence_of(:title) }
 
     it { is_expected.to validate_presence_of(:template) }
@@ -21,32 +20,30 @@
 
     it { is_expected.not_to allow_value(nil).for(:complete) }
 
-    describe "dates" do
+    describe 'dates' do
       before(:each) do
         @plan = build(:plan)
       end
 
-      it "allows start_date to be nil" do
+      it 'allows start_date to be nil' do
         @plan.start_date = nil
         @plan.end_date = Time.now + 3.days
         expect(@plan.valid?).to eql(true)
       end
-      it "allows end_date to be nil" do
+      it 'allows end_date to be nil' do
         @plan.start_date = Time.now + 3.days
         @plan.end_date = nil
         expect(@plan.valid?).to eql(true)
       end
-      it "does not allow end_date to come before start_date" do
+      it 'does not allow end_date to come before start_date' do
         @plan.start_date = Time.now + 3.days
         @plan.end_date = Time.now
         expect(@plan.valid?).to eql(false)
       end
     end
-
   end
 
-  context "associations" do
-
+  context 'associations' do
     it { is_expected.to belong_to :template }
 
     it { is_expected.to belong_to :org }
@@ -78,131 +75,98 @@
     it { is_expected.to have_many(:identifiers) }
 
     it { is_expected.to have_many(:contributors) }
-
   end
 
-  describe ".publicly_visible" do
-
+  describe '.publicly_visible' do
     subject { Plan.publicly_visible }
 
-    context "when plan visibility is publicly_visible" do
-
+    context 'when plan visibility is publicly_visible' do
       let!(:plan) { create(:plan, :creator, :publicly_visible) }
 
       it { is_expected.to include(plan) }
-
     end
 
-    context "when plan visibility is organisationally_visible" do
-
+    context 'when plan visibility is organisationally_visible' do
       let!(:plan) { create(:plan, :creator, :organisationally_visible) }
 
       it { is_expected.not_to include(plan) }
-
     end
 
-    context "when plan visibility is is_test" do
-
+    context 'when plan visibility is is_test' do
       let!(:plan) { create(:plan, :creator, :is_test) }
 
       it { is_expected.not_to include(plan) }
-
     end
 
-    context "when plan visibility is privately_visible" do
-
+    context 'when plan visibility is privately_visible' do
       let!(:plan) { create(:plan, :creator, :privately_visible) }
 
       it { is_expected.not_to include(plan) }
-
     end
-
   end
 
-  describe ".organisationally_visible" do
-
+  describe '.organisationally_visible' do
     subject { Plan.organisationally_visible }
 
-    context "when plan visibility is publicly_visible" do
-
+    context 'when plan visibility is publicly_visible' do
       let!(:plan) { create(:plan, :creator, :publicly_visible) }
 
       it { is_expected.not_to include(plan) }
-
     end
 
-    context "when plan visibility is organisationally_visible" do
-
+    context 'when plan visibility is organisationally_visible' do
       let!(:plan) { create(:plan, :creator, :organisationally_visible) }
 
       it { is_expected.to include(plan) }
-
     end
 
-    context "when plan visibility is is_test" do
-
+    context 'when plan visibility is is_test' do
       let!(:plan) { create(:plan, :creator, :is_test) }
 
       it { is_expected.not_to include(plan) }
-
     end
 
-    context "when plan visibility is privately_visible" do
-
+    context 'when plan visibility is privately_visible' do
       let!(:plan) { create(:plan, :creator, :privately_visible) }
 
       it { is_expected.not_to include(plan) }
-
     end
-
   end
 
-  describe ".privately_visible" do
-
+  describe '.privately_visible' do
     subject { Plan.privately_visible }
 
-    context "when plan visibility is publicly_visible" do
-
+    context 'when plan visibility is publicly_visible' do
       let!(:plan) { create(:plan, :creator, :publicly_visible) }
 
       it { is_expected.not_to include(plan) }
-
     end
 
-    context "when plan visibility is organisationally_visible" do
-
+    context 'when plan visibility is organisationally_visible' do
       let!(:plan) { create(:plan, :creator, :organisationally_visible) }
 
       it { is_expected.not_to include(plan) }
-
     end
 
-    context "when plan visibility is is_test" do
-
+    context 'when plan visibility is is_test' do
       let!(:plan) { create(:plan, :creator, :is_test) }
 
       it { is_expected.not_to include(plan) }
-
     end
 
-    context "when plan visibility is privately_visible" do
-
+    context 'when plan visibility is privately_visible' do
       let!(:plan) { create(:plan, :creator, :privately_visible) }
 
       it { is_expected.to include(plan) }
-
     end
-
   end
 
-  describe ".organisationally_or_publicly_visible" do
-
+  describe '.organisationally_or_publicly_visible' do
     let!(:user) { create(:user) }
 
     subject { Plan.organisationally_or_publicly_visible(user) }
 
-    context "when user is creator" do
-
+    context 'when user is creator' do
       before do
         create(:role, :creator, user: user, plan: plan)
       end
@@ -210,11 +174,9 @@
       let!(:plan) { create(:plan, :creator, :publicly_visible) }
 
       it { is_expected.not_to include(plan) }
-
     end
 
-    context "when user is administrator" do
-
+    context 'when user is administrator' do
       before do
         create(:role, :administrator, user: user, plan: plan)
       end
@@ -222,11 +184,9 @@
       let!(:plan) { create(:plan, :creator, :publicly_visible) }
 
       it { is_expected.not_to include(plan) }
-
     end
 
-    context "when user is commenter" do
-
+    context 'when user is commenter' do
       before do
         create(:role, :commenter, user: user, plan: plan)
       end
@@ -234,11 +194,9 @@
       let!(:plan) { create(:plan, :creator, :publicly_visible) }
 
       it { is_expected.not_to include(plan) }
-
     end
 
-    context "when user is editor" do
-
+    context 'when user is editor' do
       before do
         create(:role, :editor, user: user, plan: plan)
       end
@@ -246,11 +204,9 @@
       let!(:plan) { create(:plan, :creator, :publicly_visible) }
 
       it { is_expected.not_to include(plan) }
-
     end
 
-    context "when plan visibility is publicly_visible" do
-
+    context 'when plan visibility is publicly_visible' do
       before do
         new_user = create(:user, org: user.org)
         create(:role, :creator, :administrator, :editor, :commenter,
@@ -264,14 +220,12 @@
                         question: template.phases.first.sections.first.questions.first)
       end
 
-      it "includes publicly_visible plans" do
+      it 'includes publicly_visible plans' do
         is_expected.to include(plan)
       end
-
     end
 
-    context "when plan visibility is organisationally_visible" do
-
+    context 'when plan visibility is organisationally_visible' do
       before do
         new_user = create(:user, org: user.org)
         create(:role, :creator, :administrator, :editor, :commenter,
@@ -285,14 +239,12 @@
                         question: template.phases.first.sections.first.questions.first)
       end
 
-      it "includes organisationally_visible plans" do
+      it 'includes organisationally_visible plans' do
         is_expected.to include(plan)
       end
-
     end
 
-    context "when plan is not complete" do
-
+    context 'when plan is not complete' do
       before do
         new_user = create(:user, org: user.org)
         create(:role, :creator, :administrator, :editor, :commenter,
@@ -301,111 +253,86 @@
 
       let!(:plan) { create(:plan, :creator, :organisationally_visible) }
 
-      it "includes organisationally_visible plans" do
+      it 'includes organisationally_visible plans' do
         is_expected.not_to include(plan)
       end
-
     end
 
-    context "when plan visibility is is_test" do
-
+    context 'when plan visibility is is_test' do
       let!(:plan) { create(:plan, :creator, :is_test) }
 
       it { is_expected.not_to include(plan) }
-
     end
 
-    context "when plan visibility is privately_visible" do
-
+    context 'when plan visibility is privately_visible' do
       let!(:plan) { create(:plan, :creator, :privately_visible) }
 
       it { is_expected.not_to include(plan) }
-
     end
 
-    context "when plan has no active roles" do
-
+    context 'when plan has no active roles' do
       let!(:plan) { build_plan }
 
-      it "should not be included" do
+      it 'should not be included' do
         plan.roles.inject(&:deactivate!)
         is_expected.to_not include(plan)
       end
-
     end
-
   end
 
-  describe ".is_test" do
-
+  describe '.is_test' do
     subject { Plan.is_test }
 
-    context "when plan visibility is publicly_visible" do
-
+    context 'when plan visibility is publicly_visible' do
       let!(:plan) { create(:plan, :creator, :publicly_visible) }
 
       it { is_expected.not_to include(plan) }
-
     end
 
-    context "when plan visibility is organisationally_visible" do
-
+    context 'when plan visibility is organisationally_visible' do
       let!(:plan) { create(:plan, :creator, :organisationally_visible) }
 
       it { is_expected.not_to include(plan) }
-
     end
 
-    context "when plan visibility is is_test" do
-
+    context 'when plan visibility is is_test' do
       let!(:plan) { create(:plan, :creator, :is_test) }
 
       it { is_expected.to include(plan) }
-
     end
 
-    context "when plan visibility is privately_visible" do
-
+    context 'when plan visibility is privately_visible' do
       let!(:plan) { create(:plan, :creator, :privately_visible) }
 
       it { is_expected.not_to include(plan) }
-
     end
-
   end
 
-  describe ".active" do
-
+  describe '.active' do
     let!(:plan) { create(:plan, :creator) }
 
     let!(:user) { create(:user) }
 
     subject { Plan.active(user) }
 
-    context "where user role is active" do
-
+    context 'where user role is active' do
       before do
         create(:role, :active, :creator, user: user, plan: plan)
       end
 
       it { is_expected.to include(plan) }
-
     end
 
-    context "where user role is not active" do
-
+    context 'where user role is not active' do
       before do
         create(:role, :inactive, :creator, user: user, plan: plan)
       end
 
       it { is_expected.not_to include(plan) }
-
     end
-
   end
 
-  describe ".load_for_phase" do
-
+  describe '.load_for_phase' do
     let!(:template) { create(:template) }
 
     let!(:plan) { create(:plan, :creator, template: template) }
@@ -418,48 +345,40 @@
 
     subject { Plan.load_for_phase(plan.id, phase.id) }
 
-    context "when Plan ID is valid and Phase ID is valid child" do
-
-      it "returns an Array" do
+    context 'when Plan ID is valid and Phase ID is valid child' do
+      it 'returns an Array' do
         expect(subject).to be_an(Array)
       end
 
-      it "returns the Plan first" do
+      it 'returns the Plan first' do
         expect(subject.first).to eql(plan)
       end
 
-      it "returns the Phase second" do
+      it 'returns the Phase second' do
         expect(subject.second).to eql(phase)
       end
-
     end
 
-    context "when Plan ID is valid and Phase ID is not valid child" do
-
+    context 'when Plan ID is valid and Phase ID is not valid child' do
       let!(:phase) { create(:phase) }
 
-      it "raises an exception" do
+      it 'raises an exception' do
         # TODO: This is not ideal behaviour. Fix this.
         expect { subject }.to raise_error(NoMethodError)
       end
-
     end
 
-    context "when Plan ID is not valid" do
-
+    context 'when Plan ID is not valid' do
       let!(:plan) { stub(id: 0) }
 
-      it "raises an exception" do
+      it 'raises an exception' do
         # TODO: This is not ideal behaviour. Fix this.
         expect { subject }.to raise_error(NoMethodError)
       end
-
     end
-
   end
 
-  describe ".deep_copy" do
-
+  describe '.deep_copy' do
     let!(:plan) do
       create(:plan, :creator, answers: 2, guidance_groups: 2,
                               feedback_requested: true)
@@ -468,57 +387,51 @@
     subject { Plan.deep_copy(plan) }
 
     it "prepends the title with 'Copy'" do
-      expect(subject.title).to include("Copy")
+      expect(subject.title).to include('Copy')
     end
 
-    it "sets feedback_requested to false" do
+    it 'sets feedback_requested to false' do
       expect(subject.feedback_requested).to eql(false)
     end
 
-    it "copies the title from source" do
+    it 'copies the title from source' do
       expect(subject.title).to include(plan.title)
     end
 
-    it "persists the record" do
+    it 'persists the record' do
       expect(subject).to be_persisted
     end
 
-    it "creates new copies of the answers" do
+    it 'creates new copies of the answers' do
       expect(subject.answers).to have(2).items
     end
 
-    it "duplicates the guidance groups" do
+    it 'duplicates the guidance groups' do
       expect(subject.guidance_groups).to have(2).items
     end
   end
 
-  describe ".search" do
-
-    subject { Plan.search("foo") }
-
-    context "when Plan title matches term" do
+  describe '.search' do
+    subject { Plan.search('foo') }
 
-      let!(:plan) { create(:plan, :creator, title: "foolike title") }
+    context 'when Plan title matches term' do
+      let!(:plan) { create(:plan, :creator, title: 'foolike title') }
 
       it { is_expected.to include(plan) }
-
     end
 
-    context "when Template title matches term" do
-
-      let!(:template) { create(:template, title: "foolike title") }
+    context 'when Template title matches term' do
+      let!(:template) { create(:template, title: 'foolike title') }
 
       let!(:plan) { create(:plan, :creator, template: template) }
 
       it { is_expected.to include(plan) }
-
     end
 
-    context "when Organisation name matches term" do
+    context 'when Organisation name matches term' do
+      let!(:plan)  { create(:plan, :creator, description: 'foolike desc') }
 
-      let!(:plan)  { create(:plan, :creator, description: "foolike desc") }
-
-      let!(:org) { create(:org, name: "foolike name") }
+      let!(:org) { create(:org, name: 'foolike name') }
 
       before do
         user = plan.owner
@@ -526,42 +439,37 @@
         user.save
       end
 
-      it "returns organisation name" do
+      it 'returns organisation name' do
         expect(subject).to include(plan)
       end
-
     end
 
-    context "when Contributor name matches term" do
-      let!(:plan) { create(:plan, :creator, description: "foolike desc") }
-      let!(:contributor) { create(:contributor, plan: plan, name: "Dr. Foo Bar") }
+    context 'when Contributor name matches term' do
+      let!(:plan) { create(:plan, :creator, description: 'foolike desc') }
+      let!(:contributor) { create(:contributor, plan: plan, name: 'Dr. Foo Bar') }
 
-      it "returns contributor name" do
+      it 'returns contributor name' do
         expect(subject).to include(plan)
       end
     end
 
-    context "when neither title matches term" do
-
-      let!(:plan) { create(:plan, :creator, description: "foolike desc") }
+    context 'when neither title matches term' do
+      let!(:plan) { create(:plan, :creator, description: 'foolike desc') }
 
       it { is_expected.not_to include(plan) }
-
     end
-
   end
 
-  describe ".stats_filter" do
-
+  describe '.stats_filter' do
     subject { Plan.all.stats_filter }
 
-    context "when plan visibility is test" do
+    context 'when plan visibility is test' do
       let!(:plan) { create(:plan, :creator, :is_test) }
 
       it { is_expected.not_to include(plan) }
     end
 
-    context "when plan visibility is not test" do
+    context 'when plan visibility is not test' do
       let!(:p1)  { create(:plan, :creator, :publicly_visible) }
       let!(:p2)  { create(:plan, :creator, :privately_visible) }
       let!(:p3)  { create(:plan, :creator, :organisationally_visible) }
@@ -570,70 +478,59 @@
       it { is_expected.to include(p2) }
       it { is_expected.to include(p3) }
     end
-
   end
 
-  describe "#answer" do
-
+  describe '#answer' do
     let!(:plan) { create(:plan, :creator, answers: 1) }
 
     let!(:question) { create(:question) }
 
     subject { plan.answer(question.id, create_if_missing) }
 
-    context "when create_if_missing is true and answer exists on the DB" do
-
+    context 'when create_if_missing is true and answer exists on the DB' do
       let!(:create_if_missing) { true }
 
       let!(:answer) { create(:answer, plan: plan, question: question) }
 
-      it "returns the existing Answer" do
+      it 'returns the existing Answer' do
         expect(subject).to eql(answer)
       end
-
     end
 
     context "when create_if_missing is true and answer doesn't exist on the DB" do
-
       let!(:create_if_missing) { true }
 
-      it "returns a new Answer" do
+      it 'returns a new Answer' do
         expect(subject).to be_an(Answer)
       end
 
       it "doesn't persist the new Answer" do
         expect(subject).to be_new_record
       end
-
     end
 
-    context "when create_if_missing is false and qid exists on the DB" do
-
+    context 'when create_if_missing is false and qid exists on the DB' do
       let!(:create_if_missing) { false }
 
       let!(:answer) { create(:answer, plan: plan, question: question) }
 
-      it "returns the existing Answer" do
+      it 'returns the existing Answer' do
         expect(subject).to eql(answer)
       end
-
     end
 
     context "when create_if_missing is false and qid doesn't exist on the DB" do
-
       let!(:create_if_missing) { false }
 
       let!(:answer) { nil }
 
-      it "returns nil" do
+      it 'returns nil' do
         expect(subject).to be_nil
       end
-
     end
   end
 
-  describe "#guidance_group_options" do
-
+  describe '#guidance_group_options' do
     let!(:plan) { create(:plan, :creator) }
 
     subject { plan.guidance_group_options }
@@ -649,30 +546,24 @@
       @theme.guidances << @guidance
     end
 
-    context "when guidance groups are unpublished" do
-
+    context 'when guidance groups are unpublished' do
       before do
         @guidance_group.update(published: false)
       end
 
-      it "excludes the guidance group from options" do
+      it 'excludes the guidance group from options' do
         expect(subject).not_to include(@guidance_group)
       end
-
     end
 
-    context "when guidance groups are published" do
-
-      it "includes the guidance group in options" do
+    context 'when guidance groups are published' do
+      it 'includes the guidance group in options' do
         expect(subject).to include(@guidance_group)
       end
-
     end
-
   end
 
-  describe "#request_feedback" do
-
+  describe '#request_feedback' do
     subject { plan.request_feedback(user) }
 
     let!(:org)  { create(:org, contact_email: nil) }
@@ -684,7 +575,7 @@
     before do
       # Create 2 Org admins for this Org.
       create_list(:user, 2, org: org).each do |user|
-        user.perms << Perm.where(name: "modify_guidance").first_or_create
+        user.perms << Perm.where(name: 'modify_guidance').first_or_create
       end
       ActionMailer::Base.deliveries = []
     end
@@ -699,24 +590,20 @@
       expect { subject }.not_to change { ActionMailer::Base.deliveries.size }
     end
 
-    context "when org contact_email present" do
-
+    context 'when org contact_email present' do
       before do
         org.update!(contact_email: Faker::Internet.safe_email)
       end
 
-      it "emails the admins" do
+      it 'emails the admins' do
         expect { subject }.to change {
           ActionMailer::Base.deliveries.size
         }.by(1)
       end
-
     end
-
   end
 
-  describe "#complete_feedback" do
-
+  describe '#complete_feedback' do
     subject { plan.complete_feedback(user) }
 
     let!(:org)  { create(:org) }
@@ -750,172 +637,159 @@
       expect { subject }.not_to change { ActionMailer::Base.deliveries.size }
     end
 
-    context "when user feedback provided pref is true" do
-
+    context 'when user feedback provided pref is true' do
       before do
         User.any_instance.stubs(:get_preferences)
             .returns(users: { feedback_provided: true })
       end
 
-      it "emails the owners" do
+      it 'emails the owners' do
         expect { subject }.to change {
           ActionMailer::Base.deliveries.size
         }.by(2)
       end
-
     end
-
   end
 
-  describe "#guidance_by_question_as_hash" do
-
-  end
-
-  describe "#editable_by?" do
-
+  describe '#editable_by?' do
     let!(:plan) { build_plan(true, true, true) }
 
     subject { plan }
 
-    it "when role is inactive" do
+    it 'when role is inactive' do
       role = subject.roles.editor.first
       role.deactivate!
       user = role.user
       expect(subject.editable_by?(user.id)).to eql(false)
     end
 
-    it "when user is a creator" do
+    it 'when user is a creator' do
       # All creators should be able to edit
       subject.roles.creator.pluck(:user_id).each do |user_id|
         expect(subject.editable_by?(user_id)).to eql(true)
       end
     end
 
-    it "when user is a administrator" do
+    it 'when user is a administrator' do
       # All administrators (aka coowners) should be able to edit
       subject.roles.administrator.pluck(:user_id).each do |user_id|
         expect(subject.editable_by?(user_id)).to eql(true)
       end
     end
 
-    it "when user is a editor" do
+    it 'when user is a editor' do
       # All editors should be able to edit
       subject.roles.editor.pluck(:user_id).each do |user_id|
         expect(subject.editable_by?(user_id)).to eql(true)
       end
     end
 
-    it "when user is a commenter" do
+    it 'when user is a commenter' do
       # Commenters should only be able to edit if they are also
       # a creator, administrator or editor
       subject.roles.commenter.each do |role|
         expect(subject.editable_by?(role.user.id)).to eql(role.editor?)
       end
     end
-
   end
 
-  describe "#readable_by?" do
-
+  describe '#readable_by?' do
     let!(:user) { create(:user, org: create(:org)) }
     let!(:plan) { build_plan(true, true, true) }
 
     subject { plan }
 
-    context "config allows for admin viewing" do
-
-      it "super admins" do
+    context 'config allows for admin viewing' do
+      it 'super admins' do
         Rails.configuration.x.plans.super_admins_read_all = true
-        user.perms << create(:perm, name: "add_organisations")
+        user.perms << create(:perm, name: 'add_organisations')
         expect(subject.readable_by?(user.id)).to eql(true)
       end
 
-      it "org admins" do
+      it 'org admins' do
         Rails.configuration.x.plans.org_admins_read_all = true
         user.org_id = plan.owner.org_id
         user.save
-        user.perms << create(:perm, name: "modify_guidance")
+        user.perms << create(:perm, name: 'modify_guidance')
         expect(subject.readable_by?(user.id)).to eql(true)
       end
     end
 
-    context "config does not allow admin viewing" do
-
+    context 'config does not allow admin viewing' do
       before(:each) do
         Rails.configuration.x.plans.org_admins_read_all = false
       end
 
-      it "super admins" do
+      it 'super admins' do
         Rails.configuration.x.plans.super_admins_read_all = false
-        user.perms << create(:perm, name: "add_organisations")
+        user.perms << create(:perm, name: 'add_organisations')
         expect(subject.readable_by?(user.id)).to eql(false)
       end
 
-      it "org admins" do
-        user.perms << create(:perm, name: "modify_guidance")
+      it 'org admins' do
+        user.perms << create(:perm, name: 'modify_guidance')
         expect(subject.readable_by?(user.id)).to eql(false)
       end
     end
 
-    context "non-admin user" do
-
-      it "when role is inactive" do
+    context 'non-admin user' do
+      it 'when role is inactive' do
         role = subject.roles.commenter.first
         role.deactivate!
         user = role.user
         expect(subject.readable_by?(user.id)).to eql(false)
       end
 
-      it "when user is a creator" do
+      it 'when user is a creator' do
         # All creators should be able to read
         subject.roles.creator.pluck(:user_id).each do |user_id|
           expect(subject.readable_by?(user_id)).to eql(true)
         end
       end
 
-      it "when user is a administrator" do
+      it 'when user is a administrator' do
         # All administrators should be able to read
         subject.roles.administrator.pluck(:user_id).each do |user_id|
           expect(subject.readable_by?(user_id)).to eql(true)
         end
       end
 
-      it "when user is a editor" do
+      it 'when user is a editor' do
         # All editors should be able to read
         subject.roles.editor.pluck(:user_id).each do |user_id|
           expect(subject.readable_by?(user_id)).to eql(true)
         end
       end
 
-      it "when user is a commenter" do
+      it 'when user is a commenter' do
         # All commenters should be able to read
         subject.roles.commenter.pluck(:user_id).each do |user_id|
           expect(subject.readable_by?(user_id)).to eql(true)
         end
       end
 
-      context "When user is a reviewer" do
+      context 'When user is a reviewer' do
         before do
           user.org = plan.owner.org
           user.save
           user.perms << create(:perm, :review_org_plans)
         end
 
-        it "when user is a reviewer and feedback requested" do
+        it 'when user is a reviewer and feedback requested' do
           # All reviewers of the same org should be able to comment
           plan.feedback_requested = true
           plan.save
           expect(subject.readable_by?(user.id)).to eql(true)
         end
 
-        it "when user is a reviewer and feedback not requested" do
+        it 'when user is a reviewer and feedback not requested' do
           Rails.configuration.x.plans.org_admins_read_all = false
           plan.feedback_requested = false
           plan.save
           expect(subject.readable_by?(user.id)).to eql(false)
         end
 
-        it "when user is a reviewer of a different org and feedback requested" do
+        it 'when user is a reviewer of a different org and feedback requested' do
           # reviewers of other orgs should have no access
           user.org = create(:org)
           user.save
@@ -926,7 +800,7 @@
         end
       end
 
-      it "when user is not reviewer, has no roles on the plan and feedback requested" do
+      it 'when user is not reviewer, has no roles on the plan and feedback requested' do
         # All reviewers should be able to comment
         user.org = plan.owner.org
         user.save
@@ -936,11 +810,10 @@
       end
     end
 
-    context "explicit sharing does not conflict with admin-viewing" do
-
-      it "super admins" do
+    context 'explicit sharing does not conflict with admin-viewing' do
+      it 'super admins' do
         Rails.configuration.x.plans.super_admins_read_all = false
-        user.perms << create(:perm, name: "add_organisations")
+        user.perms << create(:perm, name: 'add_organisations')
         role = subject.roles.commenter.first
         role.user_id = user.id
         role.save!
@@ -948,9 +821,9 @@
         expect(subject.readable_by?(user.id)).to eql(true)
       end
 
-      it "org admins" do
+      it 'org admins' do
         Rails.configuration.x.plans.org_admins_read_all = false
-        user.perms << create(:perm, name: "modify_guidance")
+        user.perms << create(:perm, name: 'modify_guidance')
         role = subject.roles.commenter.first
         role.user_id = user.id
         role.save!
@@ -960,41 +833,40 @@
     end
   end
 
-  describe "#commentable_by?" do
-
+  describe '#commentable_by?' do
     let!(:plan) { build_plan(true, true, true) }
 
     subject { plan }
 
-    it "when role is inactive" do
+    it 'when role is inactive' do
       role = subject.roles.commenter.first
       role.deactivate!
       user = role.user
       expect(subject.commentable_by?(user.id)).to eql(false)
     end
 
-    it "when user is a creator" do
+    it 'when user is a creator' do
       # All creators should be able to comment
       subject.roles.creator.pluck(:user_id).each do |user_id|
         expect(subject.commentable_by?(user_id)).to eql(true)
       end
     end
 
-    it "when user is a administrator" do
+    it 'when user is a administrator' do
       # All administrators should be able to comment
       subject.roles.administrator.pluck(:user_id).each do |user_id|
         expect(subject.commentable_by?(user_id)).to eql(true)
       end
     end
 
-    it "when user is a editor" do
+    it 'when user is a editor' do
       # All editors should be able to comment
       subject.roles.editor.pluck(:user_id).each do |user_id|
         expect(subject.commentable_by?(user_id)).to eql(true)
       end
     end
 
-    it "when user is a commenter" do
+    it 'when user is a commenter' do
       # All commenters should be able to comment
       subject.roles.commenter.pluck(:user_id).each do |user_id|
         expect(subject.commentable_by?(user_id)).to eql(true)
@@ -1003,27 +875,26 @@
 
     let(:user) { create(:user) }
 
-    context "when user is a reviewer" do
-
+    context 'when user is a reviewer' do
       before do
         user.org = plan.owner.org
         user.save
         user.perms << create(:perm, :review_org_plans)
       end
-      it "of the same org and feedback requested" do
+      it 'of the same org and feedback requested' do
         # All reviewers of the same org should be able to comment
         plan.feedback_requested = true
         plan.save
         expect(subject.commentable_by?(user.id)).to eql(true)
       end
 
-      it "of the same org and feedback not requested" do
+      it 'of the same org and feedback not requested' do
         plan.feedback_requested = false
         plan.save
         expect(subject.commentable_by?(user.id)).to eql(false)
       end
 
-      it "of a different org and feedback requested" do
+      it 'of a different org and feedback requested' do
         # All reviewers of other orgs should not be able to comment
         user.org = create(:org)
         user.save
@@ -1033,10 +904,9 @@
         plan.save
         expect(subject.commentable_by?(user.id)).to eql(false)
       end
-
     end
 
-    it "when user is not reviewer, has no roles on the plan and feedback requested" do
+    it 'when user is not reviewer, has no roles on the plan and feedback requested' do
       # All reviewers should be able to comment
       user.org = plan.owner.org
       user.save
@@ -1044,37 +914,35 @@
       plan.save
       expect(subject.commentable_by?(user.id)).to eql(false)
     end
-
   end
 
-  describe "#administerable_by?" do
-
+  describe '#administerable_by?' do
     let!(:plan) { build_plan(true, true, true) }
 
     subject { plan }
 
-    it "when role is inactive" do
+    it 'when role is inactive' do
       role = subject.roles.administrator.first
       role.deactivate!
       user = role.user
       expect(subject.administerable_by?(user.id)).to eql(false)
     end
 
-    it "when user is a creator" do
+    it 'when user is a creator' do
       # All creators should be able to administer
       subject.roles.creator.pluck(:user_id).each do |user_id|
         expect(subject.administerable_by?(user_id)).to eql(true)
       end
     end
 
-    it "when user is a administrator" do
+    it 'when user is a administrator' do
       # All administrators should be able to administer
       subject.roles.administrator.pluck(:user_id).each do |user_id|
         expect(subject.administerable_by?(user_id)).to eql(true)
       end
     end
 
-    it "when user is a editor" do
+    it 'when user is a editor' do
       # Editors should only be able to administer if they are also
       # a creator or administrator
       subject.roles.editor.each do |role|
@@ -1082,17 +950,16 @@
       end
     end
 
-    it "when user is a commenter" do
+    it 'when user is a commenter' do
       # Commenters should only be able to administer if they are also
       # a creator or administrator
       subject.roles.commenter.each do |role|
         expect(subject.administerable_by?(role.user.id)).to eql(role.administrator?)
       end
     end
-
   end
 
-  describe "#reviewable_by?" do
+  describe '#reviewable_by?' do
     let!(:plan) { build_plan(true, true, true) }
     let!(:user) { create(:user) }
 
@@ -1104,11 +971,11 @@
 
     subject { plan }
 
-    it "when user is not a reviewer" do
+    it 'when user is not a reviewer' do
       expect(subject.reviewable_by?(user.id)).to eql(false)
     end
 
-    it "when user is a reviewer" do
+    it 'when user is a reviewer' do
       user.org = plan.owner.org
       user.save
       user.perms << Perm.review_plans
@@ -1117,17 +984,14 @@
       expect(plan.feedback_requested?).to eql(true)
       expect(subject.reviewable_by?(user.id)).to eql(true)
     end
-
   end
 
-  describe "#latest_update" do
-
+  describe '#latest_update' do
     let!(:plan) { create(:plan, :creator, updated_at: 5.minutes.ago) }
 
     subject { plan.latest_update.to_i }
 
-    context "when plan updated_at is latest" do
-
+    context 'when plan updated_at is latest' do
       before do
         create_list(:phase, 2, template: plan.template,
                                updated_at: 6.minutes.ago)
@@ -1136,11 +1000,9 @@
       it "returns the plan's updated_at value" do
         is_expected.to be_within(5.seconds).of(5.minutes.ago.to_i)
       end
-
     end
 
-    context "when plan has phases updated_at latest" do
-
+    context 'when plan has phases updated_at latest' do
       before do
         create_list(:phase, 2, template: plan.template)
       end
@@ -1148,52 +1010,45 @@
       it "returns the plan's updated_at value" do
         is_expected.to be_within(5.seconds).of(Time.current.to_i)
       end
-
     end
-
   end
 
-  describe "#name" do
-
-    let!(:plan) { build(:plan, :creator, title: "Foo bar") }
+  describe '#name' do
+    let!(:plan) { build(:plan, :creator, title: 'Foo bar') }
 
-    it "returns the title" do
-      expect(plan.name).to eql("Foo bar")
+    it 'returns the title' do
+      expect(plan.name).to eql('Foo bar')
     end
-
   end
 
-  describe "#owner" do
-
+  describe '#owner' do
     let!(:plan) { build_plan(true, true, true) }
 
     subject { plan }
 
-    it "is the creator" do
+    it 'is the creator' do
       user = subject.roles.creator.first.user
       expect(subject.owner).to eql(user)
     end
 
-    it "is the administrator if there is no creator" do
+    it 'is the administrator if there is no creator' do
       subject.roles.creator.first.deactivate!
       user = subject.roles.where(active: true).administrator.first.user
       expect(subject.owner).to eql(user)
     end
-
   end
 
-  describe "#add_user" do
-
+  describe '#add_user' do
     let!(:user) { create(:user, org: create(:org)) }
     let!(:plan) { build_plan }
 
     subject { plan }
 
-    it "returns false if user does not exist" do
+    it 'returns false if user does not exist' do
       expect(subject.add_user!(326_465)).to eql(false)
     end
 
-    it "adds the creator" do
+    it 'adds the creator' do
       expect(subject.add_user!(user.id, :creator)).to eql(true)
       role = Role.find_by(user_id: user.id, plan_id: subject.id)
       expect(role.creator?).to eql(true)
@@ -1203,7 +1058,7 @@
       expect(role.reviewer?).to eql(false)
     end
 
-    it "adds the administrator" do
+    it 'adds the administrator' do
       expect(subject.add_user!(user.id, :administrator)).to eql(true)
       role = Role.find_by(user_id: user.id, plan_id: subject.id)
       expect(role.creator?).to eql(false)
@@ -1213,7 +1068,7 @@
       expect(role.reviewer?).to eql(false)
     end
 
-    it "adds the editor" do
+    it 'adds the editor' do
       expect(subject.add_user!(user.id, :editor)).to eql(true)
       role = Role.find_by(user_id: user.id, plan_id: subject.id)
       expect(role.creator?).to eql(false)
@@ -1223,7 +1078,7 @@
       expect(role.reviewer?).to eql(false)
     end
 
-    it "adds the commenter" do
+    it 'adds the commenter' do
       expect(subject.add_user!(user.id, :commenter)).to eql(true)
       role = Role.find_by(user_id: user.id, plan_id: subject.id)
       expect(role.creator?).to eql(false)
@@ -1233,7 +1088,7 @@
       expect(role.reviewer?).to eql(false)
     end
 
-    it "defaults to commenter if access_level is not a known symbol" do
+    it 'defaults to commenter if access_level is not a known symbol' do
       expect(subject.add_user!(user.id)).to eql(true)
       role = Role.find_by(user_id: user.id, plan_id: subject.id)
       expect(role.creator?).to eql(false)
@@ -1242,101 +1097,89 @@
       expect(role.commenter?).to eql(true)
       expect(role.reviewer?).to eql(false)
     end
-
   end
 
-  describe "#shared?" do
-
-    it "is not shared if the only user is the creator" do
+  describe '#shared?' do
+    it 'is not shared if the only user is the creator' do
       plan = build_plan
       expect(plan.shared?).to eql(false)
     end
 
-    it "is shared if the plan has an administrator" do
+    it 'is shared if the plan has an administrator' do
       plan = build_plan(true, false, false)
       expect(plan.shared?).to eql(true)
     end
 
-    it "is shared if the plan has an editor" do
+    it 'is shared if the plan has an editor' do
       plan = build_plan(false, true, false)
       expect(plan.shared?).to eql(true)
     end
 
-    it "is shared if the plan has an commenter" do
+    it 'is shared if the plan has an commenter' do
       plan = build_plan(false, false, true)
       expect(plan.shared?).to eql(true)
     end
-
   end
 
-  describe "#owner_and_coowners" do
-
+  describe '#owner_and_coowners' do
     let!(:plan) { build_plan(true, true, true) }
 
     subject { plan }
 
-    it "includes the creator" do
+    it 'includes the creator' do
       user = subject.roles.creator.first.user
       expect(subject.owner_and_coowners).to include(user)
     end
 
-    it "includes the administrator" do
+    it 'includes the administrator' do
       user = subject.roles.administrator.first.user
       expect(subject.owner_and_coowners).to include(user)
     end
 
-    it "does not include the editor" do
+    it 'does not include the editor' do
       # Only if the editor is not also an administrator or creator
       subject.roles.editor.each do |role|
-        if !role.creator? && !role.administrator?
-          expect(subject.owner_and_coowners).to_not include(role.user)
-        end
+        expect(subject.owner_and_coowners).to_not include(role.user) if !role.creator? && !role.administrator?
       end
     end
 
-    it "does not include the commenter" do
+    it 'does not include the commenter' do
       # Only if the commenter is not also an administrator or creator
       subject.roles.commenter.each do |role|
-        if !role.creator? && !role.administrator?
-          expect(subject.owner_and_coowners).to_not include(role.user)
-        end
+        expect(subject.owner_and_coowners).to_not include(role.user) if !role.creator? && !role.administrator?
       end
     end
-
   end
 
-  describe ".authors" do
+  describe '.authors' do
     let!(:plan) { build_plan(true, true, true) }
 
     subject { plan }
 
-    it "includes the creator" do
+    it 'includes the creator' do
       user = subject.roles.creator.first.user
       expect(subject.authors).to include(user)
     end
 
-    it "includes the administrator" do
+    it 'includes the administrator' do
       user = subject.roles.administrator.first.user
       expect(subject.authors).to include(user)
     end
 
-    it "includes the editor" do
+    it 'includes the editor' do
       user = subject.roles.editor.first.user
       expect(subject.authors).to include(user)
     end
 
-    it "does not include the commenter" do
+    it 'does not include the commenter' do
       # Only if the commenter is not also an editor, administrator or creator
       subject.roles.commenter.each do |role|
-        if !role.creator? && !role.administrator? && !role.editor?
-          expect(subject.authors).to_not include(role.user)
-        end
+        expect(subject.authors).to_not include(role.user) if !role.creator? && !role.administrator? && !role.editor?
       end
     end
   end
 
-  describe "#percent_answered" do
-
+  describe '#percent_answered' do
     let!(:template) { create(:template) }
 
     let!(:plan) { create(:plan, :creator, template: template) }
@@ -1357,14 +1200,12 @@
       end
     end
 
-    it "returns the percentage of questions with valid answers" do
+    it 'returns the percentage of questions with valid answers' do
       expect(subject.to_i).to eql(33)
     end
-
   end
 
-  describe "#num_questions" do
-
+  describe '#num_questions' do
     let!(:template) { create(:template) }
 
     let!(:plan) { create(:plan, :creator, template: template) }
@@ -1382,11 +1223,9 @@
     it "returns the number of questions belonging to this plan's sections" do
       expect(subject).to eql(12)
     end
-
   end
 
-  describe "#visibility_allowed?" do
-
+  describe '#visibility_allowed?' do
     let!(:template) { create(:template) }
 
     let!(:plan) { create(:plan, :creator, template: template) }
@@ -1402,31 +1241,25 @@
       end
     end
 
-    context "when requisite number of questions answered" do
-
+    context 'when requisite number of questions answered' do
       before do
         Rails.configuration.x.plans.default_percentage_answered = 75
       end
 
       it { is_expected.to eql(true) }
-
     end
 
-    context "when requisite number of questions not answered" do
-
+    context 'when requisite number of questions not answered' do
       before do
         Rails.configuration.x.plans.default_percentage_answered = 76
       end
 
       it { is_expected.to eql(false) }
     end
-
   end
 
-  describe "#question_exists?" do
-
-    context "when Question with ID and Plan exists" do
-
+  describe '#question_exists?' do
+    context 'when Question with ID and Plan exists' do
       let!(:question) { create(:question) }
 
       let!(:plan) { create(:plan, :creator, template: question.section.phase.template) }
@@ -1434,11 +1267,9 @@
       subject { plan.question_exists?(question.id) }
 
       it { is_expected.to eql(true) }
-
     end
 
     context "when Question with ID and Plan don't exist" do
-
       let!(:question) { create(:question) }
 
       let!(:plan) { create(:plan, :creator) }
@@ -1446,41 +1277,33 @@
       subject { plan.question_exists?(question.id) }
 
       it { is_expected.to eql(false) }
-
     end
-
   end
 
-  describe "#percent_answered" do
-
+  describe '#percent_answered' do
     let!(:template) { create(:template, phases: 1, sections: 1, questions: 1) }
 
     let!(:plan) { create(:plan, :creator, template: template) }
 
     subject { plan.percent_answered }
 
-    context "when has no answers" do
-
+    context 'when has no answers' do
       it { is_expected.to eql(0) }
-
     end
 
-    context "when has answers that are not valid" do
-
+    context 'when has answers that are not valid' do
       let!(:question) do
         create(:question, :textarea, section: template.phases.first.sections.first)
       end
 
       before do
-        create_list(:answer, 1, text: "", plan: plan, question: question)
+        create_list(:answer, 1, text: '', plan: plan, question: question)
       end
 
       it { is_expected.to eql(0) }
-
     end
 
-    context "when has answers that are valid" do
-
+    context 'when has answers that are valid' do
       let!(:question) do
         create(:question, :textarea, section: template.phases.first.sections.first)
       end
@@ -1490,37 +1313,36 @@
       end
 
       it { is_expected.to eql(50.0) }
-
     end
   end
 
-  describe "#landing_page" do
+  describe '#landing_page' do
     let!(:plan) { create(:plan, :creator) }
 
-    it "returns nil if no DOI or ARK is available" do
+    it 'returns nil if no DOI or ARK is available' do
       expect(plan.landing_page).to eql(nil)
     end
-    it "returns the DOI if available" do
-      id = create(:identifier, identifiable: plan, value: "10.9999/123erge/45f")
+    it 'returns the DOI if available' do
+      id = create(:identifier, identifiable: plan, value: '10.9999/123erge/45f')
       plan.reload
       expect(plan.landing_page).to eql(id)
     end
-    it "returns the ARK if available" do
-      id = create(:identifier, identifiable: plan, value: "ark:10.9999/123")
+    it 'returns the ARK if available' do
+      id = create(:identifier, identifiable: plan, value: 'ark:10.9999/123')
       plan.reload
       expect(plan.landing_page).to eql(id)
     end
   end
 
-  describe "#grant association sanity checks" do
+  describe '#grant association sanity checks' do
     let!(:plan) { create(:plan, :creator) }
 
-    it "allows a grant identifier to be associated" do
+    it 'allows a grant identifier to be associated' do
       plan.grant = build(:identifier, identifier_scheme: nil)
       plan.save
       expect(plan.grant.new_record?).to eql(false)
     end
-    it "allows a grant identifier to be deleted" do
+    it 'allows a grant identifier to be deleted' do
       plan.grant = build(:identifier, identifier_scheme: nil)
       plan.save
       plan.grant = nil
@@ -1528,7 +1350,7 @@
       expect(plan.grant).to eql(nil)
       expect(Identifier.last).to eql(nil)
     end
-    it "does not allow multiple grants on a single plan" do
+    it 'does not allow multiple grants on a single plan' do
       plan.grant = build(:identifier, identifier_scheme: nil)
       plan.save
       val = SecureRandom.uuid
@@ -1538,7 +1360,7 @@
       expect(plan.grant.value).to eql(val)
       expect(Identifier.all.length).to eql(1)
     end
-    it "allows the same grant to be associated with different plans" do
+    it 'allows the same grant to be associated with different plans' do
       val = SecureRandom.uuid
       id = build(:identifier, identifier_scheme: nil, value: val)
       plan.grant = id
@@ -1551,15 +1373,15 @@
     end
   end
 
-  describe "#grant association sanity checks" do
+  describe '#grant association sanity checks' do
     let!(:plan) { create(:plan, :creator) }
 
-    it "allows a grant identifier to be associated" do
+    it 'allows a grant identifier to be associated' do
       plan.grant = { value: build(:identifier, identifier_scheme: nil).value }
       plan.save
       expect(plan.grant.new_record?).to eql(false)
     end
-    it "allows a grant identifier to be deleted" do
+    it 'allows a grant identifier to be deleted' do
       plan.grant = { value: build(:identifier, identifier_scheme: nil).value }
       plan.save
       plan.grant = { value: nil }
@@ -1567,7 +1389,7 @@
       expect(plan.grant).to eql(nil)
       expect(Identifier.last).to eql(nil)
     end
-    it "does not allow multiple grants on a single plan" do
+    it 'does not allow multiple grants on a single plan' do
       plan.grant = { value: build(:identifier, identifier_scheme: nil).value }
       plan.save
       val = SecureRandom.uuid
@@ -1578,5 +1400,4 @@
       expect(Identifier.all.length).to eql(1)
     end
   end
-
 end
diff --git a/spec/models/pref_spec.rb b/spec/models/pref_spec.rb
index 127d8f3c13..eb651c1dca 100644
--- a/spec/models/pref_spec.rb
+++ b/spec/models/pref_spec.rb
@@ -1,34 +1,26 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Pref, type: :model do
-
-  context "attributes" do
-
+  context 'attributes' do
     # TODO: Uncomment this once the JSON Serialization ticket has been finished
     # it { is_expected.to serialize(:settings) }
-
   end
 
-  context "associations" do
-
+  context 'associations' do
     it { is_expected.to belong_to(:user) }
-
   end
 
-  context "validations" do
+  context 'validations' do
     it { is_expected.to validate_presence_of(:user) }
     it { is_expected.to validate_presence_of(:settings) }
   end
 
-  describe ".default_settings" do
-
-    it "returns Rails configuration for preferences" do
+  describe '.default_settings' do
+    it 'returns Rails configuration for preferences' do
       expect(Pref.default_settings).to eql(Rails.configuration.x.application.preferences)
       expect(Pref.default_settings).not_to be_nil
     end
-
   end
-
 end
diff --git a/spec/models/question_format_spec.rb b/spec/models/question_format_spec.rb
index 94a83bac0a..89a6676666 100644
--- a/spec/models/question_format_spec.rb
+++ b/spec/models/question_format_spec.rb
@@ -1,16 +1,14 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe QuestionFormat, type: :model do
-
-  context "validations" do
-
+  context 'validations' do
     it { is_expected.to validate_presence_of(:title) }
 
     it {
       is_expected.to validate_uniqueness_of(:title)
-        .with_message("must be unique")
+        .with_message('must be unique')
     }
 
     it { is_expected.to validate_presence_of(:description) }
@@ -25,82 +23,62 @@
                                   :date, :rda_metadata)
         .for(:formattype)
     }
-
   end
 
-  context "associations" do
-
+  context 'associations' do
     it { is_expected.to have_many(:questions) }
-
   end
 
-  describe ".id_for" do
-
-    let!(:format_type) { "textarea" }
+  describe '.id_for' do
+    let!(:format_type) { 'textarea' }
 
     subject { QuestionFormat.id_for(format_type) }
 
     context "when record doesn't exist" do
-
-      it "it returns nil" do
+      it 'it returns nil' do
         # TODO: This behaviour is fixed in the refactors branch
         expect(subject).to be_nil
       end
-
     end
 
-    context "when record exists" do
-
+    context 'when record exists' do
       before do
-        @question_format = create(:question_format, formattype: "textarea")
+        @question_format = create(:question_format, formattype: 'textarea')
       end
 
-      it "returns the ID for that record" do
+      it 'returns the ID for that record' do
         expect(subject).to eql(@question_format.id)
       end
-
     end
-
   end
 
-  describe "#to_s" do
-
+  describe '#to_s' do
     let!(:question_format) { create(:question_format) }
 
-    it "returns the title" do
+    it 'returns the title' do
       expect(question_format.to_s).to eql(question_format.title)
     end
-
   end
 
-  describe "#option_based?" do
-
+  describe '#option_based?' do
     subject { question_format.option_based? }
 
-    context "when question_format option_based is true" do
-
+    context 'when question_format option_based is true' do
       let!(:question_format) { create(:question_format, option_based: true) }
 
       it { is_expected.to eql(true) }
-
     end
 
-    context "when question_format option_based is true" do
-
+    context 'when question_format option_based is true' do
       let!(:question_format) { create(:question_format, option_based: false) }
 
       it { is_expected.to eql(false) }
-
     end
-
   end
 
-  describe "#formattype" do
-
-    it "raises an exception when value not recognised" do
+  describe '#formattype' do
+    it 'raises an exception when value not recognised' do
       expect { subject.formattype = :foo }.to raise_error(ArgumentError)
     end
-
   end
-
 end
diff --git a/spec/models/question_option_spec.rb b/spec/models/question_option_spec.rb
index 0ad26a240f..1cae7efda2 100644
--- a/spec/models/question_option_spec.rb
+++ b/spec/models/question_option_spec.rb
@@ -1,11 +1,9 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe QuestionOption, type: :model do
-
-  context "validations" do
-
+  context 'validations' do
     it { is_expected.to validate_presence_of(:question) }
 
     it { is_expected.to validate_presence_of(:text) }
@@ -15,21 +13,18 @@
     it { is_expected.to allow_values(true, false).for(:is_default) }
 
     it { is_expected.not_to allow_value(nil).for(:is_default) }
-
   end
 
-  context "associations" do
-
+  context 'associations' do
     it { is_expected.to belong_to(:question) }
 
     it {
       is_expected.to have_and_belong_to_many(:answers)
-        .join_table("answers_question_options")
+        .join_table('answers_question_options')
     }
   end
 
-  describe ".by_number" do
-
+  describe '.by_number' do
     subject { QuestionOption.by_number }
 
     before do
@@ -38,56 +33,49 @@
       @c = create(:question_option, number: 2)
     end
 
-    it "orders records by the number attribute" do
+    it 'orders records by the number attribute' do
       expect(subject.first).to eql(@a)
       expect(subject.last).to eql(@b)
     end
-
   end
 
-  describe "#deep_copy" do
-
+  describe '#deep_copy' do
     let!(:options) { {} }
 
     let!(:question_option) { create(:question_option, is_default: true) }
 
     subject { question_option.deep_copy(options) }
 
-    context "when no options provided" do
-
-      it "builds a new record" do
+    context 'when no options provided' do
+      it 'builds a new record' do
         expect(subject).to be_new_record
       end
 
-      it "copies is_default from original" do
+      it 'copies is_default from original' do
         expect(subject.is_default).to eql(question_option.is_default)
       end
 
-      it "copies number from original" do
+      it 'copies number from original' do
         expect(subject.number).to eql(question_option.number)
       end
 
-      it "copies text from original" do
+      it 'copies text from original' do
         expect(subject.text).to eql(question_option.text)
       end
 
-      it "sets question_id to nil" do
+      it 'sets question_id to nil' do
         expect(subject.question_id).to be_nil
       end
-
     end
 
-    context "when question_id option is present" do
-
+    context 'when question_id option is present' do
       let!(:question) { create(:question) }
 
       let!(:options) { { question_id: question.id } }
 
-      it "sets question_id to given option" do
+      it 'sets question_id to given option' do
         expect(subject.question_id).to eql(question.id)
       end
-
     end
   end
-
 end
diff --git a/spec/models/question_spec.rb b/spec/models/question_spec.rb
index 943e5ff414..ff3f995a4c 100644
--- a/spec/models/question_spec.rb
+++ b/spec/models/question_spec.rb
@@ -1,13 +1,11 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Question, type: :model do
+  it_behaves_like 'VersionableModel'
 
-  it_behaves_like "VersionableModel"
-
-  context "validations" do
-
+  context 'validations' do
     it {
       is_expected.to validate_presence_of(:text)
         .with_message("for 'Question text' can't be blank.")
@@ -15,11 +13,11 @@
 
     it { is_expected.to validate_presence_of(:number) }
 
-    it "validates uniqueness of number" do
+    it 'validates uniqueness of number' do
       subject.versionable_id = SecureRandom.uuid
       expect(subject).to validate_uniqueness_of(:number)
         .scoped_to(:section_id)
-        .with_message("must be unique")
+        .with_message('must be unique')
     end
 
     it { is_expected.to validate_presence_of(:section).on(:update) }
@@ -33,11 +31,9 @@
     it { is_expected.to allow_values(true, false).for(:modifiable) }
 
     it { is_expected.to allow_value(nil).for(:modifiable) }
-
   end
 
-  context "associations" do
-
+  context 'associations' do
     it { is_expected.to belong_to :section }
 
     it { is_expected.to belong_to :question_format }
@@ -54,85 +50,70 @@
 
     it {
       is_expected.to have_and_belong_to_many(:themes)
-        .join_table("questions_themes")
+        .join_table('questions_themes')
     }
-
   end
 
-  describe "#to_s" do
-
+  describe '#to_s' do
     before do
-      subject.text = "foo bar"
+      subject.text = 'foo bar'
     end
 
     it "returns the Question's text" do
-      expect(subject.to_s).to eql("foo bar")
+      expect(subject.to_s).to eql('foo bar')
     end
-
   end
 
-  describe "#option_based?" do
-
+  describe '#option_based?' do
     subject { question_format.option_based? }
 
-    context "when QuestionFormat is option_based and has at least one option" do
-
+    context 'when QuestionFormat is option_based and has at least one option' do
       let!(:question_format) { create(:question_format, option_based: true) }
       let!(:question) { create(:question, question_format: question_format, options: 1) }
 
       it { is_expected.to eql(true) }
-
     end
 
-    context "when QuestionFormat is option_based and has no option" do
-
+    context 'when QuestionFormat is option_based and has no option' do
       let!(:question_format) { create(:question_format, option_based: true) }
 
-      # rubocop:disable Layout/LineLength
       it {
         expect do
           create(:question, question_format: question_format, options: 0)
         end.to raise_error(ActiveRecord::RecordInvalid,
-                           "Validation failed: You must have at least one option with accompanying text.")
+                           'Validation failed: You must have at least one option with accompanying text.')
       }
-      # rubocop:enable Layout/LineLength
-
       it { is_expected.to eql(true) }
-
     end
 
-    context "when QuestionFormat is not option_based" do
-
+    context 'when QuestionFormat is not option_based' do
       let!(:question_format) { create(:question_format, option_based: false) }
       let!(:question) { create(:question, question_format: question_format) }
 
       it { is_expected.to eql(false) }
-
     end
   end
 
-  describe "#deep_copy" do
-
+  describe '#deep_copy' do
     let!(:question) do
       create(:question,
-             default_value: "foo bar",
+             default_value: 'foo bar',
              modifiable: true,
              number: 12,
              option_comment_display: false,
-             text: "How many foos can bar?")
+             text: 'How many foos can bar?')
     end
 
     let!(:options) { {} }
 
     subject { question.deep_copy(options) }
 
-    context "when no options are provided" do
-
+    context 'when no options are provided' do
       before do
         create_list(:question_option, 4, question: question)
       end
 
-      it "checks number of question options" do
+      it 'checks number of question options' do
         expect(subject.question_options.size).to eql(question.question_options.size)
       end
 
@@ -140,43 +121,41 @@
         expect(subject).to be_new_record
       end
 
-      it "copies default_value from original Question" do
-        expect(subject.default_value).to eql("foo bar")
+      it 'copies default_value from original Question' do
+        expect(subject.default_value).to eql('foo bar')
       end
 
-      it "copies modifiable from original Question" do
+      it 'copies modifiable from original Question' do
         expect(subject.modifiable).to eql(true)
         question.modifiable = false
         expect(question.deep_copy.modifiable).to eql(false)
       end
 
-      it "copies number from original Question" do
+      it 'copies number from original Question' do
         expect(subject.number).to eql(12)
       end
 
-      it "copies option_comment_display from original Question" do
+      it 'copies option_comment_display from original Question' do
         expect(subject.option_comment_display).to eql(false)
       end
 
-      it "copies text from original Question" do
-        expect(subject.text).to eql("How many foos can bar?")
+      it 'copies text from original Question' do
+        expect(subject.text).to eql('How many foos can bar?')
       end
 
-      it "copies question_format_id from original Question" do
+      it 'copies question_format_id from original Question' do
         expect(subject.question_format_id).to eql(question.question_format_id)
       end
 
-      it "sets section_id to nil" do
+      it 'sets section_id to nil' do
         expect(subject.section_id).to be_nil
       end
-
     end
 
-    context "when modifiable option provided" do
-
+    context 'when modifiable option provided' do
       let!(:options) { { modifiable: true } }
 
-      it "copies modifiable from option" do
+      it 'copies modifiable from option' do
         expect(subject.modifiable).to eql(true)
         question.modifiable = false
         expect(question.deep_copy.modifiable).to eql(false)
@@ -186,33 +165,28 @@
         question.modifiable = false
         expect(question.deep_copy(options).modifiable).to eql(true)
       end
-
     end
 
-    context "when section_id option provided" do
-
+    context 'when section_id option provided' do
       let!(:section) { create(:section) }
 
       let!(:options) { { section_id: section.id } }
 
-      it "sets the section_id attribute" do
+      it 'sets the section_id attribute' do
         expect(subject.section_id).to eql(section.id)
       end
-
     end
 
-    context "when save option provided" do
-
+    context 'when save option provided' do
       let!(:options) { { save: true } }
 
-      it "persists the record to the database" do
+      it 'persists the record to the database' do
         expect(subject).to be_persisted
       end
     end
   end
 
-  describe "#example_answers" do
-
+  describe '#example_answers' do
     subject { question.example_answers([org.id]) }
 
     let!(:question) { create(:question) }
@@ -220,42 +194,34 @@
     let!(:org) { create(:org) }
 
     context "when belongs to Org and type 'Example answer'" do
-
       let!(:annotation) do
         create(:annotation, question: question, org: org,
                             type: Annotation.types[:example_answer])
       end
 
       it { is_expected.to include(annotation) }
-
     end
 
     context "when belongs to Org and type 'Guidance'" do
-
       let!(:annotation) do
         create(:annotation, question: question, org: org,
                             type: Annotation.types[:guidance])
       end
 
       it { is_expected.not_to include(annotation) }
-
     end
 
     context "when belongs to other Org and type 'Example answer'" do
-
       let!(:annotation) do
         create(:annotation, question: question,
                             type: Annotation.types[:guidance])
       end
 
       it { is_expected.not_to include(annotation) }
-
     end
-
   end
 
-  describe "#guidance_annotation" do
-
+  describe '#guidance_annotation' do
     subject { question.guidance_annotation(org.id) }
 
     let!(:question) { create(:question) }
@@ -263,7 +229,6 @@
     let!(:org) { create(:org) }
 
     context "when Annotation type is 'guidance' and belongs to Org" do
-
       let!(:annotation) do
         create(:annotation,
                org: org,
@@ -272,11 +237,9 @@
       end
 
       it { is_expected.to eql(annotation) }
-
     end
 
     context "when Annotation type is 'Example Answer' and belongs to Org" do
-
       let!(:annotation) do
         create(:annotation,
                org: org,
@@ -285,11 +248,9 @@
       end
 
       it { is_expected.to be_nil }
-
     end
 
     context "when Annotation type is 'guidance' and doesn't belong to Org" do
-
       let!(:annotation) do
         create(:annotation,
                question: question,
@@ -297,11 +258,9 @@
       end
 
       it { is_expected.to be_nil }
-
     end
 
     context "when Annotation type 'Example Answer' and doesn't belong to Org" do
-
       let!(:annotation) do
         create(:annotation,
                question: question,
@@ -309,77 +268,64 @@
       end
 
       it { is_expected.to be_nil }
-
     end
-
   end
 
-  describe "#annotations_per_org" do
-
+  describe '#annotations_per_org' do
     subject { question.annotations_per_org(org.id) }
 
     let!(:org) { create(:org) }
 
     let!(:question) { create(:question) }
 
-    context "when example answer already present" do
-
+    context 'when example answer already present' do
       before do
         create(:annotation, type: Annotation.types[:example_answer],
                             org: org, question: question)
       end
 
-      it "returns the existing annotation" do
+      it 'returns the existing annotation' do
         expect(subject.first).to be_persisted
       end
 
-      it "returns example answer" do
+      it 'returns example answer' do
         expect(subject.first).to be_example_answer
       end
-
     end
 
-    context "when example answer not present" do
-
-      it "returns the existing annotation" do
+    context 'when example answer not present' do
+      it 'returns the existing annotation' do
         expect(subject.first).to be_new_record
       end
 
-      it "returns example answer" do
+      it 'returns example answer' do
         expect(subject.first).to be_example_answer
       end
-
     end
 
-    context "when guidance already present" do
-
+    context 'when guidance already present' do
       before do
         create(:annotation, type: Annotation.types[:guidance],
                             org: org, question: question)
       end
 
-      it "returns the existing annotation" do
+      it 'returns the existing annotation' do
         expect(subject.last).to be_persisted
       end
 
-      it "returns example answer" do
+      it 'returns example answer' do
         expect(subject.last).to be_guidance
       end
-
     end
 
-    context "when guidance not present" do
-
-      it "returns the existing annotation" do
+    context 'when guidance not present' do
+      it 'returns the existing annotation' do
         expect(subject.last).to be_new_record
       end
 
-      it "returns example answer" do
+      it 'returns example answer' do
         expect(subject.last).to be_guidance
       end
-
     end
-
   end
-
 end
diff --git a/spec/models/region_spec.rb b/spec/models/region_spec.rb
index 30b1e31ea6..90fbef90fa 100644
--- a/spec/models/region_spec.rb
+++ b/spec/models/region_spec.rb
@@ -1,15 +1,14 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Region, type: :model do
-
-  context "validations" do
+  context 'validations' do
     it { is_expected.to validate_presence_of(:abbreviation) }
 
     it {
       is_expected.to validate_uniqueness_of(:abbreviation)
-        .with_message("must be unique")
+        .with_message('must be unique')
     }
 
     it { is_expected.to validate_presence_of(:description) }
@@ -17,12 +16,9 @@
     it { is_expected.to validate_presence_of(:name) }
   end
 
-  context "associations" do
-
+  context 'associations' do
     it { is_expected.to belong_to(:super_region).optional }
 
     it { is_expected.to have_many :sub_regions }
-
   end
-
 end
diff --git a/spec/models/research_domain_spec.rb b/spec/models/research_domain_spec.rb
index a9294fa69c..5edb23eb68 100644
--- a/spec/models/research_domain_spec.rb
+++ b/spec/models/research_domain_spec.rb
@@ -1,12 +1,10 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 describe ResearchDomain do
-
-  context "associations" do
+  context 'associations' do
     it { is_expected.to have_many :sub_fields }
     it { is_expected.to belong_to(:parent).optional }
   end
-
 end
diff --git a/spec/models/research_output_spec.rb b/spec/models/research_output_spec.rb
index d948f6c206..bdccc75518 100644
--- a/spec/models/research_output_spec.rb
+++ b/spec/models/research_output_spec.rb
@@ -1,15 +1,13 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe ResearchOutput, type: :model do
-
-  context "associations" do
+  context 'associations' do
     it { is_expected.to belong_to(:plan).optional }
   end
 
-  # rubocop:disable Layout/LineLength
-  context "validations" do
+  context 'validations' do
     before(:each) do
       @subject = create(:research_output, plan: create(:plan))
     end
@@ -32,15 +30,13 @@
       expect(@subject).not_to validate_presence_of(:output_type_description)
     end
   end
-  # rubocop:enable Layout/LineLength
-
-  it "factory builds a valid model" do
+  it 'factory builds a valid model' do
     expect(build(:research_output).valid?).to eql(true)
     expect(build(:research_output, :complete).valid?).to eql(true)
   end
 
-  describe "cascading deletes" do
-    it "does not delete associated plan" do
+  describe 'cascading deletes' do
+    it 'does not delete associated plan' do
       model = create(:research_output, :complete, plan: create(:plan))
       plan = model.plan
       model.destroy
@@ -48,19 +44,18 @@
     end
   end
 
-  context "instance methods" do
-    xit "licenses should have tests once implemented" do
+  context 'instance methods' do
+    xit 'licenses should have tests once implemented' do
       true
     end
-    xit "repositories should have tests once implemented" do
+    xit 'repositories should have tests once implemented' do
       true
     end
-    xit "metadata_standards should have tests once implemented" do
+    xit 'metadata_standards should have tests once implemented' do
       true
     end
-    xit "resource_types should have tests once implemented" do
+    xit 'resource_types should have tests once implemented' do
       true
     end
   end
-
 end
diff --git a/spec/models/role_spec.rb b/spec/models/role_spec.rb
index 62a93fb6bd..b57bddfe4c 100644
--- a/spec/models/role_spec.rb
+++ b/spec/models/role_spec.rb
@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Role, type: :model do
   include RolesHelper
 
-  context "validations" do
+  context 'validations' do
     it { is_expected.to validate_presence_of(:user) }
 
     it { is_expected.to validate_presence_of(:plan) }
@@ -20,70 +20,61 @@
         .is_greater_than(0)
         .with_message("can't be less than zero")
     }
-
   end
 
-  context "associations" do
-
+  context 'associations' do
     it { is_expected.to belong_to :user }
 
     it { is_expected.to belong_to :plan }
-
   end
 
-  describe ".deactivate!" do
+  describe '.deactivate!' do
     before do
       @plan = build_plan(true, true, true)
     end
 
     subject { @plan }
 
-    context "different access levels" do
-
-      it "creator is no longer active" do
+    context 'different access levels' do
+      it 'creator is no longer active' do
         role = subject.roles.creator.first
         role.deactivate!
         expect(role.active).to eql(false)
       end
 
-      it "administrator is no longer active" do
+      it 'administrator is no longer active' do
         @role = subject.roles.administrator.first
         @role.deactivate!
         expect(@role.active).to eql(false)
       end
 
-      it "editor is no longer active" do
+      it 'editor is no longer active' do
         @role = subject.roles.editor.first
         @role.deactivate!
         expect(@role.active).to eql(false)
       end
 
-      it "commenter is no longer active" do
+      it 'commenter is no longer active' do
         @role = subject.roles.commenter.first
         @role.deactivate!
         expect(@role.active).to eql(false)
       end
-
     end
 
-    context "Deactivation calls Plan.deactivate! if Plan.authors is empty" do
-
-      it "plan has no other authors" do
+    context 'Deactivation calls Plan.deactivate! if Plan.authors is empty' do
+      it 'plan has no other authors' do
         plan = build_plan(false, false, false)
         role = plan.roles.creator.first
         role.plan.expects(:deactivate!).times(1)
         role.deactivate!
       end
 
-      it "plan has another author" do
+      it 'plan has another author' do
         plan = build_plan(true, false, false)
         role = plan.roles.creator.first
         role.plan.expects(:deactivate!).times(0)
         role.deactivate!
       end
-
     end
-
   end
-
 end
diff --git a/spec/models/section_sorter_spec.rb b/spec/models/section_sorter_spec.rb
index 726783e743..0075aa241a 100644
--- a/spec/models/section_sorter_spec.rb
+++ b/spec/models/section_sorter_spec.rb
@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
-require "spec_helper"
+require 'spec_helper'
 
 RSpec.describe SectionSorter, type: :model do
-
+  # rubocop:disable Lint/ConstantDefinitionInBlock
   StubSection = Struct.new(:number, :modifiable, :id) do
-
     alias_method :modifiable?, :modifiable
 
     def unmodifiable?
@@ -19,11 +18,10 @@ def has_number?(value)
     def has_id?(value)
       id == value
     end
-
   end
+  # rubocop:enable Lint/ConstantDefinitionInBlock
 
-  describe "#sort!" do
-
+  describe '#sort!' do
     let!(:sections_array) do
       [
         StubSection.new(1, true, 105),
@@ -37,24 +35,23 @@ def has_id?(value)
 
     subject { SectionSorter.new(*sections_array).sort! }
 
-    it "returns an Array" do
+    it 'returns an Array' do
       expect(subject).to be_an_instance_of(Array)
     end
 
-    it "moves the prefix section to the front" do
+    it 'moves the prefix section to the front' do
       expect(subject.first).to have_number(1)
     end
 
-    it "groups unmodifiable sections together" do
+    it 'groups unmodifiable sections together' do
       expect(subject[1..3].map(&:number)).to eql([2, 3, 5])
     end
 
-    it "groups modifiable sections together, last" do
+    it 'groups modifiable sections together, last' do
       expect(subject[4..5].map(&:number)).to eql([4, 6])
     end
 
-    context "when duplicate prefix exists" do
-
+    context 'when duplicate prefix exists' do
       let!(:sections_array) do
         [
           StubSection.new(1, false, 12),
@@ -67,20 +64,18 @@ def has_id?(value)
         ].shuffle
       end
 
-      it "moves the modifiable one to the front" do
+      it 'moves the modifiable one to the front' do
         expect(subject.first).to have_id(34)
         expect(subject.first).to be_modifiable
       end
 
-      it "moves the unmodifiable one to the second position" do
+      it 'moves the unmodifiable one to the second position' do
         expect(subject.second).to have_id(12)
         expect(subject.second).to be_unmodifiable
       end
-
     end
 
-    context "when duplicate section exists" do
-
+    context 'when duplicate section exists' do
       let!(:sections_array) do
         [
           StubSection.new(1, true, 34),
@@ -91,16 +86,14 @@ def has_id?(value)
         ].shuffle
       end
 
-      it "sorts the duplicates by id" do
+      it 'sorts the duplicates by id' do
         expect(subject[2]).to have_id(84)
         expect(subject[3]).to have_id(199)
         expect(subject[4]).to have_id(205)
       end
-
     end
 
-    context "when all sections are modifiable" do
-
+    context 'when all sections are modifiable' do
       let!(:sections_array) do
         [
           StubSection.new(1, true, 105),
@@ -112,18 +105,16 @@ def has_id?(value)
         ].shuffle
       end
 
-      it "sorts all sections by number" do
+      it 'sorts all sections by number' do
         expect(subject.map(&:number)).to eql([1, 2, 3, 4, 5, 5])
       end
 
-      it "sorts duplicates by id" do
+      it 'sorts duplicates by id' do
         expect(subject.last).to have_id(1009)
       end
-
     end
 
-    context "when all sections are unmodifiable" do
-
+    context 'when all sections are unmodifiable' do
       let!(:sections_array) do
         [
           StubSection.new(1, false, 105),
@@ -135,16 +126,13 @@ def has_id?(value)
         ].shuffle
       end
 
-      it "sorts all sections by number" do
+      it 'sorts all sections by number' do
         expect(subject.map(&:number)).to eql([1, 2, 3, 4, 4, 5])
       end
 
-      it "sorts duplicates by id" do
+      it 'sorts duplicates by id' do
         expect(subject[4]).to have_id(109)
       end
-
     end
-
   end
-
 end
diff --git a/spec/models/section_spec.rb b/spec/models/section_spec.rb
index 9727e1cbf9..8eaa0650f8 100644
--- a/spec/models/section_spec.rb
+++ b/spec/models/section_spec.rb
@@ -1,31 +1,28 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Section, type: :model do
+  it_behaves_like 'VersionableModel'
 
-  it_behaves_like "VersionableModel"
-
-  context "validations" do
+  context 'validations' do
     it { is_expected.to validate_presence_of(:title) }
 
     it { is_expected.to validate_presence_of(:number) }
 
     it { is_expected.to validate_presence_of(:phase) }
 
-    it "validates uniqueness of number" do
+    it 'validates uniqueness of number' do
       subject.versionable_id = SecureRandom.uuid
       expect(subject).to validate_uniqueness_of(:number)
         .scoped_to(:phase_id)
-        .with_message("must be unique")
+        .with_message('must be unique')
     end
 
     it { is_expected.to allow_values(true, false).for(:modifiable) }
-
   end
 
-  context "associations" do
-
+  context 'associations' do
     it { is_expected.to belong_to :phase }
 
     it { is_expected.not_to belong_to :organisation }
@@ -33,58 +30,49 @@
     it { is_expected.to have_one :template }
 
     it { is_expected.to have_many :questions }
-
   end
 
-  describe "#deep_copy" do
-
+  describe '#deep_copy' do
     let!(:options) { {} }
 
     let!(:section) { create(:section) }
 
     subject { section.deep_copy(options) }
 
-    context "when no options provided" do
-
+    context 'when no options provided' do
       before do
         create_list(:question, 3, section: section)
       end
 
-      it "checks number of questions" do
+      it 'checks number of questions' do
         expect(section.questions.size).to eql(section.questions.size)
       end
-
     end
-
   end
 
-  describe "#num_answered_questions" do
-
+  describe '#num_answered_questions' do
     let!(:phase) { create(:phase, template: template) }
 
     let!(:section) { create(:section, phase: phase) }
 
     subject { section.num_answered_questions(plan) }
 
-    context "when plan is nil" do
-
+    context 'when plan is nil' do
       let!(:plan) { nil }
 
       let!(:template) { create(:template) }
 
       it { is_expected.to be_zero }
-
     end
 
-    context "when plan is present" do
-
+    context 'when plan is present' do
       let!(:plan) { create(:plan) }
 
       let!(:template) { plan.template }
 
       before do
         question = create(:question, section: section)
-        create(:answer, question: question, plan: plan, text: "")
+        create(:answer, question: question, plan: plan, text: '')
 
         question = create(:question, section: section)
         create(:answer, question: question, plan: plan)
@@ -93,12 +81,9 @@
         create(:answer, question: question, plan: plan)
       end
 
-      it "is expected to return the number of valid answered questions" do
+      it 'is expected to return the number of valid answered questions' do
         expect(subject).to eql(2)
       end
-
     end
-
   end
-
 end
diff --git a/spec/models/stat_created_plan_spec.rb b/spec/models/stat_created_plan_spec.rb
index 41e5255bb5..7918f0ed97 100644
--- a/spec/models/stat_created_plan_spec.rb
+++ b/spec/models/stat_created_plan_spec.rb
@@ -1,32 +1,32 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe StatCreatedPlan, type: :model do
-  describe ".to_json" do
-    it "returns only the count and date if no details are defined" do
+  describe '.to_json' do
+    it 'returns only the count and date if no details are defined' do
       stat = build(:stat_created_plan)
       json = JSON.parse(stat.to_json)
-      expect(json["count"]).to eql(stat.count)
-      expect(json["date"]).to eql(stat.date.strftime("%Y-%m-%d"))
-      expect(json["by_template"]).to eql([])
-      expect(json["org_id"]).to eql(nil)
-      expect(json["created_at"]).to eql(nil)
+      expect(json['count']).to eql(stat.count)
+      expect(json['date']).to eql(stat.date.strftime('%Y-%m-%d'))
+      expect(json['by_template']).to eql([])
+      expect(json['org_id']).to eql(nil)
+      expect(json['created_at']).to eql(nil)
     end
   end
-  describe ".to_csv" do
-    context "when no instances" do
-      it "returns empty" do
+  describe '.to_csv' do
+    context 'when no instances' do
+      it 'returns empty' do
         csv = described_class.to_csv([])
 
         expect(csv).to be_empty
       end
     end
-    context "when instances" do
+    context 'when instances' do
       let(:org) { FactoryBot.create(:org) }
 
-      context "when no details" do
-        it "returns counts in a comma-separated row" do
+      context 'when no details' do
+        it 'returns counts in a comma-separated row' do
           may = FactoryBot.create(:stat_created_plan,
                                   date: Date.new(2018, 0o5, 31),
                                   org: org, count: 20)
@@ -46,22 +46,22 @@
         end
       end
 
-      context "when details by template is true" do
-        it "returns counts by_template in a comma-separated row" do
+      context 'when details by template is true' do
+        it 'returns counts by_template in a comma-separated row' do
           may = FactoryBot.create(:stat_created_plan,
                                   date: Date.new(2018, 0o5, 31),
                                   org: org,
                                   count: 20,
                                   details: { by_template: [
-                                    { name: "Template1", count: 5 },
-                                    { name: "Template2", count: 15 }
+                                    { name: 'Template1', count: 5 },
+                                    { name: 'Template2', count: 15 }
                                   ] })
           june = FactoryBot.create(:stat_created_plan,
                                    date: Date.new(2018, 0o6, 30),
                                    org: org, count: 10,
                                    details: { by_template: [
-                                     { name: "Template1", count: 2 },
-                                     { name: "Template3", count: 8 }
+                                     { name: 'Template1', count: 2 },
+                                     { name: 'Template3', count: 8 }
                                    ] })
           july = FactoryBot.create(:stat_created_plan,
                                    date: Date.new(2018, 0o7, 31),
@@ -69,7 +69,7 @@
                                    count: 0)
           data = [may, june, july]
 
-          csv = described_class.to_csv(data, details: { by_template: true, sep: "," })
+          csv = described_class.to_csv(data, details: { by_template: true, sep: ',' })
 
           expected_csv = <<~HERE
             Date,Template1,Template2,Template3,Count
@@ -83,28 +83,28 @@
     end
   end
 
-  describe ".serialize" do
+  describe '.serialize' do
     let(:org) do
       FactoryBot.create(:org,
-                        name: "An Org",
-                        contact_email: "foo@bar.com",
-                        contact_name: "Foo")
+                        name: 'An Org',
+                        contact_email: 'foo@bar.com',
+                        contact_name: 'Foo')
     end
     let(:details) do
-      { "by_template" => [
-        { "name" => "Template 1", "count" => 10 },
-        { "name" => "Template 2", "count" => 10 }
+      { 'by_template' => [
+        { 'name' => 'Template 1', 'count' => 10 },
+        { 'name' => 'Template 2', 'count' => 10 }
       ] }
     end
 
-    it "retrieves JSON details as a hash object" do
+    it 'retrieves JSON details as a hash object' do
       FactoryBot.create(:stat_created_plan,
-                        date: "2018-09-30",
+                        date: '2018-09-30',
                         org: org,
                         count: 20,
                         details: details)
 
-      json_details = described_class.find_by_date("2018-09-30").details
+      json_details = described_class.find_by_date('2018-09-30').details
 
       expect(json_details).to eq(details)
     end
diff --git a/spec/models/stat_joined_user_spec.rb b/spec/models/stat_joined_user_spec.rb
index 30262083cc..ef3c12ee5d 100644
--- a/spec/models/stat_joined_user_spec.rb
+++ b/spec/models/stat_joined_user_spec.rb
@@ -1,34 +1,34 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe StatJoinedUser, type: :model do
   before(:example) do
     @org = FactoryBot.create(:org)
   end
 
-  describe ".to_json" do
-    it "returns only the count and date if no details are defined" do
+  describe '.to_json' do
+    it 'returns only the count and date if no details are defined' do
       stat = build(:stat_joined_user)
       json = JSON.parse(stat.to_json)
-      expect(json["count"]).to eql(stat.count)
-      expect(json["date"]).to eql(stat.date.strftime("%Y-%m-%d"))
-      expect(json["by_template"]).to eql(nil)
-      expect(json["org_id"]).to eql(nil)
-      expect(json["created_at"]).to eql(nil)
+      expect(json['count']).to eql(stat.count)
+      expect(json['date']).to eql(stat.date.strftime('%Y-%m-%d'))
+      expect(json['by_template']).to eql(nil)
+      expect(json['org_id']).to eql(nil)
+      expect(json['created_at']).to eql(nil)
     end
   end
-  describe ".to_csv" do
-    context "when no instances" do
-      it "returns empty" do
+  describe '.to_csv' do
+    context 'when no instances' do
+      it 'returns empty' do
         csv = described_class.to_csv([])
 
         expect(csv).to be_empty
       end
     end
-    context "when instances" do
+    context 'when instances' do
       let(:org) { FactoryBot.create(:org) }
-      it "returns instances in a comma-separated row" do
+      it 'returns instances in a comma-separated row' do
         may = FactoryBot.create(:stat_joined_user, date: Date.new(2018, 0o5, 31),
                                                    org: org, count: 20)
         june = FactoryBot.create(:stat_joined_user, date: Date.new(2018, 0o6, 30),
diff --git a/spec/models/template_spec.rb b/spec/models/template_spec.rb
index 7173d2e648..b4f983f90e 100644
--- a/spec/models/template_spec.rb
+++ b/spec/models/template_spec.rb
@@ -1,10 +1,9 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Template, type: :model do
-
-  context "validations" do
+  context 'validations' do
     it { is_expected.to validate_presence_of(:title) }
 
     it { is_expected.to allow_values(true, false).for(:published) }
@@ -36,8 +35,7 @@
     # it { is_expected.not_to allow_value(nil).for(:archived) }
   end
 
-  context "associations" do
-
+  context 'associations' do
     it { is_expected.to belong_to :org }
 
     it { is_expected.to have_many :plans }
@@ -53,125 +51,102 @@
     it { is_expected.to have_many :conditions }
 
     it { is_expected.to have_many :annotations }
-
   end
 
-  describe ".archived" do
-
+  describe '.archived' do
     subject { Template.archived }
 
-    context "when template is archived" do
-
+    context 'when template is archived' do
       let!(:template) { create(:template, archived: true) }
 
       it { is_expected.to include(template) }
-
     end
 
-    context "when template is archived" do
-
+    context 'when template is archived' do
       let!(:template) { create(:template, archived: false) }
 
       it { is_expected.not_to include(template) }
-
     end
   end
 
-  describe ".unarchived" do
-
+  describe '.unarchived' do
     subject { Template.unarchived }
 
-    context "when template is archived" do
-
+    context 'when template is archived' do
       let!(:template) { create(:template, archived: true) }
 
       it { is_expected.not_to include(template) }
-
     end
 
-    context "when template is archived" do
-
+    context 'when template is archived' do
       let!(:template) { create(:template, archived: false) }
 
       it { is_expected.to include(template) }
-
     end
   end
 
-  describe ".default" do
-
+  describe '.default' do
     subject { Template.default }
 
-    context "when default published template exists" do
-
+    context 'when default published template exists' do
       before do
         @a = create(:template, :default, :published)
         @b = create(:template, :default, :published)
       end
 
-      it "returns the latest record" do
+      it 'returns the latest record' do
         expect(subject).to eql(@b)
       end
-
     end
 
-    context "when default template is not published" do
-
+    context 'when default template is not published' do
       before do
         create(:template, :default, :unpublished)
       end
 
-      it "returns nil" do
+      it 'returns nil' do
         is_expected.to be_nil
       end
-
     end
 
-    context "when none of the published templates are default" do
-
+    context 'when none of the published templates are default' do
       before do
         create(:template, :published, is_default: false)
       end
 
-      it "returns nil" do
+      it 'returns nil' do
         is_expected.to be_nil
       end
-
     end
-
   end
 
-  describe ".latest_version" do
-
+  describe '.latest_version' do
     let!(:family_id) { nil }
 
     subject { Template.latest_version(family_id) }
 
-    it "returns an ActiveRecord::Relation" do
+    it 'returns an ActiveRecord::Relation' do
       expect(subject).to be_a(ActiveRecord::Relation)
     end
 
-    context "when family_id is present" do
-
-      let!(:family_id) { "1235" }
+    context 'when family_id is present' do
+      let!(:family_id) { '1235' }
 
       let!(:template) do
-        create(:template, :unpublished, family_id: "1235", version: 12)
+        create(:template, :unpublished, family_id: '1235', version: 12)
       end
 
       before do
-        create(:template, :unpublished, family_id: "1235", version: 11)
-        create(:template, :unpublished, family_id: "9999", version: 13)
+        create(:template, :unpublished, family_id: '1235', version: 11)
+        create(:template, :unpublished, family_id: '9999', version: 13)
       end
 
-      it "filters results by family_id" do
+      it 'filters results by family_id' do
         expect(subject).to include(template)
       end
-
     end
 
-    context "when family_id is absent" do
-
+    context 'when family_id is absent' do
       let!(:family_id) { nil }
 
       let!(:template) { create(:template, :unpublished, version: 12) }
@@ -181,14 +156,12 @@
         create(:template, :unpublished, version: 10)
       end
 
-      it "returns the " do
+      it 'returns the ' do
         expect(subject).to include(template)
       end
-
     end
 
-    context "when template is archived" do
-
+    context 'when template is archived' do
       let!(:family_id) { nil }
 
       let!(:template) { create(:template, :archived, :unpublished, version: 12) }
@@ -198,16 +171,13 @@
         @b = create(:template, :unpublished, version: 10)
       end
 
-      it "excludes from the results" do
+      it 'excludes from the results' do
         expect(subject).not_to include(template)
       end
-
     end
-
   end
 
-  describe ".published" do
-
+  describe '.published' do
     subject { Template.published(family_id_search) }
 
     before do
@@ -217,45 +187,41 @@
       @d = create(:template, :unpublished, version: 5)
     end
 
-    context "when family_id is present" do
+    context 'when family_id is present' do
+      let!(:family_id_search) { '1234' }
+      let!(:family_id_set) { '1234' }
 
-      let!(:family_id_search) { "1234" }
-      let!(:family_id_set) { "1234" }
-
-      it "includes records with family id" do
+      it 'includes records with family id' do
         expect(subject).to include(@a)
       end
 
-      it "excludes records without family id" do
+      it 'excludes records without family id' do
         expect(subject).not_to include(@b)
       end
 
-      it "excludes unpublished records" do
+      it 'excludes unpublished records' do
         expect(subject).not_to include(@c)
         expect(subject).not_to include(@d)
       end
-
     end
 
-    context "when family_id is absent" do
-
+    context 'when family_id is absent' do
       let!(:family_id_search) { nil }
-      let!(:family_id_set) { "1234" }
+      let!(:family_id_set) { '1234' }
 
-      it "includes all published records" do
+      it 'includes all published records' do
         expect(subject).to include(@a)
         expect(subject).to include(@b)
       end
 
-      it "excludes all published records" do
+      it 'excludes all published records' do
         expect(subject).not_to include(@c)
         expect(subject).not_to include(@d)
       end
     end
   end
 
-  describe ".latest_customized_version" do
-
+  describe '.latest_customized_version' do
     let!(:original_template) { create(:template) }
 
     let!(:family_id) { original_template.family_id }
@@ -264,68 +230,58 @@
 
     subject { Template.latest_customized_version(family_id, org.id) }
 
-    context "when latest version present" do
-
+    context 'when latest version present' do
       before do
         create(:template, customization_of: family_id, org: org, version: 5)
         create(:template, customization_of: family_id, org: org, version: 6)
       end
 
-      it "returns a single record" do
+      it 'returns a single record' do
         expect(subject).to be_one
       end
 
-      it "returns the correct version" do
+      it 'returns the correct version' do
         expect(subject.last.version).to eql(6)
       end
-
     end
 
-    context "when latest version absent" do
-
+    context 'when latest version absent' do
       before do
-        create(:template, customization_of: "1234", org: org, version: 5)
-        create(:template, customization_of: "1234", org: org, version: 6)
+        create(:template, customization_of: '1234', org: org, version: 5)
+        create(:template, customization_of: '1234', org: org, version: 6)
       end
 
-      it "returns an empty set" do
+      it 'returns an empty set' do
         expect(subject).to be_empty
       end
-
     end
 
-    context "when latest version belongs to different Org" do
-
+    context 'when latest version belongs to different Org' do
       before do
         create(:template, customization_of: family_id, version: 5)
         create(:template, customization_of: family_id, version: 6)
       end
 
-      it "returns an empty set" do
+      it 'returns an empty set' do
         expect(subject).to be_empty
       end
-
     end
 
-    context "when latest version is archived" do
-
+    context 'when latest version is archived' do
       before do
         create(:template, customization_of: family_id, org: org, version: 5)
         create(:template, :archived, customization_of: family_id, org: org, version: 6)
       end
 
       # TODO: Confirm: Is this the desired behaviour?
-      it "returns an empty set" do
+      it 'returns an empty set' do
         expect(subject).to be_empty
       end
-
     end
   end
 
-  describe ".latest_version_per_org" do
-
-    context "when org_id is an Integer" do
-
+  describe '.latest_version_per_org' do
+    context 'when org_id is an Integer' do
       let!(:org) { create(:org) }
 
       subject { Template.latest_version_per_org(org.id) }
@@ -344,11 +300,9 @@
       it { is_expected.to include(@c) }
 
       it { is_expected.not_to include(@d) }
-
     end
 
-    context "when org_id is an Array" do
-
+    context 'when org_id is an Array' do
       let!(:org_a) { create(:org) }
 
       let!(:org_b) { create(:org) }
@@ -369,13 +323,10 @@
       it { is_expected.to include(@c) }
 
       it { is_expected.not_to include(@d) }
-
     end
-
   end
 
-  describe ".latest_customized_version_per_org" do
-
+  describe '.latest_customized_version_per_org' do
     let!(:original_template) { create(:template) }
 
     let!(:family_id) { original_template.family_id }
@@ -384,68 +335,58 @@
 
     subject { Template.latest_customized_version_per_org(org.id) }
 
-    context "when latest version present" do
-
+    context 'when latest version present' do
       before do
         create(:template, customization_of: family_id, org: org, version: 5)
         create(:template, customization_of: family_id, org: org, version: 6)
       end
 
-      it "returns a single record" do
+      it 'returns a single record' do
         expect(subject).to be_one
       end
 
-      it "returns the correct version" do
+      it 'returns the correct version' do
         expect(subject.last.version).to eql(6)
       end
-
     end
 
-    context "when latest version absent" do
-
+    context 'when latest version absent' do
       before do
-        create(:template, customization_of: "1234", org: org, version: 5)
-        create(:template, customization_of: "1234", org: org, version: 6)
+        create(:template, customization_of: '1234', org: org, version: 5)
+        create(:template, customization_of: '1234', org: org, version: 6)
       end
 
-      it "returns an empty set" do
+      it 'returns an empty set' do
         expect(subject).to be_empty
       end
-
     end
 
-    context "when latest version belongs to different Org" do
-
+    context 'when latest version belongs to different Org' do
       before do
         create(:template, customization_of: family_id, version: 5)
         create(:template, customization_of: family_id, version: 6)
       end
 
-      it "returns an empty set" do
+      it 'returns an empty set' do
         expect(subject).to be_empty
       end
-
     end
 
-    context "when latest version is archived" do
-
+    context 'when latest version is archived' do
       before do
         create(:template, customization_of: family_id, org: org, version: 5)
         create(:template, :archived, customization_of: family_id, org: org, version: 6)
       end
 
       # TODO: Confirm: Is this the desired behaviour?
-      it "returns an empty set" do
+      it 'returns an empty set' do
         expect(subject).to be_empty
       end
-
     end
   end
 
-  describe ".families" do
-
-    context "when org_id is given" do
-
+  describe '.families' do
+    context 'when org_id is given' do
       let!(:org) { create(:org) }
 
       subject { Template.families([org.id]) }
@@ -456,48 +397,43 @@
         @c = create(:template, :archived, customization_of: nil, org: org)
       end
 
-      it "excludes Templates belonging to other Orgs" do
+      it 'excludes Templates belonging to other Orgs' do
         expect(subject).not_to include(@a)
       end
 
-      it "includes Templates that are not customisations" do
+      it 'includes Templates that are not customisations' do
         expect(subject).to include(@b)
       end
 
-      it "excludes archived Templates" do
+      it 'excludes archived Templates' do
         expect(subject).not_to include(@c)
       end
-
     end
 
-    context "when org_id is nil" do
-
+    context 'when org_id is nil' do
       subject { Template.families(nil) }
 
       before do
         @a = create(:template, customization_of: nil)
-        @b = create(:template, customization_of: "123")
+        @b = create(:template, customization_of: '123')
         @c = create(:template, :archived, customization_of: nil)
       end
 
-      it "includes Templates belonging to all Orgs" do
+      it 'includes Templates belonging to all Orgs' do
         expect(subject).to include(@a)
       end
 
-      it "excludes Templates that are customizations" do
+      it 'excludes Templates that are customizations' do
         expect(subject).not_to include(@b)
       end
 
-      it "excludes archived Templates" do
+      it 'excludes archived Templates' do
         expect(subject).not_to include(@c)
       end
-
     end
-
   end
 
-  describe ".latest_customizable" do
-
+  describe '.latest_customizable' do
     before do
       create(:org, is_other: true) unless Org.where(is_other: true).any?
       create(:template, :default, :published)
@@ -507,74 +443,56 @@
 
     subject { Template.latest_customizable }
 
-    context "when Org is an institution" do
-
+    context 'when Org is an institution' do
       let!(:org) { create(:org, :institution) }
 
       it { is_expected.not_to include(template) }
-
     end
 
-    context "when Org is a funder" do
-
+    context 'when Org is a funder' do
       let!(:org) { create(:org, :funder) }
 
       it { is_expected.to include(template) }
-
     end
 
-    context "when Org is an organisation" do
-
+    context 'when Org is an organisation' do
       let!(:org) { create(:org, :organisation) }
 
       it { is_expected.not_to include(template) }
-
     end
 
-    context "when Org is a research_institute" do
-
+    context 'when Org is a research_institute' do
       let!(:org) { create(:org, :research_institute) }
 
       it { is_expected.not_to include(template) }
-
     end
 
-    context "when Org is a project" do
-
+    context 'when Org is a project' do
       let!(:org) { create(:org, :project) }
 
       it { is_expected.not_to include(template) }
-
     end
 
-    context "when Org is a school" do
-
+    context 'when Org is a school' do
       let!(:org) { create(:org, :school) }
 
       it { is_expected.not_to include(template) }
-
     end
 
-    context "when template is default and published" do
-
+    context 'when template is default and published' do
       let!(:template) { create(:template, :default, :published) }
 
       it { is_expected.to include(template) }
-
     end
 
-    context "when template is default and unpublished" do
-
+    context 'when template is default and unpublished' do
       let!(:template) { create(:template, :default, :unpublished) }
 
       it { is_expected.not_to include(template) }
-
     end
-
   end
 
-  describe ".publicly_visible" do
-
+  describe '.publicly_visible' do
     subject { Template.publicly_visible }
 
     before do
@@ -583,23 +501,21 @@
       @c = create(:template, :organisationally_visible)
     end
 
-    it "excludes archived Templates" do
+    it 'excludes archived Templates' do
       # The enum is currently overwriting this scope
       expect(subject).not_to include(@a)
     end
 
-    it "includes publicly_visible Templates" do
+    it 'includes publicly_visible Templates' do
       expect(subject).to include(@b)
     end
 
-    it "excludes organisationally_visible Templates" do
+    it 'excludes organisationally_visible Templates' do
       expect(subject).not_to include(@c)
     end
-
   end
 
-  describe ".organisationally_visible" do
-
+  describe '.organisationally_visible' do
     subject { Template.organisationally_visible }
 
     before do
@@ -608,77 +524,71 @@
       @c = create(:template, :organisationally_visible)
     end
 
-    it "excludes archived Templates" do
+    it 'excludes archived Templates' do
       # The enum is currently overwriting this scope
       expect(subject).not_to include(@a)
     end
 
-    it "excludes publicly_visible Templates" do
+    it 'excludes publicly_visible Templates' do
       expect(subject).not_to include(@b)
     end
 
-    it "includes organisationally_visible Templates" do
+    it 'includes organisationally_visible Templates' do
       expect(subject).to include(@c)
     end
-
   end
 
-  describe ".search" do
-
-    subject { Template.search("foo") }
+  describe '.search' do
+    subject { Template.search('foo') }
 
     before do
-      @a = create(:template, :archived, title: "foo bar")
-      @b = create(:template, title: "foo bar")
-      @c = create(:template, description: "<p>foo bar</p>")
-      @d = create(:template, org: create(:org, name: "foo org"))
+      @a = create(:template, :archived, title: 'foo bar')
+      @b = create(:template, title: 'foo bar')
+      @c = create(:template, description: '<p>foo bar</p>')
+      @d = create(:template, org: create(:org, name: 'foo org'))
     end
 
-    it "excludes archived Templates" do
+    it 'excludes archived Templates' do
       expect(subject).not_to include(@a)
     end
 
-    it "includes Templates with a matching title" do
+    it 'includes Templates with a matching title' do
       expect(subject).to include(@b)
     end
 
-    it "excludes Templates with a matching description" do
+    it 'excludes Templates with a matching description' do
       expect(subject).not_to include(@c)
     end
 
-    it "includes Templates with a matching Org name" do
+    it 'includes Templates with a matching Org name' do
       expect(subject).to include(@d)
     end
   end
 
-  describe ".current" do
-
-    subject { Template.current("1234") }
+  describe '.current' do
+    subject { Template.current('1234') }
 
     before do
-      @a = create(:template, :archived, family_id: "1234", version: 5)
-      @b = create(:template, family_id: "5555", version: 2)
-      @c = create(:template, family_id: "1234", version: 2)
+      @a = create(:template, :archived, family_id: '1234', version: 5)
+      @b = create(:template, family_id: '5555', version: 2)
+      @c = create(:template, family_id: '1234', version: 2)
     end
 
-    it "excludes archived Templates" do
+    it 'excludes archived Templates' do
       expect(subject).not_to eql(@a)
     end
 
-    it "excludes Templates with a different family_id" do
+    it 'excludes Templates with a different family_id' do
       expect(subject).not_to eql(@b)
     end
 
-    it "orders results by DESC version" do
+    it 'orders results by DESC version' do
       expect(subject).to eql(@c)
     end
-
   end
 
-  describe ".live" do
-
-    context "when family ID is an Array" do
-
+  describe '.live' do
+    context 'when family ID is an Array' do
       subject { Template.live([1234, 1235]) }
 
       before do
@@ -688,30 +598,28 @@
         @d = create(:template, :published, family_id: 1235)
       end
 
-      it "returns an enumerable" do
+      it 'returns an enumerable' do
         expect(subject).to be_a(ActiveRecord::Relation)
       end
 
-      it "excludes archived Templates" do
+      it 'excludes archived Templates' do
         expect(subject).not_to include(@a)
       end
 
-      it "includes published Templates" do
+      it 'includes published Templates' do
         expect(subject).to include(@b)
       end
 
-      it "excludes unpublished Templates" do
+      it 'excludes unpublished Templates' do
         expect(subject).not_to include(@c)
       end
 
-      it "includes published Templates" do
+      it 'includes published Templates' do
         expect(subject).to include(@d)
       end
-
     end
 
-    context "when family ID is an Integer" do
-
+    context 'when family ID is an Integer' do
       subject { Template.live(1234) }
 
       before do
@@ -721,186 +629,159 @@
         @d = create(:template, :published, family_id: 1235)
       end
 
-      it "excludes archived Templates" do
+      it 'excludes archived Templates' do
         expect(subject).not_to eql(@a)
       end
 
-      it "includes published Templates" do
+      it 'includes published Templates' do
         expect(subject).to eql(@b)
       end
 
-      it "excludes unpublished Templates" do
+      it 'excludes unpublished Templates' do
         expect(subject).not_to eql(@c)
       end
 
-      it "excludes published Templates with other family_id" do
+      it 'excludes published Templates with other family_id' do
         expect(subject).not_to eql(@d)
       end
     end
-
   end
 
-  describe ".find_or_generate_version!" do
-
+  describe '.find_or_generate_version!' do
     subject { Template.find_or_generate_version!(template) }
 
-    context "when template is not latest?" do
-
+    context 'when template is not latest?' do
       let!(:template) { create(:template) }
 
       before do
         template.expects(:latest?).at_least(1).returns(false)
       end
 
-      it "raises an error" do
+      it 'raises an error' do
         expect { subject }.to raise_error(StandardError)
       end
-
     end
 
-    context "when template is latest and generate_version? is true" do
-
+    context 'when template is latest and generate_version? is true' do
       let!(:template) { create(:template, :published) }
 
       before do
         template.expects(:latest?).at_least(1).returns(true)
       end
 
-      it "returns a different Template" do
+      it 'returns a different Template' do
         expect(subject).not_to eql(template)
       end
 
-      it "creates a persisted Template" do
+      it 'creates a persisted Template' do
         expect(subject).to be_persisted
       end
-
     end
 
-    context "when template is latest and generate_version? is false" do
-
+    context 'when template is latest and generate_version? is false' do
       let!(:template) { create(:template, :unpublished) }
 
       before do
         template.expects(:latest?).at_least(1).returns(true)
       end
 
-      it "returns the same Template" do
+      it 'returns the same Template' do
         expect(subject).to eql(template)
       end
-
     end
-
   end
 
-  describe "#deep_copy" do
-
-    context "when attributes is provided" do
-
+  describe '#deep_copy' do
+    context 'when attributes is provided' do
       let!(:template) { create(:template, :published, phases: 2) }
 
       subject do
-        template.deep_copy(attributes: { title: "foo", description: "bar" })
+        template.deep_copy(attributes: { title: 'foo', description: 'bar' })
       end
 
-      it "updates title with the provided value" do
-        expect(subject.title).to eql("foo")
+      it 'updates title with the provided value' do
+        expect(subject.title).to eql('foo')
       end
 
-      it "updates describe with the provided value" do
-        expect(subject.description).to eql("bar")
+      it 'updates describe with the provided value' do
+        expect(subject.description).to eql('bar')
       end
-
     end
 
-    context "when options save is true" do
-
+    context 'when options save is true' do
       let!(:template) { create(:template, :published, phases: 2) }
 
       subject { template.deep_copy(attributes: { family_id: 123 }, save: true) }
 
-      it "returns a persisted record" do
+      it 'returns a persisted record' do
         expect(subject).to be_persisted
       end
 
-      it "creates phases" do
+      it 'creates phases' do
         expect(subject.phases).to be_many
       end
 
-      it "sets template_id on phases to the new template" do
+      it 'sets template_id on phases to the new template' do
         new_temp = subject
         expect(new_temp.phases.map(&:template_id).uniq).to eql([new_temp.id])
       end
-
     end
 
-    context "when options save is false" do
-
+    context 'when options save is false' do
       let!(:template) { create(:template, :published, phases: 2) }
 
       subject { template.deep_copy(attributes: { family_id: 123 }, save: false) }
 
-      it "returns a new record" do
+      it 'returns a new record' do
         expect(subject).to be_new_record
       end
 
-      it "builds phases" do
+      it 'builds phases' do
         expect(subject.phases).to be_many
       end
 
       it "doesn't set template_id on phases" do
         expect(subject.phases.map(&:template_id).compact).to be_empty
       end
-
     end
-
   end
 
-  describe "#base_org" do
-
+  describe '#base_org' do
     subject { template.base_org }
 
-    context "when customization_of is present" do
-
+    context 'when customization_of is present' do
       let!(:source_template) { create(:template) }
 
       let!(:template) do
         create(:template, customization_of: source_template.family_id)
       end
 
-      it "returns the source Template org" do
+      it 'returns the source Template org' do
         expect(subject).to eql(source_template.org)
       end
-
     end
 
-    context "when customization_of is not present" do
-
+    context 'when customization_of is not present' do
       let!(:template) { create(:template, customization_of: nil) }
 
-      it "returns the base Template org" do
+      it 'returns the base Template org' do
         expect(subject).to eql(template.org)
       end
-
     end
-
   end
 
-  describe "#latest?" do
-
-    context "when Template is the latest in its family" do
-
+  describe '#latest?' do
+    context 'when Template is the latest in its family' do
       let!(:template) do
         create(:template, :published, version: 5, family_id: 123)
       end
 
-      it "returns true" do
+      it 'returns true' do
         expect(template).to be_latest
       end
-
     end
 
-    context "when Template is not the latest in its family" do
-
+    context 'when Template is not the latest in its family' do
       let!(:template) do
         create(:template, :published, version: 5, family_id: 123)
       end
@@ -909,68 +790,54 @@
         create(:template, :published, version: 6, family_id: 123)
       end
 
-      it "returns false" do
+      it 'returns false' do
         expect(template).not_to be_latest
       end
-
     end
-
   end
 
-  describe "#generate_version?" do
-
+  describe '#generate_version?' do
     let!(:template) { build(:template) }
 
     subject { template.generate_version? }
 
-    context "when published is true" do
-
+    context 'when published is true' do
       before do
         template.published = true
       end
 
       it { is_expected.to eql(true) }
-
     end
 
-    context "when published is false" do
-
+    context 'when published is false' do
       before do
         template.published = false
       end
 
       it { is_expected.to eql(false) }
-
     end
-
   end
 
-  describe "#customize?" do
-
+  describe '#customize?' do
     subject { template.customize?(org) }
 
     context "when param is Org, org is funder, customization doesn't exist" do
-
       let!(:org) { create(:org, :funder) }
 
       let!(:template) { create(:template, org: org) }
 
       it { is_expected.to eql(true) }
-
     end
 
     context "when param is Org, template default, customization doesn't exist" do
-
       let!(:org) { create(:org) }
 
       let!(:template) { create(:template, :default, org: org) }
 
       it { is_expected.to eql(true) }
-
     end
 
-    context "when param is Org, org is funder, customization exists" do
-
+    context 'when param is Org, org is funder, customization exists' do
       let!(:org) { create(:org, :funder) }
 
       let!(:template) { create(:template, org: org) }
@@ -980,11 +847,9 @@
       end
 
       it { is_expected.to eql(false) }
-
     end
 
-    context "when param is Org, template default, customization exists" do
-
+    context 'when param is Org, template default, customization exists' do
       let!(:org) { create(:org) }
 
       let!(:template) { create(:template, :default, org: org) }
@@ -994,37 +859,29 @@
       end
 
       it { is_expected.to eql(false) }
-
     end
 
-    context "when param not Org" do
-
+    context 'when param not Org' do
       let!(:org) { build(:plan) }
 
       let!(:template) { create(:template, org: create(:org, :funder)) }
 
       it { is_expected.to eql(false) }
-
     end
-
   end
 
-  describe "#upgrade_customization?" do
-
+  describe '#upgrade_customization?' do
     let!(:org) { create(:org, :funder) }
 
-    context "when not a customization of another template" do
-
+    context 'when not a customization of another template' do
       let!(:template) do
         create(:template, :published, customization_of: nil, org: org)
       end
 
       it { expect(template).not_to be_upgrade_customization }
-
     end
 
-    context "when customization of another template and source is newer" do
-
+    context 'when customization of another template and source is newer' do
       let!(:source) do
         create(:template, :published,
                family_id: 123, org: org, created_at: 1.minutes.from_now)
@@ -1035,11 +892,9 @@
       end
 
       it { expect(template).to be_upgrade_customization }
-
     end
 
-    context "when customization of another template and source is older" do
-
+    context 'when customization of another template and source is older' do
       let!(:source) do
         create(:template, :published, family_id: 123, org: org, created_at: 1.minutes.ago)
       end
@@ -1049,16 +904,13 @@
       end
 
       it { expect(template).not_to be_upgrade_customization }
-
     end
   end
 
-  describe "#draft?" do
-
+  describe '#draft?' do
     subject { template.draft? }
 
-    context "when published and family has published template" do
-
+    context 'when published and family has published template' do
       let!(:template) { create(:template, :published) }
 
       before do
@@ -1066,11 +918,9 @@
       end
 
       it { is_expected.to eql(false) }
-
     end
 
-    context "when published and family has no published template" do
-
+    context 'when published and family has no published template' do
       let!(:template) { create(:template, :published) }
 
       before do
@@ -1078,11 +928,9 @@
       end
 
       it { is_expected.to eql(false) }
-
     end
 
-    context "when unpublished and family has published template" do
-
+    context 'when unpublished and family has published template' do
       let!(:template) { create(:template, :unpublished) }
 
       before do
@@ -1090,11 +938,9 @@
       end
 
       it { is_expected.to eql(true) }
-
     end
 
-    context "when unpublished and family has no published template" do
-
+    context 'when unpublished and family has no published template' do
       let!(:template) { create(:template, :unpublished) }
 
       before do
@@ -1102,132 +948,110 @@
       end
 
       it { is_expected.to eql(false) }
-
     end
   end
 
-  describe "#removable?" do
-
+  describe '#removable?' do
     let!(:template) { create(:template) }
 
-    context "when there are no Plans using this Template" do
-
+    context 'when there are no Plans using this Template' do
       it { expect(template).to be_removable }
-
     end
 
-    context "when there Plans using this Template" do
-
+    context 'when there Plans using this Template' do
       before do
         create(:plan, template: template)
       end
 
       it { expect(template).not_to be_removable }
-
     end
 
-    context "when there are Plans, but using different Templates" do
-
+    context 'when there are Plans, but using different Templates' do
       before do
         create(:plan)
       end
 
       it { expect(template).to be_removable }
-
     end
-
   end
 
-  describe "#generate_copy!" do
-
+  describe '#generate_copy!' do
     subject { template.generate_copy!(org) }
 
     let!(:template) { create(:template) }
 
-    context "when org is not an Org" do
-
+    context 'when org is not an Org' do
       let!(:org) { build(:plan) }
 
-      it "raises a StandardError" do
+      it 'raises a StandardError' do
         expect { subject }.to raise_error(StandardError)
       end
-
     end
 
-    context "when org is an Org record" do
-
+    context 'when org is an Org record' do
       let!(:org) { create(:org) }
 
-      it "sets the version to zero" do
+      it 'sets the version to zero' do
         expect(subject.version).to be_zero
       end
 
-      it "sets published to false" do
+      it 'sets published to false' do
         expect(subject.published).to eql(false)
       end
 
-      it "sets family_id to a new integer" do
+      it 'sets family_id to a new integer' do
         expect(subject.family_id).to be_a(Integer)
       end
 
-      it "sets org to new org" do
+      it 'sets org to new org' do
         expect(subject.org).to eql(org)
       end
 
-      it "sets is_default to false" do
+      it 'sets is_default to false' do
         expect(subject.is_default).to eql(false)
       end
 
       it "sets title to include 'Copy of'" do
-        expect(subject.title).to include("Copy of")
+        expect(subject.title).to include('Copy of')
       end
 
-      it "sets title to include original title" do
+      it 'sets title to include original title' do
         expect(subject.title).to include(template.title)
       end
-
     end
-
   end
 
-  describe "#generate_version!" do
-
+  describe '#generate_version!' do
     subject { template.generate_version! }
 
-    context "when template is not published" do
-
+    context 'when template is not published' do
       let!(:template) { create(:template, :unpublished) }
 
-      it "raises a StandardError" do
+      it 'raises a StandardError' do
         expect { subject }.to raise_error(StandardError)
       end
-
     end
 
-    context "when Template is published" do
-
+    context 'when Template is published' do
       let!(:template) do
         create(:template, :published, version: 4)
       end
 
-      it "sets the version to current version plus one" do
+      it 'sets the version to current version plus one' do
         expect(subject.version).to eql(5)
       end
 
-      it "sets published to false" do
+      it 'sets published to false' do
         expect(subject.published).to eql(false)
       end
 
-      it "sets org to new org" do
+      it 'sets org to new org' do
         expect(subject.org).to eql(template.org)
       end
-
     end
-
   end
 
-  describe "#customize!" do
-
+  describe '#customize!' do
     subject { template.customize!(org) }
 
     # Added an additional type to Org so that funder_only? fails
@@ -1235,15 +1059,15 @@
 
     let!(:template) { create(:template, :default, org: org) }
 
-    it "sets the version to 0" do
+    it 'sets the version to 0' do
       expect(subject.version).to be_zero
     end
 
-    it "sets the published to false" do
+    it 'sets the published to false' do
       expect(subject.published).to eql(false)
     end
 
-    it "sets the family_id to a new Integer" do
+    it 'sets the family_id to a new Integer' do
       expect(subject.family_id).not_to eql(template.family_id)
     end
 
@@ -1255,42 +1079,36 @@
       expect(subject.org).to eql(template.org)
     end
 
-    it "sets visibility to Organisationally visible" do
-      expect(subject.visibility).to eql("organisationally_visible")
+    it 'sets visibility to Organisationally visible' do
+      expect(subject.visibility).to eql('organisationally_visible')
     end
 
-    it "sets is_default to false" do
+    it 'sets is_default to false' do
       expect(subject.is_default).to eql(false)
     end
 
-    context "when org is not an Org" do
-
+    context 'when org is not an Org' do
       let!(:org) { stubs(:org) }
 
       let!(:template) { create(:template) }
 
-      it "raises an exception" do
+      it 'raises an exception' do
         expect { subject }.to raise_error(StandardError)
       end
-
     end
 
-    context "when org is not funder only" do
-
+    context 'when org is not funder only' do
       let!(:org) { create(:org, :school) }
 
       let!(:template) { create(:template, org: org) }
 
-      it "raises an exception" do
+      it 'raises an exception' do
         expect { subject }.to raise_error(StandardError)
       end
-
     end
-
   end
 
-  describe "#upgrade_customization!" do
-
+  describe '#upgrade_customization!' do
     subject { template.upgrade_customization! }
 
     let!(:source) do
@@ -1302,19 +1120,19 @@
              version: 5, customization_of: source.family_id)
     end
 
-    it "returns a Template" do
+    it 'returns a Template' do
       expect(subject).to be_a(Template)
     end
 
-    it "returns a persisted Template" do
+    it 'returns a persisted Template' do
       expect(subject).to be_persisted
     end
 
-    it "sets the version to template version plus one" do
+    it 'sets the version to template version plus one' do
       expect(subject.version).to eql(6)
     end
 
-    it "sets the published to false" do
+    it 'sets the published to false' do
       expect(subject.published).to eql(false)
     end
 
@@ -1330,46 +1148,40 @@
       expect(subject.org).to eql(template.org)
     end
 
-    it "sets the visibility to Organisationally visible" do
-      expect(subject.visibility).to eql("organisationally_visible")
+    it 'sets the visibility to Organisationally visible' do
+      expect(subject.visibility).to eql('organisationally_visible')
     end
 
-    it "sets is_default to false" do
+    it 'sets is_default to false' do
       expect(subject.is_default).to eql(false)
     end
 
-    it "sets phases modifiable to false" do
+    it 'sets phases modifiable to false' do
       subject.phases.each do |phase|
         expect(phase.modifiable).to eql(false)
       end
     end
 
-    context "when customization_of is blank" do
-
+    context 'when customization_of is blank' do
       let!(:template) { create(:template, customization_of: nil) }
 
-      it "raises an error" do
+      it 'raises an error' do
         expect { subject }.to raise_error(StandardError)
       end
-
     end
 
-    context "when source Template is not present" do
-
+    context 'when source Template is not present' do
       let!(:template) do
         create(:template, :published, customization_of: 456)
       end
 
-      it "raises an error" do
+      it 'raises an error' do
         expect { subject }.to raise_error(StandardError)
       end
-
     end
-
   end
 
-  describe "#publishability" do
-
+  describe '#publishability' do
     subject { template.publishability }
 
     # Added an additional type to Org so that funder_only? fails
@@ -1378,25 +1190,23 @@
     # let!(:template) { create(:template, :default, org: org) }
 
     # case when template is correctly generated
-    context "When the Template has all components, is latest, and unpublished" do
-
+    context 'When the Template has all components, is latest, and unpublished' do
       let(:template) do
         create(:template, :default, published: false, org: org, phases: 1,
                                     sections: 1, questions: 1)
       end
 
-      it "returns true" do
+      it 'returns true' do
         expect(subject[0]).to eql(true)
       end
 
-      it "has no errors" do
-        expect(subject[1]).to eql("")
+      it 'has no errors' do
+        expect(subject[1]).to eql('')
       end
-
     end
 
     # case when the template is historical
-    context "When the template is an historical version" do
+    context 'When the template is an historical version' do
       let(:template) do
         create(:template, :default, published: true, org: org, phases: 3,
                                     version: 1, sections: 1, questions: 1)
@@ -1407,83 +1217,72 @@
         template.update_column(:published, false)
       end
 
-      it "returns false" do
+      it 'returns false' do
         expect(subject[0]).to eql(false)
       end
 
-      it "has error_message" do
-        expected = "You can not publish a historical version of this template.  "
+      it 'has error_message' do
+        expected = 'You can not publish a historical version of this template.  '
         expect(subject[1]).to include(expected)
       end
-
     end
 
     # case when the template is published
-    context "When the Template has all components, is latest, and already published" do
-
+    context 'When the Template has all components, is latest, and already published' do
       let(:template) do
         create(:template, :default, published: true, org: org, phases: 1,
                                     sections: 1, questions: 1)
       end
 
-      it "is not publishable" do
+      it 'is not publishable' do
         expect(subject[0]).to eql(false)
       end
 
-      it "has error_message" do
-        expect(subject[1]).to include("You can not publish a published template.")
+      it 'has error_message' do
+        expect(subject[1]).to include('You can not publish a published template.')
       end
-
     end
     # case when template has no phases
-    context "When the Template has no phases" do
-
+    context 'When the Template has no phases' do
       let(:template) { create(:template, :default, published: true, org: org, phases: 0) }
 
-      it "is not publishable" do
+      it 'is not publishable' do
         expect(subject[0]).to eql(false)
       end
 
-      it "has error_message" do
-        expect(subject[1]).to include("You can not publish a template without phases")
+      it 'has error_message' do
+        expect(subject[1]).to include('You can not publish a template without phases')
       end
-
     end
     # case when a template has no sections
-    context "When the Template has no sections" do
-
+    context 'When the Template has no sections' do
       let(:template) do
         create(:template, :default, published: true, org: org, phases: 1, sections: 0)
       end
 
-      it "is not publishable" do
+      it 'is not publishable' do
         expect(subject[0]).to eql(false)
       end
 
-      it "has error_message" do
-        expect(subject[1]).to include("You can not publish a template without sections in a phase")
+      it 'has error_message' do
+        expect(subject[1]).to include('You can not publish a template without sections in a phase')
       end
-
     end
     # case when a section has no questions
-    context "When the Template has no questions" do
-
+    context 'When the Template has no questions' do
       let(:template) do
         create(:template, :default, published: true, org: org, phases: 1,
                                     sections: 1, questions: 0)
       end
 
-      it "is not publishable" do
+      it 'is not publishable' do
         expect(subject[0]).to eql(false)
       end
 
-      it "has error_message" do
-        expected = "You can not publish a template without questions in a section"
+      it 'has error_message' do
+        expected = 'You can not publish a template without questions in a section'
         expect(subject[1]).to include(expected)
       end
-
     end
-
   end
-
 end
diff --git a/spec/models/theme_spec.rb b/spec/models/theme_spec.rb
index 400f9d0d6d..666f3d0656 100644
--- a/spec/models/theme_spec.rb
+++ b/spec/models/theme_spec.rb
@@ -1,70 +1,55 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Theme, type: :model do
-
-  context "validations" do
-
+  context 'validations' do
     it { is_expected.to validate_presence_of(:title) }
-
   end
 
-  context "associations" do
-
+  context 'associations' do
     it {
       is_expected.to have_and_belong_to_many(:questions)
-        .join_table("questions_themes")
+        .join_table('questions_themes')
     }
 
     it {
       is_expected.to have_and_belong_to_many(:guidances)
-        .join_table("themes_in_guidance")
+        .join_table('themes_in_guidance')
     }
-
   end
 
-  describe ".search" do
-
-    let!(:term) { "foo" }
+  describe '.search' do
+    let!(:term) { 'foo' }
 
     subject { Theme.search(term) }
 
-    context "when neither title or description matches term" do
-
+    context 'when neither title or description matches term' do
       let!(:theme) { create(:theme) }
 
       it { is_expected.not_to include(theme) }
-
     end
 
-    context "when title is a match for term" do
-
-      let!(:theme) { create(:theme, title: "The title is foo bar") }
+    context 'when title is a match for term' do
+      let!(:theme) { create(:theme, title: 'The title is foo bar') }
 
       it { is_expected.to include(theme) }
-
     end
 
-    context "when description is a match for term" do
-
-      let!(:theme) { create(:theme, description: "The title is foo bar") }
+    context 'when description is a match for term' do
+      let!(:theme) { create(:theme, description: 'The title is foo bar') }
 
       it { is_expected.to include(theme) }
-
     end
-
   end
 
-  describe "#to_s" do
-
+  describe '#to_s' do
     let!(:theme) { create(:theme) }
 
     subject { theme.to_s }
 
-    it "returns the title" do
+    it 'returns the title' do
       expect(subject).to eql(theme.title)
     end
   end
-
 end
diff --git a/spec/models/token_permission_type_spec.rb b/spec/models/token_permission_type_spec.rb
index 879b8eb922..bb8848afcb 100644
--- a/spec/models/token_permission_type_spec.rb
+++ b/spec/models/token_permission_type_spec.rb
@@ -1,27 +1,21 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe TokenPermissionType, type: :model do
-
-  context "validations" do
-
+  context 'validations' do
     it { is_expected.to validate_presence_of(:token_type) }
-
   end
 
-  describe "#to_s" do
-
+  describe '#to_s' do
     let!(:token_permission_type) do
-      build(:token_permission_type, token_type: "templates")
+      build(:token_permission_type, token_type: 'templates')
     end
 
     subject { token_permission_type.to_s }
 
-    it "returns the token_type attribute" do
-      expect(subject).to eql("templates")
+    it 'returns the token_type attribute' do
+      expect(subject).to eql('templates')
     end
-
   end
-
 end
diff --git a/spec/models/tracker_spec.rb b/spec/models/tracker_spec.rb
index 48a83b0445..959e08c47a 100644
--- a/spec/models/tracker_spec.rb
+++ b/spec/models/tracker_spec.rb
@@ -1,36 +1,36 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Tracker, type: :model do
-  describe "creation" do
-    it "can be created from an org" do
+  describe 'creation' do
+    it 'can be created from an org' do
       org = build(:org)
       tracker = org.build_tracker
       expect(tracker).to be_valid
     end
 
-    it "can be created with an empty code" do
+    it 'can be created with an empty code' do
       org = build(:org)
-      tracker = org.build_tracker(code: "")
+      tracker = org.build_tracker(code: '')
       expect(tracker).to be_valid
     end
 
-    it "fails with a badly formatted code" do
+    it 'fails with a badly formatted code' do
       org = build(:org)
-      tracker = org.build_tracker(code: "XXXXXXXXXX")
+      tracker = org.build_tracker(code: 'XXXXXXXXXX')
       expect(tracker).to_not be_valid
     end
 
-    it "works with a valid code" do
+    it 'works with a valid code' do
       org = build(:org)
-      tracker = org.build_tracker(code: "UA-12345678-12")
+      tracker = org.build_tracker(code: 'UA-12345678-12')
       expect(tracker).to be_valid
     end
 
-    it "fails with a null org" do
+    it 'fails with a null org' do
       org = build(:org)
-      tracker = org.build_tracker(code: "XXXXXXXXXX")
+      tracker = org.build_tracker(code: 'XXXXXXXXXX')
       tracker.org = nil
       expect(tracker).to_not be_valid
     end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index fa7461fc28..7645560348 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -1,26 +1,25 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe User, type: :model do
-
-  context "validations" do
+  context 'validations' do
     it { is_expected.to validate_presence_of(:email) }
 
-    it "should validate that email addres is unqique" do
-      subject.email = "text-email@example.com"
+    it 'should validate that email addres is unqique' do
+      subject.email = 'text-email@example.com'
       is_expected.to validate_uniqueness_of(:email)
         .case_insensitive
-        .with_message("has already been taken")
+        .with_message('has already been taken')
     end
 
     it {
-      is_expected.to allow_values("one@example.com", "foo-bar@ed.ac.uk")
+      is_expected.to allow_values('one@example.com', 'foo-bar@ed.ac.uk')
         .for(:email)
     }
 
     it {
-      is_expected.not_to allow_values("example.com", "foo bar@ed.ac.uk")
+      is_expected.not_to allow_values('example.com', 'foo bar@ed.ac.uk')
         .for(:email)
     }
 
@@ -35,8 +34,7 @@
     it { is_expected.to validate_presence_of(:org) }
   end
 
-  context "associations" do
-
+  context 'associations' do
     it { is_expected.to have_and_belong_to_many(:perms) }
 
     it { is_expected.to belong_to(:language) }
@@ -63,41 +61,36 @@
 
     it {
       is_expected.to have_and_belong_to_many(:notifications)
-        .join_table("notification_acknowledgements")
+        .join_table('notification_acknowledgements')
     }
   end
 
-  describe "#active_for_authentication?" do
-
+  describe '#active_for_authentication?' do
     let!(:user) { build(:user) }
 
     subject { user.active_for_authentication? }
 
-    context "when user is active" do
+    context 'when user is active' do
       before do
         user.active = true
       end
 
       it { is_expected.to eql(true) }
-
     end
 
-    context "when user is not active" do
+    context 'when user is not active' do
       before do
         user.active = false
       end
 
       it { is_expected.to eql(false) }
-
     end
   end
 
-  describe "#save" do
-
-    context "when org has changed and can change org" do
-
+  describe '#save' do
+    context 'when org has changed and can change org' do
       let!(:user) do
-        create(:user, org: create(:org), api_token: "barfoo")
+        create(:user, org: create(:org), api_token: 'barfoo')
       end
 
       before do
@@ -112,7 +105,7 @@
         user.reload
       end
 
-      it "updates the org" do
+      it 'updates the org' do
         expect(user.org).to eql(@new_org)
       end
 
@@ -121,15 +114,14 @@
       end
 
       it "doesn't reset api_token" do
-        expect(user.api_token).to eql("barfoo")
+        expect(user.api_token).to eql('barfoo')
       end
     end
 
-    context "when org has changed and can not change org" do
-
+    context 'when org has changed and can not change org' do
       let!(:user) do
         @org = create(:org, managed: true)
-        create(:user, org: @org, api_token: "barfoo",
+        create(:user, org: @org, api_token: 'barfoo',
                       perms: [
                         create(:perm, :use_api),
                         create(:perm, :modify_guidance),
@@ -143,29 +135,26 @@
         user.reload
       end
 
-      it "does not change the org" do
+      it 'does not change the org' do
         expect(user.org).to eql(@new_org)
       end
 
-      it "destroys user perms" do
+      it 'destroys user perms' do
         expect(user.perms.count).to eql(0)
       end
 
-      it "resets api_token to be nil" do
+      it 'resets api_token to be nil' do
         expect(user.api_token).to be_nil
       end
     end
-
   end
 
-  describe "#locale" do
-
+  describe '#locale' do
     let!(:user) { build(:user) }
 
     subject { user.locale }
 
-    context "when user language present" do
-
+    context 'when user language present' do
       let(:language) { create(:language) }
 
       before do
@@ -173,41 +162,34 @@
       end
 
       it { is_expected.to eql(language.abbreviation) }
-
     end
 
-    context "when user language and org absent" do
-
+    context 'when user language and org absent' do
       before do
         user.language = nil
         user.org = nil
       end
 
       it { is_expected.to be_nil }
-
     end
 
-    context "when user language absent and org present" do
-
+    context 'when user language absent and org present' do
       before do
         user.language = nil
         @locale = user.org.locale
       end
 
       it { is_expected.to eql(@locale) }
-
     end
   end
 
-  describe "#name" do
-
+  describe '#name' do
     let!(:user) { build(:user) }
 
     subject { user.name }
 
     context "when user firstname and surname not blank and
                use_email set to false" do
-
       subject { user.name(false) }
 
       before do
@@ -215,79 +197,70 @@
       end
 
       it { is_expected.to eql(@name) }
-
     end
 
     context "when user firstname is blank and surname is not blank and
                use_email set to false" do
-
       subject { user.name(false) }
 
       before do
-        user.firstname = ""
+        user.firstname = ''
         @name = user.surname.to_s.strip
       end
 
       it { is_expected.to eql(@name) }
-
     end
 
     context "when user firstname is blank and surname is not blank and
                use_email set to false" do
-
       subject { user.name(false) }
 
       before do
-        user.surname = ""
+        user.surname = ''
         @name = user.firstname.to_s.strip
       end
 
       it { is_expected.to eql(@name) }
-
     end
 
     context "when user firstname is blank and surname is not blank
                use_email set to true (by default)" do
-
       before do
-        user.surname = ""
+        user.surname = ''
         @email = user.email
       end
 
       it { is_expected.to eql(@email) }
-
     end
 
     context "when user firstname is not blank and surname is blank
                use_email set to true (by default)" do
       before do
-        user.firstname = ""
+        user.firstname = ''
         @email = user.email
       end
 
       it { is_expected.to eql(@email) }
-
     end
 
     context "when user firstname is not blank and surname is blank
                use_email set to true (by default)" do
       before do
-        user.firstname = ""
+        user.firstname = ''
         @email = user.email
       end
 
       it { is_expected.to eql(@email) }
-
     end
   end
 
-  describe "#identifier_for" do
+  describe '#identifier_for' do
     let!(:user) { create(:user) }
     let!(:scheme) { create(:identifier_scheme) }
 
     subject { user.identifier_for(scheme.name) }
 
-    context "when user has an identifier present" do
+    context 'when user has an identifier present' do
       let!(:identifier) do
         create(:identifier, :for_user, identifier_scheme: scheme,
                                        identifiable: user)
@@ -296,252 +269,203 @@
       it { is_expected.to eql(identifier) }
     end
 
-    context "when user has no identifier" do
-      it { is_expected.not_to eql("") }
+    context 'when user has no identifier' do
+      it { is_expected.not_to eql('') }
     end
   end
 
-  describe "#can_super_admin?" do
-
+  describe '#can_super_admin?' do
     subject { user.can_super_admin? }
 
     context "when user includes Perm with name 'add_organisations'" do
-
-      let!(:perms) { create_list(:perm, 1, name: "add_organisations") }
+      let!(:perms) { create_list(:perm, 1, name: 'add_organisations') }
 
       let!(:user) { create(:user, perms: perms) }
 
       it { is_expected.to eq(true) }
-
     end
 
     context "when user includes Perm with name 'grant_api_to_orgs'" do
-
-      let!(:perms) { create_list(:perm, 1, name: "grant_api_to_orgs") }
+      let!(:perms) { create_list(:perm, 1, name: 'grant_api_to_orgs') }
 
       let!(:user) { create(:user, perms: perms) }
 
       it { is_expected.to eq(true) }
-
     end
 
     context "when user includes Perm with name 'change_org_affiliation'" do
-
-      let!(:perms) { create_list(:perm, 1, name: "change_org_affiliation") }
+      let!(:perms) { create_list(:perm, 1, name: 'change_org_affiliation') }
 
       let!(:user) { create(:user, perms: perms) }
 
       it { is_expected.to eq(true) }
-
     end
-
   end
 
-  describe "#can_org_admin?" do
+  describe '#can_org_admin?' do
     subject { user.can_org_admin? }
 
     context "when user includes Perm with name 'grant_permissions'" do
-
-      let!(:perms) { create_list(:perm, 1, name: "grant_permissions") }
+      let!(:perms) { create_list(:perm, 1, name: 'grant_permissions') }
       let!(:user) { create(:user, perms: perms) }
 
       it { is_expected.to eq(true) }
-
     end
 
     context "when user includes Perm with name 'modify_guidance'" do
-
-      let!(:perms) { create_list(:perm, 1, name: "modify_guidance") }
+      let!(:perms) { create_list(:perm, 1, name: 'modify_guidance') }
       let!(:user) { create(:user, perms: perms) }
 
       it { is_expected.to eq(true) }
-
     end
 
     context "when user includes Perm with name 'modify_templates'" do
-
-      let!(:perms) { create_list(:perm, 1, name: "modify_templates") }
+      let!(:perms) { create_list(:perm, 1, name: 'modify_templates') }
       let!(:user) { create(:user, perms: perms) }
 
       it { is_expected.to eq(true) }
-
     end
 
     context "when user includes Perm with name 'change_org_details'" do
-
-      let!(:perms) { create_list(:perm, 1, name: "change_org_details") }
+      let!(:perms) { create_list(:perm, 1, name: 'change_org_details') }
       let!(:user) { create(:user, perms: perms) }
 
       it { is_expected.to eq(true) }
-
     end
-
   end
 
-  describe "#can_add_orgs?" do
-
-    let!(:perms) { create_list(:perm, 1, name: "add_organisations") }
+  describe '#can_add_orgs?' do
+    let!(:perms) { create_list(:perm, 1, name: 'add_organisations') }
 
     let!(:user) { create(:user, perms: perms) }
 
     subject { user.can_add_orgs? }
 
     it { is_expected.to eq(true) }
-
   end
 
-  describe "#can_change_org?" do
-
-    let!(:perms) { create_list(:perm, 1, name: "change_org_affiliation") }
+  describe '#can_change_org?' do
+    let!(:perms) { create_list(:perm, 1, name: 'change_org_affiliation') }
 
     let!(:user) { create(:user, perms: perms) }
 
     subject { user.can_change_org? }
 
     it { is_expected.to eq(true) }
-
   end
 
-  describe "#can_grant_permissions?" do
-
-    let!(:perms) { create_list(:perm, 1, name: "grant_permissions") }
+  describe '#can_grant_permissions?' do
+    let!(:perms) { create_list(:perm, 1, name: 'grant_permissions') }
 
     let!(:user) { create(:user, perms: perms) }
 
     subject { user.can_grant_permissions? }
 
     it { is_expected.to eq(true) }
-
   end
 
-  describe "#can_modify_templates?" do
-
-    let!(:perms) { create_list(:perm, 1, name: "modify_templates") }
+  describe '#can_modify_templates?' do
+    let!(:perms) { create_list(:perm, 1, name: 'modify_templates') }
 
     let!(:user) { create(:user, perms: perms) }
 
     subject { user.can_modify_templates? }
 
     it { is_expected.to eq(true) }
-
   end
 
-  describe "#can_modify_guidance?" do
-
-    let!(:perms) { create_list(:perm, 1, name: "modify_guidance") }
+  describe '#can_modify_guidance?' do
+    let!(:perms) { create_list(:perm, 1, name: 'modify_guidance') }
 
     let!(:user) { create(:user, perms: perms) }
 
     subject { user.can_modify_guidance? }
 
     it { is_expected.to eq(true) }
-
   end
 
-  describe "#can_use_api?" do
-
-    let!(:perms) { create_list(:perm, 1, name: "use_api") }
+  describe '#can_use_api?' do
+    let!(:perms) { create_list(:perm, 1, name: 'use_api') }
 
     let!(:user) { create(:user, perms: perms) }
 
     subject { user.can_use_api? }
 
     it { is_expected.to eq(true) }
-
   end
 
-  describe "#can_modify_org_details?" do
-
-    let!(:perms) { create_list(:perm, 1, name: "change_org_details") }
+  describe '#can_modify_org_details?' do
+    let!(:perms) { create_list(:perm, 1, name: 'change_org_details') }
 
     let!(:user) { create(:user, perms: perms) }
 
     subject { user.can_modify_org_details? }
 
     it { is_expected.to eq(true) }
-
   end
 
-  describe "#can_grant_api_to_orgs?" do
-
-    let!(:perms) { create_list(:perm, 1, name: "grant_api_to_orgs") }
+  describe '#can_grant_api_to_orgs?' do
+    let!(:perms) { create_list(:perm, 1, name: 'grant_api_to_orgs') }
 
     let!(:user) { create(:user, perms: perms) }
 
     subject { user.can_grant_api_to_orgs? }
 
     it { is_expected.to eq(true) }
-
   end
 
-  describe "#remove_token!" do
-
+  describe '#remove_token!' do
     subject { user.remove_token! }
 
-    context "when user is not a new record and api_token is not blank" do
-
-      let!(:user) { create(:user, api_token: "an token string") }
+    context 'when user is not a new record and api_token is not blank' do
+      let!(:user) { create(:user, api_token: 'an token string') }
 
       it { expect { subject }.to change { user.api_token }.to(nil) }
-
     end
 
-    context "when user is not a new record and api_token is nil" do
-
+    context 'when user is not a new record and api_token is nil' do
       let!(:user) { create(:user, api_token: nil) }
 
       it { expect { subject }.not_to change { user.api_token } }
-
     end
 
-    context "when user is not a new record and api_token is an empty string" do
-
-      let!(:user) { create(:user, api_token: "") }
+    context 'when user is not a new record and api_token is an empty string' do
+      let!(:user) { create(:user, api_token: '') }
 
       it { expect { subject }.to change { user.api_token }.to(nil) }
-
     end
 
-    context "when user is a new record" do
-
-      let!(:user) { build(:user, api_token: "an token string") }
+    context 'when user is a new record' do
+      let!(:user) { build(:user, api_token: 'an token string') }
 
       it { expect { subject }.not_to change { user.api_token } }
-
     end
   end
 
-  describe "#keep_or_generate_token!" do
-
+  describe '#keep_or_generate_token!' do
     subject { user.keep_or_generate_token! }
 
-    context "when user is not a new record and api_token is an empty string" do
-
-      let!(:user) { create(:user, api_token: "") }
+    context 'when user is not a new record and api_token is an empty string' do
+      let!(:user) { create(:user, api_token: '') }
 
       it { expect { subject }.to change { user.api_token } }
-
     end
 
-    context "when user is not a new record and api_token is nil" do
-
+    context 'when user is not a new record and api_token is nil' do
       let!(:user) { create(:user, api_token: nil) }
 
       it { expect { subject }.to change { user.api_token } }
-
     end
 
-    context "when user is a new record and api_token is an empty string" do
-
-      let!(:user) { build(:user, api_token: "") }
+    context 'when user is a new record and api_token is an empty string' do
+      let!(:user) { build(:user, api_token: '') }
 
       it { expect { subject }.not_to change { user.api_token } }
-
     end
   end
 
   # Test creationg a User from an omniauth callback like Shibboleth
-  describe ".from_omniauth" do
+  describe '.from_omniauth' do
     let!(:user) { create(:user) }
     let!(:auth) do
       OpenStruct.new(provider: Faker::Lorem.unique.word, uid: Faker::Lorem.word)
@@ -550,7 +474,7 @@
 
     subject { User.from_omniauth(auth) }
 
-    context "when User has Identifier, with different ID" do
+    context 'when User has Identifier, with different ID' do
       let!(:identifier) do
         create(:identifier, :for_user, identifiable: user,
                                        identifier_scheme: scheme,
@@ -560,7 +484,7 @@
       it { is_expected.to be_nil }
     end
 
-    context "when user Identifier and auth Provider are the same string" do
+    context 'when user Identifier and auth Provider are the same string' do
       let!(:identifier) do
         create(:identifier, :for_user, identifiable: user,
                                        identifier_scheme: scheme,
@@ -569,11 +493,9 @@
 
       it { is_expected.to eql(user) }
     end
-
   end
 
-  describe "#get_preferences" do
-
+  describe '#get_preferences' do
     let!(:user) { create(:user) }
 
     let!(:key) { :email }
@@ -581,107 +503,87 @@
     subject { user.get_preferences(key) }
 
     context "when the User doesn't have thier own Pref" do
-
-      it "returns the default value" do
+      it 'returns the default value' do
         Pref.expects(:default_settings)
-            .returns(email: { foo: { "bar" => "baz" } })
-        expect(subject).to eql({ foo: { "bar" => "baz" } })
+            .returns(email: { foo: { 'bar' => 'baz' } })
+        expect(subject).to eql({ foo: { 'bar' => 'baz' } })
       end
-
     end
 
-    context "when the User has thier own Pref" do
-
+    context 'when the User has thier own Pref' do
       before do
         create(:pref, user: user,
-                      settings: { email: { foo: { bar: "bam" } } })
+                      settings: { email: { foo: { bar: 'bam' } } })
       end
 
       it "returns the User's value" do
         Pref.expects(:default_settings)
-            .returns(email: { foo: { bar: "baz" } })
-        expect(subject).to eql({ foo: { bar: "bam" } })
+            .returns(email: { foo: { bar: 'baz' } })
+        expect(subject).to eql({ foo: { bar: 'bam' } })
       end
-
     end
 
     context "when the User's own Pref doesn't contain a new default" do
-
       before do
         create(:pref, user: user,
-                      settings: { email: { foo: { bar: "bam" } } })
+                      settings: { email: { foo: { bar: 'bam' } } })
       end
 
-      it "includes the default" do
+      it 'includes the default' do
         Pref.expects(:default_settings)
-            .returns(email: { default: { val: true }, foo: { bar: "baz" } })
-        expect(subject).to eql({ default: { val: true }, foo: { bar: "bam" } })
+            .returns(email: { default: { val: true }, foo: { bar: 'baz' } })
+        expect(subject).to eql({ default: { val: true }, foo: { bar: 'bam' } })
       end
-
     end
-
   end
 
-  describe ".where_case_insensitive" do
-
+  describe '.where_case_insensitive' do
     before do
-      @user = create(:user, firstname: "Test")
+      @user = create(:user, firstname: 'Test')
     end
 
     subject { User.where_case_insensitive(:firstname, value) }
 
-    context "when search value is capitalized" do
-
-      let!(:value) { "TEST" }
+    context 'when search value is capitalized' do
+      let!(:value) { 'TEST' }
 
       it { is_expected.to include(@user) }
-
     end
 
-    context "when search value matches case" do
-
-      let!(:value) { "Test" }
+    context 'when search value matches case' do
+      let!(:value) { 'Test' }
 
       it { is_expected.to include(@user) }
-
     end
 
-    context "when search value is lowercase" do
-
-      let!(:value) { "test" }
+    context 'when search value is lowercase' do
+      let!(:value) { 'test' }
 
       it { is_expected.to include(@user) }
-
     end
   end
 
-  describe "#acknowledge" do
-
+  describe '#acknowledge' do
     let!(:user) { create(:user) }
 
     subject { user.acknowledge(notification) }
 
-    context "when notification is dismissable" do
-
+    context 'when notification is dismissable' do
       let!(:notification) { create(:notification, :dismissable) }
 
       it "adds the Notification to the User's notifications" do
         subject
         expect(user.notifications).to include(notification)
       end
-
     end
 
-    context "when notification is not dismissable" do
-
+    context 'when notification is not dismissable' do
       let!(:notification) { create(:notification) }
 
       it "doesn't add the Notification to the User's notifications" do
         subject
         expect(user.notifications).not_to include(notification)
       end
-
     end
   end
-
 end
diff --git a/spec/policies/usage_policy_spec.rb b/spec/policies/usage_policy_spec.rb
index 30973926ba..35e49dc8b7 100644
--- a/spec/policies/usage_policy_spec.rb
+++ b/spec/policies/usage_policy_spec.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe UsagePolicy, type: :policy do
-
   subject { described_class.new(user, :usage) }
 
   let(:super_actions) do
@@ -15,34 +14,34 @@
        all_plans_by_template plans_by_template org_statistics]
   end
 
-  context "super_admin" do
+  context 'super_admin' do
     let(:user) { create(:user, :super_admin) }
-    it "has access to all actions" do
+    it 'has access to all actions' do
       is_expected.to permit_actions(super_actions)
     end
   end
 
-  context "org_admin" do
+  context 'org_admin' do
     let(:user) { create(:user, :org_admin) }
-    it "has access to all org-admin actions" do
+    it 'has access to all org-admin actions' do
       is_expected.to permit_actions(org_actions)
     end
 
-    it "does not have access to global statistics" do
+    it 'does not have access to global statistics' do
       is_expected.to forbid_actions(%i[global_statistics])
     end
   end
 
-  context "user" do
+  context 'user' do
     let(:user) { create(:user) }
-    it "not have access to any of the actions" do
+    it 'not have access to any of the actions' do
       is_expected.to forbid_actions(super_actions)
     end
   end
 
-  context "unauthenticated" do
+  context 'unauthenticated' do
     let(:user) { nil }
-    it "not have access to any of the actions" do
+    it 'not have access to any of the actions' do
       super_actions.each do |action|
         # rubocop:disable Layout/LineLength
         expect { is_expected.to permit_action(action) }.to raise_error(Pundit::NotAuthorizedError), "expected :#{action} to raise a NotAuthorizedError"
diff --git a/spec/presenters/api/v1/contributor_presenter_spec.rb b/spec/presenters/api/v1/contributor_presenter_spec.rb
index 382c484f2e..0b5e4390e3 100644
--- a/spec/presenters/api/v1/contributor_presenter_spec.rb
+++ b/spec/presenters/api/v1/contributor_presenter_spec.rb
@@ -1,39 +1,37 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Api::V1::ContributorPresenter do
-
-  describe "#role_as_uri" do
-    it "returns nil if the plans_contributor role is nil" do
+  describe '#role_as_uri' do
+    it 'returns nil if the plans_contributor role is nil' do
       uri = described_class.role_as_uri(role: nil)
       expect(uri).to eql(nil)
     end
-    it "returns the correct URI" do
-      uri = described_class.role_as_uri(role: "data_curation")
-      expect(uri.start_with?("http")).to eql(true)
-      expect(uri.end_with?("data-curation")).to eql(true)
+    it 'returns the correct URI' do
+      uri = described_class.role_as_uri(role: 'data_curation')
+      expect(uri.start_with?('http')).to eql(true)
+      expect(uri.end_with?('data-curation')).to eql(true)
     end
   end
 
-  describe "#contributor_id" do
+  describe '#contributor_id' do
     before(:each) do
       @contributor = create(:contributor, investigation: true, plan: create(:plan))
       create(:identifier, identifiable: @contributor)
       @contributor.reload
     end
 
-    it "returns nil if no ORCID exists" do
+    it 'returns nil if no ORCID exists' do
       rslt = described_class.contributor_id(identifiers: @contributor.identifiers)
       expect(rslt).to eql(nil)
     end
-    it "returns the ORCID" do
-      scheme = create(:identifier_scheme, name: "orcid")
+    it 'returns the ORCID' do
+      scheme = create(:identifier_scheme, name: 'orcid')
       orcid = create(:identifier, identifier_scheme: scheme, identifiable: @contributor)
       @contributor.reload
       rslt = described_class.contributor_id(identifiers: @contributor.identifiers)
       expect(rslt).to eql(orcid)
     end
   end
-
 end
diff --git a/spec/presenters/api/v1/funding_presenter_spec.rb b/spec/presenters/api/v1/funding_presenter_spec.rb
index 2216ace28c..181e46b830 100644
--- a/spec/presenters/api/v1/funding_presenter_spec.rb
+++ b/spec/presenters/api/v1/funding_presenter_spec.rb
@@ -1,32 +1,24 @@
 # frozen_string_literal: true
 
 module Api
-
   module V1
-
     class FundingPresenter
-
       class << self
-
         # If the plan has a grant number then it has been awarded/granted
         # otherwise it is 'planned'
         def status(plan:)
-          return "planned" unless plan.present?
+          return 'planned' unless plan.present?
 
           case plan.funding_status
-          when "funded"
-            "granted"
-          when "denied"
-            "rejected"
+          when 'funded'
+            'granted'
+          when 'denied'
+            'rejected'
           else
-            "planned"
+            'planned'
           end
         end
-
       end
-
     end
-
   end
-
 end
diff --git a/spec/presenters/api/v1/language_presenter_spec.rb b/spec/presenters/api/v1/language_presenter_spec.rb
index 1997820e84..c73320d0a0 100644
--- a/spec/presenters/api/v1/language_presenter_spec.rb
+++ b/spec/presenters/api/v1/language_presenter_spec.rb
@@ -1,25 +1,23 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Api::V1::LanguagePresenter do
-
-  describe "#three_char_code(lang:)" do
-    it "returns nil if the specified lang (as string) has no match" do
-      expect(described_class.three_char_code(lang: "foo")).to eql(nil)
+  describe '#three_char_code(lang:)' do
+    it 'returns nil if the specified lang (as string) has no match' do
+      expect(described_class.three_char_code(lang: 'foo')).to eql(nil)
     end
-    it "returns nil if the specified lang (as symbol) has no match" do
+    it 'returns nil if the specified lang (as symbol) has no match' do
       expect(described_class.three_char_code(lang: :foo)).to eql(nil)
     end
-    it "returns the 3 char code for the specified lang (as string)" do
-      expect(described_class.three_char_code(lang: "en")).to eql("eng")
+    it 'returns the 3 char code for the specified lang (as string)' do
+      expect(described_class.three_char_code(lang: 'en')).to eql('eng')
     end
-    it "returns the 3 char code for the specified lang (as symbol)" do
-      expect(described_class.three_char_code(lang: :en)).to eql("eng")
+    it 'returns the 3 char code for the specified lang (as symbol)' do
+      expect(described_class.three_char_code(lang: :en)).to eql('eng')
     end
-    it "returns the 3 char code for the specified lang with region designation" do
-      expect(described_class.three_char_code(lang: "en-UK")).to eql("eng")
+    it 'returns the 3 char code for the specified lang with region designation' do
+      expect(described_class.three_char_code(lang: 'en-UK')).to eql('eng')
     end
   end
-
 end
diff --git a/spec/presenters/api/v1/org_presenter_spec.rb b/spec/presenters/api/v1/org_presenter_spec.rb
index dea4a61a61..d496a3925c 100644
--- a/spec/presenters/api/v1/org_presenter_spec.rb
+++ b/spec/presenters/api/v1/org_presenter_spec.rb
@@ -1,30 +1,29 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Api::V1::OrgPresenter do
-
-  describe "#affiliation_id" do
+  describe '#affiliation_id' do
     before(:each) do
-      @ror_scheme = create(:identifier_scheme, name: "ror")
-      @fundref_scheme = create(:identifier_scheme, name: "fundref")
+      @ror_scheme = create(:identifier_scheme, name: 'ror')
+      @fundref_scheme = create(:identifier_scheme, name: 'fundref')
       @org = create(:org)
       create(:identifier, identifiable: @org)
       @org.reload
     end
 
-    it "returns nil if no ORCID exists" do
+    it 'returns nil if no ORCID exists' do
       rslt = described_class.affiliation_id(identifiers: @org.identifiers)
       expect(rslt).to eql(nil)
     end
-    it "returns the ROR" do
+    it 'returns the ROR' do
       ror = create(:identifier, identifier_scheme: @ror_scheme, identifiable: @org)
       create(:identifier, identifier_scheme: @fundref_scheme, identifiable: @org)
       @org.reload
       rslt = described_class.affiliation_id(identifiers: @org.identifiers)
       expect(rslt).to eql(ror)
     end
-    it "returns the FUNDREF if no ROR is present" do
+    it 'returns the FUNDREF if no ROR is present' do
       fundref = create(:identifier, identifier_scheme: @fundref_scheme,
                                     identifiable: @org)
       @org.reload
@@ -32,5 +31,4 @@
       expect(rslt).to eql(fundref)
     end
   end
-
 end
diff --git a/spec/presenters/api/v1/pagination_presenter_spec.rb b/spec/presenters/api/v1/pagination_presenter_spec.rb
index 5d9ace05f5..37e748e109 100644
--- a/spec/presenters/api/v1/pagination_presenter_spec.rb
+++ b/spec/presenters/api/v1/pagination_presenter_spec.rb
@@ -1,176 +1,172 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Api::V1::PaginationPresenter do
-
-  describe "#url_without_pagination" do
+  describe '#url_without_pagination' do
     before(:each) do
       @url = Faker::Internet.url
     end
 
-    it "returns nil if no url was specified" do
+    it 'returns nil if no url was specified' do
       presenter = described_class.new(current_url: nil, per_page: 2,
                                       total_items: 1, current_page: 1)
       expect(presenter.url_without_pagination).to eql(nil)
     end
-    it "removes per_page from the query string" do
+    it 'removes per_page from the query string' do
       target = "#{@url}?per_page=2"
       presenter = described_class.new(current_url: target, per_page: 2,
                                       total_items: 1, current_page: 1)
-      rslt = presenter.url_without_pagination.include?("per_page=2")
+      rslt = presenter.url_without_pagination.include?('per_page=2')
       expect(rslt).to eql(false)
     end
-    it "removes page from the query string" do
+    it 'removes page from the query string' do
       target = "#{@url}?page=2"
       presenter = described_class.new(current_url: target, per_page: 2,
                                       total_items: 1, current_page: 1)
-      rslt = presenter.url_without_pagination.include?("page=2")
+      rslt = presenter.url_without_pagination.include?('page=2')
       expect(rslt).to eql(false)
     end
-    it "retains other query string items if there were no pagination ones" do
+    it 'retains other query string items if there were no pagination ones' do
       target = "#{@url}?other=true"
       presenter = described_class.new(current_url: target, per_page: 2,
                                       total_items: 1, current_page: 1)
-      rslt = presenter.url_without_pagination.include?("other=true")
+      rslt = presenter.url_without_pagination.include?('other=true')
       expect(rslt).to eql(true)
     end
-    it "retains other query string items if it removed pagination ones" do
+    it 'retains other query string items if it removed pagination ones' do
       target = "#{@url}?per_page=2&other=true"
       presenter = described_class.new(current_url: target, per_page: 2,
                                       total_items: 1, current_page: 1)
-      rslt = presenter.url_without_pagination.include?("other=true")
+      rslt = presenter.url_without_pagination.include?('other=true')
       expect(rslt).to eql(true)
     end
     it "ends with a '&' if there were query string items" do
       target = "#{@url}?per_page=2&other=true"
       presenter = described_class.new(current_url: target, per_page: 2,
                                       total_items: 1, current_page: 1)
-      rslt = presenter.url_without_pagination.end_with?("&")
+      rslt = presenter.url_without_pagination.end_with?('&')
       expect(rslt).to eql(true)
     end
     it "ends with a '?' if there were no query string items" do
       presenter = described_class.new(current_url: @url, per_page: 2,
                                       total_items: 1, current_page: 1)
-      rslt = presenter.url_without_pagination.end_with?("?")
+      rslt = presenter.url_without_pagination.end_with?('?')
       expect(rslt).to eql(true)
     end
     it "ends with a '?' if there were only pagination items in query string" do
       target = "#{@url}?page=2"
       presenter = described_class.new(current_url: target, per_page: 2,
                                       total_items: 1, current_page: 1)
-      rslt = presenter.url_without_pagination.end_with?("?")
+      rslt = presenter.url_without_pagination.end_with?('?')
       expect(rslt).to eql(true)
     end
   end
 
-  describe "#prev_page?" do
-    it "returns false if we are on page 1" do
+  describe '#prev_page?' do
+    it 'returns false if we are on page 1' do
       presenter = described_class.new(current_url: nil, per_page: 2,
                                       total_items: 4, current_page: 1)
       expect(presenter.prev_page?).to eql(false)
     end
-    it "returns false if there is only 1 page" do
+    it 'returns false if there is only 1 page' do
       presenter = described_class.new(current_url: nil, per_page: 2,
                                       total_items: 2, current_page: 2)
       expect(presenter.prev_page?).to eql(false)
     end
-    it "returns true if more than 1 page and we are not on page 1" do
+    it 'returns true if more than 1 page and we are not on page 1' do
       presenter = described_class.new(current_url: nil, per_page: 2,
                                       total_items: 4, current_page: 2)
       expect(presenter.prev_page?).to eql(true)
     end
   end
 
-  describe "#next_page?" do
-    it "returns false if we are on the last page" do
+  describe '#next_page?' do
+    it 'returns false if we are on the last page' do
       presenter = described_class.new(current_url: nil, per_page: 2,
                                       total_items: 4, current_page: 2)
       expect(presenter.next_page?).to eql(false)
     end
-    it "returns false if there is only 1 page" do
+    it 'returns false if there is only 1 page' do
       presenter = described_class.new(current_url: nil, per_page: 2,
                                       total_items: 2, current_page: 1)
       expect(presenter.next_page?).to eql(false)
     end
-    it "returns true if more than 1 page and we are not on last page" do
+    it 'returns true if more than 1 page and we are not on last page' do
       presenter = described_class.new(current_url: nil, per_page: 2,
                                       total_items: 4, current_page: 1)
       expect(presenter.next_page?).to eql(true)
     end
   end
 
-  describe "#prev_page_link" do
+  describe '#prev_page_link' do
     before(:each) do
       url = "#{Faker::Internet.url}?other=true"
       @presenter = described_class.new(current_url: url, per_page: 2,
                                        total_items: 4, current_page: 2)
     end
 
-    it "includes per_page in the query string" do
-      expect(@presenter.prev_page_link.include?("per_page=2")).to eql(true)
+    it 'includes per_page in the query string' do
+      expect(@presenter.prev_page_link.include?('per_page=2')).to eql(true)
     end
-    it "includes shows the correct page number" do
-      expect(@presenter.prev_page_link.include?("page=1")).to eql(true)
+    it 'includes shows the correct page number' do
+      expect(@presenter.prev_page_link.include?('page=1')).to eql(true)
     end
-    it "retains other query params" do
-      expect(@presenter.prev_page_link.include?("other=true")).to eql(true)
+    it 'retains other query params' do
+      expect(@presenter.prev_page_link.include?('other=true')).to eql(true)
     end
   end
 
-  describe "#next_page_link" do
+  describe '#next_page_link' do
     before(:each) do
       url = "#{Faker::Internet.url}?other=true"
       @presenter = described_class.new(current_url: url, per_page: 2,
                                        total_items: 4, current_page: 1)
     end
 
-    it "includes per_page in the query string" do
-      expect(@presenter.next_page_link.include?("per_page=2")).to eql(true)
+    it 'includes per_page in the query string' do
+      expect(@presenter.next_page_link.include?('per_page=2')).to eql(true)
     end
-    it "includes shows the correct page number" do
-      expect(@presenter.next_page_link.include?("page=2")).to eql(true)
+    it 'includes shows the correct page number' do
+      expect(@presenter.next_page_link.include?('page=2')).to eql(true)
     end
-    it "retains other query params" do
-      expect(@presenter.next_page_link.include?("other=true")).to eql(true)
+    it 'retains other query params' do
+      expect(@presenter.next_page_link.include?('other=true')).to eql(true)
     end
   end
 
-  context "private methods" do
-
-    describe "#total_pages" do
-      it "returns 1 if total_items is missing" do
+  context 'private methods' do
+    describe '#total_pages' do
+      it 'returns 1 if total_items is missing' do
         presenter = described_class.new(current_url: nil, per_page: 2,
                                         total_items: nil)
         expect(presenter.send(:total_pages)).to eql(1)
       end
-      it "returns 1 if per_page is missing" do
+      it 'returns 1 if per_page is missing' do
         presenter = described_class.new(current_url: nil, per_page: nil,
                                         total_items: 4)
         expect(presenter.send(:total_pages)).to eql(1)
       end
-      it "returns 1 if total_items is <= 0" do
+      it 'returns 1 if total_items is <= 0' do
         presenter = described_class.new(current_url: nil, per_page: 2,
                                         total_items: 0)
         expect(presenter.send(:total_pages)).to eql(1)
       end
-      it "returns 1 if per_page is <= 0" do
+      it 'returns 1 if per_page is <= 0' do
         presenter = described_class.new(current_url: nil, per_page: 0,
                                         total_items: 4)
         expect(presenter.send(:total_pages)).to eql(1)
       end
-      it "returns the total_items / per_page" do
+      it 'returns the total_items / per_page' do
         presenter = described_class.new(current_url: nil, per_page: 2,
                                         total_items: 4)
         expect(presenter.send(:total_pages)).to eql(2)
       end
-      it "rounds up" do
+      it 'rounds up' do
         presenter = described_class.new(current_url: nil, per_page: 3,
                                         total_items: 4)
         expect(presenter.send(:total_pages)).to eql(2)
       end
     end
-
   end
-
 end
diff --git a/spec/presenters/api/v1/plan_presenter_spec.rb b/spec/presenters/api/v1/plan_presenter_spec.rb
index 83ffb43180..8c9714cb06 100644
--- a/spec/presenters/api/v1/plan_presenter_spec.rb
+++ b/spec/presenters/api/v1/plan_presenter_spec.rb
@@ -1,10 +1,9 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Api::V1::PlanPresenter do
-
-  describe "#initialize(plan:)" do
+  describe '#initialize(plan:)' do
     before(:each) do
       plan = build(:plan)
       @data_contact = build(:contributor, data_curation: true)
@@ -13,32 +12,31 @@
       @presenter = described_class.new(plan: plan)
     end
 
-    it "sets contributors to empty array if no plan was specified" do
+    it 'sets contributors to empty array if no plan was specified' do
       presenter = described_class.new(plan: nil)
       expect(presenter.data_contact).to eql(nil)
       expect(presenter.contributors).to eql([])
     end
-    it "sets contributors to empty array if plan has no contributors" do
+    it 'sets contributors to empty array if plan has no contributors' do
       plan = build(:plan)
       plan.contributors = []
       presenter = described_class.new(plan: plan)
       expect(presenter.data_contact).to eql(nil)
       expect(presenter.contributors).to eql([])
     end
-    it "sets data_contact to the owner" do
+    it 'sets data_contact to the owner' do
       # Plan.owner stupidly requires that the record be persisted, so need to create here
       plan = create(:plan, :creator)
       presenter = described_class.new(plan: plan)
       expect(presenter.data_contact).to eql(plan.owner)
     end
-    it "sets data_contact to the data_curation contributor if there is no owner" do
+    it 'sets data_contact to the data_curation contributor if there is no owner' do
       expect(@presenter.data_contact).to eql(@data_contact)
     end
-    it "sets other contributors (including the data_contact)" do
+    it 'sets other contributors (including the data_contact)' do
       expect(@presenter.contributors.length).to eql(2)
       expect(@presenter.contributors.include?(@data_contact)).to eql(true)
       expect(@presenter.contributors.include?(@pi)).to eql(true)
     end
   end
-
 end
diff --git a/spec/presenters/api/v1/template_presenter_spec.rb b/spec/presenters/api/v1/template_presenter_spec.rb
index 82966749aa..93d6e1545c 100644
--- a/spec/presenters/api/v1/template_presenter_spec.rb
+++ b/spec/presenters/api/v1/template_presenter_spec.rb
@@ -1,25 +1,23 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Api::V1::TemplatePresenter do
-
-  describe "#title" do
+  describe '#title' do
     before(:each) do
       @org = create(:org)
       @template = build(:template, customization_of: nil, org: @org)
     end
 
-    it "returns the template title if its not a customization" do
+    it 'returns the template title if its not a customization' do
       presenter = described_class.new(template: @template)
       expect(presenter.title).to eql(@template.title)
     end
-    it "returns the template title and Org name if it is a customization" do
+    it 'returns the template title and Org name if it is a customization' do
       @template.customization_of = Faker::Number.number
       presenter = described_class.new(template: @template)
       expect(presenter.title.start_with?(@template.title)).to eql(true)
       expect(presenter.title.end_with?(@org.name)).to eql(true)
     end
   end
-
 end
diff --git a/spec/presenters/identifier_presenter_spec.rb b/spec/presenters/identifier_presenter_spec.rb
index 8bba150230..ab7b5282e1 100644
--- a/spec/presenters/identifier_presenter_spec.rb
+++ b/spec/presenters/identifier_presenter_spec.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe IdentifierPresenter do
-
   before(:each) do
     @user = create(:user)
     @user_scheme = create(:identifier_scheme, for_users: true)
@@ -11,7 +10,7 @@
     @org_scheme = create(:identifier_scheme, for_orgs: true, for_users: false)
   end
 
-  describe "#identifiers" do
+  describe '#identifiers' do
     it "returns the identiable object's identifiers" do
       id = build(:identifier)
       @user.identifiers << id
@@ -22,7 +21,7 @@
     end
   end
 
-  describe "#id_for_scheme(scheme:)" do
+  describe '#id_for_scheme(scheme:)' do
     before(:each) do
       @user_id = build(:identifier, identifier_scheme: @user_scheme)
       @user_id2 = build(:identifier, identifier_scheme: @org_scheme)
@@ -30,67 +29,66 @@
       @presenter = described_class.new(identifiable: @user)
     end
 
-    it "initializes a new identifier if no matching identifiers exist" do
+    it 'initializes a new identifier if no matching identifiers exist' do
       rslt = @presenter.id_for_scheme(scheme: @plan_scheme)
       expect(rslt.new_record?).to eql(true)
     end
 
-    it "returns the correct identifier" do
+    it 'returns the correct identifier' do
       rslt = @presenter.id_for_scheme(scheme: @user_scheme)
       expect(rslt).to eql(@user_id)
     end
   end
 
-  describe "#scheme_by_name(name:)" do
-    it "returns the correct scheme" do
+  describe '#scheme_by_name(name:)' do
+    it 'returns the correct scheme' do
       presenter = described_class.new(identifiable: @user)
       rslt = presenter.scheme_by_name(name: @user_scheme.name)
       expect(rslt.first).to eql(@user_scheme)
     end
   end
 
-  context "#schemes" do
-    describe "when the identifiable object is an Org" do
+  context '#schemes' do
+    describe 'when the identifiable object is an Org' do
       before(:each) do
         @presenter = described_class.new(identifiable: build(:org))
       end
 
-      it "returns schemes appropriate to the Org context" do
+      it 'returns schemes appropriate to the Org context' do
         expect(@presenter.schemes.include?(@org_scheme)).to eql(true)
       end
-      it "does not return schemes for other contexts" do
+      it 'does not return schemes for other contexts' do
         expect(@presenter.schemes.include?(@user_scheme)).not_to eql(true)
         expect(@presenter.schemes.include?(@plan_scheme)).not_to eql(true)
       end
     end
 
-    describe "when the identifiable object is an Plan" do
+    describe 'when the identifiable object is an Plan' do
       before(:each) do
         @presenter = described_class.new(identifiable: build(:plan))
       end
 
-      it "returns schemes appropriate to the Plan context" do
+      it 'returns schemes appropriate to the Plan context' do
         expect(@presenter.schemes.include?(@plan_scheme)).to eql(true)
       end
-      it "does not return schemes for other contexts" do
+      it 'does not return schemes for other contexts' do
         expect(@presenter.schemes.include?(@user_scheme)).not_to eql(true)
         expect(@presenter.schemes.include?(@org_scheme)).not_to eql(true)
       end
     end
 
-    describe "when the identifiable object is an User" do
+    describe 'when the identifiable object is an User' do
       before(:each) do
         @presenter = described_class.new(identifiable: build(:user))
       end
 
-      it "returns schemes appropriate to the User context" do
+      it 'returns schemes appropriate to the User context' do
         expect(@presenter.schemes.include?(@user_scheme)).to eql(true)
       end
-      it "does not return schemes for other contexts" do
+      it 'does not return schemes for other contexts' do
         expect(@presenter.schemes.include?(@org_scheme)).not_to eql(true)
         expect(@presenter.schemes.include?(@plan_scheme)).not_to eql(true)
       end
     end
   end
-
 end
diff --git a/spec/presenters/org_selection_presenter_spec.rb b/spec/presenters/org_selection_presenter_spec.rb
index d5a7191080..6487061ab2 100644
--- a/spec/presenters/org_selection_presenter_spec.rb
+++ b/spec/presenters/org_selection_presenter_spec.rb
@@ -1,26 +1,25 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe OrgSelectionPresenter do
-
   before(:each) do
     @org = create(:org)
     @orgs = [@org, build(:org)]
     @presenter = described_class.new(orgs: @orgs, selection: @org)
   end
 
-  describe "#name" do
-    it "returns blank if no selection is defined" do
+  describe '#name' do
+    it 'returns blank if no selection is defined' do
       presenter = described_class.new(orgs: @orgs, selection: nil)
-      expect(presenter.name).to eql("")
+      expect(presenter.name).to eql('')
     end
-    it "#name returns blank" do
+    it '#name returns blank' do
       expect(@presenter.name).to eql(@org.name)
     end
   end
 
-  it "#crosswalk returns an array containing the Orgs as hashes" do
+  it '#crosswalk returns an array containing the Orgs as hashes' do
     rslt = JSON.parse(@presenter.crosswalk)
     @orgs.each do |org|
       expected = OrgSelection::OrgToHashService.to_hash(org: org).to_json
@@ -28,25 +27,24 @@
     end
   end
 
-  it "#select_list returns an array of the Org names" do
+  it '#select_list returns an array of the Org names' do
     expect(@presenter.select_list.include?(@org.name)).to eql(true)
   end
 
-  describe "#crosswalk_entry_from_org_id(value:)" do
-    it "return an empty hash if the value is blank" do
-      expect(@presenter.crosswalk_entry_from_org_id(value: nil)).to eql("{}")
+  describe '#crosswalk_entry_from_org_id(value:)' do
+    it 'return an empty hash if the value is blank' do
+      expect(@presenter.crosswalk_entry_from_org_id(value: nil)).to eql('{}')
     end
-    it "return an empty hash if the value is not an integer" do
-      expect(@presenter.crosswalk_entry_from_org_id(value: "a123")).to eql("{}")
+    it 'return an empty hash if the value is not an integer' do
+      expect(@presenter.crosswalk_entry_from_org_id(value: 'a123')).to eql('{}')
     end
-    it "return an empty hash if the value does not have a match in crosswalk" do
-      expect(@presenter.crosswalk_entry_from_org_id(value: "999")).to eql("{}")
+    it 'return an empty hash if the value does not have a match in crosswalk' do
+      expect(@presenter.crosswalk_entry_from_org_id(value: '999')).to eql('{}')
     end
-    it "return ther correct crosswalk entry" do
+    it 'return ther correct crosswalk entry' do
       rslt = @presenter.crosswalk_entry_from_org_id(value: @org.id.to_s)
       expected = OrgSelection::OrgToHashService.to_hash(org: @org).to_json
       expect(rslt).to eql(expected)
     end
   end
-
 end
diff --git a/spec/presenters/plan_presenter.rb b/spec/presenters/plan_presenter.rb
index f316e93fde..d772d4130f 100644
--- a/spec/presenters/plan_presenter.rb
+++ b/spec/presenters/plan_presenter.rb
@@ -1,34 +1,32 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe PlanPresenter do
-
   before(:each) do
     @plan = build(:plan, start_date: nil, end_date: nil)
     @presenter = described_class.new(@plan)
   end
 
-  describe "#project_dates_to_readonly_display" do
-    it "returns blank if no start_date or end_date" do
-      expect(@presenter.project_dates_to_readonly_display).to eql("")
+  describe '#project_dates_to_readonly_display' do
+    it 'returns blank if no start_date or end_date' do
+      expect(@presenter.project_dates_to_readonly_display).to eql('')
     end
     it "returns 'Starts on [:date]' if end_date is nil" do
       @plan.start_date = Time.now
       expected = @presenter.project_dates_to_readonly_display
-      expect(expected.start_with?("Starts on")).to eql(true)
+      expect(expected.start_with?('Starts on')).to eql(true)
     end
     it "returns 'Ends on [:date]' if start_date is nil" do
       @plan.end_date = Time.now
       expected = @presenter.project_dates_to_readonly_display
-      expect(expected.start_with?("Ends on")).to eql(true)
+      expect(expected.start_with?('Ends on')).to eql(true)
     end
     it "returns '[:date] to [:date]' start_date end_date are present" do
       @plan.start_date = Time.now
       @plan.end_date = Time.now + 2.months
       expected = @presenter.project_dates_to_readonly_display
-      expect(expected.include?(" to ")).to eql(true)
+      expect(expected.include?(' to ')).to eql(true)
     end
   end
-
 end
diff --git a/spec/presenters/super_admin/orgs/merge_presenter_spec.rb b/spec/presenters/super_admin/orgs/merge_presenter_spec.rb
index be130e9933..2e643acae9 100644
--- a/spec/presenters/super_admin/orgs/merge_presenter_spec.rb
+++ b/spec/presenters/super_admin/orgs/merge_presenter_spec.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe SuperAdmin::Orgs::MergePresenter do
-
   before(:each) do
     @to_org = create(:org, :organisation, is_other: false, managed: false,
                                           abbreviation: Faker::Lorem.unique.word,
@@ -18,7 +17,7 @@
                                       target_url: Faker::Internet.url,
                                       contact_name: Faker::Music::PearlJam.musician,
                                       contact_email: Faker::Internet.email,
-                                      links: { org: { foo: "bar" } },
+                                      links: { org: { foo: 'bar' } },
                                       region: create(:region, name: Faker::Music::PearlJam.song),
                                       language: create(:language),
                                       token_permission_types: [@tpt])
@@ -38,28 +37,28 @@
     @presenter = SuperAdmin::Orgs::MergePresenter.new(from_org: @from_org, to_org: @to_org)
   end
 
-  describe ":initialize(from_org:, to_org:)" do
-    it "sets the cropped :to_org and :from_org" do
+  describe ':initialize(from_org:, to_org:)' do
+    it 'sets the cropped :to_org and :from_org' do
       expect(@presenter.to_org).to eql(@to_org)
       expect(@presenter.from_org).to eql(@from_org)
     end
-    it "sets the cropped :to_org_name and :from_org_name" do
+    it 'sets the cropped :to_org_name and :from_org_name' do
       expect(@presenter.to_org_name.present? && @presenter.to_org_name.is_a?(String)).to eql(true)
       expect(@presenter.from_org_name.present? && @presenter.to_org_name.is_a?(String)).to eql(true)
     end
-    it "sets the :categories" do
+    it 'sets the :categories' do
       expect(@presenter.categories.any?).to eql(true)
       expect(@presenter.categories.first).to eql(:annotations)
       expect(@presenter.categories.last).to eql(:users)
     end
-    it "sets the :to_org_entries, :from_org_entries and mergeable_entries" do
+    it 'sets the :to_org_entries, :from_org_entries and mergeable_entries' do
       expect(@presenter.to_org_entries.is_a?(Hash)).to eql(true)
       expect(@presenter.from_org_entries.is_a?(Hash)).to eql(true)
       expect(@presenter.from_org_entries[:annotations].any?).to eql(true)
       expect(@presenter.mergeable_entries.is_a?(Hash)).to eql(true)
       expect(@presenter.mergeable_entries[:annotations].any?).to eql(true)
     end
-    it "sets the :from_org_attributes, :to_org_attributes and :mergeable_attributes" do
+    it 'sets the :from_org_attributes, :to_org_attributes and :mergeable_attributes' do
       expect(@presenter.to_org_attributes.is_a?(Hash)).to eql(true)
       expect(@presenter.from_org_attributes.is_a?(Hash)).to eql(true)
       expect(@presenter.from_org_attributes[:contact_email].present?).to eql(true)
@@ -68,9 +67,9 @@
     end
   end
 
-  context "private methods" do
-    describe ":prepare_org(org:)" do
-      it "returns the expected categories for from_org" do
+  context 'private methods' do
+    describe ':prepare_org(org:)' do
+      it 'returns the expected categories for from_org' do
         results = @presenter.send(:prepare_org, org: @from_org)
         expect(results[:annotations].any?).to eql(true)
         expect(results[:departments].any?).to eql(true)
@@ -83,7 +82,7 @@
         expect(results[:tracker].any?).to eql(true)
         expect(results[:users].any?).to eql(true)
       end
-      it "returns the expected categories for to_org" do
+      it 'returns the expected categories for to_org' do
         results = @presenter.send(:prepare_org, org: @to_org)
         expect(results[:annotations].any?).to eql(false)
         expect(results[:departments].any?).to eql(false)
@@ -98,8 +97,8 @@
       end
     end
 
-    describe ":prepare_mergeables" do
-      it "returns the expected categories" do
+    describe ':prepare_mergeables' do
+      it 'returns the expected categories' do
         results = @presenter.send(:prepare_mergeables)
         expect(results[:annotations].any?).to eql(true)
         expect(results[:departments].any?).to eql(true)
@@ -112,7 +111,7 @@
         expect(results[:tracker].any?).to eql(true)
         expect(results[:users].any?).to eql(true)
       end
-      it "does not return :tracker if one is already defined on to_org" do
+      it 'does not return :tracker if one is already defined on to_org' do
         create(:tracker, org: @to_org)
         @to_org.reload
         @presenter = SuperAdmin::Orgs::MergePresenter.new(from_org: @from_org, to_org: @to_org)
@@ -121,22 +120,22 @@
       end
     end
 
-    describe ":diff_from_and_to(category:)" do
+    describe ':diff_from_and_to(category:)' do
       before(:each) do
         @entries = %i[annotations departments funded_plans guidances identifiers
                       plans templates token_permission_types tracker users]
       end
-      it "returns an empty array if category is not present" do
+      it 'returns an empty array if category is not present' do
         expect(@presenter.send(:diff_from_and_to, category: nil)).to eql([])
       end
-      it "returns an empty array if category is not an org entry" do
+      it 'returns an empty array if category is not an org entry' do
         expect(@presenter.send(:diff_from_and_to, category: :foo)).to eql([])
       end
-      it "returns the from_org entries for :annotations" do
+      it 'returns the from_org entries for :annotations' do
         results = @presenter.send(:diff_from_and_to, category: :annotations)
         expect(results).to eql(@from_org.annotations.to_a)
       end
-      it "returns the uniquie entries for :departments" do
+      it 'returns the uniquie entries for :departments' do
         dup_department = build(:department)
         @from_org.departments << dup_department
         @to_org.departments << dup_department
@@ -145,58 +144,58 @@
         expect(results.include?(dup_department)).to eql(false)
         expect(results).to eql(@from_org.departments.reject { |dpt| dpt == dup_department })
       end
-      it "returns the from_org entries for :funded_plans" do
+      it 'returns the from_org entries for :funded_plans' do
         results = @presenter.send(:diff_from_and_to, category: :funded_plans)
         expect(results).to eql(@from_org.funded_plans.to_a)
       end
-      it "returns the all entries for :guidances" do
+      it 'returns the all entries for :guidances' do
         results = @presenter.send(:diff_from_and_to, category: :guidances)
         expect(results).to eql(@from_org.guidance_groups.map(&:guidances).flatten.to_a)
       end
-      it "returns the :identifiers that have no :identifier_scheme" do
+      it 'returns the :identifiers that have no :identifier_scheme' do
         to_id = build(:identifier, identifier_scheme: nil)
         @to_org.identifiers << to_id
         @presenter = SuperAdmin::Orgs::MergePresenter.new(from_org: @from_org, to_org: @to_org)
         results = @presenter.send(:diff_from_and_to, category: :identifiers)
         expect(results.include?(@id_no_scheme)).to eql(true)
       end
-      it "returns the :identifiers that are not defined in to_org for the :identifier_scheme" do
+      it 'returns the :identifiers that are not defined in to_org for the :identifier_scheme' do
         to_id = build(:identifier, identifier_scheme: build(:identifier_scheme))
         @to_org.identifiers << to_id
         @presenter = SuperAdmin::Orgs::MergePresenter.new(from_org: @from_org, to_org: @to_org)
         results = @presenter.send(:diff_from_and_to, category: :identifiers)
         expect(results.include?(@id_scheme)).to eql(true)
       end
-      it "does not return the :identifiers that are defined in to_org for the :identifier_scheme" do
+      it 'does not return the :identifiers that are defined in to_org for the :identifier_scheme' do
         to_id = build(:identifier, identifier_scheme: @scheme)
         @to_org.identifiers << to_id
         @presenter = SuperAdmin::Orgs::MergePresenter.new(from_org: @from_org, to_org: @to_org)
         results = @presenter.send(:diff_from_and_to, category: :identifiers)
         expect(results.include?(@id_scheme)).to eql(false)
       end
-      it "returns the from_org entries for :plans" do
+      it 'returns the from_org entries for :plans' do
         results = @presenter.send(:diff_from_and_to, category: :plans)
         expect(results).to eql(Plan.where(org: @from_org).to_a)
       end
-      it "returns the from_org entries for :templates" do
+      it 'returns the from_org entries for :templates' do
         results = @presenter.send(:diff_from_and_to, category: :templates)
         expect(results).to eql(@from_org.templates.to_a)
       end
-      it "returns the :token_permission_types that are not defined on to_org" do
+      it 'returns the :token_permission_types that are not defined on to_org' do
         results = @presenter.send(:diff_from_and_to, category: :token_permission_types)
         expect(results).to eql(@from_org.token_permission_types.to_a)
       end
-      it "does not return the :token_permission_types that are defined on to_org" do
+      it 'does not return the :token_permission_types that are defined on to_org' do
         @to_org.token_permission_types << @tpt
         @presenter = SuperAdmin::Orgs::MergePresenter.new(from_org: @from_org, to_org: @to_org)
         results = @presenter.send(:diff_from_and_to, category: :token_permission_types)
         expect(results.include?(@tpt)).to eql(false)
       end
-      it "returns the from_org entries for :users not defined on to_org" do
+      it 'returns the from_org entries for :users not defined on to_org' do
         results = @presenter.send(:diff_from_and_to, category: :users)
         expect(results).to eql(@from_org.users.to_a)
       end
-      it "does not return the :users that are defined on to_org" do
+      it 'does not return the :users that are defined on to_org' do
         @to_org.users << @user
         @presenter = SuperAdmin::Orgs::MergePresenter.new(from_org: @from_org, to_org: @to_org)
         results = @presenter.send(:diff_from_and_to, category: :users)
@@ -204,7 +203,7 @@
       end
     end
 
-    describe ":org_attributes(org:)" do
+    describe ':org_attributes(org:)' do
       before(:each) do
         @expected = %i[target_url managed links
                        contact_name contact_email
@@ -212,76 +211,75 @@
                        feedback_enabled feedback_msg]
         @results = @presenter.send(:org_attributes, org: @from_org)
       end
-      it "returns an empty hash if :org is not an Org" do
+      it 'returns an empty hash if :org is not an Org' do
         expect(@presenter.send(:org_attributes, org: build(:user))).to eql({})
       end
-      it "includes the expected columns" do
+      it 'includes the expected columns' do
         @expected.each { |column| expect(@results[column]).to eql(@from_org.send(column)) }
       end
-      it "does not include any other columns than the ones we expect" do
+      it 'does not include any other columns than the ones we expect' do
         @results.each_key { |key| expect(@expected.include?(key)).to eql(true) }
       end
     end
 
-    describe ":mergeable_columns" do
+    describe ':mergeable_columns' do
       before(:each) do
         @expected = %i[target_url managed links
                        contact_name contact_email
                        feedback_enabled feedback_msg]
         @results = @presenter.send(:mergeable_columns)
       end
-      it "includes the expected columns" do
+      it 'includes the expected columns' do
         @expected.each { |column| expect(@results[column].present?).to eql(true) }
       end
-      it "does not include any other columns than the ones we expect" do
+      it 'does not include any other columns than the ones we expect' do
         @results.each_key { |key| expect(@expected.include?(key)).to eql(true) }
       end
     end
-    describe ":mergeable_column?(column:)" do
-      it "returns false if the :to_org is :managed but the :from_org is not" do
+    describe ':mergeable_column?(column:)' do
+      it 'returns false if the :to_org is :managed but the :from_org is not' do
         @presenter.to_org.stubs(:managed?).returns(true)
         @presenter.from_org.stubs(:managed?).returns(false)
         expect(@presenter.send(:mergeable_column?, column: :managed)).to eql(false)
       end
-      it "returns false if the :to_org has :feedback_enabled but the :from_org does not" do
+      it 'returns false if the :to_org has :feedback_enabled but the :from_org does not' do
         @presenter.to_org.stubs(:feedback_enabled?).returns(true)
         @presenter.from_org.stubs(:feedback_enabled?).returns(false)
         expect(@presenter.send(:mergeable_column?, column: :feedback_enabled)).to eql(false)
       end
-      it "returns false if the :from_org links is an empty json" do
+      it 'returns false if the :from_org links is an empty json' do
         @presenter.from_org.stubs(:links).returns({})
         expect(@presenter.send(:mergeable_column?, column: :links)).to eql(false)
       end
-      it "returns false if the :to_org already has a value" do
+      it 'returns false if the :to_org already has a value' do
         @presenter.to_org.stubs(:contact_email).returns(Faker::Internet.email)
         expect(@presenter.send(:mergeable_column?, column: :contact_email)).to eql(false)
       end
-      it "returns false if the :from_org does not have a value" do
+      it 'returns false if the :from_org does not have a value' do
         @presenter.from_org.stubs(:contact_email).returns(nil)
         expect(@presenter.send(:mergeable_column?, column: :contact_email)).to eql(false)
       end
-      it "returns true for :target_url" do
+      it 'returns true for :target_url' do
         expect(@presenter.send(:mergeable_column?, column: :target_url)).to eql(true)
       end
-      it "returns true for :managed" do
+      it 'returns true for :managed' do
         expect(@presenter.send(:mergeable_column?, column: :managed)).to eql(true)
       end
-      it "returns true for :links" do
+      it 'returns true for :links' do
         expect(@presenter.send(:mergeable_column?, column: :links)).to eql(true)
       end
-      it "returns true for :contact_name" do
+      it 'returns true for :contact_name' do
         expect(@presenter.send(:mergeable_column?, column: :contact_name)).to eql(true)
       end
-      it "returns true for :contact_email" do
+      it 'returns true for :contact_email' do
         expect(@presenter.send(:mergeable_column?, column: :contact_email)).to eql(true)
       end
-      it "returns true for :feedback_enabled" do
+      it 'returns true for :feedback_enabled' do
         expect(@presenter.send(:mergeable_column?, column: :feedback_enabled)).to eql(true)
       end
-      it "returns true for :feedback_msg" do
+      it 'returns true for :feedback_msg' do
         expect(@presenter.send(:mergeable_column?, column: :feedback_msg)).to eql(true)
       end
     end
   end
-
 end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 6f740501c0..9f8c32b0ed 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
 # This file is copied to spec/ when you run 'rails generate rspec:install'
-require "spec_helper"
-ENV["RAILS_ENV"] ||= "test"
-require File.expand_path("../config/environment", __dir__)
+require 'spec_helper'
+ENV['RAILS_ENV'] ||= 'test'
+require File.expand_path('../config/environment', __dir__)
 # Prevent database truncation if the environment is production
-abort("The Rails environment is running in production mode!") if Rails.env.production?
-require "rspec/rails"
+abort('The Rails environment is running in production mode!') if Rails.env.production?
+require 'rspec/rails'
 # require "capybara-screenshot/rspec"
-require "webmock/rspec"
+require 'webmock/rspec'
 
 # Add additional requires below this line. Rails is not loaded until this point!
 # Requires supporting ruby files with custom matchers and macros, etc, in
@@ -24,12 +24,12 @@
 # directory. Alternatively, in the individual `*_spec.rb` files, manually
 # require only the support files necessary.
 #
-Dir[Rails.root.join("spec/support/**/*.rb")].sort.each { |f| require f }
+Dir[Rails.root.join('spec/support/**/*.rb')].sort.each { |f| require f }
 
-Dir[Rails.root.join("spec/mixins/*.rb")].sort.each { |f| require f }
+Dir[Rails.root.join('spec/mixins/*.rb')].sort.each { |f| require f }
 
 # Checks for pending migrations and applies them before tests are run.
-# If you are not using ActiveRecord, you can remove this line.
+# If you are not using ActiveRecord, you can remove this line.s
 ActiveRecord::Migration.maintain_test_schema!
 
 RSpec.configure do |config|
diff --git a/spec/requests/api/v1/authentication_controller_spec.rb b/spec/requests/api/v1/authentication_controller_spec.rb
index fe4165dd51..e19fe6ab24 100644
--- a/spec/requests/api/v1/authentication_controller_spec.rb
+++ b/spec/requests/api/v1/authentication_controller_spec.rb
@@ -1,48 +1,44 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Api::V1::AuthenticationController, type: :request do
-
   before(:each) do
     @client = create(:api_client)
   end
 
-  context "actions" do
-
-    describe "POST /api/v1/authenticate" do
+  context 'actions' do
+    describe 'POST /api/v1/authenticate' do
       before(:each) do
         @client = create(:api_client)
         @payload = {
-          grant_type: "client_credentials",
+          grant_type: 'client_credentials',
           client_id: @client.client_id,
           client_secret: @client.client_secret
         }
       end
 
-      it "calls the Api::Jwt::AuthenticationService" do
+      it 'calls the Api::Jwt::AuthenticationService' do
         Api::V1::Auth::Jwt::AuthenticationService.any_instance.expects(:call).at_most(1)
         post api_v1_authenticate_path, params: @payload.to_json
       end
-      it "renders /api/v1/error template if authentication fails" do
+      it 'renders /api/v1/error template if authentication fails' do
         errs = [Faker::Lorem.sentence]
         Api::V1::Auth::Jwt::AuthenticationService.any_instance
                                                  .stubs(:call).returns(nil)
                                                  .stubs(:errors).returns(errs)
         post api_v1_authenticate_path, params: @payload.to_json
-        expect(response.code).to eql("401")
-        expect(response).to render_template("api/v1/error")
+        expect(response.code).to eql('401')
+        expect(response).to render_template('api/v1/error')
       end
-      it "returns a JSON Web Token" do
+      it 'returns a JSON Web Token' do
         token = Api::V1::Auth::Jwt::JsonWebToken.encode(payload: @payload)
         Api::V1::Auth::Jwt::AuthenticationService.any_instance.stubs(:call)
                                                  .returns(token)
         post api_v1_authenticate_path, params: @payload.to_json
-        expect(response.code).to eql("200")
-        expect(response).to render_template("api/v1/token")
+        expect(response.code).to eql('200')
+        expect(response).to render_template('api/v1/token')
       end
     end
-
   end
-
 end
diff --git a/spec/requests/api/v1/base_api_controller_spec.rb b/spec/requests/api/v1/base_api_controller_spec.rb
index eaeff0569c..be0e620c67 100644
--- a/spec/requests/api/v1/base_api_controller_spec.rb
+++ b/spec/requests/api/v1/base_api_controller_spec.rb
@@ -1,33 +1,30 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Api::V1::BaseApiController, type: :request do
-
   before(:each) do
     @client = create(:api_client)
   end
 
-  context "actions" do
-
-    describe "heartbeat (GET api/v1/heartbeat)" do
-      it "skips the authorize_request callback" do
+  context 'actions' do
+    describe 'heartbeat (GET api/v1/heartbeat)' do
+      it 'skips the authorize_request callback' do
         described_class.new.expects(:authorize_request).at_most(0)
         get api_v1_heartbeat_path
       end
-      it "returns a 200 status" do
+      it 'returns a 200 status' do
         get api_v1_heartbeat_path
-        expect(response.code).to eql("200")
+        expect(response.code).to eql('200')
       end
-      it "renders the standard response template" do
+      it 'renders the standard response template' do
         get api_v1_heartbeat_path
-        expect(response).to render_template(partial: "api/v1/_standard_response")
+        expect(response).to render_template(partial: 'api/v1/_standard_response')
       end
     end
-
   end
 
-  context "private methods" do
+  context 'private methods' do
     include Mocks::ApiJsonSamples
 
     before(:each) do
@@ -37,28 +34,28 @@
     # See the plans_controller_spec.rb for tests of most of this method's
     # callbacks since this controller's only endpoint, :heartbeat, skips them
 
-    describe "#authorize_request" do
+    describe '#authorize_request' do
       before(:each) do
         @client = create(:api_client)
         struct = OpenStruct.new(headers: {})
         @controller.expects(:request).returns(struct)
       end
 
-      it "calls log_access if the authorization succeeds" do
+      it 'calls log_access if the authorization succeeds' do
         auth_svc = OpenStruct.new(call: @client)
         Api::V1::Auth::Jwt::AuthorizationService.expects(:new).returns(auth_svc)
         @controller.expects(:log_access).at_least(1)
         @controller.send(:authorize_request)
       end
 
-      it "sets the client if the authorization succeeds" do
+      it 'sets the client if the authorization succeeds' do
         auth_svc = OpenStruct.new(call: @client)
         Api::V1::Auth::Jwt::AuthorizationService.expects(:new).returns(auth_svc)
         @controller.send(:authorize_request)
         expect(@controller.client).to eql(@client)
       end
 
-      it "renders an UNAUTHORIZED error if the client is not authorized" do
+      it 'renders an UNAUTHORIZED error if the client is not authorized' do
         auth_svc = OpenStruct.new(call: nil)
         Api::V1::Auth::Jwt::AuthorizationService.expects(:new).returns(auth_svc)
         @controller.expects(:render_error).at_least(1)
@@ -66,24 +63,24 @@
       end
     end
 
-    describe "#log_access" do
-      it "returns false if the client is not set" do
+    describe '#log_access' do
+      it 'returns false if the client is not set' do
         @controller.expects(:client).returns(nil)
         expect(@controller.send(:log_access)).to eql(false)
       end
-      it "returns true if the client is set" do
+      it 'returns true if the client is set' do
         @client = create(:api_client)
         @controller.expects(:client).returns(@client)
         expect(@controller.send(:log_access)).to eql(true)
       end
-      it "updates the api_client.last_access if client is an ApiClient" do
+      it 'updates the api_client.last_access if client is an ApiClient' do
         @client = create(:api_client)
         time = @client.last_access
         @controller.expects(:client).returns(@client)
         @controller.send(:log_access)
         expect(time).not_to eql(@client.reload.last_access)
       end
-      it "updates the users.last_api_access if client is a User" do
+      it 'updates the users.last_api_access if client is a User' do
         @user = create(:user)
         time = @user.last_api_access
         @controller.expects(:client).returns(@user)
@@ -92,25 +89,23 @@
       end
     end
 
-    describe "#caller_name" do
+    describe '#caller_name' do
       it "returns the caller's IP if the client is nil" do
         ip = Faker::Internet.ip_v4_address
         @controller.expects(:client).returns(nil)
         @controller.expects(:request).returns(OpenStruct.new(remote_ip: ip))
         expect(@controller.send(:caller_name)).to eql(ip)
       end
-      it "returns the user name if the client is a User" do
+      it 'returns the user name if the client is a User' do
         @user = create(:user)
         @controller.expects(:client).returns(@user)
         expect(@controller.send(:caller_name)).to eql(@user.name(false))
       end
-      it "returns the client name if the client is a ApiClient" do
+      it 'returns the client name if the client is a ApiClient' do
         @client = create(:api_client)
         @controller.expects(:client).returns(@client)
         expect(@controller.send(:caller_name)).to eql(@client.name)
       end
     end
-
   end
-
 end
diff --git a/spec/requests/api/v1/plans_controller.rb b/spec/requests/api/v1/plans_controller.rb
index 235412171a..43ff5cfbc8 100644
--- a/spec/requests/api/v1/plans_controller.rb
+++ b/spec/requests/api/v1/plans_controller.rb
@@ -1,13 +1,11 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Api::V1::PlansController, type: :request do
-
   include ApiHelper
 
-  context "ApiClient" do
-
+  context 'ApiClient' do
     before(:each) do
       mock_authorization_for_api_client
 
@@ -15,28 +13,28 @@
       create(:language, default_language: true) unless Language.default.present?
     end
 
-    describe "GET /api/v1/plan/:id - show" do
-      it "returns the plan" do
+    describe 'GET /api/v1/plan/:id - show' do
+      it 'returns the plan' do
         plan = create(:plan, api_client_id: ApiClient.first&.id)
         get api_v1_plan_path(plan)
-        expect(response.code).to eql("200")
-        expect(response).to render_template("api/v1/plans/index")
+        expect(response.code).to eql('200')
+        expect(response).to render_template('api/v1/plans/index')
         expect(assigns(:items).length).to eql(1)
       end
-      it "returns a 404 if the ApiClient did not create the plan" do
+      it 'returns a 404 if the ApiClient did not create the plan' do
         plan = create(:plan, api_client_id: create(:api_client))
         get api_v1_plan_path(plan)
-        expect(response.code).to eql("404")
-        expect(response).to render_template("api/v1/error")
+        expect(response.code).to eql('404')
+        expect(response).to render_template('api/v1/error')
       end
-      it "returns a 404 if not found" do
+      it 'returns a 404 if not found' do
         get api_v1_plan_path(9999)
-        expect(response.code).to eql("404")
-        expect(response).to render_template("api/v1/error")
+        expect(response.code).to eql('404')
+        expect(response).to render_template('api/v1/error')
       end
     end
 
-    describe "POST /api/v1/plans - create" do
+    describe 'POST /api/v1/plans - create' do
       include Webmocks
       include Mocks::ApiJsonSamples
 
@@ -46,48 +44,48 @@
         create(:template, :publicly_visible, is_default: true, published: true)
       end
 
-      context "minimal JSON" do
+      context 'minimal JSON' do
         before(:each) do
           @json = JSON.parse(minimal_create_json).with_indifferent_access
         end
 
-        it "returns a 400 if the incoming JSON is invalid" do
+        it 'returns a 400 if the incoming JSON is invalid' do
           post api_v1_plans_path, params: Faker::Lorem.word
-          expect(response.code).to eql("400")
-          expect(response).to render_template("api/v1/error")
+          expect(response.code).to eql('400')
+          expect(response).to render_template('api/v1/error')
         end
-        it "returns a 400 if the incoming DMP is invalid" do
+        it 'returns a 400 if the incoming DMP is invalid' do
           create(:plan, api_client_id: ApiClient.first.id)
-          @json[:items].first[:dmp][:title] = ""
+          @json[:items].first[:dmp][:title] = ''
           post api_v1_plans_path, params: @json.to_json
-          expect(response.code).to eql("400")
-          expect(response).to render_template("api/v1/error")
+          expect(response.code).to eql('400')
+          expect(response).to render_template('api/v1/error')
         end
-        it "returns a 400 if the plan already exists" do
+        it 'returns a 400 if the plan already exists' do
           plan = create(:plan, created_at: (Time.now - 3.days),
                                api_client_id: ApiClient.first.id)
           @json[:items].first[:dmp][:dmp_id] = {
-            type: "url",
+            type: 'url',
             identifier: Rails.application.routes.url_helpers.api_v1_plan_url(plan)
           }
           post api_v1_plans_path, params: @json.to_json
-          expect(response.code).to eql("400")
-          expect(response).to render_template("api/v1/error")
-          expect(response.body.include?("already exists")).to eql(true)
+          expect(response.code).to eql('400')
+          expect(response).to render_template('api/v1/error')
+          expect(response.body.include?('already exists')).to eql(true)
         end
-        it "returns a 400 if the owner could not be determined" do
+        it 'returns a 400 if the owner could not be determined' do
           @json[:items].first[:dmp][:contact].delete(:affiliation)
           post api_v1_plans_path, params: @json.to_json
-          expect(response.code).to eql("400")
-          expect(response.body.include?("Could not determine ownership")).to eql(true)
+          expect(response.code).to eql('400')
+          expect(response.body.include?('Could not determine ownership')).to eql(true)
         end
-        it "returns a 201 if the incoming JSON is valid" do
+        it 'returns a 201 if the incoming JSON is valid' do
           post api_v1_plans_path, params: @json.to_json
-          expect(response.code).to eql("201")
-          expect(response).to render_template("api/v1/plans/index")
+          expect(response.code).to eql('201')
+          expect(response).to render_template('api/v1/plans/index')
         end
 
-        it "defaults to api_client.org when no Contact affiliation defined" do
+        it 'defaults to api_client.org when no Contact affiliation defined' do
           @client = ApiClient.first
           @client.update(org: create(:org))
           @client.reload
@@ -96,38 +94,38 @@
           @json[:items].first[:dmp][:contact].delete(:affiliation)
           post api_v1_plans_path, params: @json.to_json
 
-          expect(response.code).to eql("201")
-          expect(response).to render_template("api/v1/plans/index")
+          expect(response.code).to eql('201')
+          expect(response).to render_template('api/v1/plans/index')
           @plan = Plan.last
           expect(@plan.org).to eql(@client.org)
         end
 
-        context "plan inspection" do
+        context 'plan inspection' do
           before(:each) do
             post api_v1_plans_path, params: @json.to_json
             @original = @json.with_indifferent_access[:items].first[:dmp]
             @plan = Plan.last
           end
 
-          it "set the Plan title" do
+          it 'set the Plan title' do
             expect(@plan.title).to eql(@original[:title])
           end
-          it "attached the contact to the Plan" do
+          it 'attached the contact to the Plan' do
             expect(@plan.contributors.length).to eql(1)
           end
-          it "set the Contact email" do
+          it 'set the Contact email' do
             expected = @plan.contributors.first.email
             expect(expected).to eql(@original[:contact][:mbox])
           end
           it "attached the plan to the Contact's Org" do
             expect(@plan.org.name).to eql(@original[:contact][:affiliation][:name])
           end
-          it "set the Contact roles" do
+          it 'set the Contact roles' do
             expected = @plan.contributors.first
             expect(expected.data_curation?).to eql(true)
           end
-          it "set the Template id" do
-            app = ApplicationService.application_name.split("-").first
+          it 'set the Template id' do
+            app = ApplicationService.application_name.split('-').first
             tmplt = @original[:extension].select { |i| i[app].present? }.first
             expected = tmplt[app][:template][:id]
             expect(@plan.template_id).to eql(expected)
@@ -135,47 +133,47 @@
         end
       end
 
-      context "complete JSON" do
+      context 'complete JSON' do
         before(:each) do
           @json = JSON.parse(complete_create_json).with_indifferent_access
         end
 
-        it "returns a 201 if the incoming JSON is valid" do
+        it 'returns a 201 if the incoming JSON is valid' do
           post api_v1_plans_path, params: @json.to_json
-          expect(response.code).to eql("201")
-          expect(response).to render_template("api/v1/plans/index")
+          expect(response.code).to eql('201')
+          expect(response).to render_template('api/v1/plans/index')
         end
 
-        context "plan inspection" do
+        context 'plan inspection' do
           before(:each) do
             post api_v1_plans_path, params: @json.to_json
             @original = @json.with_indifferent_access[:items].first[:dmp]
             @plan = Plan.last
           end
 
-          it "set the Plan title" do
+          it 'set the Plan title' do
             expect(@plan.title).to eql(@original[:title])
           end
 
-          it "set the Plan description" do
+          it 'set the Plan description' do
             expect(@plan.title).to eql(@original[:title])
           end
-          it "set the Plan start_date" do
+          it 'set the Plan start_date' do
             expect(@plan.title).to eql(@original[:title])
           end
-          it "set the Plan end_date" do
+          it 'set the Plan end_date' do
             expect(@plan.title).to eql(@original[:title])
           end
-          it "Plan identifiers includes the grant id" do
+          it 'Plan identifiers includes the grant id' do
             expect(@plan.identifiers.length).to eql(1)
             expected = @original[:project].first[:funding].first[:grant_id][:type]
-            expect("other").to eql(expected)
+            expect('other').to eql(expected)
 
             expected = @original[:project].first[:funding].first[:grant_id][:identifier]
             expect(@plan.identifiers.first.value).to eql(expected)
           end
 
-          context "contact inspection" do
+          context 'contact inspection' do
             before(:each) do
               @original = @original[:contact]
               contacts = @plan.contributors.select do |pc|
@@ -184,19 +182,19 @@
               @contact = contacts.first
             end
 
-            it "attached the Contact to the Plan" do
+            it 'attached the Contact to the Plan' do
               expect(@contact.present?).to eql(true)
             end
-            it "set the Contact name" do
+            it 'set the Contact name' do
               expect(@contact.name).to eql(@original[:name])
             end
-            it "set the Contact email" do
+            it 'set the Contact email' do
               expect(@contact.email).to eql(@original[:mbox])
             end
-            it "set the Contact roles" do
+            it 'set the Contact roles' do
               expect(@contact.data_curation?).to eql(true)
             end
-            it "Contact identifiers includes the orcid" do
+            it 'Contact identifiers includes the orcid' do
               expect(@contact.identifiers.length).to eql(1)
               expected = @original[:contact_id][:type]
               expect(@contact.identifiers.first.identifier_scheme.name).to eql(expected)
@@ -205,28 +203,28 @@
               rslt = @contact.identifiers.first.value
               expect(rslt.ends_with?(expected)).to eql(true)
             end
-            it "ignored the unknown identifier type" do
+            it 'ignored the unknown identifier type' do
               results = @contact.identifiers.select do |i|
                 i.value == @original[:contact_id]
               end
               expect(results.any?).to eql(false)
             end
 
-            context "contact org inspection" do
+            context 'contact org inspection' do
               before(:each) do
                 @original = @original[:affiliation]
               end
 
-              it "attached the Org to the Contact" do
+              it 'attached the Org to the Contact' do
                 expect(@contact.org.present?).to eql(true)
               end
-              it "sets the name" do
+              it 'sets the name' do
                 expect(@contact.org.name).to eql(@original[:name])
               end
-              it "sets the abbreviation" do
+              it 'sets the abbreviation' do
                 expect(@contact.org.abbreviation).to eql(@original[:abbreviation])
               end
-              it "Org identifiers includes the affiation id" do
+              it 'Org identifiers includes the affiation id' do
                 expect(@contact.org.identifiers.length).to eql(1)
                 expected = @original[:affiliation_id][:type]
                 result = @contact.org.identifiers.first.identifier_scheme.name
@@ -242,7 +240,7 @@
             end
           end
 
-          context "contributor inspection" do
+          context 'contributor inspection' do
             before(:each) do
               @original = @original[:contributor].first
               contributors = @plan.contributors.select do |contrib|
@@ -251,22 +249,22 @@
               @subject = contributors.first
             end
 
-            it "attached the Contributor to the Plan" do
+            it 'attached the Contributor to the Plan' do
               expect(@subject.present?).to eql(true)
             end
-            it "set the Contributor name" do
+            it 'set the Contributor name' do
               expect(@subject.name).to eql(@original[:name])
             end
-            it "set the Contributor email" do
+            it 'set the Contributor email' do
               expect(@subject.email).to eql(@original[:mbox])
             end
-            it "set the Contributor roles" do
+            it 'set the Contributor roles' do
               expected = @original[:role].map do |role|
-                role.gsub("#{Contributor::ONTOLOGY_BASE_URL}/", "")
+                role.gsub("#{Contributor::ONTOLOGY_BASE_URL}/", '')
               end
               expect(@subject.send(:"#{expected.first.downcase}?")).to eql(true)
             end
-            it "Contributor identifiers includes the orcid" do
+            it 'Contributor identifiers includes the orcid' do
               expect(@subject.identifiers.length).to eql(1)
               expected = @original[:contributor_id][:type]
               expect(@subject.identifiers.first.identifier_scheme.name).to eql(expected)
@@ -276,24 +274,24 @@
               expect(rslt.ends_with?(expected)).to eql(true)
             end
 
-            context "contributor org inspection" do
+            context 'contributor org inspection' do
               before(:each) do
                 @original = @original[:affiliation]
               end
 
-              it "attached the Org to the Contributor" do
+              it 'attached the Org to the Contributor' do
                 expect(@subject.org.present?).to eql(true)
               end
-              it "sets the name" do
+              it 'sets the name' do
                 expect(@subject.org.name).to eql(@original[:name])
               end
-              it "sets the abbreviation" do
+              it 'sets the abbreviation' do
                 expect(@subject.org.abbreviation).to eql(@original[:abbreviation])
               end
-              it "Org identifiers includes the affiation id" do
+              it 'Org identifiers includes the affiation id' do
                 expect(@subject.org.identifiers.length).to eql(1)
                 expected = @original[:affiliation_id][:type]
-                expect("ror").to eql(expected)
+                expect('ror').to eql(expected)
 
                 expected = @original[:affiliation_id][:identifier]
                 rslt = @subject.org.identifiers.first.value
@@ -302,19 +300,19 @@
             end
           end
 
-          context "funder inspection" do
+          context 'funder inspection' do
             before(:each) do
               @original = @original[:project].first[:funding].first
               @funder = @plan.funder
             end
 
-            it "attached the Funder to the Plan" do
+            it 'attached the Funder to the Plan' do
               expect(@funder.present?).to eql(true)
             end
-            it "sets the name" do
+            it 'sets the name' do
               expect(@funder.name).to eql(@original[:name])
             end
-            it "Funder identifiers includes the funder_id id" do
+            it 'Funder identifiers includes the funder_id id' do
               expect(@funder.identifiers.length).to eql(1)
               expected = @original[:funder_id][:type]
               expect(@funder.identifiers.first.identifier_scheme.name).to eql(expected)
@@ -325,63 +323,59 @@
             end
           end
 
-          it "set the Template id" do
-            app = ApplicationService.application_name.split("-").first
+          it 'set the Template id' do
+            app = ApplicationService.application_name.split('-').first
             tmplt = @original[:extension].select { |i| i[app].present? }.first
             expected = tmplt[app][:template][:id]
             expect(@plan.template_id).to eql(expected)
           end
         end
-
       end
-
     end
   end
 
-  context "User" do
-    describe "GET /api/v1/plan/:id - show" do
-      it "returns the plan if the user owns it" do
+  context 'User' do
+    describe 'GET /api/v1/plan/:id - show' do
+      it 'returns the plan if the user owns it' do
         plan = create(:plan, :creator, :organisationally_visible)
         mock_authorization_for_user(user: plan.owner)
         get api_v1_plan_path(plan)
-        expect(response.code).to eql("200")
-        expect(response).to render_template("api/v1/plans/index")
+        expect(response.code).to eql('200')
+        expect(response).to render_template('api/v1/plans/index')
         expect(assigns(:items).length).to eql(1)
       end
-      it "returns the plan if its :organisationally_visible" do
+      it 'returns the plan if its :organisationally_visible' do
         plan = create(:plan, :creator, :organisationally_visible)
         other_user = create(:user, org: plan.owner.org)
         mock_authorization_for_user(user: other_user)
         get api_v1_plan_path(plan)
-        expect(response.code).to eql("200")
-        expect(response).to render_template("api/v1/plans/index")
+        expect(response.code).to eql('200')
+        expect(response).to render_template('api/v1/plans/index')
         expect(assigns(:items).length).to eql(1)
       end
-      it "returns the plan if the user is an Org Admin and it belongs to their Org" do
+      it 'returns the plan if the user is an Org Admin and it belongs to their Org' do
         plan = create(:plan, :creator)
         org_admin = create(:user, :org_admin, org: plan.owner.org)
         mock_authorization_for_user(user: org_admin)
         get api_v1_plan_path(plan)
-        expect(response.code).to eql("200")
-        expect(response).to render_template("api/v1/plans/index")
+        expect(response.code).to eql('200')
+        expect(response).to render_template('api/v1/plans/index')
         expect(assigns(:items).length).to eql(1)
       end
-      it "returns a 404 if not found" do
+      it 'returns a 404 if not found' do
         mock_authorization_for_user
         get api_v1_plan_path(9999)
-        expect(response.code).to eql("404")
-        expect(response).to render_template("api/v1/error")
+        expect(response.code).to eql('404')
+        expect(response).to render_template('api/v1/error')
       end
-      it "returns a 404 if the user does not have access" do
+      it 'returns a 404 if the user does not have access' do
         mock_authorization_for_user
         org2 = create(:org)
         plan = create(:plan, :creator, :organisationally_visible, org: org2)
         get api_v1_plan_path(plan)
-        expect(response.code).to eql("404")
-        expect(response).to render_template("api/v1/error")
+        expect(response.code).to eql('404')
+        expect(response).to render_template('api/v1/error')
       end
     end
-
   end
-
 end
diff --git a/spec/requests/api/v1/templates_controller_spec.rb b/spec/requests/api/v1/templates_controller_spec.rb
index f5fcfecd72..3cb6f5d427 100644
--- a/spec/requests/api/v1/templates_controller_spec.rb
+++ b/spec/requests/api/v1/templates_controller_spec.rb
@@ -1,62 +1,58 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Api::V1::TemplatesController, type: :request do
-
   include ApiHelper
 
-  context "ApiClient" do
-
+  context 'ApiClient' do
     before(:each) do
       mock_authorization_for_api_client
     end
 
-    describe "GET /api/v1/templates - index" do
-      it "returns a even if there are no public templates" do
+    describe 'GET /api/v1/templates - index' do
+      it 'returns a even if there are no public templates' do
         get api_v1_templates_path
-        expect(response.code).to eql("200")
-        expect(response).to render_template("api/v1/templates/index")
+        expect(response.code).to eql('200')
+        expect(response).to render_template('api/v1/templates/index')
         expect(assigns(:items).empty?).to eql(true)
       end
 
-      it "returns a public published template" do
+      it 'returns a public published template' do
         create(:template, :publicly_visible, published: true, customization_of: nil)
         get api_v1_templates_path
         expect(assigns(:items).length).to eql(1)
       end
 
-      it "does not return an unpublished template" do
+      it 'does not return an unpublished template' do
         create(:template, :publicly_visible, published: false, customization_of: nil)
         get api_v1_templates_path
         expect(assigns(:items).length).to eql(0)
       end
 
-      it "does not return an organizational template" do
+      it 'does not return an organizational template' do
         get api_v1_templates_path
         create(:template, :organisationally_visible, :published, customization_of: nil)
         get api_v1_templates_path
         expect(assigns(:items).length).to eql(0)
       end
     end
-
   end
 
-  context "User" do
-
+  context 'User' do
     before(:each) do
       mock_authorization_for_user
     end
 
-    describe "GET /api/v1/templates - index" do
-      it "returns a even if there are no public templates" do
+    describe 'GET /api/v1/templates - index' do
+      it 'returns a even if there are no public templates' do
         get api_v1_templates_path
-        expect(response.code).to eql("200")
-        expect(response).to render_template("api/v1/templates/index")
+        expect(response.code).to eql('200')
+        expect(response).to render_template('api/v1/templates/index')
         expect(assigns(:items).empty?).to eql(true)
       end
 
-      it "returns a public published template" do
+      it 'returns a public published template' do
         create(:template, :publicly_visible, :published, customization_of: nil)
         get api_v1_templates_path
         expect(assigns(:items).length).to eql(1)
@@ -69,7 +65,7 @@
         expect(assigns(:items).length).to eql(1)
       end
 
-      it "does not return an unpublished template" do
+      it 'does not return an unpublished template' do
         create(:template, :organisationally_visible, published: false,
                                                      org: Org.last, customization_of: nil)
         get api_v1_templates_path
@@ -85,7 +81,5 @@
         expect(assigns(:items).length).to eql(0)
       end
     end
-
   end
-
 end
diff --git a/spec/requests/usage_downloads_spec.rb b/spec/requests/usage_downloads_spec.rb
index 2e967f36ca..f5f9f6e459 100644
--- a/spec/requests/usage_downloads_spec.rb
+++ b/spec/requests/usage_downloads_spec.rb
@@ -1,34 +1,34 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
-RSpec.describe "/usage_downloads", type: :request do
-  describe "#index" do
-    it "redirects when non-authorized user" do
-      get "/usage_downloads"
+RSpec.describe '/usage_downloads', type: :request do
+  describe '#index' do
+    it 'redirects when non-authorized user' do
+      get '/usage_downloads'
 
       expect(response).to have_http_status(:redirect)
     end
 
-    context "when authorized user" do
+    context 'when authorized user' do
       let(:org_admin) { create(:user, :org_admin) }
       let(:super_admin) { create(:user, :super_admin) }
 
-      it "org_admin gets csv file" do
+      it 'org_admin gets csv file' do
         sign_in(org_admin)
 
-        get "/usage_downloads"
+        get '/usage_downloads'
 
-        expect(response.content_type).to eq("text/csv")
+        expect(response.content_type).to eq('text/csv')
         expect(response).to have_http_status(:ok)
       end
 
-      it "super_admin gets csv file" do
+      it 'super_admin gets csv file' do
         sign_in(super_admin)
 
-        get "/usage_downloads"
+        get '/usage_downloads'
 
-        expect(response.content_type).to eq("text/csv")
+        expect(response.content_type).to eq('text/csv')
         expect(response).to have_http_status(:ok)
       end
     end
diff --git a/spec/services/api/v1/auth/jwt/authentication_service_spec.rb b/spec/services/api/v1/auth/jwt/authentication_service_spec.rb
index 53e5251799..2e1bdd7f35 100644
--- a/spec/services/api/v1/auth/jwt/authentication_service_spec.rb
+++ b/spec/services/api/v1/auth/jwt/authentication_service_spec.rb
@@ -1,27 +1,25 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Api::V1::Auth::Jwt::AuthenticationService do
-
   before(:each) do
     @jwt = SecureRandom.uuid
     Api::V1::Auth::Jwt::JsonWebToken.stubs(:encode).returns(@jwt)
   end
 
-  context "instance methods" do
-
-    describe "#initialize(json:)" do
-      it "sets errors to empty hash" do
+  context 'instance methods' do
+    describe '#initialize(json:)' do
+      it 'sets errors to empty hash' do
         svc = described_class.new(
           json: {
-            grant_type: "client_credentials",
+            grant_type: 'client_credentials',
             client_id: Faker::Lorem.word, client_secret: Faker::Lorem.word
           }
         )
         expect(svc.errors).to eql({})
       end
-      it "defaults :grant_type to client_credentials" do
+      it 'defaults :grant_type to client_credentials' do
         id = Faker::Lorem.word
         svc = described_class.new(
           json: {
@@ -31,7 +29,7 @@
         )
         expect(svc.send(:client_id)).to eql(id)
       end
-      it "does not accept invalid :grant_type" do
+      it 'does not accept invalid :grant_type' do
         svc = described_class.new(
           json: {
             grant_type: Faker::Lorem.word,
@@ -41,22 +39,22 @@
         )
         expect(svc.send(:client_id)).to eql(nil)
       end
-      it "accepts client_credentials :grant_type" do
+      it 'accepts client_credentials :grant_type' do
         id = Faker::Lorem.word
         svc = described_class.new(
           json: {
-            grant_type: "client_credentials",
+            grant_type: 'client_credentials',
             client_id: id,
             client_secret: Faker::Lorem.word
           }
         )
         expect(svc.send(:client_id)).to eql(id)
       end
-      it "accepts authorization_code :grant_type" do
+      it 'accepts authorization_code :grant_type' do
         email = Faker::Internet.email
         svc = described_class.new(
           json: {
-            grant_type: "authorization_code",
+            grant_type: 'authorization_code',
             email: email,
             code: Faker::Lorem.word
           }
@@ -65,11 +63,11 @@
       end
     end
 
-    describe "#call" do
-      it "returns null if the client_id is empty" do
+    describe '#call' do
+      it 'returns null if the client_id is empty' do
         svc = described_class.new(
           json: {
-            grant_type: "client_credentials",
+            grant_type: 'client_credentials',
             client_id: nil,
             client_secret: Faker::Lorem.word
           }
@@ -77,10 +75,10 @@
         expect(svc.call).to eql(nil)
       end
 
-      it "returns null if the client_secret is empty" do
+      it 'returns null if the client_secret is empty' do
         svc = described_class.new(
           json: {
-            grant_type: "client_credentials",
+            grant_type: 'client_credentials',
             client_id: Faker::Lorem.word,
             client_secret: nil
           }
@@ -88,10 +86,10 @@
         expect(svc.call).to eql(nil)
       end
 
-      it "defers to the private #client method" do
+      it 'defers to the private #client method' do
         svc = described_class.new(
           json: {
-            grant_type: "client_credentials",
+            grant_type: 'client_credentials',
             client_id: Faker::Lorem.word,
             client_secret: Faker::Lorem.word
           }
@@ -100,10 +98,10 @@
         svc.call
       end
 
-      it "returns nil if the #client method returned nil" do
+      it 'returns nil if the #client method returned nil' do
         svc = described_class.new(
           json: {
-            grant_type: "client_credentials",
+            grant_type: 'client_credentials',
             client_id: Faker::Lorem.word,
             client_secret: Faker::Lorem.word
           }
@@ -112,11 +110,11 @@
         expect(svc.call).to eql(nil)
       end
 
-      it "returns nil if the Client is not an ApiClient or User" do
+      it 'returns nil if the Client is not an ApiClient or User' do
         org = build(:org)
         svc = described_class.new(
           json: {
-            grant_type: "client_credentials",
+            grant_type: 'client_credentials',
             client_id: org.name,
             client_secret: org.abbreviation
           }
@@ -125,11 +123,11 @@
         expect(svc.call).to eql(nil)
       end
 
-      it "returns a JSON Web Token and Expiration Time for ApiClient" do
+      it 'returns a JSON Web Token and Expiration Time for ApiClient' do
         client = create(:api_client)
         svc = described_class.new(
           json: {
-            grant_type: "client_credentials",
+            grant_type: 'client_credentials',
             client_id: client.client_id,
             client_secret: client.client_secret
           }
@@ -138,11 +136,11 @@
         expect(svc.call).to eql(@jwt)
       end
 
-      it "returns a JSON Web Token and Expiration Time for User" do
+      it 'returns a JSON Web Token and Expiration Time for User' do
         user = create(:user, api_token: SecureRandom.uuid)
         svc = described_class.new(
           json: {
-            grant_type: "authorization_code",
+            grant_type: 'authorization_code',
             email: user.email,
             code: user.api_token
           }
@@ -151,38 +149,36 @@
         expect(svc.call).to eql(@jwt)
       end
     end
-
   end
 
-  context "private methods" do
-
-    describe "#client" do
+  context 'private methods' do
+    describe '#client' do
       before(:each) do
         @service = described_class.new
       end
 
-      it "is a singleton method" do
+      it 'is a singleton method' do
         client = create(:api_client)
         @service.expects(:authenticate_client).at_most(1).returns(client)
         rslt = @service.send(:client)
         expect(@service.send(:client)).to eql(rslt)
       end
-      it "returns nil if no User or ApiClient was authenticated" do
+      it 'returns nil if no User or ApiClient was authenticated' do
         @service.stubs(:authenticate_user).returns(nil)
         @service.stubs(:authenticate_client).returns(nil)
         rslt = @service.send(:client)
         expect(@service.send(:client)).to eql(rslt)
       end
-      it "returns the api_client if a ApiClient was authenticated" do
+      it 'returns the api_client if a ApiClient was authenticated' do
         client = create(:api_client)
         @service.stubs(:authenticate_client).returns(client)
         expect(@service.send(:client)).to eql(client)
       end
-      it "returns the user if a User was authenticated" do
+      it 'returns the user if a User was authenticated' do
         user = create(:user)
         svc = described_class.new(
           json: {
-            grant_type: "authorization_code",
+            grant_type: 'authorization_code',
             email: user.email, code: Faker::Lorem.word
           }
         )
@@ -193,77 +189,77 @@
         @service.stubs(:authenticate_user).returns(nil)
         @service.stubs(:authenticate_client).returns(nil)
         @service.send(:client)
-        msg = "Invalid credentials"
+        msg = 'Invalid credentials'
         expect(@service.errors[:client_authentication]).to eql(msg)
       end
     end
 
-    describe "#authenticate_client" do
+    describe '#authenticate_client' do
       before(:each) do
         @client = create(:api_client)
         @service = described_class.new(
           json: {
-            grant_type: "client_credentials",
+            grant_type: 'client_credentials',
             client_id: @client.client_id,
             client_secret: @client.client_secret
           }
         )
       end
 
-      it "returns nil if no ApiClient is matched" do
+      it 'returns nil if no ApiClient is matched' do
         @client.destroy
         expect(@service.send(:authenticate_client)).to eql(nil)
       end
-      it "returns nil if the matching ApiClient did not auth" do
+      it 'returns nil if the matching ApiClient did not auth' do
         @client.update(client_secret: SecureRandom.uuid)
         expect(@service.send(:authenticate_client)).to eql(nil)
       end
-      it "returns the ApiClient" do
+      it 'returns the ApiClient' do
         expect(@service.send(:authenticate_client)).to eql(@client)
       end
     end
 
-    describe "#authenticate_user" do
+    describe '#authenticate_user' do
       before(:each) do
         @user = create(:user, :org_admin, api_token: SecureRandom.uuid)
         @service = described_class.new(
           json: {
-            grant_type: "authorization_code",
+            grant_type: 'authorization_code',
             email: @user.email,
             code: @user.api_token
           }
         )
       end
 
-      it "returns nil if no User is matched" do
+      it 'returns nil if no User is matched' do
         @user.destroy
         expect(@service.send(:authenticate_user)).to eql(nil)
       end
-      it "returns nil if the matching User is inactive" do
+      it 'returns nil if the matching User is inactive' do
         @user.update(active: false)
         expect(@service.send(:authenticate_user)).to eql(nil)
       end
-      it "returns nil if the matching User does not have permission" do
+      it 'returns nil if the matching User does not have permission' do
         @user.perms.each(&:destroy)
         expect(@service.send(:authenticate_user)).to eql(nil)
       end
-      it "returns nil if the client_secret does not match the api_token" do
+      it 'returns nil if the client_secret does not match the api_token' do
         @user.update(api_token: SecureRandom.uuid)
         expect(@service.send(:authenticate_user)).to eql(nil)
       end
-      it "returns the User" do
+      it 'returns the User' do
         expect(@service.send(:authenticate_user)).to eql(@user)
       end
     end
 
-    describe "#parse_client" do
+    describe '#parse_client' do
       before(:each) do
         @service = described_class.new
         @client_id = SecureRandom.uuid
         @client_secret = SecureRandom.uuid
       end
 
-      it "sets the client_id to nil if its is not in JSON" do
+      it 'sets the client_id to nil if its is not in JSON' do
         @service.send(
           :parse_client,
           json: {
@@ -272,11 +268,11 @@
         )
         expect(@service.send(:client_id)).to eql(nil)
       end
-      it "sets the client_secret to nil if its is not in JSON" do
+      it 'sets the client_secret to nil if its is not in JSON' do
         @service.send(:parse_client, json: { client_id: @client_id })
         expect(@service.send(:client_secret)).to eql(nil)
       end
-      it "sets the client_id" do
+      it 'sets the client_id' do
         @service.send(
           :parse_client,
           json: {
@@ -286,7 +282,7 @@
         )
         expect(@service.send(:client_id)).to eql(@client_id)
       end
-      it "sets the client_secret" do
+      it 'sets the client_secret' do
         @service.send(
           :parse_client,
           json: {
@@ -298,31 +294,29 @@
       end
     end
 
-    describe "#parse_code" do
+    describe '#parse_code' do
       before(:each) do
         @service = described_class.new
         @email = Faker::Internet.email
         @code = SecureRandom.uuid
       end
 
-      it "sets the client_id to nil if :email is not in JSON" do
+      it 'sets the client_id to nil if :email is not in JSON' do
         @service.send(:parse_code, json: { code: @code })
         expect(@service.send(:client_id)).to eql(nil)
       end
-      it "sets the client_secret to nil if :code is not in JSON" do
+      it 'sets the client_secret to nil if :code is not in JSON' do
         @service.send(:parse_code, json: { email: @email })
         expect(@service.send(:client_secret)).to eql(nil)
       end
-      it "sets the client_id" do
+      it 'sets the client_id' do
         @service.send(:parse_code, json: { email: @email, code: @code })
         expect(@service.send(:client_id)).to eql(@email)
       end
-      it "sets the client_secret" do
+      it 'sets the client_secret' do
         @service.send(:parse_code, json: { email: @email, code: @code })
         expect(@service.send(:client_secret)).to eql(@code)
       end
     end
-
   end
-
 end
diff --git a/spec/services/api/v1/auth/jwt/authorization_service_spec.rb b/spec/services/api/v1/auth/jwt/authorization_service_spec.rb
index 06f26f94ba..45d3d5e8c3 100644
--- a/spec/services/api/v1/auth/jwt/authorization_service_spec.rb
+++ b/spec/services/api/v1/auth/jwt/authorization_service_spec.rb
@@ -1,67 +1,63 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Api::V1::Auth::Jwt::AuthorizationService do
-
   before(:each) do
     @token = SecureRandom.uuid
     Api::V1::Auth::Jwt::JsonWebToken.stubs(:decode).returns({ client_id: @token })
-    @headers = { "Authorization": "Bearer #{@token}" }
+    @headers = { Authorization: "Bearer #{@token}" }
     @service = described_class.new(headers: @headers)
   end
 
-  context "instance methods" do
-
-    it "#initialize(:headers) sets the errors to an empty hash" do
+  context 'instance methods' do
+    it '#initialize(:headers) sets the errors to an empty hash' do
       expect(@service.errors).to eql({})
     end
 
-    it "#call defers to the private #client method" do
+    it '#call defers to the private #client method' do
       @service.expects(:client).at_least(1)
       @service.call
     end
-
   end
 
-  context "private methods" do
-
+  context 'private methods' do
     before(:each) do
       @client = create(:api_client, client_id: @token)
     end
 
-    describe "#client" do
-      it "returns the client if its already set (singleton)" do
+    describe '#client' do
+      it 'returns the client if its already set (singleton)' do
         ApiClient.expects(:find_by).at_most(1)
         rslt = @service.send(:client)
         expect(@service.send(:client)).to eql(rslt)
       end
-      it "sets client to the one found with the JWT" do
+      it 'sets client to the one found with the JWT' do
         expect(@service.send(:client)).to eql(@client)
       end
       it "adds 'invalid token' to errors if no client matches the JWT" do
         @service.expects(:decoded_auth_token).returns(nil)
         @service.send(:client)
-        expect(@service.errors[:token]).to eql("Invalid token")
+        expect(@service.errors[:token]).to eql('Invalid token')
       end
     end
 
-    describe "#decoded_auth_token" do
-      it "returns the decoded token if its already set (singleton)" do
+    describe '#decoded_auth_token' do
+      it 'returns the decoded token if its already set (singleton)' do
         rslt = @service.send(:decoded_auth_token)
         expect(@service.send(:decoded_auth_token)).to eql(rslt)
       end
-      it "sets the decoded token" do
+      it 'sets the decoded token' do
         expect(@service.send(:decoded_auth_token)[:client_id]).to eql(@token)
       end
       it "adds 'token expired' to errors when a JWT has expired" do
         Api::V1::Auth::Jwt::JsonWebToken.stubs(:decode).raises(JWT::ExpiredSignature)
         expect(@service.send(:decoded_auth_token)).to eql(nil)
-        expect(@service.errors[:token]).to eql("Token expired")
+        expect(@service.errors[:token]).to eql('Token expired')
       end
     end
 
-    describe "#http_auth_header" do
+    describe '#http_auth_header' do
       it "returns nil if no 'Authorization' header" do
         svc = described_class.new(headers: {})
         expect(svc.send(:http_auth_header)).to eql(nil)
@@ -69,13 +65,11 @@
       it "adds 'missing token' to errors if no 'Authorization' header" do
         svc = described_class.new(headers: {})
         svc.send(:http_auth_header)
-        expect(svc.errors[:token]).to eql("Missing token")
+        expect(svc.errors[:token]).to eql('Missing token')
       end
       it "returns the token portion of the 'Authorization' header" do
         expect(@service.send(:http_auth_header)).to eql(@token)
       end
     end
-
   end
-
 end
diff --git a/spec/services/api/v1/auth/jwt/json_web_token_spec.rb b/spec/services/api/v1/auth/jwt/json_web_token_spec.rb
index 5a5e0db28d..7922da117e 100644
--- a/spec/services/api/v1/auth/jwt/json_web_token_spec.rb
+++ b/spec/services/api/v1/auth/jwt/json_web_token_spec.rb
@@ -1,53 +1,51 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Api::V1::Auth::Jwt::JsonWebToken do
-
   before(:each) do
     @payload = {
-      "foo": Faker::Lorem.sentence,
-      "bar": Faker::Number.number
+      foo: Faker::Lorem.sentence,
+      bar: Faker::Number.number
     }
   end
 
-  context "#encode(payload:, exp:)" do
-    it "encodes the payload into a JWT" do
+  context '#encode(payload:, exp:)' do
+    it 'encodes the payload into a JWT' do
       token = described_class.encode(payload: @payload,
                                      exp: 2.hours.from_now)
       expect(token.is_a?(String)).to eql(true)
       expect(token.length > 1).to eql(true)
     end
-    it "allows for a default expiration time" do
+    it 'allows for a default expiration time' do
       token = described_class.encode(payload: @payload)
       expect(token.is_a?(String)).to eql(true)
       expect(token.length > 1).to eql(true)
     end
   end
 
-  context "#decode(token:)" do
+  context '#decode(token:)' do
     before(:each) do
       @token = described_class.encode(payload: @payload)
     end
 
-    it "decodes the token and returns the payload" do
+    it 'decodes the token and returns the payload' do
       hash = described_class.decode(token: @token)
       expect(hash[:foo]).to eql(@payload[:foo])
       expect(hash[:bar]).to eql(@payload[:bar])
     end
-    it "includes the expiration time" do
+    it 'includes the expiration time' do
       hash = described_class.decode(token: @token)
       expect(hash[:exp]).to eql(@payload[:exp])
     end
-    it "throws JWT::ExpiredSignature when a token has expired" do
+    it 'throws JWT::ExpiredSignature when a token has expired' do
       err = JWT::ExpiredSignature
       JWT.stubs(:decode).raises(err)
       expect { described_class.decode(token: @token) }.to raise_error(err)
     end
-    it "returns nil when other JWT::DecodeError happens" do
+    it 'returns nil when other JWT::DecodeError happens' do
       JWT.stubs(:decode).raises(JWT::VerificationError)
       expect(described_class.decode(token: @token)).to eql(nil)
     end
   end
-
 end
diff --git a/spec/services/api/v1/contextual_error_service_spec.rb b/spec/services/api/v1/contextual_error_service_spec.rb
index 529b9f28c3..2da9a80db0 100644
--- a/spec/services/api/v1/contextual_error_service_spec.rb
+++ b/spec/services/api/v1/contextual_error_service_spec.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Api::V1::ContextualErrorService do
-
   before(:each) do
     @plan = build(:plan)
     @plan.identifiers << build(:identifier)
@@ -13,7 +12,7 @@
     @plan.grant = { value: build(:identifier).value }
   end
 
-  describe "process_plan_errors(plan:)" do
+  describe 'process_plan_errors(plan:)' do
     before(:each) do
       # invalidate everything
       @plan.title = nil
@@ -26,102 +25,101 @@
       @plan.contributors.first.org.name = nil
       @results = described_class.process_plan_errors(plan: @plan)
     end
-    it "returns an empty array if :plan is not a Plan" do
+    it 'returns an empty array if :plan is not a Plan' do
       expect(described_class.process_plan_errors(plan: build(:org))).to eql([])
     end
-    it "returns an empty array if :plan is valid" do
+    it 'returns an empty array if :plan is valid' do
       expect(described_class.process_plan_errors(plan: build(:plan))).to eql([])
     end
-    it "contextualizes the :plan errors" do
+    it 'contextualizes the :plan errors' do
       expect(@results.include?("Dmp title can't be blank")).to eql(true)
     end
-    it "contextualizes the :plan funder errors" do
+    it 'contextualizes the :plan funder errors' do
       expect(@results.include?("Funding name can't be blank")).to eql(true)
     end
   end
 
-  describe "contextualize(errors:)" do
-    it "returns an empty array if :errors is an empty Array" do
+  describe 'contextualize(errors:)' do
+    it 'returns an empty array if :errors is an empty Array' do
       expect(described_class.contextualize(errors: [])).to eql([])
     end
-    it "returns an empty array if :errors is an empty ActiveModel::Errors" do
+    it 'returns an empty array if :errors is an empty ActiveModel::Errors' do
       @plan.valid?
       expect(described_class.contextualize(errors: @plan.errors)).to eql([])
     end
-    it "returns an empty array if :errors is not an Array or ActiveModel::Errors" do
+    it 'returns an empty array if :errors is not an Array or ActiveModel::Errors' do
       expect(described_class.contextualize(errors: build(:org))).to eql([])
     end
     it "defaults the :context to 'Dmp'" do
       result = described_class.contextualize(errors: ["Title can't be blank"])
       expect(result.first).to eql("Dmp title can't be blank")
     end
-    it "swaps in the specified :context" do
-      result = described_class.contextualize(errors: ["Title can't be blank"], context: "Foo")
+    it 'swaps in the specified :context' do
+      result = described_class.contextualize(errors: ["Title can't be blank"], context: 'Foo')
       expect(result.first).to eql("Foo title can't be blank")
     end
-    it "returns errors if the Plan is invalid" do
+    it 'returns errors if the Plan is invalid' do
       @plan.title = nil
       @plan.valid?
       result = described_class.contextualize(errors: @plan.errors)
       expect(result.length).to eql(1)
-      expect(result.first.start_with?("Dmp title ")).to eql(true)
+      expect(result.first.start_with?('Dmp title ')).to eql(true)
     end
-    it "returns errors if the Plan Identifier is invalid" do
+    it 'returns errors if the Plan Identifier is invalid' do
       @plan.identifiers.first.value = nil
       @plan.valid?
       result = described_class.contextualize(errors: @plan.errors)
       expect(result.length).to eql(1)
-      expect(result.first.start_with?("Dmp identifier ")).to eql(true)
+      expect(result.first.start_with?('Dmp identifier ')).to eql(true)
     end
-    it "returns errors if a Contributor is invalid" do
+    it 'returns errors if a Contributor is invalid' do
       @plan.contributors.first.name = nil
       @plan.contributors.first.email = nil
       @plan.valid?
       result = described_class.contextualize(errors: @plan.errors)
       expect(result.length).to eql(2)
-      expect(result.first.start_with?("Contact/Contributor ")).to eql(true)
+      expect(result.first.start_with?('Contact/Contributor ')).to eql(true)
       expect(result.first.include?(" can't be blank if no ")).to eql(true)
     end
-    it "returns errors if a Contributor Org is invalid" do
+    it 'returns errors if a Contributor Org is invalid' do
       @plan.contributors.first.org.name = nil
       @plan.valid?
       result = described_class.contextualize(errors: @plan.errors)
       expect(result.length).to eql(1)
-      expect(result.first.start_with?("Contact/Contributor affiliation ")).to eql(true)
+      expect(result.first.start_with?('Contact/Contributor affiliation ')).to eql(true)
     end
-    it "returns errors if a Contributor Identifier is invalid" do
+    it 'returns errors if a Contributor Identifier is invalid' do
       @plan.contributors.first.identifiers.first.value = nil
       @plan.valid?
       result = described_class.contextualize(errors: @plan.errors)
       expect(result.length).to eql(1)
-      expect(result.first.start_with?("Contact/Contributor identifier ")).to eql(true)
+      expect(result.first.start_with?('Contact/Contributor identifier ')).to eql(true)
     end
-    it "returns errors if a Funder is invalid" do
+    it 'returns errors if a Funder is invalid' do
       @plan.funder.name = nil
       @plan.funder.valid?
-      result = described_class.contextualize(errors: @plan.funder.errors, context: "Funding")
+      result = described_class.contextualize(errors: @plan.funder.errors, context: 'Funding')
       expect(result.length).to eql(1)
-      expect(result.first.start_with?("Funding name ")).to eql(true)
+      expect(result.first.start_with?('Funding name ')).to eql(true)
     end
   end
 
-  describe "valid_plan?(plan:)" do
-    it "returns false if :plan is not valid" do
+  describe 'valid_plan?(plan:)' do
+    it 'returns false if :plan is not valid' do
       @plan.title = nil
       expect(described_class.valid_plan?(plan: @plan)).to eql(false)
     end
-    it "returns false if :plan funder is not valid" do
+    it 'returns false if :plan funder is not valid' do
       @plan.funder.name = nil
       expect(described_class.valid_plan?(plan: @plan)).to eql(false)
     end
-    it "does not require :plan funder and grant to be present" do
+    it 'does not require :plan funder and grant to be present' do
       @plan.funder = nil
       @plan.grant = {}
       expect(described_class.valid_plan?(plan: @plan)).to eql(true)
     end
-    it "returns true when everything is valid" do
+    it 'returns true when everything is valid' do
       expect(described_class.valid_plan?(plan: @plan)).to eql(true)
     end
   end
-
 end
diff --git a/spec/services/api/v1/conversion_service_spec.rb b/spec/services/api/v1/conversion_service_spec.rb
index fe404443f2..e8845b84bd 100644
--- a/spec/services/api/v1/conversion_service_spec.rb
+++ b/spec/services/api/v1/conversion_service_spec.rb
@@ -1,51 +1,50 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Api::V1::ConversionService do
-
-  describe "boolean_to_yes_no_unknown" do
-    it "returns `yes` when true" do
-      expect(described_class.boolean_to_yes_no_unknown(true)).to eql("yes")
+  describe 'boolean_to_yes_no_unknown' do
+    it 'returns `yes` when true' do
+      expect(described_class.boolean_to_yes_no_unknown(true)).to eql('yes')
     end
-    it "returns `yes` when 1" do
-      expect(described_class.boolean_to_yes_no_unknown(1)).to eql("yes")
+    it 'returns `yes` when 1' do
+      expect(described_class.boolean_to_yes_no_unknown(1)).to eql('yes')
     end
-    it "returns `no` when false" do
-      expect(described_class.boolean_to_yes_no_unknown(false)).to eql("no")
+    it 'returns `no` when false' do
+      expect(described_class.boolean_to_yes_no_unknown(false)).to eql('no')
     end
-    it "returns `no` when 0" do
-      expect(described_class.boolean_to_yes_no_unknown(0)).to eql("no")
+    it 'returns `no` when 0' do
+      expect(described_class.boolean_to_yes_no_unknown(0)).to eql('no')
     end
-    it "returns `unknown` when nil" do
-      expect(described_class.boolean_to_yes_no_unknown(nil)).to eql("unknown")
+    it 'returns `unknown` when nil' do
+      expect(described_class.boolean_to_yes_no_unknown(nil)).to eql('unknown')
     end
   end
 
-  describe "yes_no_unknown_to_boolean" do
-    it "returns true when `yes`" do
-      expect(described_class.yes_no_unknown_to_boolean("yes")).to eql(true)
+  describe 'yes_no_unknown_to_boolean' do
+    it 'returns true when `yes`' do
+      expect(described_class.yes_no_unknown_to_boolean('yes')).to eql(true)
     end
-    it "returns false when `no`" do
-      expect(described_class.yes_no_unknown_to_boolean("no")).to eql(false)
+    it 'returns false when `no`' do
+      expect(described_class.yes_no_unknown_to_boolean('no')).to eql(false)
     end
-    it "returns nil when `unknown`" do
-      expect(described_class.yes_no_unknown_to_boolean("unknown")).to eql(nil)
+    it 'returns nil when `unknown`' do
+      expect(described_class.yes_no_unknown_to_boolean('unknown')).to eql(nil)
     end
   end
 
-  describe "#to_identifier(context:, value:)" do
-    it "returns nil if the context is not present" do
+  describe '#to_identifier(context:, value:)' do
+    it 'returns nil if the context is not present' do
       expected = described_class.to_identifier(context: nil,
                                                value: Faker::Lorem.word)
       expect(expected).to eql(nil)
     end
-    it "returns nil if the value is not present" do
+    it 'returns nil if the value is not present' do
       expected = described_class.to_identifier(context: Faker::Lorem.word,
                                                value: nil)
       expect(expected).to eql(nil)
     end
-    it "returns an Identifier with a IdentifierScheme matching the context" do
+    it 'returns an Identifier with a IdentifierScheme matching the context' do
       context = Faker::Lorem.word
       expected = described_class.to_identifier(context: context,
                                                value: Faker::Lorem.word)
@@ -58,5 +57,4 @@
       expect(expected.value).to eql(value)
     end
   end
-
 end
diff --git a/spec/services/api/v1/deserialization/contributor_spec.rb b/spec/services/api/v1/deserialization/contributor_spec.rb
index 91e3a003c9..0d07e96ded 100644
--- a/spec/services/api/v1/deserialization/contributor_spec.rb
+++ b/spec/services/api/v1/deserialization/contributor_spec.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Api::V1::Deserialization::Contributor do
-
   before(:each) do
     # Org requires a language, so make sure a default is available!
     create(:language, default_language: true) unless Language.default
@@ -30,16 +29,16 @@
     }
   end
 
-  describe ":deserialize(json: {})" do
-    it "returns nil if json is not valid" do
+  describe ':deserialize(json: {})' do
+    it 'returns nil if json is not valid' do
       Api::V1::JsonValidationService.stubs(:contributor_valid?).returns(false)
       expect(described_class.deserialize(json: nil)).to eql(nil)
     end
-    it "attaches the Org to the Contributor" do
+    it 'attaches the Org to the Contributor' do
       result = described_class.send(:deserialize, json: @json)
       expect(result.org).to eql(@org)
     end
-    it "attaches the Identifier to the Contributor" do
+    it 'attaches the Identifier to the Contributor' do
       @identifier.destroy
       @json[:contributor_id] = { type: @scheme.name, identifier: SecureRandom.uuid }
       result = described_class.send(:deserialize, json: @json)
@@ -47,17 +46,17 @@
       expect(result.identifiers.length).to eql(1)
       expect(result.identifiers.last.value).to eql(expected)
     end
-    it "assigns the contact role if this :is_contact is true" do
-      @json[:contact_id] = { type: "URL", identifier: Faker::Internet.url }
+    it 'assigns the contact role if this :is_contact is true' do
+      @json[:contact_id] = { type: 'URL', identifier: Faker::Internet.url }
       result = described_class.send(:deserialize, json: @json, is_contact: true)
       expect(result.data_curation?).to eql(true)
     end
-    it "does not assign the contact role if this :is_contact is false" do
-      @json[:contact_id] = { type: "URL", identifier: Faker::Internet.url }
+    it 'does not assign the contact role if this :is_contact is false' do
+      @json[:contact_id] = { type: 'URL', identifier: Faker::Internet.url }
       result = described_class.send(:deserialize, json: @json)
       expect(result.data_curation?).to eql(false)
     end
-    it "assigns the contributor role" do
+    it 'assigns the contributor role' do
       role = @contributor.all_roles[1].to_s
       json = { name: Faker::TvShows::Simpsons.character, role: [role] }
       result = described_class.send(:deserialize, json: json)
@@ -65,13 +64,13 @@
     end
   end
 
-  context "private methods" do
-    describe ":find_or_initialize(id_json:, json: {})" do
-      it "returns nil if json is not present" do
+  context 'private methods' do
+    describe ':find_or_initialize(id_json:, json: {})' do
+      it 'returns nil if json is not present' do
         result = described_class.send(:find_or_initialize, id_json: nil, json: nil)
         expect(result).to eql(nil)
       end
-      it "returns a cloned copy of the Contributor when found by identifier" do
+      it 'returns a cloned copy of the Contributor when found by identifier' do
         contributor = create(:contributor, plan: @plan)
         Api::V1::DeserializationService.expects(:object_from_identifier).returns(contributor)
         result = described_class.send(:find_or_initialize, id_json: nil, json: @json)
@@ -81,7 +80,7 @@
         expect(result.name).to eql(contributor.name)
         expect(result.email).to eql(contributor.email)
       end
-      it "returns a cloned copy of the Contributor when found by email" do
+      it 'returns a cloned copy of the Contributor when found by email' do
         contributor = create(:contributor, email: @json[:mbox], plan: @plan)
         Api::V1::DeserializationService.expects(:object_from_identifier).returns(nil)
         result = described_class.send(:find_or_initialize, id_json: nil, json: @json)
@@ -91,7 +90,7 @@
         expect(result.name).to eql(contributor.name)
         expect(result.email).to eql(contributor.email)
       end
-      it "initializes the Contributor if there were no viable matches" do
+      it 'initializes the Contributor if there were no viable matches' do
         json = {
           name: Faker::TvShows::Simpsons.character,
           mbox: Faker::Internet.unique.email
@@ -105,65 +104,62 @@
       end
     end
 
-    describe ":duplicate_contributor(contributor:)" do
-      it "returns nil if the contributor is not present" do
+    describe ':duplicate_contributor(contributor:)' do
+      it 'returns nil if the contributor is not present' do
         expect(described_class.send(:duplicate_contributor, contributor: nil)).to eql(nil)
       end
-      it "duplicates the contributor" do
+      it 'duplicates the contributor' do
         result = described_class.send(:duplicate_contributor, contributor: @contributor)
         expect(result.new_record?).to eql(true)
       end
-      it "removes the plan association" do
+      it 'removes the plan association' do
         result = described_class.send(:duplicate_contributor, contributor: @contributor)
         expect(result.plan).to eql(nil)
       end
     end
 
-    describe ":assign_contact_roles(contributor:)" do
-      it "returns :contributor as-is if it is not present" do
+    describe ':assign_contact_roles(contributor:)' do
+      it 'returns :contributor as-is if it is not present' do
         result = described_class.send(:assign_contact_roles, contributor: nil)
         expect(result).to eql(nil)
       end
-      it "assigns the :data_curation role" do
+      it 'assigns the :data_curation role' do
         result = described_class.send(:assign_contact_roles, contributor: @contributor)
         expect(result.data_curation?).to eql(true)
       end
     end
 
-    describe ":assign_roles(contributor:, json:)" do
-      it "returns :contributor as-is if it is not present" do
+    describe ':assign_roles(contributor:, json:)' do
+      it 'returns :contributor as-is if it is not present' do
         result = described_class.send(:assign_roles, contributor: nil, json: @json)
         expect(result).to eql(nil)
       end
-      it "returns the :contributor as-is if json is not present" do
+      it 'returns the :contributor as-is if json is not present' do
         result = described_class.send(:assign_roles, contributor: @contributor,
                                                      json: nil)
         expect(result).to eql(@contributor)
       end
-      it "returns the :contributor as-is if json[:role] is not present" do
+      it 'returns the :contributor as-is if json[:role] is not present' do
         json = { name: @name }
         result = described_class.send(:assign_roles, contributor: @contributor,
                                                      json: json)
         expect(result).to eql(@contributor)
       end
-      it "ignores unknown/undefined roles" do
+      it 'ignores unknown/undefined roles' do
         @json[:role] << Faker::Lorem.word
         result = described_class.send(:assign_roles, contributor: @contributor,
                                                      json: @json)
         expect(result.selected_roles).to eql(@contributor.selected_roles)
       end
-      it "calls the translate_role" do
+      it 'calls the translate_role' do
         Api::V1::DeserializationService.expects(:translate_role).at_least(1)
         described_class.send(:assign_roles, contributor: @contributor, json: @json)
       end
-      it "assigns the roles" do
+      it 'assigns the roles' do
         result = described_class.send(:assign_roles, contributor: @contributor,
                                                      json: @json)
         expect(result.selected_roles).to eql(@contributor.selected_roles)
       end
-
     end
-
   end
-
 end
diff --git a/spec/services/api/v1/deserialization/funding_spec.rb b/spec/services/api/v1/deserialization/funding_spec.rb
index 77bcc2f2ba..88d7c000b7 100644
--- a/spec/services/api/v1/deserialization/funding_spec.rb
+++ b/spec/services/api/v1/deserialization/funding_spec.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Api::V1::Deserialization::Funding do
-
   before(:each) do
     # Org requires a language, so make sure a default is available!
     create(:language, default_language: true) unless Language.default
@@ -22,26 +21,25 @@
     }
   end
 
-  describe "#deserialize(plan:, json: {})" do
-    it "returns nil if plan is not present" do
+  describe '#deserialize(plan:, json: {})' do
+    it 'returns nil if plan is not present' do
       expect(described_class.deserialize(plan: nil, json: @json)).to eql(nil)
     end
-    it "returns the Plan as-is if json is not valid" do
-      json = { funding_status: "planned" }
+    it 'returns the Plan as-is if json is not valid' do
+      json = { funding_status: 'planned' }
       expect(described_class.deserialize(plan: @plan, json: json)).to eql(@plan)
     end
-    it "assigns the funder" do
+    it 'assigns the funder' do
       result = described_class.deserialize(plan: @plan, json: @json)
       expect(result.funder).to eql(@funder)
     end
-    it "assigns the grant" do
-      json = @json.merge({ grant_id: { type: "url", identifier: Faker::Lorem.word } })
+    it 'assigns the grant' do
+      json = @json.merge({ grant_id: { type: 'url', identifier: Faker::Lorem.word } })
       result = described_class.deserialize(plan: @plan, json: json)
       expect(result.grant.value).to eql(json[:grant_id][:identifier])
     end
-    it "returns the Plan" do
+    it 'returns the Plan' do
       expect(described_class.deserialize(plan: @plan, json: @json)).to eql(@plan)
     end
   end
-
 end
diff --git a/spec/services/api/v1/deserialization/identifier_spec.rb b/spec/services/api/v1/deserialization/identifier_spec.rb
index 931d0c98f9..3db45f8c2c 100644
--- a/spec/services/api/v1/deserialization/identifier_spec.rb
+++ b/spec/services/api/v1/deserialization/identifier_spec.rb
@@ -1,43 +1,42 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Api::V1::Deserialization::Identifier do
-
   before(:each) do
     @scheme = create(:identifier_scheme)
     @value = SecureRandom.uuid
-    @class_name = "Org"
+    @class_name = 'Org'
     @json = { type: @scheme.name, identifier: @value }
   end
 
-  describe ":deserialize(class_name:, json: {})" do
-    it "returns nil if :class_name is not present" do
+  describe ':deserialize(class_name:, json: {})' do
+    it 'returns nil if :class_name is not present' do
       expect(described_class.deserialize(class_name: nil, json: @json)).to eql(nil)
     end
-    it "returns nil if json is not valid" do
+    it 'returns nil if json is not valid' do
       expect(described_class.deserialize(class_name: @class_name, json: nil)).to eql(nil)
     end
-    it "initializes a new Identifier when :type does not match an IdentifierScheme" do
-      json = { type: "other", identifier: @value }
+    it 'initializes a new Identifier when :type does not match an IdentifierScheme' do
+      json = { type: 'other', identifier: @value }
       rslt = described_class.deserialize(class_name: @class_name, json: json)
       expect(rslt.new_record?).to eql(true)
       validate_identifier(result: rslt, scheme: nil, value: @value)
     end
-    it "does not load an existing Identifier when :type does not match an IdentifierScheme" do
+    it 'does not load an existing Identifier when :type does not match an IdentifierScheme' do
       create(:identifier, identifier_scheme: nil, value: @value)
-      json = { type: "other", identifier: @value }
+      json = { type: 'other', identifier: @value }
       rslt = described_class.deserialize(class_name: @class_name, json: json)
       expect(rslt.new_record?).to eql(true)
       validate_identifier(result: rslt, scheme: nil, value: @value)
     end
-    it "returns an existing Identifier when :type matches an IdentifierScheme" do
+    it 'returns an existing Identifier when :type matches an IdentifierScheme' do
       id = create(:identifier, identifier_scheme: @scheme, value: @json[:identifier],
                                identifiable: create(:org))
       result = described_class.deserialize(class_name: @class_name, json: @json)
       expect(result).to eql(id)
     end
-    it "initializes a new Identifier when :type matches an IdentifierScheme" do
+    it 'initializes a new Identifier when :type matches an IdentifierScheme' do
       result = described_class.deserialize(class_name: @class_name, json: @json)
       expect(result.new_record?).to eql(true)
       validate_identifier(result: result, scheme: @scheme,
@@ -48,9 +47,8 @@
   private
 
   def validate_identifier(result:, scheme:, value:)
-    expect(result.is_a?(Identifier)).to eql(true), "expected it to be an Identifier"
-    expect(result.identifier_scheme).to eql(scheme), "expected schemes to match"
-    expect(result.value).to eql(value), "expected values to match"
+    expect(result.is_a?(Identifier)).to eql(true), 'expected it to be an Identifier'
+    expect(result.identifier_scheme).to eql(scheme), 'expected schemes to match'
+    expect(result.value).to eql(value), 'expected values to match'
   end
-
 end
diff --git a/spec/services/api/v1/deserialization/org_spec.rb b/spec/services/api/v1/deserialization/org_spec.rb
index 5e1036958c..a6135a6865 100644
--- a/spec/services/api/v1/deserialization/org_spec.rb
+++ b/spec/services/api/v1/deserialization/org_spec.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Api::V1::Deserialization::Org do
-
   before(:each) do
     # Org requires a language, so make sure a default is available!
     create(:language, default_language: true) unless Language.default
@@ -19,40 +18,40 @@
     @json = { name: @name, abbreviation: @abbrev }
   end
 
-  describe "#deserialize(json: {})" do
+  describe '#deserialize(json: {})' do
     before(:each) do
       described_class.stubs(:find_by_name).returns(@org)
       Api::V1::DeserializationService.stubs(:object_from_identifier).returns(nil)
     end
 
-    it "returns nil if json is not valid" do
+    it 'returns nil if json is not valid' do
       expect(described_class.deserialize(json: nil)).to eql(nil)
     end
-    it "returns the Org if found by :object_from_identifier" do
+    it 'returns the Org if found by :object_from_identifier' do
       Api::V1::DeserializationService.stubs(:object_from_identifier).returns(@org)
       result = described_class.deserialize(json: @json)
       expect(result).to eql(@org)
     end
-    it "calls find_by_name if :object_from_identifier finds none" do
+    it 'calls find_by_name if :object_from_identifier finds none' do
       result = described_class.deserialize(json: @json)
       expect(result).to eql(@org)
     end
-    it "sets the language to the default" do
+    it 'sets the language to the default' do
       default = Language.default || create(:language)
       result = described_class.deserialize(json: @json)
       expect(result.language).to eql(default)
     end
-    it "sets the abbreviation" do
+    it 'sets the abbreviation' do
       result = described_class.deserialize(json: @json)
       expect(result.abbreviation).to eql(@abbrev)
     end
-    it "returns nil if the Org is not valid" do
+    it 'returns nil if the Org is not valid' do
       Org.any_instance.stubs(:valid?).returns(false)
       expect(described_class.deserialize(json: @json)).to eql(nil)
     end
-    it "attaches the identifier to the Org" do
+    it 'attaches the identifier to the Org' do
       id = SecureRandom.uuid
-      scheme = create(:identifier_scheme, identifier_prefix: nil, name: "foo")
+      scheme = create(:identifier_scheme, identifier_prefix: nil, name: 'foo')
       json = @json.merge(
         { affiliation_id: { type: scheme.name, identifier: id } }
       )
@@ -60,7 +59,7 @@
       expect(result.identifiers.length).to eql(2)
       expect(result.identifiers.last.value).to eql(id)
     end
-    it "is able to initialize a new Org" do
+    it 'is able to initialize a new Org' do
       described_class.stubs(:find_by_name)
                      .returns(build(:org, name: Faker::Company.unique.name))
       result = described_class.deserialize(json: @json)
@@ -69,26 +68,26 @@
     end
   end
 
-  context "private methods" do
-    describe "#find_by_name(json:)" do
-      it "returns nil if json is not present" do
+  context 'private methods' do
+    describe '#find_by_name(json:)' do
+      it 'returns nil if json is not present' do
         expect(described_class.send(:find_by_name, json: nil)).to eql(nil)
       end
-      it "returns nil if :name is not present" do
+      it 'returns nil if :name is not present' do
         json = { abbreviation: @abbrev }
         expect(described_class.send(:find_by_name, json: json)).to eql(nil)
       end
-      it "finds the matching Org by name" do
+      it 'finds the matching Org by name' do
         expect(described_class.send(:find_by_name, json: @json)).to eql(@org)
       end
-      it "finds the Org from the OrgSelection::SearchService" do
+      it 'finds the Org from the OrgSelection::SearchService' do
         json = { name: Faker::Company.unique.name }
         array = [{ name: @org.name, weight: 0 }]
         OrgSelection::SearchService.stubs(:search_externally).returns(array)
         OrgSelection::HashToOrgService.stubs(:to_org).returns(@org)
         expect(described_class.send(:find_by_name, json: json)).to eql(@org)
       end
-      it "initializes the Org if there were no viable matches" do
+      it 'initializes the Org if there were no viable matches' do
         json = { name: Faker::Company.unique.name }
         OrgSelection::SearchService.stubs(:search_externally).returns([])
         org = build(:org, name: json[:name])
@@ -97,5 +96,4 @@
       end
     end
   end
-
 end
diff --git a/spec/services/api/v1/deserialization/plan_spec.rb b/spec/services/api/v1/deserialization/plan_spec.rb
index d558458e9b..9738140ac1 100644
--- a/spec/services/api/v1/deserialization/plan_spec.rb
+++ b/spec/services/api/v1/deserialization/plan_spec.rb
@@ -1,29 +1,28 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Api::V1::Deserialization::Plan do
-
   before(:each) do
     # Org requires a language, so make sure a default is available!
     create(:language, default_language: true) unless Language.default
 
     @template = create(:template)
     @plan = create(:plan, template: @template)
-    @scheme = create(:identifier_scheme, name: "doi",
+    @scheme = create(:identifier_scheme, name: 'doi',
                                          identifier_prefix: Faker::Internet.url)
-    @doi = "10.9999/45ty5t.345/34t"
+    @doi = '10.9999/45ty5t.345/34t'
     @identifier = create(:identifier, identifier_scheme: @scheme,
                                       identifiable: @plan, value: @doi)
 
-    @app_name = ApplicationService.application_name.split("-").first&.downcase
-    @app_name = "tester" unless @app_name.present?
+    @app_name = ApplicationService.application_name.split('-').first&.downcase
+    @app_name = 'tester' unless @app_name.present?
 
     contrib = Contributor.new
     @json = {
       title: Faker::Lorem.sentence,
       description: Faker::Lorem.paragraph,
-      ethical_issues_exist: "unknown",
+      ethical_issues_exist: 'unknown',
       contact: {
         name: Faker::Movies::StarWars.character,
         mbox: Faker::Internet.email
@@ -52,7 +51,7 @@
       dataset: [
         { title: Faker::Lorem.sentence }
       ],
-      dmp_id: { type: "doi", identifier: @identifier.value },
+      dmp_id: { type: 'doi', identifier: @identifier.value },
       extension: [
         "#{@app_name}": {
           template: { id: @template.id, title: @template.title }
@@ -66,7 +65,7 @@
     Api::V1::Deserialization::Identifier.stubs(:deserialize!).returns(@identifier)
   end
 
-  describe "#deserialize!(json: {})" do
+  describe '#deserialize!(json: {})' do
     before(:each) do
       described_class.stubs(:find_or_initialize).returns(@plan)
       described_class.stubs(:deserialize_project).returns(@plan)
@@ -75,57 +74,57 @@
       described_class.stubs(:deserialize_datasets).returns(@plan)
     end
 
-    it "returns nil if json is not valid" do
+    it 'returns nil if json is not valid' do
       expect(described_class.deserialize(json: nil)).to eql(nil)
     end
-    it "returns nil if no :dmp_id, :template or default template available" do
+    it 'returns nil if no :dmp_id, :template or default template available' do
       @plan.template = nil
       described_class.stubs(:find_or_initialize).returns(@plan)
       expect(described_class.deserialize(json: @json)).to eql(nil)
     end
-    it "returns the Plan" do
+    it 'returns the Plan' do
       expect(described_class.deserialize(json: @json)).to eql(@plan)
     end
-    it "sets the title" do
+    it 'sets the title' do
       result = described_class.deserialize(json: @json)
       expect(result.title).to eql(@plan.title)
     end
-    it "sets the description" do
+    it 'sets the description' do
       result = described_class.deserialize(json: @json)
       expect(result.description).to eql(@plan.description)
     end
   end
 
-  context "private methods" do
-    describe ":find_or_initialize(id_json:, json: {})" do
-      it "returns nil if json is not present" do
+  context 'private methods' do
+    describe ':find_or_initialize(id_json:, json: {})' do
+      it 'returns nil if json is not present' do
         result = described_class.send(:find_or_initialize, id_json: nil, json: nil)
         expect(result).to eql(nil)
       end
-      it "returns a the existing Plan when :dmp_id is one of our DOIs" do
+      it 'returns a the existing Plan when :dmp_id is one of our DOIs' do
         Api::V1::DeserializationService.expects(:object_from_identifier).returns(@plan)
         result = described_class.send(:find_or_initialize, id_json: @json[:dmp_id], json: @json)
         expect(result).to eql(@plan)
         expect(result.new_record?).to eql(false)
         expect(result.title).to eql(@plan.title)
       end
-      it "returns a the existing Plan when the :dmp_id is one of our URLs" do
+      it 'returns a the existing Plan when the :dmp_id is one of our URLs' do
         @json[:dmp_id] = {
-          type: "URL", identifier: Rails.application.routes.url_helpers.plan_url(@plan)
+          type: 'URL', identifier: Rails.application.routes.url_helpers.plan_url(@plan)
         }
         result = described_class.send(:find_or_initialize, id_json: @json[:dmp_id], json: @json)
         expect(result).to eql(@plan)
         expect(result.new_record?).to eql(false)
         expect(result.title).to eql(@plan.title)
       end
-      it "initializes the Plan if the :dmp_id had no matches" do
-        @json[:dmp_id] = { type: "URL", identifier: Faker::Internet.url }
+      it 'initializes the Plan if the :dmp_id had no matches' do
+        @json[:dmp_id] = { type: 'URL', identifier: Faker::Internet.url }
         result = described_class.send(:find_or_initialize, id_json: @json[:dmp_id], json: @json)
         expect(result).not_to eql(@plan)
         expect(result.new_record?).to eql(true)
         expect(result.title).to eql(@json[:title])
       end
-      it "initializes the Plan if there were no viable matches" do
+      it 'initializes the Plan if there were no viable matches' do
         json = {
           title: Faker::Lorem.sentence,
           contact: { email: Faker::Internet.email }
@@ -136,25 +135,25 @@
       end
     end
 
-    describe "#deserialize_project(plan:, json:)" do
+    describe '#deserialize_project(plan:, json:)' do
       before(:each) do
         # clear out the dates set in the factory
         @plan.start_date = nil
         @plan.end_date = nil
       end
 
-      it "returns the Plan as-is if the json is not present" do
+      it 'returns the Plan as-is if the json is not present' do
         result = described_class.send(:deserialize_project, plan: @plan, json: nil)
         expect(result).to eql(@plan)
         expect(result.start_date).to eql(nil)
       end
-      it "returns the Plan as-is if the json :project is not present" do
+      it 'returns the Plan as-is if the json :project is not present' do
         json = { title: Faker::Lorem.sentence }
         result = described_class.send(:deserialize_project, plan: @plan, json: json)
         expect(result).to eql(@plan)
         expect(result.start_date).to eql(nil)
       end
-      it "returns the Plan as-is if the json :project is not an array" do
+      it 'returns the Plan as-is if the json :project is not an array' do
         json = {
           title: Faker::Lorem.sentence,
           project: { start: Time.now.to_formatted_s(:iso8601) }
@@ -163,40 +162,40 @@
         expect(result).to eql(@plan)
         expect(result.start_date).to eql(nil)
       end
-      it "assigns the start_date of the Plan" do
+      it 'assigns the start_date of the Plan' do
         result = described_class.send(:deserialize_project, plan: @plan, json: @json)
         expected = Time.parse(@json[:project].first[:start]).utc.to_formatted_s(:iso8601)
         expect(result.start_date.to_formatted_s(:iso8601)).to eql(expected)
       end
-      it "assigns the end_date of the Plan" do
+      it 'assigns the end_date of the Plan' do
         result = described_class.send(:deserialize_project, plan: @plan, json: @json)
         expected = Time.parse(@json[:project].first[:end]).utc.to_formatted_s(:iso8601)
         expect(result.end_date.to_formatted_s(:iso8601)).to eql(expected)
       end
-      it "does not call the deserializer for Funding if :funding is not present" do
+      it 'does not call the deserializer for Funding if :funding is not present' do
         @json[:project].first[:funding] = nil
         Api::V1::Deserialization::Funding.expects(:deserialize).at_most(0)
         described_class.send(:deserialize_project, plan: @plan, json: @json)
       end
-      it "calls the deserializer for Funding if :funding present" do
+      it 'calls the deserializer for Funding if :funding present' do
         Api::V1::Deserialization::Funding.expects(:deserialize).at_least(1)
         described_class.send(:deserialize_project, plan: @plan, json: @json)
       end
     end
 
-    describe "#deserialize_contact(plan:, json:)" do
-      it "returns the Plan as-is if json is not present" do
+    describe '#deserialize_contact(plan:, json:)' do
+      it 'returns the Plan as-is if json is not present' do
         result = described_class.send(:deserialize_contact, plan: @plan, json: nil)
         expect(result).to eql(@plan)
         expect(result.contributors.length).to eql(0)
       end
-      it "returns the Plan as-is if json :contact is not present" do
+      it 'returns the Plan as-is if json :contact is not present' do
         @json[:contact] = nil
         result = described_class.send(:deserialize_contact, plan: @plan, json: @json)
         expect(result).to eql(@plan)
         expect(result.contributors.length).to eql(0)
       end
-      it "calls the Contributor.deserialize! for the contact entry" do
+      it 'calls the Contributor.deserialize! for the contact entry' do
         Api::V1::Deserialization::Contributor.expects(:deserialize).at_least(1)
         described_class.send(:deserialize_contact, plan: @plan, json: @json)
       end
@@ -207,12 +206,12 @@
       end
     end
 
-    describe "#deserialize_contributors(plan:, json:)" do
-      it "calls the Contributor.deserialize for each contributor entry" do
+    describe '#deserialize_contributors(plan:, json:)' do
+      it 'calls the Contributor.deserialize for each contributor entry' do
         Api::V1::Deserialization::Contributor.expects(:deserialize).at_least(2)
         described_class.send(:deserialize_contributors, plan: @plan, json: @json)
       end
-      it "attaches the Contributors to the Plan" do
+      it 'attaches the Contributors to the Plan' do
         result = described_class.send(:deserialize_contributors, plan: @plan,
                                                                  json: @json)
         expect(result.contributors.length).to eql(2)
@@ -221,42 +220,40 @@
       end
     end
 
-    describe "#find_template(json:)" do
-      it "returns nil if the json is not present" do
+    describe '#find_template(json:)' do
+      it 'returns nil if the json is not present' do
         expect(described_class.send(:find_template, json: nil)).to eql(nil)
       end
-      it "returns default template if no template is found for the :id" do
+      it 'returns default template if no template is found for the :id' do
         json = { template: { id: 9999, title: Faker::Lorem.sentence } }
         expect(described_class.send(:find_template, json: json)).to eql(nil)
       end
-      it "returns the specified template" do
+      it 'returns the specified template' do
         expect(described_class.send(:find_template, json: @json)).to eql(@template)
       end
     end
 
-    describe "template_id(json:)" do
-      it "returns nil if json not present" do
+    describe 'template_id(json:)' do
+      it 'returns nil if json not present' do
         expect(described_class.send(:template_id, json: nil)).to eql(nil)
       end
-      it "returns nil if extensions for the app were not found" do
+      it 'returns nil if extensions for the app were not found' do
         Api::V1::DeserializationService.stubs(:app_extensions).returns({})
         expect(described_class.send(:template_id, json: @json)).to eql(nil)
       end
-      it "returns nil if the extensions have no template info" do
+      it 'returns nil if the extensions have no template info' do
         expected = { foo: { title: Faker::Lorem.sentence } }
         Api::V1::DeserializationService.stubs(:app_extensions).returns(expected)
         expect(described_class.send(:template_id, json: @json)).to eql(nil)
       end
-      it "returns nil if the extensions have no id for the template info" do
+      it 'returns nil if the extensions have no id for the template info' do
         expected = { template: { title: Faker::Lorem.sentence } }
         Api::V1::DeserializationService.stubs(:app_extensions).returns(expected)
         expect(described_class.send(:template_id, json: @json)).to eql(nil)
       end
-      it "returns the template id" do
+      it 'returns the template id' do
         expect(described_class.send(:template_id, json: @json)).to eql(@template.id)
       end
     end
-
   end
-
 end
diff --git a/spec/services/api/v1/deserialization_service_spec.rb b/spec/services/api/v1/deserialization_service_spec.rb
index 922112163f..de5f52ceb6 100644
--- a/spec/services/api/v1/deserialization_service_spec.rb
+++ b/spec/services/api/v1/deserialization_service_spec.rb
@@ -1,85 +1,84 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Api::V1::DeserializationService do
-
-  describe "object_from_identifier(clazz:, json:)" do
+  describe 'object_from_identifier(clazz:, json:)' do
     before(:each) do
-      scheme = create(:identifier_scheme, name: "ror")
+      scheme = create(:identifier_scheme, name: 'ror')
       @org = create(:org)
       @clazz = @org.class.name
       @ror = create(:identifier, identifier_scheme: scheme, identifiable: @org)
       @url = create(:identifier, identifier_scheme: nil, identifiable: @org)
       @org.reload
       @ror_json = { type: @ror.identifier_scheme.name, identifier: @ror.value }
-      @url_json = { "type": "URL", "identifier": @url.value }
+      @url_json = { type: 'URL', identifier: @url.value }
     end
-    it "returns nil if :class_name is not present" do
+    it 'returns nil if :class_name is not present' do
       expect(described_class.object_from_identifier(class_name: nil, json: @ror_json)).to eql(nil)
     end
-    it "returns nil if :json is not present" do
+    it 'returns nil if :json is not present' do
       expect(described_class.object_from_identifier(class_name: @clazz, json: nil)).to eql(nil)
     end
-    it "returns nil if :json[:type] is not present" do
+    it 'returns nil if :json[:type] is not present' do
       @ror_json.delete(:type)
       result = described_class.object_from_identifier(class_name: @clazz, json: @ror_json)
       expect(result).to eql(nil)
     end
-    it "returns nil if :json[:identifier] is not present" do
+    it 'returns nil if :json[:identifier] is not present' do
       @ror_json.delete(:identifier)
       result = described_class.object_from_identifier(class_name: @clazz, json: @ror_json)
       expect(result).to eql(nil)
     end
-    it "returns nil if specified class is not Identifiable" do
-      result = described_class.object_from_identifier(class_name: "Section", json: @ror_json)
+    it 'returns nil if specified class is not Identifiable' do
+      result = described_class.object_from_identifier(class_name: 'Section', json: @ror_json)
       expect(result).to eql(nil)
     end
-    it "returns nil if :class_name is not a known class" do
-      result = described_class.object_from_identifier(class_name: "Foo", json: @ror_json)
+    it 'returns nil if :class_name is not a known class' do
+      result = described_class.object_from_identifier(class_name: 'Foo', json: @ror_json)
       expect(result).to eql(nil)
     end
-    it "returns nil if no record matched the identifier" do
+    it 'returns nil if no record matched the identifier' do
       @ror_json[:identifier] = SecureRandom.uuid
       result = described_class.object_from_identifier(class_name: @clazz, json: @ror_json)
       expect(result).to eql(nil)
     end
-    it "returns the object for an identifier with an IdentifierScheme" do
+    it 'returns the object for an identifier with an IdentifierScheme' do
       result = described_class.object_from_identifier(class_name: @clazz, json: @ror_json)
       expect(result).to eql(@org)
     end
-    it "returns nil for an identifier with no IdentifierScheme (e.g. URL)" do
+    it 'returns nil for an identifier with no IdentifierScheme (e.g. URL)' do
       result = described_class.object_from_identifier(class_name: @clazz, json: @url_json)
       expect(result).to eql(nil)
     end
   end
 
-  describe ":attach_identifier(object:, json:)" do
+  describe ':attach_identifier(object:, json:)' do
     before(:each) do
-      @scheme = create(:identifier_scheme, name: "ror")
+      @scheme = create(:identifier_scheme, name: 'ror')
       @object = build(:org)
       @json = { type: @scheme.name, identifier: SecureRandom.uuid }
     end
 
-    it "returns the object as-is if :object is not present" do
+    it 'returns the object as-is if :object is not present' do
       expect(described_class.attach_identifier(object: nil, json: @json)).to eql(nil)
     end
-    it "returns the object as-is if :object is not Identifiable" do
+    it 'returns the object as-is if :object is not Identifiable' do
       obj = Theme.new
       expect(described_class.attach_identifier(object: obj, json: @json)).to eql(obj)
     end
-    it "returns the object as-is if :json is not present" do
+    it 'returns the object as-is if :json is not present' do
       expect(described_class.attach_identifier(object: @object, json: nil)).to eql(@object)
     end
-    it "returns the object as-is if :json[:type] is not present" do
+    it 'returns the object as-is if :json[:type] is not present' do
       @json.delete(:type)
       expect(described_class.attach_identifier(object: @object, json: @json)).to eql(@object)
     end
-    it "returns the object as-is if :json[:identifier] is not present" do
+    it 'returns the object as-is if :json[:identifier] is not present' do
       @json.delete(:identifier)
       expect(described_class.attach_identifier(object: @object, json: @json)).to eql(@object)
     end
-    it "returns the object as-is if :object already has an identifier for that scheme" do
+    it 'returns the object as-is if :object already has an identifier for that scheme' do
       @object.identifiers << build(:identifier, identifier_scheme: @scheme,
                                                 value: SecureRandom.uuid)
       expected = @object.identifiers.first.value
@@ -88,7 +87,7 @@
       expect(result.identifiers.length).to eql(1)
       expect(result.identifiers.first.value).to eql(expected)
     end
-    it "attaches the identifier" do
+    it 'attaches the identifier' do
       expected = "#{@scheme.identifier_prefix}#{@json[:identifier]}"
       result = described_class.attach_identifier(object: @object, json: @json)
       expect(result).to eql(@object)
@@ -97,50 +96,50 @@
     end
   end
 
-  describe ":translate_role(role:)" do
+  describe ':translate_role(role:)' do
     before(:each) do
       @default = Contributor.default_role
       @role = "#{Contributor::ONTOLOGY_BASE_URL}/#{Contributor.new.all_roles.sample}"
     end
 
-    it "returns the default role if role is not present?" do
+    it 'returns the default role if role is not present?' do
       expect(described_class.send(:translate_role, role: nil)).to eql(@default)
     end
-    it "returns the default role if role is not a valid/defined role" do
+    it 'returns the default role if role is not a valid/defined role' do
       result = described_class.send(:translate_role, role: Faker::Lorem.word)
       expect(result).to eql(@default)
     end
-    it "returns the role (when it includes the ONTOLOGY_BASE_URL)" do
-      expected = @role.split("/").last
+    it 'returns the role (when it includes the ONTOLOGY_BASE_URL)' do
+      expected = @role.split('/').last
       expect(described_class.send(:translate_role, role: @role)).to eql(expected)
     end
-    it "returns the role (when it does not include the ONTOLOGY_BASE_URL)" do
+    it 'returns the role (when it does not include the ONTOLOGY_BASE_URL)' do
       role = Contributor.new.all_roles.last.to_s
       expect(described_class.send(:translate_role, role: role)).to eql(role)
     end
   end
 
-  describe ":app_extensions(json:)" do
+  describe ':app_extensions(json:)' do
     before(:each) do
       @template = create(:template)
-      @app_name = ApplicationService.application_name.split("-").first&.downcase
-      @app_name = "tester" unless @app_name.present?
+      @app_name = ApplicationService.application_name.split('-').first&.downcase
+      @app_name = 'tester' unless @app_name.present?
     end
 
-    it "returns an empty hash is json is not present" do
+    it 'returns an empty hash is json is not present' do
       expect(described_class.send(:app_extensions, json: nil)).to eql({})
     end
-    it "returns an empty hash is json :extended_attributes is not present" do
+    it 'returns an empty hash is json :extended_attributes is not present' do
       json = { title: Faker::Lorem.sentence }
       expect(described_class.send(:app_extensions, json: json)).to eql({})
     end
-    it "returns an empty hash if there is no extension for the current application" do
+    it 'returns an empty hash if there is no extension for the current application' do
       expected = { template: { id: @template.id } }
-      ApplicationService.expects(:application_name).returns("tester")
+      ApplicationService.expects(:application_name).returns('tester')
       json = { extension: [{ foo: expected }] }
       expect(described_class.send(:app_extensions, json: json)).to eql({})
     end
-    it "returns the hash for the current application" do
+    it 'returns the hash for the current application' do
       expected = { template: { id: @template.id } }
       json = { extension: [{ "#{@app_name}": expected }] }
       result = described_class.send(:app_extensions, json: json)
@@ -148,72 +147,71 @@
     end
   end
 
-  describe "doi?(value:)" do
+  describe 'doi?(value:)' do
     before(:each) do
-      @scheme = create(:identifier_scheme, name: "doi",
+      @scheme = create(:identifier_scheme, name: 'doi',
                                            identifier_prefix: Faker::Internet.url)
     end
 
-    it "returns false if value is not present" do
+    it 'returns false if value is not present' do
       expect(described_class.send(:doi?, value: nil)).to eql(false)
     end
-    it "returns false if the value does not match ARK or DOI pattern" do
+    it 'returns false if the value does not match ARK or DOI pattern' do
       url = Faker::Internet.url
       expect(described_class.send(:doi?, value: url)).to eql(false)
     end
-    it "returns false if the value does not match a partial ARK/DOI pattern" do
-      val = "23645gy3d"
+    it 'returns false if the value does not match a partial ARK/DOI pattern' do
+      val = '23645gy3d'
       expect(described_class.send(:doi?, value: val)).to eql(false)
-      val = "10.999"
+      val = '10.999'
       expect(described_class.send(:doi?, value: val)).to eql(false)
     end
     it "returns false if there is no 'doi' identifier scheme" do
-      val = "10.999/23645gy3d"
+      val = '10.999/23645gy3d'
       @scheme.destroy
       expect(described_class.send(:doi?, value: val)).to eql(false)
     end
     it "returns false if 'doi' identifier scheme exists but value is not doi" do
       expect(described_class.send(:doi?, value: SecureRandom.uuid)).to eql(false)
     end
-    it "returns true (identifier only)" do
-      val = "10.999/23645gy3d"
+    it 'returns true (identifier only)' do
+      val = '10.999/23645gy3d'
       expect(described_class.send(:doi?, value: val)).to eql(true)
     end
-    it "returns true (fully qualified ARK/DOI url)" do
+    it 'returns true (fully qualified ARK/DOI url)' do
       url = "#{Faker::Internet.url}/10.999/23645gy3d"
       expect(described_class.send(:doi?, value: url)).to eql(true)
     end
   end
 
-  describe ":safe_date(value:)" do
-    it "returns nil if :value is not a String" do
+  describe ':safe_date(value:)' do
+    it 'returns nil if :value is not a String' do
       expect(described_class.safe_date(value: 123)).to eql(nil)
       expect(described_class.safe_date(value: Date.today)).to eql(nil)
     end
-    it "returns the :value as a string if it is not parsable by Time" do
-      expect(described_class.safe_date(value: "foo")).to eql("foo")
+    it 'returns the :value as a string if it is not parsable by Time' do
+      expect(described_class.safe_date(value: 'foo')).to eql('foo')
     end
-    it "converts :value to a UTC format" do
+    it 'converts :value to a UTC format' do
       now = Time.now
-      expected = "2020-11-11"
-      rslt = described_class.safe_date(value: "2020-11-11")
+      expected = '2020-11-11'
+      rslt = described_class.safe_date(value: '2020-11-11')
       expect(rslt.getlocal.to_s.start_with?(expected)).to eql(true)
-      expect(rslt.to_s.end_with?("UTC")).to eql(true)
-      rslt = described_class.safe_date(value: "November 11, 2020")
+      expect(rslt.to_s.end_with?('UTC')).to eql(true)
+      rslt = described_class.safe_date(value: 'November 11, 2020')
       expect(rslt.getlocal.to_s.start_with?(expected)).to eql(true)
-      expect(rslt.to_s.end_with?("UTC")).to eql(true)
-      rslt = described_class.safe_date(value: "Nov. 11 2020")
+      expect(rslt.to_s.end_with?('UTC')).to eql(true)
+      rslt = described_class.safe_date(value: 'Nov. 11 2020')
       expect(rslt.getlocal.to_s.start_with?(expected)).to eql(true)
-      expect(rslt.to_s.end_with?("UTC")).to eql(true)
-      rslt = described_class.safe_date(value: "11 Nov. 2020")
+      expect(rslt.to_s.end_with?('UTC')).to eql(true)
+      rslt = described_class.safe_date(value: '11 Nov. 2020')
       expect(rslt.getlocal.to_s.start_with?(expected)).to eql(true)
-      expect(rslt.to_s.end_with?("UTC")).to eql(true)
-      rslt = described_class.safe_date(value: "2020-11-11 10:15:35 PST")
+      expect(rslt.to_s.end_with?('UTC')).to eql(true)
+      rslt = described_class.safe_date(value: '2020-11-11 10:15:35 PST')
       expect(rslt.to_s.start_with?(expected)).to eql(true)
-      expect(rslt.to_s.end_with?("UTC")).to eql(true)
+      expect(rslt.to_s.end_with?('UTC')).to eql(true)
       expected = now.utc.to_s
       expect(described_class.safe_date(value: now.to_formatted_s(:iso8601)).to_s).to eql(expected)
     end
   end
-
 end
diff --git a/spec/services/api/v1/json_validation_service_spec.rb b/spec/services/api/v1/json_validation_service_spec.rb
index c24e3b5662..c5ea039928 100644
--- a/spec/services/api/v1/json_validation_service_spec.rb
+++ b/spec/services/api/v1/json_validation_service_spec.rb
@@ -1,78 +1,77 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Api::V1::JsonValidationService do
-
-  describe "plan_valid?(json:)" do
-    it "returns `false` when json is not present" do
+  describe 'plan_valid?(json:)' do
+    it 'returns `false` when json is not present' do
       expect(described_class.plan_valid?(json: nil)).to eql(false)
     end
-    it "returns `false` when json[:title] is not present" do
+    it 'returns `false` when json[:title] is not present' do
       json = { contact: { mbox: Faker::Internet.email } }
       expect(described_class.plan_valid?(json: json)).to eql(false)
     end
-    it "returns `false` when json[:contact][:mbox] is not present" do
+    it 'returns `false` when json[:contact][:mbox] is not present' do
       json = { title: Faker::Lorem.sentence }
       expect(described_class.plan_valid?(json: json)).to eql(false)
     end
-    it "returns `true` when json[:title] and json[:contact][:mbox] are present" do
+    it 'returns `true` when json[:title] and json[:contact][:mbox] are present' do
       json = { title: Faker::Lorem.sentence, contact: { mbox: Faker::Internet.email } }
       expect(described_class.plan_valid?(json: json)).to eql(true)
     end
   end
 
-  describe "identifier_valid?(json:)" do
-    it "returns `false` when json is not present" do
+  describe 'identifier_valid?(json:)' do
+    it 'returns `false` when json is not present' do
       expect(described_class.identifier_valid?(json: nil)).to eql(false)
     end
-    it "returns `false` when json[:type] is not present" do
+    it 'returns `false` when json[:type] is not present' do
       json = { identifier: SecureRandom.uuid }
       expect(described_class.identifier_valid?(json: json)).to eql(false)
     end
-    it "returns `false` when json[:identifier] is not present" do
+    it 'returns `false` when json[:identifier] is not present' do
       json = { type: Faker::Lorem.word }
       expect(described_class.identifier_valid?(json: json)).to eql(false)
     end
-    it "returns `true` when valid" do
+    it 'returns `true` when valid' do
       json = { type: Faker::Lorem.word, identifier: SecureRandom.uuid }
       expect(described_class.identifier_valid?(json: json)).to eql(true)
     end
   end
 
-  describe "org_valid?(json:)" do
-    it "returns `false` when json is not present" do
+  describe 'org_valid?(json:)' do
+    it 'returns `false` when json is not present' do
       expect(described_class.org_valid?(json: nil)).to eql(false)
     end
-    it "returns `false` when json[:name] is not present" do
+    it 'returns `false` when json[:name] is not present' do
       json = { abbreviation: Faker::Lorem.word.upcase }
       expect(described_class.org_valid?(json: json)).to eql(false)
     end
-    it "returns `true` when valid" do
+    it 'returns `true` when valid' do
       json = { name: Faker::Company.unique.name }
       expect(described_class.org_valid?(json: json)).to eql(true)
     end
   end
 
-  describe "contributor_valid?(json:, is_contact: false)" do
-    it "returns `false` when json is not present" do
+  describe 'contributor_valid?(json:, is_contact: false)' do
+    it 'returns `false` when json is not present' do
       expect(described_class.contributor_valid?(json: nil)).to eql(false)
     end
-    it "returns `false` when json[:name] or json[:mbox] is not present" do
+    it 'returns `false` when json[:name] or json[:mbox] is not present' do
       json = { contributor_id: { type: Faker::Lorem.word, identifier: SecureRandom.uuid } }
       expect(described_class.contributor_valid?(json: json)).to eql(false)
     end
-    it "returns `false` when json[:role] is not present and :is_contact is false" do
+    it 'returns `false` when json[:role] is not present and :is_contact is false' do
       json = { name: Faker::Music::PearlJam.musician, mbox: Faker::Internet.email }
       expect(described_class.contributor_valid?(json: json)).to eql(false)
     end
-    it "returns `true` when valid and :is_contact is false" do
+    it 'returns `true` when valid and :is_contact is false' do
       json = { name: Faker::Music::PearlJam.musician, role: Faker::Lorem.word }
       expect(described_class.contributor_valid?(json: json)).to eql(true)
       json = { mbox: Faker::Internet.email, role: Faker::Lorem.word }
       expect(described_class.contributor_valid?(json: json)).to eql(true)
     end
-    it "returns `true` when valid and :is_contact is true" do
+    it 'returns `true` when valid and :is_contact is true' do
       json = { name: Faker::Music::PearlJam.musician }
       expect(described_class.contributor_valid?(json: json, is_contact: true)).to eql(true)
       json = { mbox: Faker::Internet.email }
@@ -80,35 +79,35 @@
     end
   end
 
-  describe "funding_valid?(json:)" do
-    it "returns `false` when json is not present" do
+  describe 'funding_valid?(json:)' do
+    it 'returns `false` when json is not present' do
       expect(described_class.funding_valid?(json: nil)).to eql(false)
     end
-    it "returns `false` when json[:name] or json[:funder_id] or json[:grant_id] are not present" do
+    it 'returns `false` when json[:name] or json[:funder_id] or json[:grant_id] are not present' do
       json = { status: Faker::Lorem.word }
       expect(described_class.funding_valid?(json: json)).to eql(false)
     end
-    it "returns `true` when json[:name] is present" do
+    it 'returns `true` when json[:name] is present' do
       json = { name: Faker::Company.name }
       expect(described_class.funding_valid?(json: json)).to eql(true)
     end
-    it "returns `true` when json[:funder_id][:identifier] is present" do
+    it 'returns `true` when json[:funder_id][:identifier] is present' do
       json = { funder_id: { identifier: SecureRandom.uuid } }
       expect(described_class.funding_valid?(json: json)).to eql(true)
     end
-    it "returns `true` when json[:grant_id][:identifier] is present" do
+    it 'returns `true` when json[:grant_id][:identifier] is present' do
       json = { grant_id: { identifier: SecureRandom.uuid } }
       expect(described_class.funding_valid?(json: json)).to eql(true)
     end
   end
 
-  describe "dataset_valid?(json:)" do
-    it "returns `false` when json is not present" do
+  describe 'dataset_valid?(json:)' do
+    it 'returns `false` when json is not present' do
       expect(described_class.dataset_valid?(json: nil)).to eql(false)
     end
   end
 
-  describe "validation_errors(json:)" do
+  describe 'validation_errors(json:)' do
     before(:each) do
       @json = {
         title: Faker::Lorem.sentence,
@@ -122,34 +121,34 @@
             ]
           }
         ],
-        dmp_id: { type: "URL", identifier: Faker::Internet.url }
+        dmp_id: { type: 'URL', identifier: Faker::Internet.url }
       }
     end
     it "returns an 'Invalid JSON' error if :json is not present" do
-      expect(described_class.validation_errors(json: nil)).to eql([_("invalid JSON")])
+      expect(described_class.validation_errors(json: nil)).to eql([_('invalid JSON')])
     end
-    it "returns an empty array if everything is valid" do
+    it 'returns an empty array if everything is valid' do
       expect(described_class.validation_errors(json: @json)).to eql([])
     end
-    it "calls the contributor_validation_errors" do
+    it 'calls the contributor_validation_errors' do
       described_class.expects(:contributor_validation_errors).at_least(2)
       described_class.validation_errors(json: @json)
     end
-    it "calls the funding_validation_errors" do
+    it 'calls the funding_validation_errors' do
       described_class.expects(:funding_validation_errors).at_least(1)
       described_class.validation_errors(json: @json)
     end
-    it "returns the BAD_PLAN_MSG if the plan is not valid" do
+    it 'returns the BAD_PLAN_MSG if the plan is not valid' do
       described_class.stubs(:plan_valid?).returns(false)
       results = described_class.validation_errors(json: @json)
       expect(results.include?(described_class::BAD_PLAN_MSG)).to eql(true)
     end
-    it "returns the BAD_ID_MSG if the dmp_id is not valid" do
+    it 'returns the BAD_ID_MSG if the dmp_id is not valid' do
       described_class.stubs(:identifier_valid?).returns(false)
       results = described_class.validation_errors(json: @json)
       expect(results.include?(described_class::BAD_ID_MSG)).to eql(true)
     end
-    it "returns all of the error messages" do
+    it 'returns all of the error messages' do
       c_errs = [described_class::BAD_ORG_MSG, described_class::BAD_CONTRIB_MSG]
       f_errs = [described_class::BAD_FUNDING_MSG]
       described_class.stubs(:contributor_validation_errors).returns(c_errs)
@@ -165,47 +164,47 @@
     end
   end
 
-  describe ":contributor_validation_errors(json:)" do
+  describe ':contributor_validation_errors(json:)' do
     before(:each) do
       @json = {
         name: Faker::Movies::StarWars.character,
         mbox: Faker::Internet.email,
         affiliation: {
           name: Faker::Company.name,
-          affiliation_id: { type: "URL", identifier: SecureRandom.uuid }
+          affiliation_id: { type: 'URL', identifier: SecureRandom.uuid }
         },
-        contributor_id: { type: "URL", identifier: Faker::Internet.url },
+        contributor_id: { type: 'URL', identifier: Faker::Internet.url },
         role: [Contributor.new.all_roles.sample.to_s]
       }
     end
-    it "returns an empty array if :json is not present" do
+    it 'returns an empty array if :json is not present' do
       expect(described_class.contributor_validation_errors(json: nil)).to eql([])
     end
-    it "returns an empty array if everything is valid" do
+    it 'returns an empty array if everything is valid' do
       expect(described_class.contributor_validation_errors(json: nil)).to eql([])
     end
-    it "calls the org_validation_errors" do
+    it 'calls the org_validation_errors' do
       described_class.expects(:org_validation_errors).at_least(1)
       described_class.contributor_validation_errors(json: @json)
     end
-    it "returns the BAD_CONTRIB_MSG if the contributor is not valid" do
+    it 'returns the BAD_CONTRIB_MSG if the contributor is not valid' do
       described_class.stubs(:contributor_valid?).returns(false)
       results = described_class.contributor_validation_errors(json: @json)
       expect(results.include?(described_class::BAD_CONTRIB_MSG)).to eql(true)
     end
-    it "returns the BAD_ID_MSG if the contact_id is not valid" do
+    it 'returns the BAD_ID_MSG if the contact_id is not valid' do
       @json.delete(:contributor_id)
-      @json[:contact_id] = { type: "URL", identifier: Faker::Internet.url }
+      @json[:contact_id] = { type: 'URL', identifier: Faker::Internet.url }
       described_class.stubs(:identifier_valid?).returns(false)
       results = described_class.contributor_validation_errors(json: @json)
       expect(results.include?(described_class::BAD_ID_MSG)).to eql(true)
     end
-    it "returns the BAD_ID_MSG if the contributor_id is not valid" do
+    it 'returns the BAD_ID_MSG if the contributor_id is not valid' do
       described_class.stubs(:identifier_valid?).returns(false)
       results = described_class.contributor_validation_errors(json: @json)
       expect(results.include?(described_class::BAD_ID_MSG)).to eql(true)
     end
-    it "returns all of the error messages" do
+    it 'returns all of the error messages' do
       described_class.expects(:org_validation_errors).at_least(1)
       described_class.stubs(:contributor_valid?).returns(false)
       described_class.stubs(:identifier_valid?).returns(false)
@@ -215,35 +214,35 @@
     end
   end
 
-  describe ":funding_validation_errors(json:)" do
+  describe ':funding_validation_errors(json:)' do
     before(:each) do
       @json = {
         name: Faker::Company.name,
-        funder_id: { type: "URL", identifier: Faker::Internet.url },
-        grant_id: { type: "URL", identifier: Faker::Internet.url }
+        funder_id: { type: 'URL', identifier: Faker::Internet.url },
+        grant_id: { type: 'URL', identifier: Faker::Internet.url }
       }
     end
-    it "returns an empty array if :json is not present" do
+    it 'returns an empty array if :json is not present' do
       expect(described_class.funding_validation_errors(json: nil)).to eql([])
     end
-    it "returns an empty array if everything is valid" do
+    it 'returns an empty array if everything is valid' do
       expect(described_class.funding_validation_errors(json: nil)).to eql([])
     end
-    it "calls the org_validation_errors" do
+    it 'calls the org_validation_errors' do
       described_class.expects(:org_validation_errors).at_least(1)
       described_class.funding_validation_errors(json: @json)
     end
-    it "returns the BAD_ID_MSG if the funder_id is not valid" do
+    it 'returns the BAD_ID_MSG if the funder_id is not valid' do
       described_class.stubs(:identifier_valid?).returns(false)
       results = described_class.funding_validation_errors(json: @json)
       expect(results.include?(described_class::BAD_ID_MSG)).to eql(true)
     end
-    it "returns the BAD_ID_MSG if the grant_id is not valid" do
+    it 'returns the BAD_ID_MSG if the grant_id is not valid' do
       described_class.stubs(:identifier_valid?).returns(false)
       results = described_class.funding_validation_errors(json: @json)
       expect(results.include?(described_class::BAD_ID_MSG)).to eql(true)
     end
-    it "returns all of the error messages" do
+    it 'returns all of the error messages' do
       described_class.expects(:org_validation_errors).at_least(1)
       described_class.stubs(:identifier_valid?).returns(false)
       results = described_class.funding_validation_errors(json: @json)
@@ -251,30 +250,30 @@
     end
   end
 
-  describe ":org_validation_errors(json:)" do
+  describe ':org_validation_errors(json:)' do
     before(:each) do
       @json = {
         name: Faker::Company.name,
-        affiliation_id: { type: "URL", identifier: Faker::Internet.url }
+        affiliation_id: { type: 'URL', identifier: Faker::Internet.url }
       }
     end
-    it "returns an empty array if :json is not present" do
+    it 'returns an empty array if :json is not present' do
       expect(described_class.org_validation_errors(json: nil)).to eql([])
     end
-    it "returns an empty array if everything is valid" do
+    it 'returns an empty array if everything is valid' do
       expect(described_class.org_validation_errors(json: nil)).to eql([])
     end
-    it "returns the BAD_ORG_MSG if the org is not valid" do
+    it 'returns the BAD_ORG_MSG if the org is not valid' do
       described_class.stubs(:org_valid?).returns(false)
       results = described_class.org_validation_errors(json: @json)
       expect(results.include?(described_class::BAD_ORG_MSG)).to eql(true)
     end
-    it "returns the BAD_ID_MSG if the identifier is not valid" do
+    it 'returns the BAD_ID_MSG if the identifier is not valid' do
       described_class.stubs(:identifier_valid?).returns(false)
       results = described_class.org_validation_errors(json: @json)
       expect(results.include?(described_class::BAD_ID_MSG)).to eql(true)
     end
-    it "returns all of the error messages" do
+    it 'returns all of the error messages' do
       described_class.stubs(:org_valid?).returns(false)
       described_class.stubs(:identifier_valid?).returns(false)
       results = described_class.org_validation_errors(json: @json)
@@ -282,5 +281,4 @@
       expect(results.include?(described_class::BAD_ID_MSG)).to eql(true)
     end
   end
-
 end
diff --git a/spec/services/api/v1/persistence_service_spec.rb b/spec/services/api/v1/persistence_service_spec.rb
index bfb9167152..d39b65c852 100644
--- a/spec/services/api/v1/persistence_service_spec.rb
+++ b/spec/services/api/v1/persistence_service_spec.rb
@@ -1,23 +1,22 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Api::V1::PersistenceService do
-
-  describe "safe_save(plan:)" do
-    it "returns nil if :plan is not a Plan" do
+  describe 'safe_save(plan:)' do
+    it 'returns nil if :plan is not a Plan' do
       expect(described_class.safe_save(plan: build(:org))).to eql(nil)
     end
-    it "returns nil if :plan is not valid?" do
+    it 'returns nil if :plan is not valid?' do
       expect(described_class.safe_save(plan: build(:plan, title: nil))).to eql(nil)
     end
-    it "saves the :plan that has no other associations" do
+    it 'saves the :plan that has no other associations' do
       plan = build(:plan)
       result = described_class.safe_save(plan: plan)
       expect(result.new_record?).to eql(false)
       expect(result.title).to eql(plan.title)
     end
-    it "saves the :plan that has contributors" do
+    it 'saves the :plan that has contributors' do
       plan = build(:plan)
       contributor = build(:contributor, investigation: true)
       plan.contributors << contributor
@@ -26,7 +25,7 @@
       expect(result.contributors.first.new_record?).to eql(false)
       expect(result.contributors.first.email).to eql(contributor.email)
     end
-    it "safely handles duplicate contributors" do
+    it 'safely handles duplicate contributors' do
       plan = build(:plan)
       contributor = build(:contributor, investigation: true)
       plan.contributors << contributor
@@ -36,7 +35,7 @@
       expect(result.contributors.first.new_record?).to eql(false)
       expect(result.contributors.first.email).to eql(contributor.email)
     end
-    it "safely handles duplicate orgs" do
+    it 'safely handles duplicate orgs' do
       plan = build(:plan)
       org = build(:org)
       contributor = build(:contributor, investigation: true, org: org)
@@ -47,7 +46,7 @@
       expect(result.contributors.length).to eql(2)
       expect(result.contributors.first.org).to eql(result.contributors.last.org)
     end
-    it "saves the :plan that has identifiers" do
+    it 'saves the :plan that has identifiers' do
       plan = build(:plan)
       id = build(:identifier)
       plan.identifiers << id
@@ -56,7 +55,7 @@
       expect(result.identifiers.first.new_record?).to eql(false)
       expect(result.identifiers.first.value).to eql(id.value)
     end
-    it "saves the :plan that has a funder" do
+    it 'saves the :plan that has a funder' do
       plan = build(:plan)
       org = build(:org)
       plan.funder = org
@@ -64,7 +63,7 @@
       expect(result.funder.present?).to eql(true)
       expect(result.funder.name).to eql(org.name)
     end
-    it "saves the :plan that has a grant" do
+    it 'saves the :plan that has a grant' do
       plan = build(:plan)
       id = build(:identifier)
       plan.grant = id
@@ -74,26 +73,26 @@
     end
   end
 
-  context "private methods" do
-    describe "safe_save_identifier(identifier:)" do
+  context 'private methods' do
+    describe 'safe_save_identifier(identifier:)' do
       before(:each) do
         @org = create(:org)
       end
 
-      it "returns nil unless :identifier is an Identifier" do
+      it 'returns nil unless :identifier is an Identifier' do
         expect(described_class.send(:safe_save_identifier, identifier: build(:org))).to eql(nil)
       end
-      it "returns nil and does not save the :identifier if it is not valid" do
+      it 'returns nil and does not save the :identifier if it is not valid' do
         id = build(:identifier, identifiable: @org, value: nil)
         expect(described_class.send(:safe_save_identifier, identifier: id)).to eql(nil)
       end
-      it "loads the Identifier if the :identifier is not valid because it already exists" do
+      it 'loads the Identifier if the :identifier is not valid because it already exists' do
         existing = create(:identifier, identifiable: @org)
         id = build(:identifier, value: existing.value, identifiable: @org,
                                 identifier_scheme: existing.identifier_scheme)
         expect(described_class.send(:safe_save_identifier, identifier: id)).to eql(existing)
       end
-      it "creates the identifier" do
+      it 'creates the identifier' do
         id = build(:identifier, identifiable: @org)
         result = described_class.send(:safe_save_identifier, identifier: id)
         expect(result.new_record?).to eql(false)
@@ -101,27 +100,27 @@
       end
     end
 
-    describe "safe_save_org(org:)" do
-      it "returns nil unless :org is an Org" do
+    describe 'safe_save_org(org:)' do
+      it 'returns nil unless :org is an Org' do
         expect(described_class.send(:safe_save_org, org: build(:identifier))).to eql(nil)
       end
-      it "returns nil and does not save the :org if it is not valid" do
+      it 'returns nil and does not save the :org if it is not valid' do
         org = build(:org, name: nil)
         expect(described_class.send(:safe_save_org, org: org)).to eql(nil)
       end
-      it "loads the Org if the :org already exists" do
+      it 'loads the Org if the :org already exists' do
         existing = create(:org)
         org = build(:org, name: existing.name)
         expect(described_class.send(:safe_save_org, org: org)).to eql(existing)
       end
-      it "creates the Org" do
+      it 'creates the Org' do
         org = build(:org)
         result = described_class.send(:safe_save_org, org: org)
         expect(result.new_record?).to eql(false)
         expect(result.name).to eql(org.name)
         expect(result.abbreviation).to eql(org.abbreviation)
       end
-      it "also creates any identifiers for the Org" do
+      it 'also creates any identifiers for the Org' do
         org = build(:org)
         id = build(:identifier)
         org.identifiers << id
@@ -131,34 +130,34 @@
       end
     end
 
-    describe "safe_save_contributor(contributor:)" do
-      it "returns nil unless :contributor is an Contributor" do
+    describe 'safe_save_contributor(contributor:)' do
+      it 'returns nil unless :contributor is an Contributor' do
         expect(described_class.send(:safe_save_contributor, contributor: build(:org))).to eql(nil)
       end
-      it "returns nil and does not save the :contributor if it is not valid" do
+      it 'returns nil and does not save the :contributor if it is not valid' do
         contributor = build(:contributor, plan: create(:plan), email: nil)
         expect(described_class.send(:safe_save_contributor, contributor: contributor)).to eql(nil)
       end
-      it "loads the Contributor if the :contributor already exists" do
+      it 'loads the Contributor if the :contributor already exists' do
         existing = create(:contributor, plan: create(:plan), investigation: true)
         contributor = build(:contributor, email: existing.email, investigation: true)
         result = described_class.send(:safe_save_contributor, contributor: contributor)
         expect(result).to eql(existing)
       end
-      it "creates the Contributor" do
+      it 'creates the Contributor' do
         contributor = build(:contributor, plan: create(:plan), investigation: true)
         result = described_class.send(:safe_save_contributor, contributor: contributor)
         expect(result.new_record?).to eql(false)
         expect(result.email).to eql(contributor.email)
         expect(result.name).to eql(contributor.name)
       end
-      it "also creates the Org for the Contributor" do
+      it 'also creates the Org for the Contributor' do
         contributor = build(:contributor, org: build(:org), plan: create(:plan),
                                           investigation: true)
         result = described_class.send(:safe_save_contributor, contributor: contributor)
         expect(result.org.name).to eql(contributor.org.name)
       end
-      it "also creates any identifiers for the Contributor" do
+      it 'also creates any identifiers for the Contributor' do
         contributor = build(:contributor, plan: create(:plan), investigation: true)
         id = build(:identifier)
         contributor.identifiers << id
@@ -168,39 +167,39 @@
       end
     end
 
-    describe "deduplicate_contributors(contributors:)" do
+    describe 'deduplicate_contributors(contributors:)' do
       before(:each) do
-        scheme = create(:identifier_scheme, name: "orcid")
+        scheme = create(:identifier_scheme, name: 'orcid')
         @plan = build(:plan)
         @orcid = build(:identifier, identifier_scheme: scheme)
         @contributor = build(:contributor, investigation: true, identifiers: [@orcid])
         @plan.contributors << @contributor
       end
-      it "returns an empty array unless the :contributors is an Array" do
+      it 'returns an empty array unless the :contributors is an Array' do
         expect(described_class.send(:deduplicate_contributors, contributors: nil)).to eql([])
       end
-      it "returns an empty array if :contributors is empty" do
+      it 'returns an empty array if :contributors is empty' do
         @plan.contributors = []
         results = described_class.send(:deduplicate_contributors, contributors: @plan.contributors)
         expect(results.length).to eql(0)
       end
-      it "leaves different :contributors as-is" do
+      it 'leaves different :contributors as-is' do
         @plan.contributors << build(:contributor, name: Faker::Movies::StarWars.character,
                                                   email: Faker::Internet.unique.email)
         results = described_class.send(:deduplicate_contributors, contributors: @plan.contributors)
         expect(results.length).to eql(2)
       end
-      it "consolidates :contributors with the same email" do
+      it 'consolidates :contributors with the same email' do
         @plan.contributors << build(:contributor, email: @contributor.email)
         results = described_class.send(:deduplicate_contributors, contributors: @plan.contributors)
         expect(results.length).to eql(1)
       end
-      it "consolidates :contributors with the same ORCID" do
+      it 'consolidates :contributors with the same ORCID' do
         @plan.contributors << build(:contributor, identifiers: [@orcid])
         results = described_class.send(:deduplicate_contributors, contributors: @plan.contributors)
         expect(results.length).to eql(1)
       end
-      it "consolidates :contributors with the same name" do
+      it 'consolidates :contributors with the same name' do
         @plan.contributors << build(:contributor, name: @contributor.name)
         results = described_class.send(:deduplicate_contributors, contributors: @plan.contributors)
         expect(results.length).to eql(1)
diff --git a/spec/services/api/v1/validation_service_spec.rb b/spec/services/api/v1/validation_service_spec.rb
index 9f44ac0cd7..21c14893e8 100644
--- a/spec/services/api/v1/validation_service_spec.rb
+++ b/spec/services/api/v1/validation_service_spec.rb
@@ -1,60 +1,59 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Api::V1::ValidationService do
-
-  describe "identifier_valid?(json:)" do
-    it "returns `false` when json is not present" do
+  describe 'identifier_valid?(json:)' do
+    it 'returns `false` when json is not present' do
       expect(described_class.identifier_valid?(json: nil)).to eql(false)
     end
-    it "returns `false` when json[:type] is not present" do
+    it 'returns `false` when json[:type] is not present' do
       json = { identifier: SecureRandom.uuid }
       expect(described_class.identifier_valid?(json: json)).to eql(false)
     end
-    it "returns `false` when json[:identifier] is not present" do
+    it 'returns `false` when json[:identifier] is not present' do
       json = { type: Faker::Lorem.word }
       expect(described_class.identifier_valid?(json: json)).to eql(false)
     end
-    it "returns `true` when valid" do
+    it 'returns `true` when valid' do
       json = { type: Faker::Lorem.word, identifier: SecureRandom.uuid }
       expect(described_class.identifier_valid?(json: json)).to eql(true)
     end
   end
 
-  describe "org_valid?(json:)" do
-    it "returns `false` when json is not present" do
+  describe 'org_valid?(json:)' do
+    it 'returns `false` when json is not present' do
       expect(described_class.org_valid?(json: nil)).to eql(false)
     end
-    it "returns `false` when json[:name] is not present" do
+    it 'returns `false` when json[:name] is not present' do
       json = { abbreviation: Faker::Lorem.word.upcase }
       expect(described_class.org_valid?(json: json)).to eql(false)
     end
-    it "returns `true` when valid" do
+    it 'returns `true` when valid' do
       json = { name: Faker::Company.unique.name }
       expect(described_class.org_valid?(json: json)).to eql(true)
     end
   end
 
-  describe "contributor_valid?(json:, is_contact: false)" do
-    it "returns `false` when json is not present" do
+  describe 'contributor_valid?(json:, is_contact: false)' do
+    it 'returns `false` when json is not present' do
       expect(described_class.contributor_valid?(json: nil)).to eql(false)
     end
-    it "returns `false` when json[:name] or json[:mbox] is not present" do
+    it 'returns `false` when json[:name] or json[:mbox] is not present' do
       json = { contributor_id: { type: Faker::Lorem.word, identifier: SecureRandom.uuid } }
       expect(described_class.contributor_valid?(json: json)).to eql(false)
     end
-    it "returns `false` when json[:role] is not present and :is_contact is false" do
+    it 'returns `false` when json[:role] is not present and :is_contact is false' do
       json = { name: Faker::Music::PearlJam.musician, mbox: Faker::Internet.email }
       expect(described_class.contributor_valid?(json: json)).to eql(false)
     end
-    it "returns `true` when valid and :is_contact is false" do
+    it 'returns `true` when valid and :is_contact is false' do
       json = { name: Faker::Music::PearlJam.musician, role: Faker::Lorem.word }
       expect(described_class.contributor_valid?(json: json)).to eql(true)
       json = { mbox: Faker::Internet.email, role: Faker::Lorem.word }
       expect(described_class.contributor_valid?(json: json)).to eql(true)
     end
-    it "returns `true` when valid and :is_contact is true" do
+    it 'returns `true` when valid and :is_contact is true' do
       json = { name: Faker::Music::PearlJam.musician }
       expect(described_class.contributor_valid?(json: json, is_contact: true)).to eql(true)
       json = { mbox: Faker::Internet.email }
@@ -62,50 +61,49 @@
     end
   end
 
-  describe "funding_valid?(json:)" do
-    it "returns `false` when json is not present" do
+  describe 'funding_valid?(json:)' do
+    it 'returns `false` when json is not present' do
       expect(described_class.funding_valid?(json: nil)).to eql(false)
     end
-    it "returns `false` when json[:name] or json[:funder_id] or json[:grant_id] are not present" do
+    it 'returns `false` when json[:name] or json[:funder_id] or json[:grant_id] are not present' do
       json = { status: Faker::Lorem.word }
       expect(described_class.funding_valid?(json: json)).to eql(false)
     end
-    it "returns `true` when json[:name] is present" do
+    it 'returns `true` when json[:name] is present' do
       json = { name: Faker::Company.name }
       expect(described_class.funding_valid?(json: json)).to eql(true)
     end
-    it "returns `true` when json[:funder_id][:identifier] is present" do
+    it 'returns `true` when json[:funder_id][:identifier] is present' do
       json = { funder_id: { identifier: SecureRandom.uuid } }
       expect(described_class.funding_valid?(json: json)).to eql(true)
     end
-    it "returns `true` when json[:grant_id][:identifier] is present" do
+    it 'returns `true` when json[:grant_id][:identifier] is present' do
       json = { grant_id: { identifier: SecureRandom.uuid } }
       expect(described_class.funding_valid?(json: json)).to eql(true)
     end
   end
 
-  describe "dataset_valid?(json:)" do
-    it "returns `false` when json is not present" do
+  describe 'dataset_valid?(json:)' do
+    it 'returns `false` when json is not present' do
       expect(described_class.dataset_valid?(json: nil)).to eql(false)
     end
   end
 
-  describe "plan_valid?(json:)" do
-    it "returns `false` when json is not present" do
+  describe 'plan_valid?(json:)' do
+    it 'returns `false` when json is not present' do
       expect(described_class.plan_valid?(json: nil)).to eql(false)
     end
-    it "returns `false` when json[:title] is not present" do
+    it 'returns `false` when json[:title] is not present' do
       json = { contact: { mbox: Faker::Internet.email } }
       expect(described_class.plan_valid?(json: json)).to eql(false)
     end
-    it "returns `false` when json[:contact][:mbox] is not present" do
+    it 'returns `false` when json[:contact][:mbox] is not present' do
       json = { title: Faker::Lorem.sentence }
       expect(described_class.plan_valid?(json: json)).to eql(false)
     end
-    it "returns `true` when json[:title] and json[:contact][:mbox] are present" do
+    it 'returns `true` when json[:title] and json[:contact][:mbox] are present' do
       json = { title: Faker::Lorem.sentence, contact: { mbox: Faker::Internet.email } }
       expect(described_class.plan_valid?(json: json)).to eql(true)
     end
   end
-
 end
diff --git a/spec/services/application_service_spec.rb b/spec/services/application_service_spec.rb
index fa939b4915..1623e75cc0 100644
--- a/spec/services/application_service_spec.rb
+++ b/spec/services/application_service_spec.rb
@@ -1,19 +1,17 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe ApplicationService do
-
-  describe "#application_name" do
-    it "returns the application name defined in the dmproadmap.rb initializer" do
-      Rails.configuration.x.application.name = "Foo"
-      expect(described_class.application_name).to eql("Foo")
+  describe '#application_name' do
+    it 'returns the application name defined in the dmproadmap.rb initializer' do
+      Rails.configuration.x.application.name = 'Foo'
+      expect(described_class.application_name).to eql('Foo')
     end
-    it "returns the Rails application name if no dmproadmap.rb initializer entry" do
+    it 'returns the Rails application name if no dmproadmap.rb initializer entry' do
       Rails.configuration.x.application.delete(:name)
-      expected = Rails.application.class.name.split("::").first
+      expected = Rails.application.class.name.split('::').first
       expect(described_class.application_name).to eql(expected)
     end
   end
-
 end
diff --git a/spec/services/external_apis/base_service_spec.rb b/spec/services/external_apis/base_service_spec.rb
index 506c976bfd..2d371f9c41 100644
--- a/spec/services/external_apis/base_service_spec.rb
+++ b/spec/services/external_apis/base_service_spec.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe ExternalApis::BaseService do
-
   before(:each) do
     # The base service is meant to abstract, so spoof some config
     # variables here so that our tests can function
@@ -11,124 +10,123 @@
     described_class.stubs(:api_base_url).returns(Faker::Internet.url)
   end
 
-  describe "#headers" do
+  describe '#headers' do
     before(:each) do
       @headers = described_class.headers
     end
-    it "sets the Content-Type header for JSON" do
-      expect(@headers[:"Content-Type"]).to eql("application/json")
+    it 'sets the Content-Type header for JSON' do
+      expect(@headers[:'Content-Type']).to eql('application/json')
     end
-    it "sets the Accept header for JSON" do
-      expect(@headers[:Accept]).to eql("application/json")
+    it 'sets the Accept header for JSON' do
+      expect(@headers[:Accept]).to eql('application/json')
     end
-    it "sets the User-Agent header for the default Application name and contact us url" do
+    it 'sets the User-Agent header for the default Application name and contact us url' do
       expected = "#{described_class.send(:app_name)}" \
                  " (#{described_class.send(:app_email)})"
-      expect(@headers[:"User-Agent"]).to eql(expected)
+      expect(@headers[:'User-Agent']).to eql(expected)
     end
   end
 
-  describe "#log_error" do
+  describe '#log_error' do
     before(:each) do
       @err = Exception.new(Faker::Lorem.sentence)
     end
-    it "does not write to the log if method is undefined" do
+    it 'does not write to the log if method is undefined' do
       expect(described_class.log_error(method: nil, error: @err)).to eql(nil)
     end
-    it "does not write to the log if error is undefined" do
+    it 'does not write to the log if error is undefined' do
       expect(described_class.log_error(method: Faker::Lorem.word, error: nil)).to eql(nil)
     end
-    it "writes to the log" do
+    it 'writes to the log' do
       Rails.logger.expects(:error).at_least(1)
       described_class.log_error(method: Faker::Lorem.word, error: @err)
     end
   end
 
-  context "private methods" do
-    context "#app_name" do
-      it "defaults to the Rails.application.class.name" do
+  context 'private methods' do
+    context '#app_name' do
+      it 'defaults to the Rails.application.class.name' do
         Rails.configuration.x.application.delete(:name)
         expected = ApplicationService.application_name
         expect(described_class.send(:app_name)).to eql(expected)
       end
-      it "returns the application name defined in dmproadmap.rb initializer" do
-        Rails.configuration.x.application.name = "Foo"
-        expect(described_class.send(:app_name)).to eql("Foo")
+      it 'returns the application name defined in dmproadmap.rb initializer' do
+        Rails.configuration.x.application.name = 'Foo'
+        expect(described_class.send(:app_name)).to eql('Foo')
       end
     end
-    context "#app_email" do
-      it "defaults to the contact_us url" do
+    context '#app_email' do
+      it 'defaults to the contact_us url' do
         Rails.configuration.x.organisation.delete(:helpdesk_email)
         expected = Rails.application.routes.url_helpers.contact_us_url
         expect(described_class.send(:app_email)).to eql(expected)
       end
-      it "returns the help_desk email defined in dmproadmap.rb initializer" do
-        Rails.configuration.x.organisation.helpdesk_email = "Foo"
-        expect(described_class.send(:app_email)).to eql("Foo")
+      it 'returns the help_desk email defined in dmproadmap.rb initializer' do
+        Rails.configuration.x.organisation.helpdesk_email = 'Foo'
+        expect(described_class.send(:app_email)).to eql('Foo')
       end
     end
-    context "#http_get" do
+    context '#http_get' do
       before(:each) do
-        @uri = "http://example.org"
+        @uri = 'http://example.org'
       end
-      it "returns nil if no URI is specified" do
+      it 'returns nil if no URI is specified' do
         expect(described_class.send(:http_get, uri: nil)).to eql(nil)
       end
-      it "returns nil if an error occurs" do
-        expect(described_class.send(:http_get, uri: "badurl~^(%")).to eql(nil)
+      it 'returns nil if an error occurs' do
+        expect(described_class.send(:http_get, uri: 'badurl~^(%')).to eql(nil)
       end
-      it "logs an error if an error occurs" do
+      it 'logs an error if an error occurs' do
         Rails.logger.expects(:error).at_least(1)
-        expect(described_class.send(:http_get, uri: "badurl~^(%")).to eql(nil)
+        expect(described_class.send(:http_get, uri: 'badurl~^(%')).to eql(nil)
       end
-      it "returns an HTTP response" do
+      it 'returns an HTTP response' do
         stub_request(:get, @uri).with(headers: described_class.headers)
-                                .to_return(status: 200, body: "", headers: {})
+                                .to_return(status: 200, body: '', headers: {})
         expect(described_class.send(:http_get, uri: @uri).code).to eql(200)
       end
-      it "follows redirects" do
+      it 'follows redirects' do
         uri2 = "#{@uri}/redirected"
         stub_redirect(uri: @uri, redirect_to: uri2)
         stub_request(:get, uri2).with(headers: described_class.headers)
-                                .to_return(status: 200, body: "", headers: {})
+                                .to_return(status: 200, body: '', headers: {})
 
         resp = described_class.send(:http_get, uri: @uri)
         expect(resp.code).to eql(200)
       end
     end
 
-    context "#options(additional_headers:, debug:)" do
+    context '#options(additional_headers:, debug:)' do
       before(:each) do
-        described_class.stubs(:headers).returns({ "Accept": "*/*" })
+        described_class.stubs(:headers).returns({ Accept: '*/*' })
       end
-      it "headers just include base headers if no :additional_headers" do
+      it 'headers just include base headers if no :additional_headers' do
         result = described_class.send(:options)
-        expect(result[:headers][:Accept]).to eql("*/*")
+        expect(result[:headers][:Accept]).to eql('*/*')
       end
-      it "merges additonal headers into the :headers option" do
-        result = described_class.send(:options, additional_headers: { foo: "bar" })
-        expect(result[:headers][:Accept]).to eql("*/*")
-        expect(result[:headers][:foo]).to eql("bar")
+      it 'merges additonal headers into the :headers option' do
+        result = described_class.send(:options, additional_headers: { foo: 'bar' })
+        expect(result[:headers][:Accept]).to eql('*/*')
+        expect(result[:headers][:foo]).to eql('bar')
       end
-      it "does not include :debug_output if :debug is false" do
+      it 'does not include :debug_output if :debug is false' do
         result = described_class.send(:options)
         expect(result[:debug_output]).to eql(nil)
       end
-      it "includes :debug_output if :debug is true" do
+      it 'includes :debug_output if :debug is true' do
         result = described_class.send(:options, additional_headers: {}, debug: true)
         expect(result[:debug_output].nil?).to eql(false)
       end
-      it "includes :follow_redirects option" do
+      it 'includes :follow_redirects option' do
         result = described_class.send(:options)
         expect(result[:follow_redirects]).to eql(true)
       end
     end
-
   end
 
   def stub_redirect(uri:, redirect_to:)
     stub_request(:get, uri).with(headers: described_class.headers)
-                           .to_return(status: 301, body: "",
-                                      headers: { "Location": redirect_to })
+                           .to_return(status: 301, body: '',
+                                      headers: { Location: redirect_to })
   end
 end
diff --git a/spec/services/external_apis/ror_service_spec.rb b/spec/services/external_apis/ror_service_spec.rb
index 193eb28470..8b0dc3b1ad 100644
--- a/spec/services/external_apis/ror_service_spec.rb
+++ b/spec/services/external_apis/ror_service_spec.rb
@@ -1,27 +1,26 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe ExternalApis::RorService do
-
-  describe "#ping" do
+  describe '#ping' do
     before(:each) do
       @headers = described_class.headers
       @heartbeat = URI("#{described_class.api_base_url}#{described_class.heartbeat_path}")
     end
-    it "returns true if an HTTP 200 is returned" do
+    it 'returns true if an HTTP 200 is returned' do
       stub_request(:get, @heartbeat).with(headers: @headers)
-                                    .to_return(status: 200, body: "", headers: {})
+                                    .to_return(status: 200, body: '', headers: {})
       expect(described_class.ping).to eql(true)
     end
-    it "returns false if an HTTP 200 is NOT returned" do
+    it 'returns false if an HTTP 200 is NOT returned' do
       stub_request(:get, @heartbeat).with(headers: @headers)
-                                    .to_return(status: 404, body: "", headers: {})
+                                    .to_return(status: 404, body: '', headers: {})
       expect(described_class.ping).to eql(false)
     end
   end
 
-  describe "#search" do
+  describe '#search' do
     before(:each) do
       @headers = described_class.headers
       @search = URI("#{described_class.api_base_url}#{described_class.search_path}")
@@ -29,32 +28,32 @@
       stub_request(:get, @heartbeat).with(headers: @headers).to_return(status: 200)
     end
 
-    it "returns an empty array if term is blank" do
+    it 'returns an empty array if term is blank' do
       expect(described_class.search(term: nil)).to eql([])
     end
 
-    context "ROR did not return a 200 status" do
+    context 'ROR did not return a 200 status' do
       before(:each) do
         @term = Faker::Lorem.word
         uri = "#{@search}?page=1&query=#{@term}"
         stub_request(:get, uri).with(headers: @headers)
-                               .to_return(status: 404, body: "", headers: {})
+                               .to_return(status: 404, body: '', headers: {})
       end
-      it "returns an empty array" do
+      it 'returns an empty array' do
         expect(described_class.search(term: @term)).to eql([])
       end
-      it "logs the response as an error" do
+      it 'logs the response as an error' do
         described_class.expects(:handle_http_failure).at_least(1)
         described_class.search(term: @term)
       end
     end
 
-    it "returns an empty string if ROR found no matches" do
+    it 'returns an empty string if ROR found no matches' do
       results = {
-        "number_of_results": 0,
-        "time_taken": 23,
-        "items": [],
-        "meta": { "types": [], "countries" => [] }
+        number_of_results: 0,
+        time_taken: 23,
+        items: [],
+        meta: { types: [], 'countries' => [] }
       }
       term = Faker::Lorem.word
       uri = "#{@search}?page=1&query=#{term}"
@@ -63,35 +62,35 @@
       expect(described_class.search(term: term)).to eql([])
     end
 
-    context "Successful response from API" do
+    context 'Successful response from API' do
       before(:each) do
         results = {
-          "number_of_results": 2,
-          "time_taken": 5,
-          "items": [
+          number_of_results: 2,
+          time_taken: 5,
+          items: [
             {
-              "id": "https://ror.org/1234567890",
-              "name": "Example University",
-              "types": ["Education"],
-              "links": ["http://example.edu/"],
-              "aliases": ["Example"],
-              "acronyms": ["EU"],
-              "status": "active",
-              "country": { "country_name": "United States", "country_code": "US" },
-              "external_ids": {
-                "GRID": { "preferred": "grid.12345.1", "all": "grid.12345.1" }
+              id: 'https://ror.org/1234567890',
+              name: 'Example University',
+              types: ['Education'],
+              links: ['http://example.edu/'],
+              aliases: ['Example'],
+              acronyms: ['EU'],
+              status: 'active',
+              country: { country_name: 'United States', country_code: 'US' },
+              external_ids: {
+                GRID: { preferred: 'grid.12345.1', all: 'grid.12345.1' }
               }
             }, {
-              "id": "https://ror.org/0987654321",
-              "name": "Universidade de Example",
-              "types": ["Education"],
-              "links": [],
-              "aliases": ["Example"],
-              "acronyms": ["EU"],
-              "status": "active",
-              "country": { "country_name": "Mexico", "country_code": "MX" },
-              "external_ids": {
-                "GRID": { "preferred": "grid.98765.8", "all": "grid.98765.8" }
+              id: 'https://ror.org/0987654321',
+              name: 'Universidade de Example',
+              types: ['Education'],
+              links: [],
+              aliases: ['Example'],
+              acronyms: ['EU'],
+              status: 'active',
+              country: { country_name: 'Mexico', country_code: 'MX' },
+              external_ids: {
+                GRID: { preferred: 'grid.98765.8', all: 'grid.98765.8' }
               }
             }
           ]
@@ -103,38 +102,38 @@
         @orgs = described_class.search(term: term)
       end
 
-      it "returns both results" do
+      it 'returns both results' do
         expect(@orgs.length).to eql(2)
       end
 
-      it "includes the website in the name (if available)" do
+      it 'includes the website in the name (if available)' do
         expected = {
-          id: "https://ror.org/1234567890",
-          name: "Example University (example.edu)"
+          id: 'https://ror.org/1234567890',
+          name: 'Example University (example.edu)'
         }
         expect(@orgs.map { |i| i[:name] }.include?(expected[:name])).to eql(true)
       end
 
-      it "includes the country in the name (if no website is available)" do
+      it 'includes the country in the name (if no website is available)' do
         expected = {
-          id: "https://ror.org/0987654321",
-          name: "Universidade de Example (Mexico)"
+          id: 'https://ror.org/0987654321',
+          name: 'Universidade de Example (Mexico)'
         }
         expect(@orgs.map { |i| i[:name] }.include?(expected[:name])).to eql(true)
       end
     end
   end
 
-  context "private methods" do
-    describe "#query_ror" do
+  context 'private methods' do
+    describe '#query_ror' do
       before(:each) do
         @results = {
-          "number_of_results": 1,
-          "time_taken": 5,
-          "items": [{
-            "id": Faker::Internet.url,
-            "name": Faker::Lorem.word,
-            "country": { "country_name": Faker::Lorem.word }
+          number_of_results: 1,
+          time_taken: 5,
+          items: [{
+            id: Faker::Internet.url,
+            name: Faker::Lorem.word,
+            country: { country_name: Faker::Lorem.word }
           }]
         }
         @term = Faker::Lorem.word
@@ -143,16 +142,16 @@
         @uri = "#{search}?page=1&query=#{@term}"
       end
 
-      it "returns an empty array if term is blank" do
+      it 'returns an empty array if term is blank' do
         expect(described_class.send(:query_ror, term: nil)).to eql([])
       end
-      it "calls the handle_http_failure method if a non 200 response is received" do
+      it 'calls the handle_http_failure method if a non 200 response is received' do
         stub_request(:get, @uri).with(headers: @headers)
-                                .to_return(status: 403, body: "", headers: {})
+                                .to_return(status: 403, body: '', headers: {})
         described_class.expects(:handle_http_failure).at_least(1)
         expect(described_class.send(:query_ror, term: @term)).to eql([])
       end
-      it "returns the response body as JSON" do
+      it 'returns the response body as JSON' do
         stub_request(:get, @uri).with(headers: @headers)
                                 .to_return(status: 200, body: @results.to_json,
                                            headers: {})
@@ -160,36 +159,36 @@
       end
     end
 
-    describe "#query_string" do
+    describe '#query_string' do
       it "assigns the search term to the 'query' argument" do
-        str = described_class.send(:query_string, term: "Foo")
-        expect(str).to eql("query=Foo&page=1")
+        str = described_class.send(:query_string, term: 'Foo')
+        expect(str).to eql('query=Foo&page=1')
       end
-      it "defaults the page number to 1" do
-        str = described_class.send(:query_string, term: "Foo")
-        expect(str).to eql("query=Foo&page=1")
+      it 'defaults the page number to 1' do
+        str = described_class.send(:query_string, term: 'Foo')
+        expect(str).to eql('query=Foo&page=1')
       end
       it "assigns the page number to the 'page' argument" do
-        str = described_class.send(:query_string, term: "Foo", page: 3)
-        expect(str).to eql("query=Foo&page=3")
+        str = described_class.send(:query_string, term: 'Foo', page: 3)
+        expect(str).to eql('query=Foo&page=3')
       end
-      it "ignores empty filter options" do
-        str = described_class.send(:query_string, term: "Foo", filters: [])
-        expect(str).to eql("query=Foo&page=1")
+      it 'ignores empty filter options' do
+        str = described_class.send(:query_string, term: 'Foo', filters: [])
+        expect(str).to eql('query=Foo&page=1')
       end
-      it "assigns a single filter" do
-        str = described_class.send(:query_string, term: "Foo", filters: ["types:A"])
-        expect(str).to eql("query=Foo&page=1&filter=types:A")
+      it 'assigns a single filter' do
+        str = described_class.send(:query_string, term: 'Foo', filters: ['types:A'])
+        expect(str).to eql('query=Foo&page=1&filter=types:A')
       end
-      it "assigns multiple filters" do
-        str = described_class.send(:query_string, term: "Foo", filters: [
-                                     "types:A", "country.country_code:GB"
+      it 'assigns multiple filters' do
+        str = described_class.send(:query_string, term: 'Foo', filters: [
+                                     'types:A', 'country.country_code:GB'
                                    ])
-        expect(str).to eql("query=Foo&page=1&filter=types:A,country.country_code:GB")
+        expect(str).to eql('query=Foo&page=1&filter=types:A,country.country_code:GB')
       end
     end
 
-    describe "#process_pages" do
+    describe '#process_pages' do
       before(:each) do
         described_class.stubs(:max_pages).returns(2)
         described_class.stubs(:max_results_per_page).returns(5)
@@ -199,39 +198,39 @@
         @headers = described_class.headers
       end
 
-      it "returns an empty array if json is blank" do
+      it 'returns an empty array if json is blank' do
         rslts = described_class.send(:process_pages, term: @term, json: nil)
         expect(rslts.length).to eql(0)
       end
-      it "properly manages results with only one page" do
+      it 'properly manages results with only one page' do
         items = 4.times.map do
           {
-            "id": Faker::Internet.unique.url,
-            "name": Faker::Lorem.word,
-            "country": { "country_name": Faker::Lorem.word }
+            id: Faker::Internet.unique.url,
+            name: Faker::Lorem.word,
+            country: { country_name: Faker::Lorem.word }
           }
         end
-        results1 = { "number_of_results": 4, "items": items }
+        results1 = { number_of_results: 4, items: items }
 
         stub_request(:get, "#{@search}?page=1&query=#{@term}")
           .with(headers: @headers)
           .to_return(status: 200, body: results1.to_json, headers: {})
 
-        json = JSON.parse({ "items": items, "number_of_results": 4 }.to_json)
+        json = JSON.parse({ items: items, number_of_results: 4 }.to_json)
         rslts = described_class.send(:process_pages, term: @term, json: json)
 
         expect(rslts.length).to eql(4)
       end
-      it "properly manages results with multiple pages" do
+      it 'properly manages results with multiple pages' do
         items = 7.times.map do
           {
-            "id": Faker::Internet.unique.url,
-            "name": Faker::Lorem.word,
-            "country": { "country_name": Faker::Lorem.word }
+            id: Faker::Internet.unique.url,
+            name: Faker::Lorem.word,
+            country: { country_name: Faker::Lorem.word }
           }
         end
-        results1 = { "number_of_results": 7, "items": items[0..4] }
-        results2 = { "number_of_results": 7, "items": items[5..6] }
+        results1 = { number_of_results: 7, items: items[0..4] }
+        results2 = { number_of_results: 7, items: items[5..6] }
 
         stub_request(:get, "#{@search}?page=1&query=#{@term}")
           .with(headers: @headers)
@@ -240,20 +239,20 @@
           .with(headers: @headers)
           .to_return(status: 200, body: results2.to_json, headers: {})
 
-        json = JSON.parse({ "items": items[0..4], "number_of_results": 7 }.to_json)
+        json = JSON.parse({ items: items[0..4], number_of_results: 7 }.to_json)
         rslts = described_class.send(:process_pages, term: @term, json: json)
         expect(rslts.length).to eql(7)
       end
-      it "does not go beyond the max_pages" do
+      it 'does not go beyond the max_pages' do
         items = 12.times.map do
           {
-            "id": Faker::Internet.unique.url,
-            "name": Faker::Lorem.word,
-            "country": { "country_name": Faker::Lorem.word }
+            id: Faker::Internet.unique.url,
+            name: Faker::Lorem.word,
+            country: { country_name: Faker::Lorem.word }
           }
         end
-        results1 = { "number_of_results": 12, "items": items[0..4] }
-        results2 = { "number_of_results": 12, "items": items[5..9] }
+        results1 = { number_of_results: 12, items: items[0..4] }
+        results2 = { number_of_results: 12, items: items[5..9] }
 
         stub_request(:get, "#{@search}?page=1&query=#{@term}")
           .with(headers: @headers)
@@ -262,110 +261,109 @@
           .with(headers: @headers)
           .to_return(status: 200, body: results2.to_json, headers: {})
 
-        json = JSON.parse({ "items": items[0..4], "number_of_results": 12 }.to_json)
+        json = JSON.parse({ items: items[0..4], number_of_results: 12 }.to_json)
         rslts = described_class.send(:process_pages, term: @term, json: json)
         expect(rslts.length).to eql(10)
       end
     end
 
-    describe "#parse_results" do
-      it "returns an empty array if there are no items" do
+    describe '#parse_results' do
+      it 'returns an empty array if there are no items' do
         expect(described_class.send(:parse_results, json: nil)).to eql([])
       end
-      it "ignores items with no name or id" do
-        json = { "items": [
-          { "id": Faker::Internet.url, "name": Faker::Lorem.word },
-          { "id": Faker::Internet.url },
-          { "name": Faker::Lorem.word }
+      it 'ignores items with no name or id' do
+        json = { items: [
+          { id: Faker::Internet.url, name: Faker::Lorem.word },
+          { id: Faker::Internet.url },
+          { name: Faker::Lorem.word }
         ] }.to_json
         items = described_class.send(:parse_results, json: JSON.parse(json))
         expect(items.length).to eql(1)
       end
-      it "returns the correct number of results" do
-        json = { "items": [
-          { "id": Faker::Internet.url, "name": Faker::Lorem.word },
-          { "id": Faker::Internet.url, "name": Faker::Lorem.word }
+      it 'returns the correct number of results' do
+        json = { items: [
+          { id: Faker::Internet.url, name: Faker::Lorem.word },
+          { id: Faker::Internet.url, name: Faker::Lorem.word }
         ] }.to_json
         items = described_class.send(:parse_results, json: JSON.parse(json))
         expect(items.length).to eql(2)
       end
     end
 
-    describe "#org_name" do
-      it "returns nil if there is no name" do
-        json = { "country": { "country_name": "Nowhere" } }.to_json
-        expect(described_class.send(:org_name, item: JSON.parse(json))).to eql("")
+    describe '#org_name' do
+      it 'returns nil if there is no name' do
+        json = { country: { country_name: 'Nowhere' } }.to_json
+        expect(described_class.send(:org_name, item: JSON.parse(json))).to eql('')
       end
-      it "properly appends the website if available" do
+      it 'properly appends the website if available' do
         json = {
-          "name": "Example College",
-          "links": ["https://example.edu"],
-          "country": { "country_name": "Nowhere" }
+          name: 'Example College',
+          links: ['https://example.edu'],
+          country: { country_name: 'Nowhere' }
         }.to_json
-        expected = "Example College (example.edu)"
+        expected = 'Example College (example.edu)'
         expect(described_class.send(:org_name, item: JSON.parse(json))).to eql(expected)
       end
-      it "properly appends the country if available and no website is available" do
+      it 'properly appends the country if available and no website is available' do
         json = {
-          "name": "Example College",
-          "country": { "country_name": "Nowhere" }
+          name: 'Example College',
+          country: { country_name: 'Nowhere' }
         }.to_json
-        expected = "Example College (Nowhere)"
+        expected = 'Example College (Nowhere)'
         expect(described_class.send(:org_name, item: JSON.parse(json))).to eql(expected)
       end
-      it "properly handles an item with no website or country" do
+      it 'properly handles an item with no website or country' do
         json = {
-          "name": "Example College",
-          "links": [],
-          "country": {}
+          name: 'Example College',
+          links: [],
+          country: {}
         }.to_json
-        expected = "Example College"
+        expected = 'Example College'
         expect(described_class.send(:org_name, item: JSON.parse(json))).to eql(expected)
       end
     end
 
-    describe "#org_website" do
+    describe '#org_website' do
       it "returns nil if no 'links' are in the json" do
-        item = JSON.parse({ "links": nil }.to_json)
+        item = JSON.parse({ links: nil }.to_json)
         expect(described_class.send(:org_website, item: item)).to eql(nil)
       end
-      it "returns nil if the item is nil" do
+      it 'returns nil if the item is nil' do
         expect(described_class.send(:org_website, item: nil)).to eql(nil)
       end
-      it "returns the domain only" do
-        item = JSON.parse({ "links": ["https://example.org/path?a=b"] }.to_json)
-        expect(described_class.send(:org_website, item: item)).to eql("example.org")
+      it 'returns the domain only' do
+        item = JSON.parse({ links: ['https://example.org/path?a=b'] }.to_json)
+        expect(described_class.send(:org_website, item: item)).to eql('example.org')
       end
-      it "removes the www prefix" do
-        item = JSON.parse({ "links": ["www.example.org"] }.to_json)
-        expect(described_class.send(:org_website, item: item)).to eql("example.org")
+      it 'removes the www prefix' do
+        item = JSON.parse({ links: ['www.example.org'] }.to_json)
+        expect(described_class.send(:org_website, item: item)).to eql('example.org')
       end
     end
 
-    describe "#fundref_id" do
+    describe '#fundref_id' do
       before(:each) do
-        @hash = { "external_ids": {} }
+        @hash = { external_ids: {} }
       end
-      it "returns a blank if no external_ids are present" do
+      it 'returns a blank if no external_ids are present' do
         json = JSON.parse(@hash.to_json)
-        expect(described_class.send(:fundref_id, item: json)).to eql("")
+        expect(described_class.send(:fundref_id, item: json)).to eql('')
       end
-      it "returns a blank if no FundRef ids are present" do
-        @hash["external_ids"] = { "FundRef": {} }
+      it 'returns a blank if no FundRef ids are present' do
+        @hash['external_ids'] = { FundRef: {} }
         json = JSON.parse(@hash.to_json)
-        expect(described_class.send(:fundref_id, item: json)).to eql("")
+        expect(described_class.send(:fundref_id, item: json)).to eql('')
       end
-      it "returns the preferred id when specified" do
-        @hash["external_ids"] = { "FundRef": { "preferred": "1", "all": %w[2 1] } }
+      it 'returns the preferred id when specified' do
+        @hash['external_ids'] = { FundRef: { preferred: '1', all: %w[2 1] } }
         json = JSON.parse(@hash.to_json)
-        expect(described_class.send(:fundref_id, item: json)).to eql("1")
+        expect(described_class.send(:fundref_id, item: json)).to eql('1')
       end
-      it "returns the firstid if no preferred is specified" do
-        @hash["external_ids"] = { "FundRef": { "preferred": nil, "all": %w[2 1] } }
+      it 'returns the firstid if no preferred is specified' do
+        @hash['external_ids'] = { FundRef: { preferred: nil, all: %w[2 1] } }
         json = JSON.parse(@hash.to_json)
-        expect(described_class.send(:fundref_id, item: json)).to eql("2")
+        expect(described_class.send(:fundref_id, item: json)).to eql('2')
       end
     end
-
   end
 end
diff --git a/spec/services/locale_service_spec.rb b/spec/services/locale_service_spec.rb
index 8e390d7755..7c0eb2fb1c 100644
--- a/spec/services/locale_service_spec.rb
+++ b/spec/services/locale_service_spec.rb
@@ -1,83 +1,82 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe LocaleService do
-
   before(:each) do
     Language.destroy_all
     @default = Language.default || create(:language, default_language: true)
     Rails.configuration.x.locales.default = @default.abbreviation
-    Rails.configuration.x.locales.gettext_join_character = "_"
-    Rails.configuration.x.locales.i18n_join_character = "-"
+    Rails.configuration.x.locales.gettext_join_character = '_'
+    Rails.configuration.x.locales.i18n_join_character = '-'
   end
 
-  describe "#default_locale" do
-    it "returns the Language defined as the default in the database" do
+  describe '#default_locale' do
+    it 'returns the Language defined as the default in the database' do
       Language.update_all(default_language: false)
-      create(:language, abbreviation: "zz-TP", default_language: true)
-      expect(described_class.default_locale).to eql("zz-TP")
+      create(:language, abbreviation: 'zz-TP', default_language: true)
+      expect(described_class.default_locale).to eql('zz-TP')
     end
-    it "returns the default language defined in dmproadmap.rb initializer" do
+    it 'returns the default language defined in dmproadmap.rb initializer' do
       Language.destroy_all
       expect(described_class.default_locale).to eql(@default.abbreviation)
     end
   end
 
-  describe "#available_locales" do
-    it "returns the abbreviations of all Languages in the database" do
+  describe '#available_locales' do
+    it 'returns the abbreviations of all Languages in the database' do
       create(:language)
       expected = Language.all.order(:abbreviation).pluck(:abbreviation)
       expect(described_class.available_locales).to eql(expected)
     end
-    it "returns the default language if no Languages are in the database" do
+    it 'returns the default language if no Languages are in the database' do
       Language.destroy_all
       expect(described_class.available_locales).to eql([@default.abbreviation])
     end
   end
 
-  describe "#to_i18n(locale:)" do
-    it "uses the default_locale if no locale is specified" do
+  describe '#to_i18n(locale:)' do
+    it 'uses the default_locale if no locale is specified' do
       expect(described_class.to_i18n(locale: nil)).to eql(@default.abbreviation)
     end
-    it "converts the locale to i18n format" do
-      expect(described_class.to_i18n(locale: "en-GB")).to eql("en-GB")
-      expect(described_class.to_i18n(locale: "en_GB")).to eql("en-GB")
-      expect(described_class.to_i18n(locale: "en|GB")).to eql("en-GB")
+    it 'converts the locale to i18n format' do
+      expect(described_class.to_i18n(locale: 'en-GB')).to eql('en-GB')
+      expect(described_class.to_i18n(locale: 'en_GB')).to eql('en-GB')
+      expect(described_class.to_i18n(locale: 'en|GB')).to eql('en-GB')
     end
   end
 
-  describe "#to_gettext(locale:)" do
-    it "uses the default_locale if no locale is specified" do
+  describe '#to_gettext(locale:)' do
+    it 'uses the default_locale if no locale is specified' do
       expect(described_class.to_gettext(locale: nil)).to eql(@default.abbreviation)
     end
-    it "converts the locale to Gettext format" do
-      expect(described_class.to_gettext(locale: "en_GB")).to eql("en_GB")
-      expect(described_class.to_gettext(locale: "en-GB")).to eql("en_GB")
-      expect(described_class.to_gettext(locale: "en|GB")).to eql("en_GB")
+    it 'converts the locale to Gettext format' do
+      expect(described_class.to_gettext(locale: 'en_GB')).to eql('en_GB')
+      expect(described_class.to_gettext(locale: 'en-GB')).to eql('en_GB')
+      expect(described_class.to_gettext(locale: 'en|GB')).to eql('en_GB')
     end
   end
 
-  context "private methods" do
-    describe "#convert(string:, join_char:)" do
-      it "handles a 2 character locale (e.g. `en`)" do
-        expect(described_class.send(:convert, string: "en")).to eql("en")
+  context 'private methods' do
+    describe '#convert(string:, join_char:)' do
+      it 'handles a 2 character locale (e.g. `en`)' do
+        expect(described_class.send(:convert, string: 'en')).to eql('en')
       end
-      it "handles a locale with an extension (e.g. `en-GB`)" do
-        expect(described_class.send(:convert, string: "en|GB")).to eql("en_GB")
+      it 'handles a locale with an extension (e.g. `en-GB`)' do
+        expect(described_class.send(:convert, string: 'en|GB')).to eql('en_GB')
       end
-      it "handles a locale as upper case (e.g. `EN-GB`)" do
-        expect(described_class.send(:convert, string: "EN|GB")).to eql("en_GB")
+      it 'handles a locale as upper case (e.g. `EN-GB`)' do
+        expect(described_class.send(:convert, string: 'EN|GB')).to eql('en_GB')
       end
-      it "handles a locale as lower case (e.g. `en-gb`)" do
-        expect(described_class.send(:convert, string: "en|gb")).to eql("en_GB")
+      it 'handles a locale as lower case (e.g. `en-gb`)' do
+        expect(described_class.send(:convert, string: 'en|gb')).to eql('en_GB')
       end
-      it "uses the specified join_char" do
-        result = described_class.send(:convert, string: "en|gb", join_char: "+")
-        expect(result).to eql("en+GB")
+      it 'uses the specified join_char' do
+        result = described_class.send(:convert, string: 'en|gb', join_char: '+')
+        expect(result).to eql('en+GB')
       end
-      it "defaults to Gettext join_char" do
-        expect(described_class.send(:convert, string: "en-GB")).to eql("en_GB")
+      it 'defaults to Gettext join_char' do
+        expect(described_class.send(:convert, string: 'en-GB')).to eql('en_GB')
       end
     end
   end
diff --git a/spec/services/org/create_created_plan_service_spec.rb b/spec/services/org/create_created_plan_service_spec.rb
index 7a705ae5eb..a3bc78e653 100644
--- a/spec/services/org/create_created_plan_service_spec.rb
+++ b/spec/services/org/create_created_plan_service_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Org::CreateCreatedPlanService do
   let(:org) do
@@ -79,8 +79,8 @@ def find_by_dates(dates:, org_id:)
     end
   end
 
-  describe ".call" do
-    context "when org is passed" do
+  describe '.call' do
+    context 'when org is passed' do
       it "generates monthly counts since org's creation" do
         described_class.call(org)
 
@@ -101,24 +101,24 @@ def find_by_dates(dates:, org_id:)
                                                          2018-06-30
                                                          2018-07-31],
                                                org_id: org.id)
-        expect(april.details["by_template"]).to match_array [
-          { "name" => template.title, "count" => 1 },
-          { "name" => template2.title, "count" => 1 }
+        expect(april.details['by_template']).to match_array [
+          { 'name' => template.title, 'count' => 1 },
+          { 'name' => template2.title, 'count' => 1 }
         ]
-        expect(may.details["by_template"]).to match_array [
-          { "name" => template.title, "count" => 1 }
+        expect(may.details['by_template']).to match_array [
+          { 'name' => template.title, 'count' => 1 }
         ]
-        expect(june.details["by_template"]).to match_array [
-          { "name" => template.title, "count" => 1 },
-          { "name" => template2.title, "count" => 1 }
+        expect(june.details['by_template']).to match_array [
+          { 'name' => template.title, 'count' => 1 },
+          { 'name' => template2.title, 'count' => 1 }
         ]
-        expect(july.details["by_template"]).to match_array []
+        expect(july.details['by_template']).to match_array []
       end
 
-      it "monthly records are either created or updated" do
+      it 'monthly records are either created or updated' do
         described_class.call(org)
 
-        april = StatCreatedPlan.where(date: "2018-04-30", org: org, filtered: true)
+        april = StatCreatedPlan.where(date: '2018-04-30', org: org, filtered: true)
         expect(april).to have(1).items
         expect(april.first.count).to eq(2)
 
@@ -129,14 +129,14 @@ def find_by_dates(dates:, org_id:)
 
         described_class.call(org)
 
-        april = StatCreatedPlan.where(date: "2018-04-30", org: org, filtered: true)
+        april = StatCreatedPlan.where(date: '2018-04-30', org: org, filtered: true)
         expect(april).to have(1).items
         expect(april.first.count).to eq(3)
       end
     end
 
-    context "when no org is passed" do
-      it "generates monthly counts for each org since their creation" do
+    context 'when no org is passed' do
+      it 'generates monthly counts for each org since their creation' do
         Org.stubs(:all).returns([org])
 
         described_class.call
@@ -151,7 +151,7 @@ def find_by_dates(dates:, org_id:)
         expect(counts).to eq([2, 1, 2, 0])
       end
 
-      it "generates montly counts by template for each org since their creation" do
+      it 'generates montly counts by template for each org since their creation' do
         Org.stubs(:all).returns([org])
 
         described_class.call
@@ -162,26 +162,26 @@ def find_by_dates(dates:, org_id:)
                                                          2018-07-31],
                                                org_id: org.id)
 
-        expect(april.details["by_template"]).to match_array [
-          { "name" => template.title, "count" => 1 },
-          { "name" => template2.title, "count" => 1 }
+        expect(april.details['by_template']).to match_array [
+          { 'name' => template.title, 'count' => 1 },
+          { 'name' => template2.title, 'count' => 1 }
         ]
-        expect(may.details["by_template"]).to match_array [
-          { "name" => template.title, "count" => 1 }
+        expect(may.details['by_template']).to match_array [
+          { 'name' => template.title, 'count' => 1 }
         ]
-        expect(june.details["by_template"]).to match_array [
-          { "name" => template.title, "count" => 1 },
-          { "name" => template2.title, "count" => 1 }
+        expect(june.details['by_template']).to match_array [
+          { 'name' => template.title, 'count' => 1 },
+          { 'name' => template2.title, 'count' => 1 }
         ]
-        expect(july.details["by_template"]).to match_array []
+        expect(july.details['by_template']).to match_array []
       end
 
-      it "monthly records are either created or updated" do
+      it 'monthly records are either created or updated' do
         Org.stubs(:all).returns([org])
 
         described_class.call
 
-        april = StatCreatedPlan.where(date: "2018-04-30", org: org, filtered: true)
+        april = StatCreatedPlan.where(date: '2018-04-30', org: org, filtered: true)
         expect(april).to have(1).items
         expect(april.first.count).to eq(2)
 
@@ -192,7 +192,7 @@ def find_by_dates(dates:, org_id:)
 
         described_class.call
 
-        april = StatCreatedPlan.where(date: "2018-04-30", org: org, filtered: true)
+        april = StatCreatedPlan.where(date: '2018-04-30', org: org, filtered: true)
         expect(april).to have(1).items
         expect(april.first.count).to eq(3)
       end
diff --git a/spec/services/org/create_joined_user_service_spec.rb b/spec/services/org/create_joined_user_service_spec.rb
index 26447d93ef..ddea1528a9 100644
--- a/spec/services/org/create_joined_user_service_spec.rb
+++ b/spec/services/org/create_joined_user_service_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Org::CreateJoinedUserService do
   let(:org) do
@@ -21,8 +21,8 @@ def find_by_dates(dates:, org_id:)
       StatJoinedUser.find_by(date: date, org_id: org_id)
     end
   end
-  describe ".call" do
-    context "when an org is passed" do
+  describe '.call' do
+    context 'when an org is passed' do
       it "generates monthly aggregates since org's creation" do
         described_class.call(org)
         april, may, june, july = find_by_dates(dates: @dates, org_id: org.id)
@@ -30,21 +30,21 @@ def find_by_dates(dates:, org_id:)
         expect(counts).to eq([2, 1, 2, 0])
       end
 
-      it "monthly records are either created or updated" do
+      it 'monthly records are either created or updated' do
         described_class.call(org)
 
         FactoryBot.create(:user, org: org, created_at: DateTime.new(2018, 0o4, 0o5, 0, 0, 0))
 
         described_class.call(org)
 
-        stat_joined_user = StatJoinedUser.where(date: "2018-04-30", org_id: org.id)
+        stat_joined_user = StatJoinedUser.where(date: '2018-04-30', org_id: org.id)
         expect(stat_joined_user).to have(1).items
         expect(stat_joined_user.first.count).to eq(3)
       end
     end
 
-    context "when no org is passed" do
-      it "generates monthly aggregates for each org since their creation" do
+    context 'when no org is passed' do
+      it 'generates monthly aggregates for each org since their creation' do
         Org.stubs(:all).returns([org])
 
         described_class.call
@@ -54,7 +54,7 @@ def find_by_dates(dates:, org_id:)
         expect(counts).to eq([2, 1, 2, 0])
       end
 
-      it "monthly records are either created or updated" do
+      it 'monthly records are either created or updated' do
         Org.stubs(:all).returns([org])
 
         described_class.call
@@ -63,7 +63,7 @@ def find_by_dates(dates:, org_id:)
 
         described_class.call
 
-        stat_joined_user = StatJoinedUser.where(date: "2018-04-30", org_id: org.id)
+        stat_joined_user = StatJoinedUser.where(date: '2018-04-30', org_id: org.id)
         expect(stat_joined_user).to have(1).items
         expect(stat_joined_user.first.count).to eq(3)
       end
diff --git a/spec/services/org/create_last_month_created_plan_service_spec.rb b/spec/services/org/create_last_month_created_plan_service_spec.rb
index 17e89c35e1..4d77cdeea8 100644
--- a/spec/services/org/create_last_month_created_plan_service_spec.rb
+++ b/spec/services/org/create_last_month_created_plan_service_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Org::CreateLastMonthCreatedPlanService do
   let(:org) do
@@ -46,8 +46,8 @@
     FactoryBot.create(:role, :creator, plan: plan4, user: user3)
   end
 
-  describe ".call" do
-    context "when org is passed" do
+  describe '.call' do
+    context 'when org is passed' do
       it "generates counts from today's last month" do
         described_class.call(org)
 
@@ -68,8 +68,8 @@
 
         expect(last_month_details).to match_array(
           [
-            { "name" => template.title, "count" => 2 },
-            { "name" => template2.title, "count" => 1 }
+            { 'name' => template.title, 'count' => 2 },
+            { 'name' => template2.title, 'count' => 1 }
           ]
         )
       end
@@ -84,13 +84,13 @@
 
         expect(last_month_details).to match_array(
           [
-            { "name" => template.title, "count" => 2 },
-            { "name" => template2.title, "count" => 2 }
+            { 'name' => template.title, 'count' => 2 },
+            { 'name' => template2.title, 'count' => 2 }
           ]
         )
       end
 
-      it "monthly records are either created or updated" do
+      it 'monthly records are either created or updated' do
         described_class.call(org)
 
         last_month = StatCreatedPlan.where(
@@ -118,7 +118,7 @@
       end
     end
 
-    context "when no org is passed" do
+    context 'when no org is passed' do
       it "generates counts from today's last month" do
         Org.expects(:all).returns([org])
 
@@ -144,8 +144,8 @@
 
         expect(last_month_details).to match_array(
           [
-            { "name" => template.title, "count" => 2 },
-            { "name" => template2.title, "count" => 1 }
+            { 'name' => template.title, 'count' => 2 },
+            { 'name' => template2.title, 'count' => 1 }
           ]
         )
       end
@@ -162,13 +162,13 @@
 
         expect(last_month_details).to match_array(
           [
-            { "name" => template.title, "count" => 2 },
-            { "name" => template2.title, "count" => 2 }
+            { 'name' => template.title, 'count' => 2 },
+            { 'name' => template2.title, 'count' => 2 }
           ]
         )
       end
 
-      it "monthly records are either created or updated" do
+      it 'monthly records are either created or updated' do
         Org.stubs(:all).returns([org])
 
         described_class.call
diff --git a/spec/services/org/create_last_month_joined_user_service_spec.rb b/spec/services/org/create_last_month_joined_user_service_spec.rb
index 62c14e0ff6..2b52414e3e 100644
--- a/spec/services/org/create_last_month_joined_user_service_spec.rb
+++ b/spec/services/org/create_last_month_joined_user_service_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Org::CreateLastMonthJoinedUserService do
   let(:org) do
@@ -12,8 +12,8 @@
     end
     @last_day_of_month = Date.today.last_month.end_of_month
   end
-  describe ".call" do
-    context "when an org is passed" do
+  describe '.call' do
+    context 'when an org is passed' do
       it "generates counts from today's last month" do
         described_class.call(org)
 
@@ -21,7 +21,7 @@
         expect(last_month).to eq(5)
       end
 
-      it "monthly records are either created or updated" do
+      it 'monthly records are either created or updated' do
         described_class.call(org)
 
         FactoryBot.create(:user, org: org, created_at: Date.today.last_month)
@@ -34,7 +34,7 @@
       end
     end
 
-    context "when no org is passed" do
+    context 'when no org is passed' do
       it "generates counts from today's last month" do
         Org.stubs(:all).returns([org])
 
diff --git a/spec/services/org/total_count_created_plan_service_spec.rb b/spec/services/org/total_count_created_plan_service_spec.rb
index 351de6880c..58b78c5e73 100644
--- a/spec/services/org/total_count_created_plan_service_spec.rb
+++ b/spec/services/org/total_count_created_plan_service_spec.rb
@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Org::TotalCountCreatedPlanService do
-  describe ".call" do
+  describe '.call' do
     let(:org) { create(:org, created_at: DateTime.new(2018, 6, 1, 0, 0, 0)) }
     let(:org2) { create(:org, created_at: DateTime.new(2018, 6, 1, 0, 0, 0)) }
-    context "when org is passed" do
-      it "returns the number of created plans" do
+    context 'when org is passed' do
+      it 'returns the number of created plans' do
         create_stats(org)
 
         count = described_class.call(org)
@@ -16,8 +16,8 @@
       end
     end
 
-    context "when org is NOT passed" do
-      it "returns the number of created plans" do
+    context 'when org is NOT passed' do
+      it 'returns the number of created plans' do
         create_stats(org)
         create_stats(org2)
 
diff --git a/spec/services/org/total_count_joined_user_service_spec.rb b/spec/services/org/total_count_joined_user_service_spec.rb
index 340fa58ccf..c73ea0adfc 100644
--- a/spec/services/org/total_count_joined_user_service_spec.rb
+++ b/spec/services/org/total_count_joined_user_service_spec.rb
@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Org::TotalCountJoinedUserService do
-  describe ".call" do
+  describe '.call' do
     let(:org) { create(:org, created_at: DateTime.new(2018, 6, 1, 0, 0, 0)) }
     let(:org2) { create(:org, created_at: DateTime.new(2018, 6, 1, 0, 0, 0)) }
-    context "when org is passed" do
-      it "returns the number of joined users" do
+    context 'when org is passed' do
+      it 'returns the number of joined users' do
         create_stats(org)
 
         count = described_class.call(org)
@@ -16,8 +16,8 @@
       end
     end
 
-    context "when org is NOT passed" do
-      it "returns the number of joined users" do
+    context 'when org is NOT passed' do
+      it 'returns the number of joined users' do
         create_stats(org)
         create_stats(org2)
 
diff --git a/spec/services/org/total_count_stat_service_spec.rb b/spec/services/org/total_count_stat_service_spec.rb
index 29fb0ff448..02007ae254 100644
--- a/spec/services/org/total_count_stat_service_spec.rb
+++ b/spec/services/org/total_count_stat_service_spec.rb
@@ -1,25 +1,25 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe Org::TotalCountStatService do
-  describe ".do" do
-    it "returns the total stats for each org" do
+  describe '.do' do
+    it 'returns the total stats for each org' do
       Org::TotalCountJoinedUserService.stubs(:call).returns([
-                                                              { org_name: "Org 1", count: 10 },
-                                                              { org_name: "Org 2", count: 20 }
+                                                              { org_name: 'Org 1', count: 10 },
+                                                              { org_name: 'Org 2', count: 20 }
                                                             ])
       Org::TotalCountCreatedPlanService.stubs(:call).returns([
-                                                               { org_name: "Org 2", count: 10 },
-                                                               { org_name: "Org 3", count: 15 }
+                                                               { org_name: 'Org 2', count: 10 },
+                                                               { org_name: 'Org 3', count: 15 }
                                                              ])
 
       totals = described_class.call
 
       expect(totals).to include(
-        { org_name: "Org 1", total_users: 10, total_plans: 0 },
-        { org_name: "Org 2", total_users: 20, total_plans: 10 },
-        { org_name: "Org 3", total_users: 0, total_plans: 15 }
+        { org_name: 'Org 1', total_users: 10, total_plans: 0 },
+        { org_name: 'Org 2', total_users: 20, total_plans: 10 },
+        { org_name: 'Org 3', total_users: 0, total_plans: 15 }
       )
     end
   end
diff --git a/spec/services/org_selection/hash_to_org_service_spec.rb b/spec/services/org_selection/hash_to_org_service_spec.rb
index 54b56268d4..63d425710c 100644
--- a/spec/services/org_selection/hash_to_org_service_spec.rb
+++ b/spec/services/org_selection/hash_to_org_service_spec.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe OrgSelection::HashToOrgService do
-
   before(:each) do
     @name = Faker::Company.name
     @abbrev = Faker::Lorem.word.upcase
@@ -26,53 +25,53 @@
     }
   end
 
-  describe "#to_org(hash:)" do
-    it "returns nil if the hash is empty" do
+  describe '#to_org(hash:)' do
+    it 'returns nil if the hash is empty' do
       expect(described_class.to_org(hash: nil)).to eql(nil)
     end
-    it "returns the Org if the hash contains an Org id and the names match" do
+    it 'returns the Org if the hash contains an Org id and the names match' do
       org = create(:org, name: @name)
       @hash[:id] = org.id
       expect(described_class.to_org(hash: @hash)).to eql(org)
     end
-    it "returns the Org by its identifier and the names match" do
+    it 'returns the Org by its identifier and the names match' do
       ident = build(:identifier, identifier_scheme: @scheme,
                                  value: @hash[:"#{@scheme.name}"])
       org = create(:org, name: @name, identifiers: [ident])
       expect(described_class.to_org(hash: @hash)).to eql(org)
     end
-    it "returns the Org by name match" do
+    it 'returns the Org by name match' do
       org = create(:org, name: @name)
       expect(described_class.to_org(hash: @hash)).to eql(org)
     end
-    it "returns a new Org instance" do
+    it 'returns a new Org instance' do
       expect(described_class.to_org(hash: @hash).new_record?).to eql(true)
     end
   end
 
-  describe "#to_identifiers(hash:)" do
+  describe '#to_identifiers(hash:)' do
     before(:each) do
       @rslt = described_class.to_identifiers(hash: @hash)
     end
 
-    it "returns an empty array if hash is nil" do
+    it 'returns an empty array if hash is nil' do
       expect(described_class.to_identifiers(hash: nil)).to eql([])
     end
-    it "skips non-IdentifierScheme entries" do
+    it 'skips non-IdentifierScheme entries' do
       @hash.delete(:"#{@scheme.name}")
       expect(described_class.to_identifiers(hash: @hash)).to eql([])
     end
-    it "returns an array of new Identifiers" do
+    it 'returns an array of new Identifiers' do
       expect(@rslt.is_a?(Array)).to eql(true)
       expect(@rslt.length).to eql(1)
     end
-    it "returned Identifiers have an identifier scheme" do
+    it 'returned Identifiers have an identifier scheme' do
       expect(@rslt.first.identifier_scheme).to eql(@scheme)
     end
-    it "returned Identifiers have a value" do
+    it 'returned Identifiers have a value' do
       expect(@rslt.first.value.ends_with?(@hash[:"#{@scheme.name}"])).to eql(true)
     end
-    it "returned Identifiers have attrs" do
+    it 'returned Identifiers have attrs' do
       expected = JSON.parse({
         name: @hash[:name],
         url: @url,
@@ -84,22 +83,21 @@
     end
   end
 
-  context "private methods" do
-
-    describe "#initialize_org(hash:)" do
-      it "returns nil if the hash is nil" do
+  context 'private methods' do
+    describe '#initialize_org(hash:)' do
+      it 'returns nil if the hash is nil' do
         rslt = described_class.send(:initialize_org, hash: nil)
         expect(rslt).to eql(nil)
       end
-      it "returns nil if the hash has no name attribute" do
+      it 'returns nil if the hash has no name attribute' do
         @hash.delete(:name)
         rslt = described_class.send(:initialize_org, hash: @hash)
         expect(rslt).to eql(nil)
       end
-      it "returns a new instance of Org" do
+      it 'returns a new instance of Org' do
         rslt = described_class.send(:initialize_org, hash: @hash)
         nm = "#{@name} (#{@abbrev})"
-        lnks = JSON.parse({ "org": [{ "link": @url, "text": nm }] }.to_json)
+        lnks = JSON.parse({ org: [{ link: @url, text: nm }] }.to_json)
         expect(rslt.is_a?(Org)).to eql(true)
         expect(rslt.new_record?).to eql(true)
         expect(rslt.name).to eql(nm)
@@ -111,28 +109,28 @@
       end
     end
 
-    describe "#links_from_hash(name:, website:)" do
+    describe '#links_from_hash(name:, website:)' do
       before(:each) do
         @dflt = { org: [] }
       end
 
-      it "returns a default hash if name is blank" do
+      it 'returns a default hash if name is blank' do
         rslt = described_class.send(:links_from_hash, name: nil, website: @url)
         expect(rslt).to eql(@dflt)
       end
-      it "returns a default hash if website is blank" do
+      it 'returns a default hash if website is blank' do
         rslt = described_class.send(:links_from_hash, name: @name, website: nil)
         expect(rslt).to eql(@dflt)
       end
-      it "returns the links hash" do
+      it 'returns the links hash' do
         rslt = described_class.send(:links_from_hash, name: @name,
                                                       website: @url)
-        expect(rslt).to eql({ org: [{ "link": @url, "text": @name }] })
+        expect(rslt).to eql({ org: [{ link: @url, text: @name }] })
       end
     end
 
-    describe "#abbreviation_from_hash(hash:)" do
-      it "returns nil if the hash is nil" do
+    describe '#abbreviation_from_hash(hash:)' do
+      it 'returns nil if the hash is nil' do
         rslt = described_class.send(:abbreviation_from_hash, hash: nil)
         expect(rslt).to eql(nil)
       end
@@ -140,98 +138,96 @@
         rslt = described_class.send(:abbreviation_from_hash, hash: @hash)
         expect(rslt).to eql(@abbrev)
       end
-      it "returns the name as an acronym (first letter of each word)" do
+      it 'returns the name as an acronym (first letter of each word)' do
         @hash.delete(:abbreviation)
         rslt = described_class.send(:abbreviation_from_hash, hash: @hash)
-        expected = @name.split(" ").map { |i| i[0].upcase }.join
+        expected = @name.split.map { |i| i[0].upcase }.join
         expect(rslt).to eql(expected)
       end
     end
 
-    describe "#language_from_hash(hash:)" do
+    describe '#language_from_hash(hash:)' do
       before(:each) do
         @dflt = Language.default || create(:language, default_language: true)
       end
 
-      it "returns the default language if hash is empty" do
+      it 'returns the default language if hash is empty' do
         rslt = described_class.send(:language_from_hash, hash: nil)
         expect(rslt).to eql(@dflt)
       end
-      it "returns the default language if hash does not have a :language" do
+      it 'returns the default language if hash does not have a :language' do
         rslt = described_class.send(:language_from_hash, hash: {})
         expect(rslt).to eql(@dflt)
       end
-      it "returns the default language if no matching languages exist" do
+      it 'returns the default language if no matching languages exist' do
         @lang.destroy
         rslt = described_class.send(:language_from_hash, hash: @hash)
         expect(rslt).to eql(@dflt)
       end
-      it "returns the correct language" do
+      it 'returns the correct language' do
         rslt = described_class.send(:language_from_hash, hash: @hash)
         expect(rslt).to eql(@lang)
       end
     end
 
-    describe "#identifier_keys" do
+    describe '#identifier_keys' do
       before(:each) do
         @rslt = described_class.send(:identifier_keys)
       end
 
-      it "returns the identifier key" do
+      it 'returns the identifier key' do
         expect(@rslt.include?(@scheme.name.to_s)).to eql(true)
       end
-      it "does not return the other keys" do
-        expect(@rslt.include?("name")).to eql(false)
-        expect(@rslt.include?("sort_name")).to eql(false)
-        expect(@rslt.include?("weight")).to eql(false)
-        expect(@rslt.include?("score")).to eql(false)
-        expect(@rslt.include?("language")).to eql(false)
-        expect(@rslt.include?("url")).to eql(false)
+      it 'does not return the other keys' do
+        expect(@rslt.include?('name')).to eql(false)
+        expect(@rslt.include?('sort_name')).to eql(false)
+        expect(@rslt.include?('weight')).to eql(false)
+        expect(@rslt.include?('score')).to eql(false)
+        expect(@rslt.include?('language')).to eql(false)
+        expect(@rslt.include?('url')).to eql(false)
         expect(@rslt.include?(@attr_key.to_s)).to eql(false)
       end
     end
 
-    describe "#attr_keys(hash:)" do
+    describe '#attr_keys(hash:)' do
       before(:each) do
         @rslt = described_class.send(:attr_keys, hash: JSON.parse(@hash.to_json))
       end
 
-      it "returns an empty hash if hash is nil" do
+      it 'returns an empty hash if hash is nil' do
         expect(described_class.send(:attr_keys, hash: nil)).to eql({})
       end
-      it "does not include sort_name, weight or score attributes" do
-        expect(@rslt.include?("sort_name")).to eql(false)
-        expect(@rslt.include?("weight")).to eql(false)
-        expect(@rslt.include?("score")).to eql(false)
+      it 'does not include sort_name, weight or score attributes' do
+        expect(@rslt.include?('sort_name')).to eql(false)
+        expect(@rslt.include?('weight')).to eql(false)
+        expect(@rslt.include?('score')).to eql(false)
       end
-      it "does not include identifier keys" do
+      it 'does not include identifier keys' do
         expect(@rslt.include?(@scheme.name.to_s)).to eql(false)
       end
-      it "returns the other attributes" do
-        expect(@rslt.include?("name")).to eql(true)
-        expect(@rslt.include?("language")).to eql(true)
-        expect(@rslt.include?("url")).to eql(true)
+      it 'returns the other attributes' do
+        expect(@rslt.include?('name')).to eql(true)
+        expect(@rslt.include?('language')).to eql(true)
+        expect(@rslt.include?('url')).to eql(true)
         expect(@rslt.include?(@attr_key.to_s)).to eql(true)
       end
     end
 
-    describe "#exact_match?(rec:, name2:)" do
-      it "returns false if no record is present" do
+    describe '#exact_match?(rec:, name2:)' do
+      it 'returns false if no record is present' do
         rslt = described_class.send(:exact_match?, rec: nil,
                                                    name2: Faker::Lorem.word)
         expect(rslt).to eql(false)
       end
-      it "returns false if the name is blank" do
-        rslt = described_class.send(:exact_match?, rec: build(:org), name2: "")
+      it 'returns false if the name is blank' do
+        rslt = described_class.send(:exact_match?, rec: build(:org), name2: '')
         expect(rslt).to eql(false)
       end
-      it "calls the SearchService" do
+      it 'calls the SearchService' do
         OrgSelection::SearchService.expects(:exact_match?).at_least(1)
         described_class.send(:exact_match?, rec: build(:org),
                                             name2: Faker::Lorem.word)
       end
     end
-
   end
-
 end
diff --git a/spec/services/org_selection/org_to_hash_service_spec.rb b/spec/services/org_selection/org_to_hash_service_spec.rb
index 7a4fb8b934..ac9d1471ef 100644
--- a/spec/services/org_selection/org_to_hash_service_spec.rb
+++ b/spec/services/org_selection/org_to_hash_service_spec.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe OrgSelection::OrgToHashService do
-
   before(:each) do
     @name = Faker::Lorem.word
     @scheme = build(:identifier_scheme)
@@ -11,26 +10,25 @@
     @org = build(:org, name: "#{@name} (ABC)", identifiers: [@id])
   end
 
-  describe "#to_hash(org:)" do
+  describe '#to_hash(org:)' do
     before(:each) do
       @rslt = described_class.to_hash(org: @org)
     end
 
-    it "returns an empty hash if the Org is nil" do
+    it 'returns an empty hash if the Org is nil' do
       expect(described_class.to_hash(org: nil)).to eql({})
     end
-    it "places the Org.id into the :id parameter" do
+    it 'places the Org.id into the :id parameter' do
       expect(@rslt[:id]).to eql(@org.id)
     end
-    it "places the Org.name into the :name parameter" do
+    it 'places the Org.name into the :name parameter' do
       expect(@rslt[:name]).to eql(@org.name)
     end
-    it "places the Org.name (without an alias) into the :sort_name parameter" do
+    it 'places the Org.name (without an alias) into the :sort_name parameter' do
       expect(@rslt[:sort_name]).to eql(@name)
     end
-    it "places identifiers into the correct `[scheme.name]: [value]` format" do
+    it 'places identifiers into the correct `[scheme.name]: [value]` format' do
       expect(@rslt[:"#{@scheme.name}"]).to eql(@id.value)
     end
   end
-
 end
diff --git a/spec/services/org_selection/search_service_spec.rb b/spec/services/org_selection/search_service_spec.rb
index cd221ae63f..bf8f4b739e 100644
--- a/spec/services/org_selection/search_service_spec.rb
+++ b/spec/services/org_selection/search_service_spec.rb
@@ -1,30 +1,29 @@
 # frozen_string_literal: true
 
-require "rails_helper"
+require 'rails_helper'
 
 RSpec.describe OrgSelection::SearchService do
-
   before(:each) do
     @records = [
       {
         id: Faker::Internet.url,
-        name: "Foo College (test.edu)",
-        sort_name: "Foo College"
+        name: 'Foo College (test.edu)',
+        sort_name: 'Foo College'
       },
       {
         id: Faker::Internet.url,
-        name: "Foo College (other.edu)",
-        sort_name: "Foo College"
+        name: 'Foo College (other.edu)',
+        sort_name: 'Foo College'
       },
       {
         id: Faker::Internet.url,
-        name: "Foo University (Ireland)",
-        sort_name: "Foo University"
+        name: 'Foo University (Ireland)',
+        sort_name: 'Foo University'
       },
       {
         id: Faker::Internet.url,
-        name: "University of Foo (Spain)",
-        sort_name: "University of Foo"
+        name: 'University of Foo (Spain)',
+        sort_name: 'University of Foo'
       }
     ]
 
@@ -33,177 +32,176 @@
     ExternalApis::RorService.stubs(:search).returns(@records)
   end
 
-  describe "#search_combined(search_term:)" do
-    it "returns an empty array if the search term is not provided" do
+  describe '#search_combined(search_term:)' do
+    it 'returns an empty array if the search term is not provided' do
       expect(described_class.search_combined(search_term: nil)).to eql([])
     end
-    it "returns an empty array if the search term is less than 2 chars" do
-      expect(described_class.search_combined(search_term: "Ab")).to eql([])
+    it 'returns an empty array if the search term is less than 2 chars' do
+      expect(described_class.search_combined(search_term: 'Ab')).to eql([])
     end
-    it "only searches locally if an exact match was found" do
+    it 'only searches locally if an exact match was found' do
       org = create(:org)
       described_class.expects(:local_search).returns([org]).at_least(1)
       described_class.expects(:externals_search).at_least(0)
       described_class.search_combined(search_term: org.name)
     end
-    it "calls both search_locally and search_externally" do
+    it 'calls both search_locally and search_externally' do
       described_class.expects(:local_search).at_least(1)
       described_class.expects(:externals_search).at_least(1)
       described_class.search_combined(search_term: Faker::Company.name)
     end
   end
 
-  describe "#search_externally(search_term:)" do
-    it "returns an empty array if the search term is not provided" do
+  describe '#search_externally(search_term:)' do
+    it 'returns an empty array if the search term is not provided' do
       expect(described_class.search_externally(search_term: nil)).to eql([])
     end
-    it "returns an empty array if the search term is less than 2 chars" do
-      expect(described_class.search_externally(search_term: "Ab")).to eql([])
+    it 'returns an empty array if the search term is less than 2 chars' do
+      expect(described_class.search_externally(search_term: 'Ab')).to eql([])
     end
-    it "calls the private externals_search method" do
+    it 'calls the private externals_search method' do
       described_class.expects(:externals_search).at_least(1)
       described_class.search_externally(search_term: Faker::Company.name)
     end
   end
 
-  describe "#search_locally(search_term:)" do
-    it "returns an empty array if the search term is not provided" do
+  describe '#search_locally(search_term:)' do
+    it 'returns an empty array if the search term is not provided' do
       expect(described_class.search_locally(search_term: nil)).to eql([])
     end
-    it "returns an empty array if the search term is less than 2 chars" do
-      expect(described_class.search_locally(search_term: "Ab")).to eql([])
+    it 'returns an empty array if the search term is less than 2 chars' do
+      expect(described_class.search_locally(search_term: 'Ab')).to eql([])
     end
-    it "calls the private locals_search method" do
+    it 'calls the private locals_search method' do
       described_class.expects(:local_search).at_least(1)
       described_class.search_locally(search_term: Faker::Company.name)
     end
   end
 
-  describe "#name_without_alias(name:)" do
-    it "returns an empty string if name is not present" do
-      expect(described_class.name_without_alias(name: nil)).to eql("")
+  describe '#name_without_alias(name:)' do
+    it 'returns an empty string if name is not present' do
+      expect(described_class.name_without_alias(name: nil)).to eql('')
     end
-    it "returns the name without the abbreviation alias" do
+    it 'returns the name without the abbreviation alias' do
       name = Faker::Company.name
       rslt = described_class.name_without_alias(name: "#{name} (ABC)")
       expect(rslt).to eql(name)
     end
-    it "returns the name without the domain alias" do
+    it 'returns the name without the domain alias' do
       name = Faker::Company.name
       rslt = described_class.name_without_alias(name: "#{name} (example.edu)")
       expect(rslt).to eql(name)
     end
   end
 
-  describe "#exact_match?(name1:, name2:)" do
-    it "returns false if name1 is nil" do
-      rslt = described_class.exact_match?(name1: nil, name2: "Foo")
+  describe '#exact_match?(name1:, name2:)' do
+    it 'returns false if name1 is nil' do
+      rslt = described_class.exact_match?(name1: nil, name2: 'Foo')
       expect(rslt).to eql(false)
     end
-    it "returns false if name2 is nil" do
-      rslt = described_class.exact_match?(name1: "Foo", name2: nil)
+    it 'returns false if name2 is nil' do
+      rslt = described_class.exact_match?(name1: 'Foo', name2: nil)
       expect(rslt).to eql(false)
     end
-    it "returns false if the names do not match" do
-      rslt = described_class.exact_match?(name1: "Bar", name2: "Foo")
+    it 'returns false if the names do not match' do
+      rslt = described_class.exact_match?(name1: 'Bar', name2: 'Foo')
       expect(rslt).to eql(false)
     end
-    it "returns true if the names match" do
-      rslt = described_class.exact_match?(name1: "Foo", name2: "Foo")
+    it 'returns true if the names match' do
+      rslt = described_class.exact_match?(name1: 'Foo', name2: 'Foo')
       expect(rslt).to eql(true)
     end
-    it "returns true if the names match but their cases do not" do
-      rslt = described_class.exact_match?(name1: "foo", name2: "Foo")
+    it 'returns true if the names match but their cases do not' do
+      rslt = described_class.exact_match?(name1: 'foo', name2: 'Foo')
       expect(rslt).to eql(true)
     end
   end
 
-  context "private methods" do
-
-    describe "#local_search(search_term:)" do
-      it "returns an empty array if the search term is blank" do
+  context 'private methods' do
+    describe '#local_search(search_term:)' do
+      it 'returns an empty array if the search term is blank' do
         rslts = described_class.send(:local_search, search_term: nil)
         expect(rslts).to eql([])
       end
-      it "returns an empty array if no Orgs were matched" do
-        rslts = described_class.send(:local_search, search_term: "Bar")
+      it 'returns an empty array if no Orgs were matched' do
+        rslts = described_class.send(:local_search, search_term: 'Bar')
         expect(rslts).to eql([])
       end
-      it "returns an array of matching Orgs" do
-        create(:org, name: "Foo Bar")
-        rslts = described_class.send(:local_search, search_term: "Foo")
+      it 'returns an array of matching Orgs' do
+        create(:org, name: 'Foo Bar')
+        rslts = described_class.send(:local_search, search_term: 'Foo')
         expect(rslts.length).to eql(1)
         expect(rslts.is_a?(Array)).to eql(true)
       end
     end
 
-    describe "#externals_search(search_term:)" do
+    describe '#externals_search(search_term:)' do
       before(:each) do
         ExternalApis::RorService.stubs(:active?).returns(true)
       end
 
-      it "returns an empty array if the search term is blank" do
+      it 'returns an empty array if the search term is blank' do
         rslts = described_class.send(:externals_search, search_term: nil)
         expect(rslts).to eql([])
       end
-      it "returns an empty array if no external apis are active" do
+      it 'returns an empty array if no external apis are active' do
         ExternalApis::RorService.stubs(:active?).returns(false)
-        rslts = described_class.send(:externals_search, search_term: "Foo")
+        rslts = described_class.send(:externals_search, search_term: 'Foo')
         expect(rslts).to eql([])
       end
-      it "returns an empty array if no Orgs were matched" do
+      it 'returns an empty array if no Orgs were matched' do
         ExternalApis::RorService.stubs(:search).returns([])
-        rslts = described_class.send(:externals_search, search_term: "Foo")
+        rslts = described_class.send(:externals_search, search_term: 'Foo')
         expect(rslts).to eql([])
       end
-      it "returns an array of matching Orgs" do
-        rslts = described_class.send(:externals_search, search_term: "Foo")
+      it 'returns an array of matching Orgs' do
+        rslts = described_class.send(:externals_search, search_term: 'Foo')
         expect(rslts.length).to eql(4)
         expect(rslts.is_a?(Array)).to eql(true)
       end
     end
 
-    describe "#prepare(search_term:, records:)" do
-      it "returns an empty array if the search term is blank" do
+    describe '#prepare(search_term:, records:)' do
+      it 'returns an empty array if the search term is blank' do
         rslts = described_class.send(:prepare, search_term: nil,
                                                records: @records)
         expect(rslts).to eql([])
       end
-      it "returns an empty array if the records is not an array" do
-        rslts = described_class.send(:prepare, search_term: "Foo",
+      it 'returns an empty array if the records is not an array' do
+        rslts = described_class.send(:prepare, search_term: 'Foo',
                                                records: nil)
         expect(rslts).to eql([])
       end
-      it "handles Org models" do
-        recs = [create(:org, name: "Fooville Community College")]
-        rslts = described_class.send(:prepare, search_term: "Foo",
+      it 'handles Org models' do
+        recs = [create(:org, name: 'Fooville Community College')]
+        rslts = described_class.send(:prepare, search_term: 'Foo',
                                                records: recs)
-        expect(rslts.first[:name]).to eql("Fooville Community College")
+        expect(rslts.first[:name]).to eql('Fooville Community College')
       end
-      it "handles non-Org models" do
-        rslts = described_class.send(:prepare, search_term: "Foo",
+      it 'handles non-Org models' do
+        rslts = described_class.send(:prepare, search_term: 'Foo',
                                                records: @records)
-        rec = rslts.select { |item| item[:name].include?("Ireland") }.first
-        expect(rec[:name]).to eql("Foo University (Ireland)")
+        rec = rslts.select { |item| item[:name].include?('Ireland') }.first
+        expect(rec[:name]).to eql('Foo University (Ireland)')
       end
     end
 
-    describe "#deduplicate(records:)" do
-      it "returns an empty array if the incoming records is not an Array" do
+    describe '#deduplicate(records:)' do
+      it 'returns an empty array if the incoming records is not an Array' do
         expect(described_class.send(:deduplicate, records: nil)).to eql([])
       end
-      it "includes all of the unique records" do
+      it 'includes all of the unique records' do
         rslts = described_class.send(:deduplicate, records: @records)
         expect(rslts.length).to eql(3)
       end
-      it "removes the duplicate" do
+      it 'removes the duplicate' do
         rslts = described_class.send(:deduplicate, records: @records)
-        dupe = rslts.select { |rec| rec[:name] == "Foo College (other.edu)" }
+        dupe = rslts.select { |rec| rec[:name] == 'Foo College (other.edu)' }
         expect(dupe).to eql([])
       end
     end
 
-    describe "#sort(array:)" do
+    describe '#sort(array:)' do
       before(:each) do
         @sortable = @records.each_with_index.map do |rec, idx|
           rec.merge(weight: idx, score: idx + 1)
@@ -212,114 +210,114 @@
         @sortable = @sortable.sort { |a, b| b[:name] <=> a[:name] }
       end
 
-      it "returns an empty array if the incoming array is not an Array" do
+      it 'returns an empty array if the incoming array is not an Array' do
         expect(described_class.send(:sort, array: nil)).to eql([])
       end
-      it "places the record with the lowest score + weight first" do
+      it 'places the record with the lowest score + weight first' do
         rslts = described_class.send(:sort, array: @sortable)
         expect(rslts.first[:score]).to eql(1)
         expect(rslts.first[:weight]).to eql(0)
       end
-      it "places the record with the highest score+ weight last" do
+      it 'places the record with the highest score+ weight last' do
         rslts = described_class.send(:sort, array: @sortable)
         expect(rslts.last[:score]).to eql(4)
         expect(rslts.last[:weight]).to eql(3)
       end
-      it "sorts by name ascending when the score and weight match" do
+      it 'sorts by name ascending when the score and weight match' do
         @sortable[1][:score] = 0
         @sortable[1][:weight] = 0
         @sortable[2][:score] = 0
         @sortable[2][:weight] = 0
 
         rslts = described_class.send(:sort, array: @sortable)
-        expect(rslts[0][:sort_name].include?("College")).to eql(true)
-        expect(rslts[1][:sort_name].include?("University")).to eql(true)
+        expect(rslts[0][:sort_name].include?('College')).to eql(true)
+        expect(rslts[1][:sort_name].include?('University')).to eql(true)
       end
     end
 
-    describe "#evaluate(reord:, search_term:)" do
+    describe '#evaluate(reord:, search_term:)' do
       before(:each) do
         described_class.stubs(:score).returns(0)
         described_class.stubs(:weigh).returns(0)
         @record = @records.first
       end
-      it "returns the record if search term is nil" do
+      it 'returns the record if search term is nil' do
         rslt = described_class.send(:evaluate, record: @record,
                                                search_term: nil)
         expect(rslt).to eql(@record)
       end
-      it "returns a nil if record is nil" do
+      it 'returns a nil if record is nil' do
         rslt = described_class.send(:evaluate, record: nil,
-                                               search_term: "Foo")
+                                               search_term: 'Foo')
         expect(rslt).to eql(nil)
       end
-      it "adds a score to each item" do
+      it 'adds a score to each item' do
         rslt = described_class.send(:evaluate, record: @record,
-                                               search_term: "Foo")
+                                               search_term: 'Foo')
         expect(rslt[:score]).to eql(0)
       end
-      it "adds a weight to each item" do
+      it 'adds a weight to each item' do
         rslt = described_class.send(:evaluate, record: @record,
-                                               search_term: "Foo")
+                                               search_term: 'Foo')
         expect(rslt[:weight]).to eql(0)
       end
     end
 
-    describe "#score(search_term:, item_name:)" do
+    describe '#score(search_term:, item_name:)' do
       it "returns a high value '99' if term is nil" do
         rslt = described_class.send(:score, search_term: nil,
-                                            item_name: "Foo")
+                                            item_name: 'Foo')
         expect(rslt).to eql(99)
       end
       it "returns a high value '99' if item_name is nil" do
-        rslt = described_class.send(:score, search_term: "Foo",
+        rslt = described_class.send(:score, search_term: 'Foo',
                                             item_name: nil)
         expect(rslt).to eql(99)
       end
       it "calls the base class' natuaral language comparison method" do
         Text::Levenshtein.stubs(:distance).returns(0)
-        rslt = described_class.send(:score, search_term: "Foo",
-                                            item_name: "Bar")
+        rslt = described_class.send(:score, search_term: 'Foo',
+                                            item_name: 'Bar')
         expect(rslt).to eql(0)
       end
     end
 
-    describe "#weigh(search_term:, item_name:)" do
+    describe '#weigh(search_term:, item_name:)' do
       before(:each) do
-        @term = "Foo"
+        @term = 'Foo'
       end
-      it "expects a weight of 3 if the search_term is blank" do
+      it 'expects a weight of 3 if the search_term is blank' do
         rslt = described_class.send(:weigh, search_term: nil,
                                             item_name: @term)
         expect(rslt).to eql(3)
       end
-      it "expects a weight of 3 if the search_term is blank" do
+      it 'expects a weight of 3 if the search_term is blank' do
         rslt = described_class.send(:weigh, search_term: @term,
                                             item_name: nil)
         expect(rslt).to eql(3)
       end
-      it "expects a result that starts with the search term to weigh zero" do
+      it 'expects a result that starts with the search term to weigh zero' do
         item = "#{@term.downcase}#{Faker::Lorem.sentence}"
         rslt = described_class.send(:weigh, search_term: @term,
                                             item_name: item)
         expect(rslt).to eql(0)
       end
-      it "expects a result that contains the search term to weigh one" do
+      it 'expects a result that contains the search term to weigh one' do
         item = "#{Faker::Lorem.sentence}#{@term.downcase}"
         rslt = described_class.send(:weigh, search_term: @term,
                                             item_name: item)
         expect(rslt).to eql(1)
       end
-      it "expects a result that does not contain the search term to weigh two" do
-        item = Faker::Lorem.sentence.to_s.gsub(@term, "foo bar")
+      it 'expects a result that does not contain the search term to weigh two' do
+        item = Faker::Lorem.sentence.to_s.gsub(@term, 'foo bar')
         rslt = described_class.send(:weigh, search_term: @term,
                                             item_name: item)
         expect(rslt).to eql(2)
       end
     end
 
-    describe "#filter(array:)" do
-      it "returns an empty array if the array in is not an Array" do
+    describe '#filter(array:)' do
+      it 'returns an empty array if the array in is not an Array' do
         expect(described_class.send(:filter, array: nil)).to eql([])
       end
       it "returns all records if they do not have a 'score' and 'weight'" do
@@ -330,7 +328,7 @@
         rslts = described_class.send(:filter, array: recs)
         expect(rslts.length).to eql(2)
       end
-      it "discards any item whose score is > 25 and weight > 1" do
+      it 'discards any item whose score is > 25 and weight > 1' do
         recs = [
           { name: Faker::Lorem.word },
           { name: Faker::Lorem.word, score: 26, weight: 2 }
@@ -338,7 +336,7 @@
         rslts = described_class.send(:filter, array: recs)
         expect(rslts.length).to eql(1)
       end
-      it "does not discard an item whose weight is > 1 but score < 25" do
+      it 'does not discard an item whose weight is > 1 but score < 25' do
         recs = [
           { name: Faker::Lorem.word },
           { name: Faker::Lorem.word, score: 20, weight: 2 }
@@ -346,7 +344,7 @@
         rslts = described_class.send(:filter, array: recs)
         expect(rslts.length).to eql(2)
       end
-      it "does not discard an item whose weight is < 2 but score > 25" do
+      it 'does not discard an item whose weight is < 2 but score > 25' do
         recs = [
           { name: Faker::Lorem.word },
           { name: Faker::Lorem.word, score: 26, weight: 1 }
@@ -355,7 +353,5 @@
         expect(rslts.length).to eql(2)
       end
     end
-
   end
-
 end
diff --git a/spec/services/template/upgrade_customization_service_spec.rb b/spec/services/template/upgrade_customization_service_spec.rb
index b92298ed25..f8d718b3e0 100644
--- a/spec/services/template/upgrade_customization_service_spec.rb
+++ b/spec/services/template/upgrade_customization_service_spec.rb
@@ -1,11 +1,9 @@
 # frozen_string_literal: true
 
-require "rails_helper"
-
-RSpec.describe "Template::UpgradeCustomizationService", type: :service do
-
-  describe ".call" do
+require 'rails_helper'
 
+RSpec.describe 'Template::UpgradeCustomizationService', type: :service do
+  describe '.call' do
     let!(:funder_template) do
       ft = create(:template, :published, :default, org: create(:org, :funder))
       phase = create(:phase, template: ft)
@@ -26,54 +24,51 @@
 
     subject { Template::UpgradeCustomizationService.call(template) }
 
-    context "when template is a customization of a published funder template" do
-
-      it "returns a new Template" do
+    context 'when template is a customization of a published funder template' do
+      it 'returns a new Template' do
         expect(subject).to be_an_instance_of(Template)
       end
 
-      it "returns a persisted Template" do
+      it 'returns a persisted Template' do
         expect(subject).to be_persisted
       end
 
-      it "increments the version number" do
+      it 'increments the version number' do
         template.update!(version: 2)
         expect(subject.version).to eql(3)
       end
 
-      it "returns a draft Template" do
+      it 'returns a draft Template' do
         expect(subject.published).to eql(false)
       end
 
-      it "sets the customization_of to the family_id" do
+      it 'sets the customization_of to the family_id' do
         expect(subject.customization_of).to eql(template.customization_of)
         expect(subject.customization_of).to eql(funder_template.family_id)
       end
 
-      it "sets the org to the template org" do
+      it 'sets the org to the template org' do
         expect(subject.org).to eql(template.org)
       end
 
-      it "creates new phases for this Template" do
+      it 'creates new phases for this Template' do
         expect { subject }.to change { Phase.count }.by(1)
       end
 
-      it "creates new sections for this Template" do
+      it 'creates new sections for this Template' do
         expect { subject }.to change { Section.count }.by(4)
       end
 
-      it "creates new questions for this Template" do
+      it 'creates new questions for this Template' do
         expect { subject }.to change { Question.count }.by(8)
       end
 
-      it "creates new annotations for this Template" do
+      it 'creates new annotations for this Template' do
         expect { subject }.to change { Annotation.count }.by(16)
       end
-
     end
 
-    context "when a new phase is present in funder template" do
-
+    context 'when a new phase is present in funder template' do
       let!(:org) { create(:org) }
 
       let!(:template) { funder_template.customize!(org) }
@@ -82,14 +77,12 @@
         funder_template.phases << create(:phase)
       end
 
-      it "copies the new sections" do
+      it 'copies the new sections' do
         expect(subject.phases).to have_exactly(2).items
       end
-
     end
 
-    context "when a new section is present in funder template" do
-
+    context 'when a new section is present in funder template' do
       let!(:org) { create(:org) }
 
       let!(:template) { funder_template.customize!(org) }
@@ -97,10 +90,10 @@
       before do
         # Reverse the sections
         phase = funder_template.phases.first
-        phase.sections << build(:section, title: "New funder section", number: 5, modifiable: true)
+        phase.sections << build(:section, title: 'New funder section', number: 5, modifiable: true)
       end
 
-      it "preserves the versionable_id" do
+      it 'preserves the versionable_id' do
         subject.sections.each do |section|
           matching_section = funder_template.sections.detect do |s|
             # Note, there's no uniqueness criterion on the description
@@ -111,7 +104,7 @@
       end
 
       # Doesn't need to. Number should be flexible if sections are modifiable
-      it "preserves the number" do
+      it 'preserves the number' do
         subject.sections.each do |section|
           matching_section = funder_template.sections.detect do |s|
             # Changing matching criteria as we validated versionable_id is preserved
@@ -121,11 +114,9 @@
           expect(section.number).to eql(matching_section.number)
         end
       end
-
     end
 
-    context "when a new question is present in funder template" do
-
+    context 'when a new question is present in funder template' do
       let!(:org) { create(:org) }
 
       let!(:template) { funder_template.customize!(org) }
@@ -134,14 +125,12 @@
         funder_template.sections.first.questions << create(:question)
       end
 
-      it "copies the new question" do
+      it 'copies the new question' do
         expect(subject.questions).to have_exactly(9).items
       end
-
     end
 
-    context "when a new annotation is present in funder template" do
-
+    context 'when a new annotation is present in funder template' do
       let!(:org) { create(:org) }
 
       let!(:template) { funder_template.customize!(org) }
@@ -150,14 +139,12 @@
         funder_template.questions.first.annotations << create(:annotation)
       end
 
-      it "copies the new annotation" do
+      it 'copies the new annotation' do
         expect(subject.annotations).to have_exactly(17).items
       end
-
     end
 
-    context "when a new section is present in customized template" do
-
+    context 'when a new section is present in customized template' do
       let!(:org) { create(:org) }
 
       let!(:template) { funder_template.customize!(org) }
@@ -166,14 +153,12 @@
         template.phases.first.sections << create(:section, modifiable: true)
       end
 
-      it "adds the new section to the new customization" do
+      it 'adds the new section to the new customization' do
         expect(subject.sections.count).to eql(funder_template.sections.count + 1)
       end
-
     end
 
-    context "when a new section is present in both templates" do
-
+    context 'when a new section is present in both templates' do
       let!(:org) { create(:org) }
 
       let!(:template) { funder_template.customize!(org) }
@@ -198,11 +183,9 @@
         expected = funder_template.sections.maximum(:number) + 1
         expect(subject.sections.maximum(:number)).to eql(expected)
       end
-
     end
 
-    context "when a new annotation is present in customized template" do
-
+    context 'when a new annotation is present in customized template' do
       let!(:org) { create(:org) }
 
       let!(:template) { funder_template.customize!(org) }
@@ -212,39 +195,32 @@
         @annotation = Annotation.last
       end
 
-      it "copies the new annotation" do
+      it 'copies the new annotation' do
         expect(subject.annotations).to have_exactly(17).items
         annotation_vals = [@annotation.text, @annotation.versionable_id]
         expected_vals = subject.annotations.pluck(:text, :versionable_id)
         expect(expected_vals).to include(annotation_vals)
       end
-
     end
 
-    context "when template is not a customization of a published funder template" do
-
+    context 'when template is not a customization of a published funder template' do
       let!(:template) { create(:template) }
 
-      it "raises an exception" do
+      it 'raises an exception' do
         expect do
           subject
         end.to raise_error(Template::UpgradeCustomizationService::NotACustomizationError)
       end
-
     end
 
-    context "when no published funder template exists" do
-
+    context 'when no published funder template exists' do
       let!(:funder_template) { create(:template, :archived, org: create(:org, :funder)) }
 
-      it "raises an exception" do
+      it 'raises an exception' do
         expect do
           subject
         end.to raise_error(Template::UpgradeCustomizationService::NoFunderTemplateError)
       end
-
     end
-
   end
-
 end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index aa0e20edae..8d1add27e0 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require "mocha"
-require "simplecov"
+require 'mocha'
+# require 'simplecov'
 
 # Start up the SimpleCov Test Coverage service. This must run before the app's
 # code is loaded/required!
 # SimpleCov writes the results to the ./coverage dir once the tests complete
-SimpleCov.start "rails"
+# SimpleCov.start 'rails'
 
 $LOAD_PATH.unshift(File.expand_path(__dir__))
 
@@ -26,8 +26,7 @@
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
-
-  config.example_status_persistence_file_path = "./tmp/rspec"
+  config.example_status_persistence_file_path = './tmp/rspec'
 
   # rspec-expectations config goes here. You can use an alternate
   # assertion/expectation library such as wrong or the stdlib/minitest
@@ -64,7 +63,7 @@
   # Allows RSpec to persist some state between runs in order to support
   # the `--only-failures` and `--next-failure` CLI options. We recommend
   # you configure your source control system to ignore this file.
-  config.example_status_persistence_file_path = "spec/examples.txt"
+  config.example_status_persistence_file_path = 'spec/examples.txt'
 
   # Limits the available syntax to the non-monkey patched syntax that is
   # recommended. For more details, see:
@@ -108,7 +107,7 @@
 
   config.after(:context) do
     # Clean up any files generated by the Export/Download UI pages
-    path = Rails.root.join("*.{csv,txt,docx,pdf}").to_s
+    path = Rails.root.join('*.{csv,txt,docx,pdf}').to_s
     Dir.glob(path).each do |file|
       puts "Deleting test file generated by Download/Export: #{file}"
       File.delete(file) if File.ctime(file) > @start_time
@@ -129,11 +128,10 @@
     end
 
     # Ensure that there is always a default Language
-    create(:language, abbreviation: "en", default_language: true) unless Language.default.present?
+    create(:language, abbreviation: 'en', default_language: true) unless Language.default.present?
   end
 
-  config.after(:suite) do
-    Capybara::Webmock.stop
+  config.after(:suite) do |example|
+    Capybara::Webmock.stop if example.metadata[:type] == :feature
   end
-
 end
diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb
index b35b219445..8165a74595 100644
--- a/spec/support/capybara.rb
+++ b/spec/support/capybara.rb
@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require "webdrivers/chromedriver"
-require_relative "helpers/capybara_helper"
-require_relative "helpers/sessions_helper"
-require_relative "helpers/tiny_mce_helper"
-require_relative "helpers/autocomplete_helper"
+require 'webdrivers/chromedriver'
+require_relative 'helpers/capybara_helper'
+require_relative 'helpers/sessions_helper'
+require_relative 'helpers/tiny_mce_helper'
+require_relative 'helpers/autocomplete_helper'
 
 Capybara.default_driver = :rack_test
 
@@ -18,14 +18,13 @@
 Capybara.register_driver :selenium_chrome_headless do |app|
   Capybara::Selenium::Driver.load_selenium
   browser_options = ::Selenium::WebDriver::Chrome::Options.new
-  browser_options.args << "--headless"
-  browser_options.args << "--no-sandbox"
-  browser_options.args << "--disable-gpu" if Gem.win_platform?
+  browser_options.args << '--headless'
+  browser_options.args << '--no-sandbox'
+  browser_options.args << '--disable-gpu' if Gem.win_platform?
   Capybara::Selenium::Driver.new(app, browser: :chrome, options: browser_options)
 end
 
 RSpec.configure do |config|
-
   config.before(:each, type: :feature, js: false) do
     Capybara.use_default_driver
   end
@@ -33,7 +32,6 @@
   config.before(:each, type: :feature, js: true) do
     Capybara.current_driver = :selenium_chrome_headless
   end
-
 end
 
 Capybara.configure do |config|
diff --git a/spec/support/database_cleaner.rb b/spec/support/database_cleaner.rb
index 6efc2fd8f6..500e7eb92d 100644
--- a/spec/support/database_cleaner.rb
+++ b/spec/support/database_cleaner.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-require "database_cleaner"
+require 'database_cleaner'
 
 RSpec.configure do |config|
-
   config.before(:suite) do
     if config.use_transactional_fixtures?
       raise(<<~TEXT)
@@ -48,5 +47,4 @@
   config.append_after(:each) do
     DatabaseCleaner.clean
   end
-
 end
diff --git a/spec/support/factory_bot.rb b/spec/support/factory_bot.rb
index f25ab336f3..d79f9e0ca8 100644
--- a/spec/support/factory_bot.rb
+++ b/spec/support/factory_bot.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 RSpec.configure do |config|
-
   config.include(FactoryBot::Syntax::Methods)
 
   config.before(:suite) do
diff --git a/spec/support/faker.rb b/spec/support/faker.rb
index 935d897a21..afa86a907d 100644
--- a/spec/support/faker.rb
+++ b/spec/support/faker.rb
@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require "faker"
+require 'faker'
 
 # Keep this as :en. Faker doesn't have :en-GB
-LOCALE = "en"
+LOCALE = 'en'
 
 RSpec.configure do |config|
   config.before(:each) do
diff --git a/spec/support/helpers/api.rb b/spec/support/helpers/api.rb
index 25d17a7653..c87931c12e 100644
--- a/spec/support/helpers/api.rb
+++ b/spec/support/helpers/api.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 module ApiHelper
-
   def mock_authorization_for_api_client
     api_client = ApiClient.first
     api_client = create(:api_client) unless api_client.present?
@@ -14,12 +13,9 @@ def mock_authorization_for_user(user: nil)
     create(:org) unless Org.any?
     user = User.org_admins(Org.last).first unless user.present?
 
-    unless user.present?
-      user = create(:user, :org_admin, api_token: SecureRandom.uuid, org: Org.last)
-    end
+    user = create(:user, :org_admin, api_token: SecureRandom.uuid, org: Org.last) unless user.present?
 
     Api::V1::BaseApiController.any_instance.stubs(:authorize_request).returns(true)
     Api::V1::BaseApiController.any_instance.stubs(:client).returns(user)
   end
-
 end
diff --git a/spec/support/helpers/autocomplete_helper.rb b/spec/support/helpers/autocomplete_helper.rb
index c3efb401f8..8f8818a0d2 100644
--- a/spec/support/helpers/autocomplete_helper.rb
+++ b/spec/support/helpers/autocomplete_helper.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 module AutoCompleteHelper
-
   def select_an_org(autocomplete_id, org)
     # Set the Org Name
     find(autocomplete_id).set org.name
@@ -9,7 +8,7 @@ def select_an_org(autocomplete_id, org)
 
     # The controllers are expecting the org_id though, so lets
     # populate it
-    hidden_id = autocomplete_id.gsub("_name", "_id").gsub("#", "")
+    hidden_id = autocomplete_id.gsub('_name', '_id').gsub('#', '')
     hash = { id: org.id, name: org.name }.to_json
 
     js = "document.getElementById('#{hidden_id}').value = '#{hash}'"
@@ -17,17 +16,14 @@ def select_an_org(autocomplete_id, org)
   end
 
   def choose_suggestion(suggestion_text)
-    matcher = ".ui-autocomplete .ui-menu-item"
+    matcher = '.ui-autocomplete .ui-menu-item'
     matching_element = all(:css, matcher).detect do |element|
       element.text.strip == suggestion_text.strip
     end
-    unless matching_element.present?
-      raise ArgumentError, "No such suggestion with text '#{suggestion_text}'"
-    end
+    raise ArgumentError, "No such suggestion with text '#{suggestion_text}'" unless matching_element.present?
 
     matching_element.click
     # Wait for the JS to run
     sleep(0.3)
   end
-
 end
diff --git a/spec/support/helpers/capybara_helper.rb b/spec/support/helpers/capybara_helper.rb
index 823702fee0..d7b8b3481b 100644
--- a/spec/support/helpers/capybara_helper.rb
+++ b/spec/support/helpers/capybara_helper.rb
@@ -1,18 +1,16 @@
 # frozen_string_literal: true
 
 module CapybaraHelper
-
   def clear_cookies!
     browser = Capybara.current_session.driver.browser
     if browser.respond_to?(:clear_cookies)
       # Rack::MockSession
       browser.clear_cookies
-    elsif browser.respond_to?(:manage) and browser.manage.respond_to?(:delete_all_cookies)
+    elsif browser.respond_to?(:manage) && browser.manage.respond_to?(:delete_all_cookies)
       # Selenium::WebDriver
       browser.manage.delete_all_cookies
     else
       raise "Don't know how to clear cookies. Weird driver?"
     end
   end
-
 end
diff --git a/spec/support/helpers/identifier_helper.rb b/spec/support/helpers/identifier_helper.rb
index 8a199a8a48..53afc495e3 100644
--- a/spec/support/helpers/identifier_helper.rb
+++ b/spec/support/helpers/identifier_helper.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 module IdentifierHelper
-
   def create_orcid(user:, val: SecureRandom.uuid)
     scheme = orcid_scheme
     val = append_prefix(scheme: scheme, val: val)
@@ -9,8 +8,8 @@ def create_orcid(user:, val: SecureRandom.uuid)
   end
 
   def orcid_scheme
-    name = Rails.configuration.x.orcid.name || "orcid"
-    landing_page = Rails.configuration.x.orcid.landing_page_url || "https://orcid.org/"
+    name = Rails.configuration.x.orcid.name || 'orcid'
+    landing_page = Rails.configuration.x.orcid.landing_page_url || 'https://orcid.org/'
     scheme = IdentifierScheme.find_by(name: name)
     scheme.update(identifier_prefix: landing_page) if scheme.present?
     return scheme if scheme.present?
@@ -20,23 +19,20 @@ def orcid_scheme
   end
 
   def append_prefix(scheme:, val:)
-    val = val.start_with?("/") ? val[1..val.length] : val
+    val = val.start_with?('/') ? val[1..val.length] : val
     url = landing_page_for(scheme: scheme)
     val.start_with?(url) ? val : "#{url}#{val}"
   end
 
   def remove_prefix(scheme:, val:)
-    val.gsub(landing_page_for(scheme: scheme), "")
+    val.gsub(landing_page_for(scheme: scheme), '')
   end
 
   def landing_page_for(scheme:)
     url = scheme.identifier_prefix
-    unless url.present?
-      url = Rails.configuration.x.send(:"#{scheme.name.downcase}")&.landing_page_url
-    end
+    url = Rails.configuration.x.send(:"#{scheme.name.downcase}")&.landing_page_url unless url.present?
     return nil unless url.present?
 
     %w[/ : & ?].include?(url.last) ? url : "#{url}/"
   end
-
 end
diff --git a/spec/support/helpers/links_helper.rb b/spec/support/helpers/links_helper.rb
index b412fbbbc4..cdf63ba34e 100644
--- a/spec/support/helpers/links_helper.rb
+++ b/spec/support/helpers/links_helper.rb
@@ -1,13 +1,11 @@
 # frozen_string_literal: true
 
 module LinksHelper
-
   def add_link
-    click_link "+ Add an additional URL"
+    click_link '+ Add an additional URL'
   end
 
   def remove_link
-    all(".link a > .fa-times-circle").last.click
+    all('.link a > .fa-times-circle').last.click
   end
-
 end
diff --git a/spec/support/helpers/roles_helper.rb b/spec/support/helpers/roles_helper.rb
index 059b7618c1..c626ec9764 100644
--- a/spec/support/helpers/roles_helper.rb
+++ b/spec/support/helpers/roles_helper.rb
@@ -1,19 +1,17 @@
 # frozen_string_literal: true
 
+# rubocop:disable Style/OptionalBooleanParameter
 module RolesHelper
-
   def build_plan(administrator = false, editor = false, commenter = false)
     org = create(:org)
     plan = create(:plan, answers: 2, guidance_groups: 2, org: org)
     creator = create(:user, org: org)
     create(:role, :creator, :active, plan: plan, user: creator)
 
-    if administrator
-      create(:role, :administrator, :active, plan: plan, user: create(:user, org: org))
-    end
+    create(:role, :administrator, :active, plan: plan, user: create(:user, org: org)) if administrator
     create(:role, :editor, :active, plan: plan, user: create(:user, org: org)) if editor
     create(:role, :commenter, :active, plan: plan, user: create(:user, org: org)) if commenter
     plan
   end
-
 end
+# rubocop:enable Style/OptionalBooleanParameter
diff --git a/spec/support/helpers/sessions_helper.rb b/spec/support/helpers/sessions_helper.rb
index 0f5dd51210..3fa530d4e9 100644
--- a/spec/support/helpers/sessions_helper.rb
+++ b/spec/support/helpers/sessions_helper.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 module SessionsHelper
-
   def sign_in(user = :user)
     case user
     when User
@@ -16,11 +15,10 @@ def sign_in(user = :user)
   def sign_in_as_user(user)
     clear_cookies!
     visit root_path
-    within "#sign-in-form" do
-      fill_in "Email", with: user.email
-      fill_in "Password", with: user.password.presence || "password"
-      click_button "Sign in"
+    within '#sign-in-form' do
+      fill_in 'Email', with: user.email
+      fill_in 'Password', with: user.password.presence || 'password'
+      click_button 'Sign in'
     end
   end
-
 end
diff --git a/spec/support/helpers/template_helper.rb b/spec/support/helpers/template_helper.rb
index f7702ac5f0..fc75199ef4 100644
--- a/spec/support/helpers/template_helper.rb
+++ b/spec/support/helpers/template_helper.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 module TemplateHelper
-
   def build_template(nbr_phases = 0, nbr_sections = 0, nbr_questions = 0)
     template = create(:template, phases: nbr_phases)
 
@@ -15,5 +14,4 @@ def build_template(nbr_phases = 0, nbr_sections = 0, nbr_questions = 0)
     end
     template
   end
-
 end
diff --git a/spec/support/helpers/tiny_mce_helper.rb b/spec/support/helpers/tiny_mce_helper.rb
index 7d65de296d..467d5d4e1d 100644
--- a/spec/support/helpers/tiny_mce_helper.rb
+++ b/spec/support/helpers/tiny_mce_helper.rb
@@ -2,7 +2,6 @@
 
 # This module provides helper methods for testing TinyMCE within feature specs
 module TinyMceHelper
-
   ##
   # Fill in TinyMCE field with given text.
   #
@@ -10,7 +9,7 @@ module TinyMceHelper
   # val - String with the value to input to the text field
   #
   # Returns String
-  def tinymce_fill_in(id, with: "")
+  def tinymce_fill_in(id, with: '')
     # wait until the TinyMCE editor instance is ready.
     # This is required for cases where the editor is loaded via XHR.
     x = 0
@@ -28,5 +27,4 @@ def tinymce_fill_in(id, with: "")
       raise "No such tinyMCE element '##{id}'"
     end
   end
-
 end
diff --git a/spec/support/helpers/webmocks.rb b/spec/support/helpers/webmocks.rb
index b5413f2b48..6ff59d0d0b 100644
--- a/spec/support/helpers/webmocks.rb
+++ b/spec/support/helpers/webmocks.rb
@@ -1,14 +1,13 @@
 # frozen_string_literal: true
 
 module Webmocks
-
   def stub_ror_service
     url = ExternalApis::RorService.api_base_url
     headers = ExternalApis::RorService.headers
 
     # Mock the results of the ping/heartbeat check
     stub_request(:get, "#{url}#{ExternalApis::RorService.heartbeat_path}")
-      .with(headers: headers).to_return(status: 200, body: "OK", headers: {})
+      .with(headers: headers).to_return(status: 200, body: 'OK', headers: {})
 
     # Mock the results of a search. We are only returning the elements of the
     # ROR response that we actually care about here
@@ -21,14 +20,14 @@ def stub_openaire
     url = ExternalApis::OpenAireService.api_base_url
     url = "#{url}#{ExternalApis::OpenAireService.search_path}"
     url = url % ExternalApis::OpenAireService.default_funder
-    stub_request(:get, url).to_return(status: 200, body: "", headers: {})
+    stub_request(:get, url).to_return(status: 200, body: '', headers: {})
   end
 
   def mocked_ror_response
     body = { number_of_results: 10, time_taken: 10, items: [] }
     10.times.each do
       body[:items] << {
-        id: Faker::Internet.url(host: "ror.org"),
+        id: Faker::Internet.url(host: 'ror.org'),
         name: Faker::Company.unique.name,
         links: [[Faker::Internet.url, nil].sample],
         country: { country_name: Faker::Books::Dune.planet },
@@ -39,5 +38,4 @@ def mocked_ror_response
     end
     body.to_json
   end
-
 end
diff --git a/spec/support/locales.rb b/spec/support/locales.rb
index ecde883990..449dad075b 100644
--- a/spec/support/locales.rb
+++ b/spec/support/locales.rb
@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
-require "shoulda/matchers"
+require 'shoulda/matchers'
 
 AVAILABLE_TEST_LOCALES = %w[en-GB en fr de].freeze
 
 RSpec.configure do |config|
-
   config.before(:suite) do
     # This is required for the Faker gem. See this issue here:
     # https://github.com/stympy/faker/issues/266
@@ -23,5 +22,4 @@
     default_locale = AVAILABLE_TEST_LOCALES.first
     I18n.config.locale = default_locale
   end
-
 end
diff --git a/spec/support/matchers/has_errors_matcher.rb b/spec/support/matchers/has_errors_matcher.rb
index bbf75bdcf9..30ea22fa7d 100644
--- a/spec/support/matchers/has_errors_matcher.rb
+++ b/spec/support/matchers/has_errors_matcher.rb
@@ -1,19 +1,17 @@
 # frozen_string_literal: true
 
-require "rspec/expectations"
+require 'rspec/expectations'
 
 RSpec::Matchers.define :have_errors do |_expected|
-
   match do
     actual.body.match(/Error:/)
   end
 
   failure_message do |_actual|
-    "expected would have errors on the page."
+    'expected would have errors on the page.'
   end
 
   failure_message_when_negated do |_actual|
-    "expected would not have errors on the page."
+    'expected would not have errors on the page.'
   end
-
 end
diff --git a/spec/support/mocks/api_json_samples.rb b/spec/support/mocks/api_json_samples.rb
index 1c69579f5a..e45ad21371 100644
--- a/spec/support/mocks/api_json_samples.rb
+++ b/spec/support/mocks/api_json_samples.rb
@@ -2,7 +2,6 @@
 
 # Mock JSON submissions
 module Mocks
-
   # Disabling rubocop checks here since its basically just large hashes and
   # would be difficult to read if broken up into multiple smaller functions.
   # One option might be to store them as .json files and then just load them here
@@ -10,34 +9,33 @@ module Mocks
 
   # rubocop:disable Metrics/ModuleLength, Metrics/MethodLength
   module ApiJsonSamples
-
     ROLES = %w[Investigation Project_administration Data_curation].freeze
 
     def mock_identifier_schemes
-      create(:identifier_scheme, name: "ror")
-      create(:identifier_scheme, name: "fundref")
-      create(:identifier_scheme, name: "orcid")
-      create(:identifier_scheme, name: "grant")
+      create(:identifier_scheme, name: 'ror')
+      create(:identifier_scheme, name: 'fundref')
+      create(:identifier_scheme, name: 'orcid')
+      create(:identifier_scheme, name: 'grant')
     end
 
     def minimal_update_json
       {
-        "total_items": 1,
-        "items": [
+        total_items: 1,
+        items: [
           {
-            "dmp": {
-              "title": Faker::Lorem.sentence,
-              "contact": {
-                "name": Faker::TvShows::Simpsons.character,
-                "mbox": Faker::Internet.email,
-                "affiliation": { "name": Faker::Movies::StarWars.planet }
+            dmp: {
+              title: Faker::Lorem.sentence,
+              contact: {
+                name: Faker::TvShows::Simpsons.character,
+                mbox: Faker::Internet.email,
+                affiliation: { name: Faker::Movies::StarWars.planet }
               },
-              "dataset": [{
-                "title": Faker::Lorem.sentence
+              dataset: [{
+                title: Faker::Lorem.sentence
               }],
-              "dmp_id": {
-                "type": "doi",
-                "identifier": SecureRandom.uuid
+              dmp_id: {
+                type: 'doi',
+                identifier: SecureRandom.uuid
               }
             }
           }
@@ -47,24 +45,24 @@ def minimal_update_json
 
     def minimal_create_json
       {
-        "total_items": 1,
-        "items": [
+        total_items: 1,
+        items: [
           {
-            "dmp": {
-              "title": Faker::Lorem.sentence,
-              "contact": {
-                "name": Faker::TvShows::Simpsons.character,
-                "mbox": Faker::Internet.email,
-                "affiliation": { "name": Faker::Movies::StarWars.planet }
+            dmp: {
+              title: Faker::Lorem.sentence,
+              contact: {
+                name: Faker::TvShows::Simpsons.character,
+                mbox: Faker::Internet.email,
+                affiliation: { name: Faker::Movies::StarWars.planet }
               },
-              "dataset": [{
-                "title": Faker::Lorem.sentence
+              dataset: [{
+                title: Faker::Lorem.sentence
               }],
-              "extension": [
-                "#{ApplicationService.application_name.split("-").first}": {
-                  "template": {
-                    "id": Template.last.id,
-                    "title": Faker::Lorem.sentence
+              extension: [
+                "#{ApplicationService.application_name.split('-').first}": {
+                  template: {
+                    id: Template.last.id,
+                    title: Faker::Lorem.sentence
                   }
                 }
               ]
@@ -76,111 +74,111 @@ def minimal_create_json
 
     # rubocop:disable Metrics/AbcSize
     def complete_create_json
-      lang = Language.all.pluck(:abbreviation).sample || "en-UK"
+      lang = Language.all.pluck(:abbreviation).sample || 'en-UK'
       contact = {
         name: Faker::TvShows::Simpsons.character,
         email: Faker::Internet.email,
         id: SecureRandom.uuid
       }
       {
-        "total_items": 1,
-        "items": [
+        total_items: 1,
+        items: [
           {
-            "dmp": {
-              "created": (Time.now - 3.months).to_formatted_s(:iso8601),
-              "title": Faker::Lorem.sentence,
-              "description": Faker::Lorem.paragraph,
-              "language": Api::V1::LanguagePresenter.three_char_code(lang: lang),
-              "ethical_issues_exist": %w[yes no unknown].sample,
-              "ethical_issues_description": Faker::Lorem.paragraph,
-              "ethical_issues_report": Faker::Internet.url,
-              "contact": {
-                "name": contact[:name],
-                "mbox": contact[:email],
-                "affiliation": {
-                  "name": Faker::TvShows::Simpsons.location,
-                  "abbreviation": Faker::Lorem.word.upcase,
-                  "region": Faker::Space.planet,
-                  "affiliation_id": {
-                    "type": "ror",
-                    "identifier": SecureRandom.uuid
+            dmp: {
+              created: (Time.now - 3.months).to_formatted_s(:iso8601),
+              title: Faker::Lorem.sentence,
+              description: Faker::Lorem.paragraph,
+              language: Api::V1::LanguagePresenter.three_char_code(lang: lang),
+              ethical_issues_exist: %w[yes no unknown].sample,
+              ethical_issues_description: Faker::Lorem.paragraph,
+              ethical_issues_report: Faker::Internet.url,
+              contact: {
+                name: contact[:name],
+                mbox: contact[:email],
+                affiliation: {
+                  name: Faker::TvShows::Simpsons.location,
+                  abbreviation: Faker::Lorem.word.upcase,
+                  region: Faker::Space.planet,
+                  affiliation_id: {
+                    type: 'ror',
+                    identifier: SecureRandom.uuid
                   }
                 },
-                "contact_id": {
-                  "type": "orcid",
-                  "identifier": contact[:id]
+                contact_id: {
+                  type: 'orcid',
+                  identifier: contact[:id]
                 }
               },
-              "contributor": [{
-                "role": [
-                  "http://credit.niso.org/contributor-roles/project-administration",
-                  "http://credit.niso.org/contributor-roles/investigation"
+              contributor: [{
+                role: [
+                  'http://credit.niso.org/contributor-roles/project-administration',
+                  'http://credit.niso.org/contributor-roles/investigation'
                 ],
-                "name": Faker::Movies::StarWars.character,
-                "mbox": Faker::Internet.email,
-                "affiliation": {
-                  "name": Faker::Movies::StarWars.planet,
-                  "abbreviation": Faker::Lorem.word.upcase,
-                  "affiliation_id": {
-                    "type": "ror",
-                    "identifier": SecureRandom.uuid
+                name: Faker::Movies::StarWars.character,
+                mbox: Faker::Internet.email,
+                affiliation: {
+                  name: Faker::Movies::StarWars.planet,
+                  abbreviation: Faker::Lorem.word.upcase,
+                  affiliation_id: {
+                    type: 'ror',
+                    identifier: SecureRandom.uuid
                   }
                 },
-                "contributor_id": {
-                  "type": "orcid",
-                  "identifier": SecureRandom.uuid
+                contributor_id: {
+                  type: 'orcid',
+                  identifier: SecureRandom.uuid
                 }
               }, {
-                "role": [
-                  "http://credit.niso.org/contributor-roles/investigation"
+                role: [
+                  'http://credit.niso.org/contributor-roles/investigation'
                 ],
-                "name": contact[:name],
-                "mbox": contact[:email],
-                "affiliation": {
-                  "name": Faker::Movies::StarWars.planet,
-                  "abbreviation": Faker::Lorem.word.upcase,
-                  "affiliation_id": {
-                    "type": "ror",
-                    "identifier": SecureRandom.uuid
+                name: contact[:name],
+                mbox: contact[:email],
+                affiliation: {
+                  name: Faker::Movies::StarWars.planet,
+                  abbreviation: Faker::Lorem.word.upcase,
+                  affiliation_id: {
+                    type: 'ror',
+                    identifier: SecureRandom.uuid
                   }
                 },
-                "contributor_id": {
-                  "type": "orcid",
-                  "identifier": contact[:id]
+                contributor_id: {
+                  type: 'orcid',
+                  identifier: contact[:id]
                 }
               }],
-              "project": [{
-                "title": Faker::Lorem.sentence,
-                "description": Faker::Lorem.paragraph,
-                "start": (Time.now + 3.months).to_formatted_s(:iso8601),
-                "end": (Time.now + 2.years).to_formatted_s(:iso8601),
-                "funding": [{
-                  "name": Faker::Movies::StarWars.droid,
-                  "funder_id": {
-                    "type": "fundref",
-                    "identifier": Faker::Number.number
+              project: [{
+                title: Faker::Lorem.sentence,
+                description: Faker::Lorem.paragraph,
+                start: (Time.now + 3.months).to_formatted_s(:iso8601),
+                end: (Time.now + 2.years).to_formatted_s(:iso8601),
+                funding: [{
+                  name: Faker::Movies::StarWars.droid,
+                  funder_id: {
+                    type: 'fundref',
+                    identifier: Faker::Number.number
                   },
-                  "grant_id": {
-                    "type": "other",
-                    "identifier": SecureRandom.uuid
+                  grant_id: {
+                    type: 'other',
+                    identifier: SecureRandom.uuid
                   },
-                  "funding_status": %w[planned applied granted].sample
+                  funding_status: %w[planned applied granted].sample
                 }]
               }],
-              "dataset": [{
-                "title": Faker::Lorem.sentence,
-                "personal_data": %w[yes no unknown].sample,
-                "sensitive_data": %w[yes no unknown].sample,
-                "dataset_id": {
-                  "type": "url",
-                  "identifier": Faker::Internet.url
+              dataset: [{
+                title: Faker::Lorem.sentence,
+                personal_data: %w[yes no unknown].sample,
+                sensitive_data: %w[yes no unknown].sample,
+                dataset_id: {
+                  type: 'url',
+                  identifier: Faker::Internet.url
                 }
               }],
-              "extension": [{
-                "#{ApplicationService.application_name.split("-").first}": {
-                  "template": {
-                    "id": Template.last.id,
-                    "title": Faker::Lorem.sentence
+              extension: [{
+                "#{ApplicationService.application_name.split('-').first}": {
+                  template: {
+                    id: Template.last.id,
+                    title: Faker::Lorem.sentence
                   }
                 }
               }]
@@ -190,8 +188,6 @@ def complete_create_json
       }.to_json
     end
     # rubocop:enable Metrics/AbcSize
-
   end
   # rubocop:enable Metrics/ModuleLength, Metrics/MethodLength
-
 end
diff --git a/spec/support/mocks/form_field_json_values.rb b/spec/support/mocks/form_field_json_values.rb
index 08a53a5656..dc5e004988 100644
--- a/spec/support/mocks/form_field_json_values.rb
+++ b/spec/support/mocks/form_field_json_values.rb
@@ -1,15 +1,13 @@
 # frozen_string_literal: true
 
 module Mocks
-
   module FormFieldJsonValues
-
     # Mock JSON contents of the hidden org_id field used by the OrgSelectors
     def org_selector_id_field(org: create(:org))
       scheme = create(:identifier_scheme)
       identifier = create(:identifier, identifier_scheme: scheme, identifiable: org)
       { id: org.id, name: org.name, sort_name: org.name,
-        "scheme.name.downcase": identifier.value }.to_json
+        'scheme.name.downcase': identifier.value }.to_json
     end
 
     # Mock JSON contents of the hidden org_crosswalk field used by the OrgSelectors
@@ -22,7 +20,5 @@ def org_selector_crosswalk_field(org: create(:org))
     def org_links_field
       { org: { link: Faker::Internet.url, text: Faker::Lorem.word } }.to_json
     end
-
   end
-
 end
diff --git a/spec/support/shoulda.rb b/spec/support/shoulda.rb
index 0fdbb25f74..fe436a9557 100644
--- a/spec/support/shoulda.rb
+++ b/spec/support/shoulda.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "shoulda/matchers"
+require 'shoulda/matchers'
 
 RSpec.configure do |config|
   config.include(Shoulda::Matchers::ActiveModel, type: :model)
diff --git a/spec/support/wait_for_ajax.rb b/spec/support/wait_for_ajax.rb
index b57b3b70f1..45890fd463 100644
--- a/spec/support/wait_for_ajax.rb
+++ b/spec/support/wait_for_ajax.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 module WaitForAjax
-
   def wait_for_ajax
     Timeout.timeout(Capybara.default_max_wait_time) do
       loop until finished_all_ajax_requests?
@@ -9,9 +8,8 @@ def wait_for_ajax
   end
 
   def finished_all_ajax_requests?
-    page.evaluate_script("jQuery.active").zero?
+    page.evaluate_script('jQuery.active').zero?
   end
-
 end
 
 RSpec.configure do |config|
diff --git a/spec/views/api/v1/_standard_response.json_jbuilder_spec.rb b/spec/views/api/v1/_standard_response.json_jbuilder_spec.rb
index 37b0678f59..3c0300f160 100644
--- a/spec/views/api/v1/_standard_response.json_jbuilder_spec.rb
+++ b/spec/views/api/v1/_standard_response.json_jbuilder_spec.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-require "rails_helper"
-
-describe "api/v1/_standard_response.json.jbuilder" do
+require 'rails_helper'
 
+describe 'api/v1/_standard_response.json.jbuilder' do
   before(:each) do
     @application = Faker::Lorem.word
     @caller = Faker::Lorem.word
@@ -14,64 +13,61 @@
     assign :caller, @caller
 
     @response = OpenStruct.new(status: @code)
-    @request = Net::HTTPGenericRequest.new("GET", nil, nil, @url)
+    @request = Net::HTTPGenericRequest.new('GET', nil, nil, @url)
   end
 
-  describe "standard response items - Also the same as: GET /heartbeat" do
-
+  describe 'standard response items - Also the same as: GET /heartbeat' do
     before(:each) do
-      render partial: "api/v1/standard_response",
+      render partial: 'api/v1/standard_response',
              locals: { response: @response, request: @request }
       @json = JSON.parse(rendered).with_indifferent_access
     end
 
-    it "includes the :application" do
+    it 'includes the :application' do
       expect(@json[:application]).to eql(@application)
     end
-    it "includes the :code" do
+    it 'includes the :code' do
       expect(@json[:code]).to eql(@code)
     end
-    it "includes the :message" do
+    it 'includes the :message' do
       expect(@json[:message]).to eql(Rack::Utils::HTTP_STATUS_CODES[@code])
     end
-    it "includes the :time" do
+    it 'includes the :time' do
       expect(@json[:time].present?).to eql(true)
     end
-    it ":time is in UTC format" do
+    it ':time is in UTC format' do
       expect(Date.parse(@json[:time]).is_a?(Date)).to eql(true)
     end
-    it "includes the :caller" do
+    it 'includes the :caller' do
       expect(@json[:caller]).to eql(@caller)
     end
-    it "includes the :source" do
+    it 'includes the :source' do
       expect(@json[:source].include?(@url)).to eql(true)
     end
-    it "includes the :total_items" do
+    it 'includes the :total_items' do
       expect(@json[:total_items]).to eql(0)
     end
-
   end
 
-  context "responses with pagination" do
-
-    describe "On the 1st page and there is only one page" do
+  context 'responses with pagination' do
+    describe 'On the 1st page and there is only one page' do
       before(:each) do
         assign :page, 1
         assign :per_page, 3
 
-        render partial: "api/v1/standard_response",
+        render partial: 'api/v1/standard_response',
                locals: { response: @response, request: @request,
                          total_items: 3 }
         @json = JSON.parse(rendered).with_indifferent_access
       end
 
-      it "shows the correct page number" do
+      it 'shows the correct page number' do
         expect(@json[:page]).to eql(1)
       end
-      it "includes the per_page number" do
+      it 'includes the per_page number' do
         expect(@json[:per_page]).to eql(3)
       end
-      it "includes the :total_items" do
+      it 'includes the :total_items' do
         expect(@json[:total_items]).to eql(3)
       end
       it "does not show a 'prev' page link" do
@@ -82,24 +78,24 @@
       end
     end
 
-    describe "On the 1st page and there multiple pages" do
+    describe 'On the 1st page and there multiple pages' do
       before(:each) do
         assign :page, 1
         assign :per_page, 3
 
-        render partial: "api/v1/standard_response",
+        render partial: 'api/v1/standard_response',
                locals: { response: @response, request: @request,
                          total_items: 4 }
         @json = JSON.parse(rendered).with_indifferent_access
       end
 
-      it "shows the correct page number" do
+      it 'shows the correct page number' do
         expect(@json[:page]).to eql(1)
       end
-      it "includes the per_page number" do
+      it 'includes the per_page number' do
         expect(@json[:per_page]).to eql(3)
       end
-      it "includes the :total_items" do
+      it 'includes the :total_items' do
         expect(@json[:total_items]).to eql(4)
       end
       it "does not show a 'prev' page link" do
@@ -110,24 +106,24 @@
       end
     end
 
-    describe "On the 2nd page and there more than 2 pages" do
+    describe 'On the 2nd page and there more than 2 pages' do
       before(:each) do
         assign :page, 2
         assign :per_page, 3
 
-        render partial: "api/v1/standard_response",
+        render partial: 'api/v1/standard_response',
                locals: { response: @response, request: @request,
                          total_items: 7 }
         @json = JSON.parse(rendered).with_indifferent_access
       end
 
-      it "shows the correct page number" do
+      it 'shows the correct page number' do
         expect(@json[:page]).to eql(2)
       end
-      it "includes the per_page number" do
+      it 'includes the per_page number' do
         expect(@json[:per_page]).to eql(3)
       end
-      it "includes the :total_items" do
+      it 'includes the :total_items' do
         expect(@json[:total_items]).to eql(7)
       end
       it "does not show a 'prev' page link" do
@@ -138,24 +134,24 @@
       end
     end
 
-    describe "On the last page" do
+    describe 'On the last page' do
       before(:each) do
         assign :page, 2
         assign :per_page, 3
 
-        render partial: "api/v1/standard_response",
+        render partial: 'api/v1/standard_response',
                locals: { response: @response, request: @request,
                          total_items: 5 }
         @json = JSON.parse(rendered).with_indifferent_access
       end
 
-      it "shows the correct page number" do
+      it 'shows the correct page number' do
         expect(@json[:page]).to eql(2)
       end
-      it "includes the per_page number" do
+      it 'includes the per_page number' do
         expect(@json[:per_page]).to eql(3)
       end
-      it "includes the :total_items" do
+      it 'includes the :total_items' do
         expect(@json[:total_items]).to eql(5)
       end
       it "does not show a 'prev' page link" do
@@ -165,7 +161,5 @@
         expect(@json[:next].present?).to eql(false)
       end
     end
-
   end
-
 end
diff --git a/spec/views/api/v1/contributors/_show.json.jbuilder_spec.rb b/spec/views/api/v1/contributors/_show.json.jbuilder_spec.rb
index a4f4b2686d..0ceeb33aeb 100644
--- a/spec/views/api/v1/contributors/_show.json.jbuilder_spec.rb
+++ b/spec/views/api/v1/contributors/_show.json.jbuilder_spec.rb
@@ -1,12 +1,11 @@
 # frozen_string_literal: true
 
-require "rails_helper"
-
-describe "api/v1/contributors/_show.json.jbuilder" do
+require 'rails_helper'
 
+describe 'api/v1/contributors/_show.json.jbuilder' do
   before(:each) do
     @plan = create(:plan)
-    scheme = create(:identifier_scheme, name: "orcid")
+    scheme = create(:identifier_scheme, name: 'orcid')
     @contact = create(:contributor, org: create(:org), plan: @plan, roles_count: 0,
                                     data_curation: true)
     @ident = create(:identifier, identifiable: @contact, value: Faker::Lorem.word,
@@ -14,33 +13,33 @@
     @contact.reload
   end
 
-  describe "includes all of the Contributor attributes" do
+  describe 'includes all of the Contributor attributes' do
     before(:each) do
-      render partial: "api/v1/contributors/show", locals: { contributor: @contact }
+      render partial: 'api/v1/contributors/show', locals: { contributor: @contact }
       @json = JSON.parse(rendered).with_indifferent_access
     end
 
-    it "includes the :name" do
+    it 'includes the :name' do
       expect(@json[:name]).to eql(@contact.name)
     end
-    it "includes the :mbox" do
+    it 'includes the :mbox' do
       expect(@json[:mbox]).to eql(@contact.email)
     end
 
-    it "includes the :role" do
-      expect(@json[:role].first.ends_with?("data-curation")).to eql(true)
+    it 'includes the :role' do
+      expect(@json[:role].first.ends_with?('data-curation')).to eql(true)
     end
 
-    it "includes :affiliation" do
+    it 'includes :affiliation' do
       expect(@json[:affiliation][:name]).to eql(@contact.org.name)
     end
 
-    it "includes :contributor_id" do
+    it 'includes :contributor_id' do
       expect(@json[:contributor_id][:type]).to eql(@ident.identifier_format)
       expect(@json[:contributor_id][:identifier]).to eql(@ident.value)
     end
-    it "ignores non-orcid identifiers :contributor_id" do
-      scheme = create(:identifier_scheme, name: "shibboleth")
+    it 'ignores non-orcid identifiers :contributor_id' do
+      scheme = create(:identifier_scheme, name: 'shibboleth')
       create(:identifier, value: Faker::Lorem.word, identifiable: @contact,
                           identifier_scheme: scheme)
       @contact.reload
@@ -49,34 +48,34 @@
     end
   end
 
-  describe "includes all of the Contact attributes" do
+  describe 'includes all of the Contact attributes' do
     before(:each) do
-      render partial: "api/v1/contributors/show", locals: { contributor: @contact,
+      render partial: 'api/v1/contributors/show', locals: { contributor: @contact,
                                                             is_contact: true }
       @json = JSON.parse(rendered).with_indifferent_access
     end
 
-    it "includes the :name" do
+    it 'includes the :name' do
       expect(@json[:name]).to eql(@contact.name)
     end
-    it "includes the :mbox" do
+    it 'includes the :mbox' do
       expect(@json[:mbox]).to eql(@contact.email)
     end
 
-    it "does NOT include the :role" do
+    it 'does NOT include the :role' do
       expect(@json[:role]).to eql(nil)
     end
 
-    it "includes :affiliation" do
+    it 'includes :affiliation' do
       expect(@json[:affiliation][:name]).to eql(@contact.org.name)
     end
 
-    it "includes :contact_id" do
+    it 'includes :contact_id' do
       expect(@json[:contact_id][:type]).to eql(@ident.identifier_format)
       expect(@json[:contact_id][:identifier]).to eql(@ident.value)
     end
-    it "ignores non-orcid identifiers :contact_id" do
-      scheme = create(:identifier_scheme, name: "shibboleth")
+    it 'ignores non-orcid identifiers :contact_id' do
+      scheme = create(:identifier_scheme, name: 'shibboleth')
       create(:identifier, value: Faker::Lorem.word, identifiable: @contact,
                           identifier_scheme: scheme)
       @contact.reload
@@ -84,5 +83,4 @@
       expect(@json[:contact_id][:identifier]).to eql(@ident.value)
     end
   end
-
 end
diff --git a/spec/views/api/v1/datasets/_show.json.jbuilder_spec.rb b/spec/views/api/v1/datasets/_show.json.jbuilder_spec.rb
index 5f9bd63a40..2d4c4e76cc 100644
--- a/spec/views/api/v1/datasets/_show.json.jbuilder_spec.rb
+++ b/spec/views/api/v1/datasets/_show.json.jbuilder_spec.rb
@@ -1,31 +1,29 @@
 # frozen_string_literal: true
 
-require "rails_helper"
-
-describe "api/v1/datasets/_show.json.jbuilder" do
+require 'rails_helper'
 
+describe 'api/v1/datasets/_show.json.jbuilder' do
   before(:each) do
     # TODO: Implement this once the Dataset models are in place
     @plan = create(:plan)
-    render partial: "api/v1/datasets/show", locals: { plan: @plan }
+    render partial: 'api/v1/datasets/show', locals: { plan: @plan }
     @json = JSON.parse(rendered).with_indifferent_access
   end
 
-  describe "includes all of the dataset attributes" do
-    it "includes :title" do
-      expect(@json[:title]).to eql("Generic Dataset")
+  describe 'includes all of the dataset attributes' do
+    it 'includes :title' do
+      expect(@json[:title]).to eql('Generic Dataset')
     end
-    it "includes :personal_data" do
-      expect(@json[:personal_data]).to eql("unknown")
+    it 'includes :personal_data' do
+      expect(@json[:personal_data]).to eql('unknown')
     end
-    it "includes :sensitive_data" do
-      expect(@json[:sensitive_data]).to eql("unknown")
+    it 'includes :sensitive_data' do
+      expect(@json[:sensitive_data]).to eql('unknown')
     end
-    it "includes :dataset_id" do
-      expect(@json[:dataset_id][:type]).to eql("url")
+    it 'includes :dataset_id' do
+      expect(@json[:dataset_id][:type]).to eql('url')
       url = Rails.application.routes.url_helpers.api_v1_plan_url(@plan)
       expect(@json[:dataset_id][:identifier]).to eql(url)
     end
   end
-
 end
diff --git a/spec/views/api/v1/error.json.jbuilder_spec.rb b/spec/views/api/v1/error.json.jbuilder_spec.rb
index de74a43ff3..86c2814852 100644
--- a/spec/views/api/v1/error.json.jbuilder_spec.rb
+++ b/spec/views/api/v1/error.json.jbuilder_spec.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-require "rails_helper"
-
-describe "api/v1/error.json.jbuilder" do
+require 'rails_helper'
 
+describe 'api/v1/error.json.jbuilder' do
   before(:each) do
     @url = Faker::Internet.url
     @code = [200, 400, 404, 500].sample
@@ -12,26 +11,23 @@
     assign :payload, { errors: @errors }
 
     @resp = OpenStruct.new(status: @code)
-    @req = Net::HTTPGenericRequest.new("GET", nil, nil, @url)
+    @req = Net::HTTPGenericRequest.new('GET', nil, nil, @url)
 
-    render template: "api/v1/error", locals: { response: @resp, request: @req }
+    render template: 'api/v1/error', locals: { response: @resp, request: @req }
     @json = JSON.parse(rendered).with_indifferent_access
   end
 
-  describe "error responses from controllers" do
-
-    it "renders the standard_response partial" do
-      expect(response).to render_template(partial: "api/v1/_standard_response")
+  describe 'error responses from controllers' do
+    it 'renders the standard_response partial' do
+      expect(response).to render_template(partial: 'api/v1/_standard_response')
     end
 
-    it ":items is an empty array" do
+    it ':items is an empty array' do
       expect(@json[:items]).to eql([])
     end
 
-    it ":errors contains an array of error messages" do
+    it ':errors contains an array of error messages' do
       expect(@json[:errors]).to eql(@errors)
     end
-
   end
-
 end
diff --git a/spec/views/api/v1/identifiers/_show.json.jbuilder_spec.rb b/spec/views/api/v1/identifiers/_show.json.jbuilder_spec.rb
index d9116a3b21..b8641f616b 100644
--- a/spec/views/api/v1/identifiers/_show.json.jbuilder_spec.rb
+++ b/spec/views/api/v1/identifiers/_show.json.jbuilder_spec.rb
@@ -1,24 +1,22 @@
 # frozen_string_literal: true
 
-require "rails_helper"
-
-describe "api/v1/identifiers/_show.json.jbuilder" do
+require 'rails_helper'
 
+describe 'api/v1/identifiers/_show.json.jbuilder' do
   before(:each) do
     @scheme = create(:identifier_scheme)
     @identifier = create(:identifier, value: Faker::Lorem.word,
                                       identifier_scheme: @scheme)
-    render partial: "api/v1/identifiers/show", locals: { identifier: @identifier }
+    render partial: 'api/v1/identifiers/show', locals: { identifier: @identifier }
     @json = JSON.parse(rendered).with_indifferent_access
   end
 
-  describe "includes all of the identifier attributes" do
-    it "includes :type" do
+  describe 'includes all of the identifier attributes' do
+    it 'includes :type' do
       expect(@json[:type]).to eql(@identifier.identifier_format)
     end
-    it "includes :identifier" do
+    it 'includes :identifier' do
       expect(@json[:identifier]).to eql(@identifier.value)
     end
   end
-
 end
diff --git a/spec/views/api/v1/orgs/_show.json.jbuilder_spec.rb b/spec/views/api/v1/orgs/_show.json.jbuilder_spec.rb
index fc77811862..c3fb59f688 100644
--- a/spec/views/api/v1/orgs/_show.json.jbuilder_spec.rb
+++ b/spec/views/api/v1/orgs/_show.json.jbuilder_spec.rb
@@ -1,35 +1,34 @@
 # frozen_string_literal: true
 
-require "rails_helper"
-
-describe "api/v1/orgs/_show.json.jbuilder" do
+require 'rails_helper'
 
+describe 'api/v1/orgs/_show.json.jbuilder' do
   before(:each) do
-    scheme = create(:identifier_scheme, name: "ror")
+    scheme = create(:identifier_scheme, name: 'ror')
     @org = create(:org)
     @ident = create(:identifier, value: Faker::Lorem.word, identifiable: @org,
                                  identifier_scheme: scheme)
     @org.reload
-    render partial: "api/v1/orgs/show", locals: { org: @org }
+    render partial: 'api/v1/orgs/show', locals: { org: @org }
     @json = JSON.parse(rendered).with_indifferent_access
   end
 
-  describe "includes all of the org attributes" do
-    it "includes :name" do
+  describe 'includes all of the org attributes' do
+    it 'includes :name' do
       expect(@json[:name]).to eql(@org.name)
     end
-    it "includes :abbreviation" do
+    it 'includes :abbreviation' do
       expect(@json[:abbreviation]).to eql(@org.abbreviation)
     end
-    it "includes :region" do
+    it 'includes :region' do
       expect(@json[:region]).to eql(@org.region.abbreviation)
     end
-    it "includes :affiliation_id" do
+    it 'includes :affiliation_id' do
       expect(@json[:affiliation_id][:type]).to eql(@ident.identifier_format)
       expect(@json[:affiliation_id][:identifier]).to eql(@ident.value)
     end
-    it "uses the ROR over the FundRef :affiliation_id" do
-      scheme = create(:identifier_scheme, name: "fundref")
+    it 'uses the ROR over the FundRef :affiliation_id' do
+      scheme = create(:identifier_scheme, name: 'fundref')
       create(:identifier, value: Faker::Lorem.word, identifiable: @org,
                           identifier_scheme: scheme)
       @org.reload
@@ -37,5 +36,4 @@
       expect(@json[:affiliation_id][:identifier]).to eql(@ident.value)
     end
   end
-
 end
diff --git a/spec/views/api/v1/plans/_cost.json.jbuilder_spec.rb b/spec/views/api/v1/plans/_cost.json.jbuilder_spec.rb
index 415b8b7df2..6b1784008a 100644
--- a/spec/views/api/v1/plans/_cost.json.jbuilder_spec.rb
+++ b/spec/views/api/v1/plans/_cost.json.jbuilder_spec.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-require "rails_helper"
-
-describe "api/v1/plans/_cost.json.jbuilder" do
+require 'rails_helper'
 
+describe 'api/v1/plans/_cost.json.jbuilder' do
   before(:each) do
     # TODO: Implement this once the Currency question and Cost theme are in place
     #       and the PlanPresenter is extracting the info
@@ -14,23 +13,22 @@
       value: Faker::Number.decimal(l_digits: 2)
     }.with_indifferent_access
 
-    render partial: "api/v1/plans/cost", locals: { cost: @cost }
+    render partial: 'api/v1/plans/cost', locals: { cost: @cost }
     @json = JSON.parse(rendered).with_indifferent_access
   end
 
-  describe "includes all of the cost attributes" do
-    it "includes :title" do
+  describe 'includes all of the cost attributes' do
+    it 'includes :title' do
       expect(@json[:title]).to eql(@cost[:title])
     end
-    it "includes :description" do
+    it 'includes :description' do
       expect(@json[:description]).to eql(@cost[:description])
     end
-    it "includes :currency_code" do
+    it 'includes :currency_code' do
       expect(@json[:currency_code]).to eql(@cost[:currency_code])
     end
-    it "includes :value" do
+    it 'includes :value' do
       expect(@json[:value]).to eql(@cost[:value])
     end
   end
-
 end
diff --git a/spec/views/api/v1/plans/_funding.json.jbuilder_spec.rb b/spec/views/api/v1/plans/_funding.json.jbuilder_spec.rb
index 69dba26ac9..97059f8c1a 100644
--- a/spec/views/api/v1/plans/_funding.json.jbuilder_spec.rb
+++ b/spec/views/api/v1/plans/_funding.json.jbuilder_spec.rb
@@ -1,48 +1,47 @@
 # frozen_string_literal: true
 
-require "rails_helper"
-
-describe "api/v1/plans/_funding.json.jbuilder" do
+require 'rails_helper'
 
+describe 'api/v1/plans/_funding.json.jbuilder' do
   before(:each) do
     @funder = create(:org, :funder)
     create(:identifier, identifiable: @funder,
-                        identifier_scheme: create(:identifier_scheme, name: "fundref"))
+                        identifier_scheme: create(:identifier_scheme, name: 'fundref'))
     @funder.reload
     @plan = create(:plan, funder: @funder, org: create(:org), identifier: SecureRandom.uuid)
     create(:identifier, identifiable: @plan.org,
-                        identifier_scheme: create(:identifier_scheme, name: "ror"))
+                        identifier_scheme: create(:identifier_scheme, name: 'ror'))
     @grant = create(:identifier, identifiable: @plan)
     @plan.update(grant_id: @grant.id)
     @plan.reload
 
-    render partial: "api/v1/plans/funding", locals: { plan: @plan }
+    render partial: 'api/v1/plans/funding', locals: { plan: @plan }
     @json = JSON.parse(rendered).with_indifferent_access
   end
 
-  describe "includes all of the funding attributes" do
-    it "includes :name" do
+  describe 'includes all of the funding attributes' do
+    it 'includes :name' do
       expect(@json[:name]).to eql(@funder.name)
     end
-    it "includes :funding_status" do
+    it 'includes :funding_status' do
       expected = Api::V1::FundingPresenter.status(plan: @plan)
       expect(@json[:funding_status]).to eql(expected)
     end
-    it "includes :funder_ids" do
+    it 'includes :funder_ids' do
       id = @funder.identifiers.first
       expect(@json[:funder_id][:type]).to eql(id.identifier_format)
       expect(@json[:funder_id][:identifier]).to eql(id.value)
     end
-    it "includes :dmproadmap_funding_opportunity_identifier" do
+    it 'includes :dmproadmap_funding_opportunity_identifier' do
       identifier = @plan.identifier
-      expect(@json[:dmproadmap_funding_opportunity_id][:type]).to eql("other")
+      expect(@json[:dmproadmap_funding_opportunity_id][:type]).to eql('other')
       expect(@json[:dmproadmap_funding_opportunity_id][:identifier]).to eql(identifier)
     end
-    it "includes :grant_ids" do
+    it 'includes :grant_ids' do
       expect(@json[:grant_id][:type]).to eql(@grant.identifier_format)
       expect(@json[:grant_id][:identifier]).to eql(@grant.value)
     end
-    it "includes :dmproadmap_funded_affiliations" do
+    it 'includes :dmproadmap_funded_affiliations' do
       org = @plan.org
       expect(@json[:dmproadmap_funded_affiliations].any?).to eql(true)
       affil = @json[:dmproadmap_funded_affiliations].last
@@ -51,5 +50,4 @@
       expect(affil[:affiliation_id][:identifier]).to eql(org.identifiers.last.value)
     end
   end
-
 end
diff --git a/spec/views/api/v1/plans/_project.json.jbuilder_spec.rb b/spec/views/api/v1/plans/_project.json.jbuilder_spec.rb
index 6e73ff20a7..b555c96a7f 100644
--- a/spec/views/api/v1/plans/_project.json.jbuilder_spec.rb
+++ b/spec/views/api/v1/plans/_project.json.jbuilder_spec.rb
@@ -1,32 +1,30 @@
 # frozen_string_literal: true
 
-require "rails_helper"
-
-describe "api/v1/plans/_project.json.jbuilder" do
+require 'rails_helper'
 
+describe 'api/v1/plans/_project.json.jbuilder' do
   before(:each) do
     @plan = build(:plan, funder: build(:org, :funder))
-    render partial: "api/v1/plans/project", locals: { plan: @plan }
+    render partial: 'api/v1/plans/project', locals: { plan: @plan }
     @json = JSON.parse(rendered).with_indifferent_access
   end
 
-  describe "includes all of the project attributes" do
-    it "includes :title" do
+  describe 'includes all of the project attributes' do
+    it 'includes :title' do
       expect(@json[:title]).to eql(@plan.title)
     end
-    it "includes :description" do
+    it 'includes :description' do
       expect(@json[:description]).to eql(@plan.description)
     end
-    it "includes :start" do
+    it 'includes :start' do
       expect(@json[:start]).to eql(@plan.start_date.to_formatted_s(:iso8601))
     end
-    it "includes :end" do
+    it 'includes :end' do
       expect(@json[:end]).to eql(@plan.end_date.to_formatted_s(:iso8601))
     end
 
-    it "includes the :funder" do
+    it 'includes the :funder' do
       expect(@json[:funding].length).to eql(1)
     end
   end
-
 end
diff --git a/spec/views/api/v1/plans/_show.json.jbuilder_spec.rb b/spec/views/api/v1/plans/_show.json.jbuilder_spec.rb
index 7f800c9d91..6bcd93cd55 100644
--- a/spec/views/api/v1/plans/_show.json.jbuilder_spec.rb
+++ b/spec/views/api/v1/plans/_show.json.jbuilder_spec.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-require "rails_helper"
-
-describe "api/v1/plans/_show.json.jbuilder" do
+require 'rails_helper'
 
+describe 'api/v1/plans/_show.json.jbuilder' do
   before(:each) do
     @plan = create(:plan)
     @data_contact = create(:contributor, data_curation: true, plan: @plan)
@@ -13,94 +12,91 @@
     @plan.reload
   end
 
-  describe "includes all of the DMP attributes" do
-
+  describe 'includes all of the DMP attributes' do
     before(:each) do
-      render partial: "api/v1/plans/show", locals: { plan: @plan }
+      render partial: 'api/v1/plans/show', locals: { plan: @plan }
       @json = JSON.parse(rendered).with_indifferent_access
     end
 
-    it "includes the :title" do
+    it 'includes the :title' do
       expect(@json[:title]).to eql(@plan.title)
     end
-    it "includes the :description" do
+    it 'includes the :description' do
       expect(@json[:description]).to eql(@plan.description)
     end
-    it "includes the :language" do
+    it 'includes the :language' do
       expected = Api::V1::LanguagePresenter.three_char_code(
         lang: LocaleService.default_locale
       )
       expect(@json[:language]).to eql(expected)
     end
-    it "includes the :created" do
+    it 'includes the :created' do
       expect(@json[:created]).to eql(@plan.created_at.to_formatted_s(:iso8601))
     end
-    it "includes the :modified" do
+    it 'includes the :modified' do
       expect(@json[:modified]).to eql(@plan.updated_at.to_formatted_s(:iso8601))
     end
-    it "includes :ethical_issues" do
+    it 'includes :ethical_issues' do
       expected = Api::V1::ConversionService.boolean_to_yes_no_unknown(@plan.ethical_issues)
       expect(@json[:ethical_issues_exist]).to eql(expected)
     end
-    it "includes :ethical_issues_description" do
+    it 'includes :ethical_issues_description' do
       expect(@json[:ethical_issues_description]).to eql(@plan.ethical_issues_description)
     end
-    it "includes :ethical_issues_report" do
+    it 'includes :ethical_issues_report' do
       expect(@json[:ethical_issues_report]).to eql(@plan.ethical_issues_report)
     end
 
-    it "returns the URL of the plan as the :dmp_id if no DOI is defined" do
+    it 'returns the URL of the plan as the :dmp_id if no DOI is defined' do
       expected = Rails.application.routes.url_helpers.api_v1_plan_url(@plan)
-      expect(@json[:dmp_id][:type]).to eql("url")
+      expect(@json[:dmp_id][:type]).to eql('url')
       expect(@json[:dmp_id][:identifier]).to eql(expected)
     end
 
-    it "includes the :contact" do
+    it 'includes the :contact' do
       expect(@json[:contact][:mbox]).to eql(@data_contact.email)
     end
-    it "includes the :contributors" do
+    it 'includes the :contributors' do
       emails = @json[:contributor].collect { |c| c[:mbox] }
       expect(emails.include?(@pi.email)).to eql(true)
     end
 
     # TODO: make sure this is working once the new Cost theme and Currency
     #       question type have been implemented
-    it "includes the :cost" do
+    it 'includes the :cost' do
       expect(@json[:cost]).to eql(nil)
     end
 
-    it "includes the :project" do
+    it 'includes the :project' do
       expect(@json[:project].length).to eql(1)
     end
-    it "includes the :dataset" do
+    it 'includes the :dataset' do
       expect(@json[:dataset].length).to eql(1)
     end
-    it "includes the :extension" do
+    it 'includes the :extension' do
       expect(@json[:extension].length).to eql(1)
     end
-    it "includes the :template in :extension" do
-      app = ApplicationService.application_name.split("-").first
+    it 'includes the :template in :extension' do
+      app = ApplicationService.application_name.split('-').first
       @section = @json[:extension].select { |hash| hash.keys.first == app }.first
       expect(@section[app.to_sym].present?).to eql(true)
       tmplt = @plan.template
       expect(@section[app.to_sym][:template][:id]).to eql(tmplt.id)
       expect(@section[app.to_sym][:template][:title]).to eql(tmplt.title)
     end
-
   end
 
-  describe "when the system mints DOIs" do
+  describe 'when the system mints DOIs' do
     before(:each) do
-      @doi = create(:identifier, value: "10.9999/123abc.zy/x23", identifiable: @plan)
+      @doi = create(:identifier, value: '10.9999/123abc.zy/x23', identifiable: @plan)
       @plan.reload
-      render partial: "api/v1/plans/show", locals: { plan: @plan }
+      render partial: 'api/v1/plans/show', locals: { plan: @plan }
       @json = JSON.parse(rendered).with_indifferent_access
     end
 
-    it "returns the DOI for the :dmp_id if one is present" do
-      expect(@json[:dmp_id][:type]).to eql("doi")
+    it 'returns the DOI for the :dmp_id if one is present' do
+      expect(@json[:dmp_id][:type]).to eql('doi')
       expect(@json[:dmp_id][:identifier]).to eql(@doi.value)
     end
   end
-
 end
diff --git a/spec/views/api/v1/templates/index.json.jbuilder_spec.rb b/spec/views/api/v1/templates/index.json.jbuilder_spec.rb
index 1fb6f8057a..7c6fd0c944 100644
--- a/spec/views/api/v1/templates/index.json.jbuilder_spec.rb
+++ b/spec/views/api/v1/templates/index.json.jbuilder_spec.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-require "rails_helper"
-
-describe "api/v1/templates/index.json.jbuilder" do
+require 'rails_helper'
 
+describe 'api/v1/templates/index.json.jbuilder' do
   before(:each) do
     @application = Faker::Lorem.word
     @url = Faker::Internet.url
@@ -16,44 +15,43 @@
     assign :items, [@template1, @template2]
 
     @resp = OpenStruct.new(status: @code)
-    @req = Net::HTTPGenericRequest.new("GET", nil, nil, @url)
+    @req = Net::HTTPGenericRequest.new('GET', nil, nil, @url)
 
-    render template: "api/v1/templates/index",
+    render template: 'api/v1/templates/index',
            locals: { response: @resp, request: @req }
     @json = JSON.parse(rendered).with_indifferent_access
   end
 
-  it "includes both templates" do
+  it 'includes both templates' do
     expect(@json[:items].length).to eql(2)
   end
 
-  describe "includes all of the Template attributes" do
+  describe 'includes all of the Template attributes' do
     before(:each) do
       @template = @json[:items].first[:dmp_template]
     end
 
-    it "includes the :title" do
+    it 'includes the :title' do
       expect(@template[:title]).to eql(@template1.title)
     end
-    it "includes the :description" do
+    it 'includes the :description' do
       expect(@template[:description]).to eql(@template1.description)
     end
-    it "includes the :version" do
+    it 'includes the :version' do
       expect(@template[:version]).to eql(@template1.version)
     end
-    it "includes the :created" do
+    it 'includes the :created' do
       expect(@template[:created]).to eql(@template1.created_at.to_formatted_s(:iso8601))
     end
-    it "includes the :modified" do
+    it 'includes the :modified' do
       expect(@template[:modified]).to eql(@template1.updated_at.to_formatted_s(:iso8601))
     end
-    it "includes the :affiliation" do
+    it 'includes the :affiliation' do
       expect(@template[:affiliation][:name]).to eql(@template1.org.name)
     end
-    it "includes the :template_ids" do
+    it 'includes the :template_ids' do
       expect(@template[:template_id][:identifier]).to eql(@template1.id.to_s)
-      expect(@template[:template_id][:type]).to eql("other")
+      expect(@template[:template_id][:type]).to eql('other')
     end
   end
-
 end
diff --git a/spec/views/api/v1/token.json.jbuilder_spec.rb b/spec/views/api/v1/token.json.jbuilder_spec.rb
index d05c39c61d..1b75351104 100644
--- a/spec/views/api/v1/token.json.jbuilder_spec.rb
+++ b/spec/views/api/v1/token.json.jbuilder_spec.rb
@@ -1,12 +1,11 @@
 # frozen_string_literal: true
 
-require "rails_helper"
-
-describe "api/v1/token.json.jbuilder" do
+require 'rails_helper'
 
+describe 'api/v1/token.json.jbuilder' do
   before(:each) do
     @url = Faker::Internet.url
-    @payload = { client_id: "foo" }
+    @payload = { client_id: 'foo' }
     @token = Api::V1::Auth::Jwt::JsonWebToken.encode(payload: @payload)
     @exp = @payload[:exp]
     @type = Faker::Lorem.word.capitalize
@@ -16,29 +15,28 @@
     assign :token_type, @type
 
     @resp = OpenStruct.new(status: 200)
-    @req = Net::HTTPGenericRequest.new("GET", nil, nil, @url)
+    @req = Net::HTTPGenericRequest.new('GET', nil, nil, @url)
 
-    render template: "api/v1/token",
+    render template: 'api/v1/token',
            locals: { response: @resp, request: @req }
     @json = JSON.parse(rendered).with_indifferent_access
   end
 
-  describe "authentication responses from controllers" do
-    it "renders the token template" do
-      expect(response).to render_template("api/v1/token")
+  describe 'authentication responses from controllers' do
+    it 'renders the token template' do
+      expect(response).to render_template('api/v1/token')
     end
-    it ":access_token is the JSON Web Token" do
+    it ':access_token is the JSON Web Token' do
       expect(@json[:access_token]).to eql(@token)
     end
-    it ":token_type is set" do
+    it ':token_type is set' do
       expect(@json[:token_type]).to eql(@type)
     end
-    it ":expires_in is set" do
+    it ':expires_in is set' do
       expect(@json[:expires_in]).to eql(@exp)
     end
-    it ":created_at is set" do
+    it ':created_at is set' do
       expect(@json[:created_at].present?).to eql(true)
     end
   end
-
 end
diff --git a/yarn.lock b/yarn.lock
index dab6bfe81d..bd73d4e197 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9,32 +9,32 @@
   dependencies:
     "@babel/highlight" "^7.10.4"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz#23b08d740e83f49c5e59945fbf1b43e80bbf4edb"
-  integrity sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==
-  dependencies:
-    "@babel/highlight" "^7.14.5"
-
-"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.15.0":
-  version "7.15.0"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.15.0.tgz#2dbaf8b85334796cafbb0f5793a90a2fc010b176"
-  integrity sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA==
-
-"@babel/core@^7.9.0":
-  version "7.15.5"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.15.5.tgz#f8ed9ace730722544609f90c9bb49162dc3bf5b9"
-  integrity sha512-pYgXxiwAgQpgM1bNkZsDEq85f0ggXMA5L7c+o3tskGMh2BunCI9QUwB9Z4jpvXUOuMdyGKiGKQiRe11VS6Jzvg==
-  dependencies:
-    "@babel/code-frame" "^7.14.5"
-    "@babel/generator" "^7.15.4"
-    "@babel/helper-compilation-targets" "^7.15.4"
-    "@babel/helper-module-transforms" "^7.15.4"
-    "@babel/helpers" "^7.15.4"
-    "@babel/parser" "^7.15.5"
-    "@babel/template" "^7.15.4"
-    "@babel/traverse" "^7.15.4"
-    "@babel/types" "^7.15.4"
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789"
+  integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==
+  dependencies:
+    "@babel/highlight" "^7.16.7"
+
+"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.4", "@babel/compat-data@^7.16.8":
+  version "7.16.8"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.16.8.tgz#31560f9f29fdf1868de8cb55049538a1b9732a60"
+  integrity sha512-m7OkX0IdKLKPpBlJtF561YJal5y/jyI5fNfWbPxh2D/nbzzGI4qRyrD8xO2jB24u7l+5I2a43scCG2IrfjC50Q==
+
+"@babel/core@^7.15.0":
+  version "7.16.12"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.16.12.tgz#5edc53c1b71e54881315923ae2aedea2522bb784"
+  integrity sha512-dK5PtG1uiN2ikk++5OzSYsitZKny4wOCD0nrO4TqnW4BVBTQ2NGS3NgilvT/TEyxTST7LNyWV/T4tXDoD3fOgg==
+  dependencies:
+    "@babel/code-frame" "^7.16.7"
+    "@babel/generator" "^7.16.8"
+    "@babel/helper-compilation-targets" "^7.16.7"
+    "@babel/helper-module-transforms" "^7.16.7"
+    "@babel/helpers" "^7.16.7"
+    "@babel/parser" "^7.16.12"
+    "@babel/template" "^7.16.7"
+    "@babel/traverse" "^7.16.10"
+    "@babel/types" "^7.16.8"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
@@ -42,64 +42,65 @@
     semver "^6.3.0"
     source-map "^0.5.0"
 
-"@babel/generator@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.15.4.tgz#85acb159a267ca6324f9793986991ee2022a05b0"
-  integrity sha512-d3itta0tu+UayjEORPNz6e1T3FtvWlP5N4V5M+lhp/CxT4oAA7/NcScnpRyspUMLK6tu9MNHmQHxRykuN2R7hw==
+"@babel/generator@^7.16.8":
+  version "7.16.8"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.16.8.tgz#359d44d966b8cd059d543250ce79596f792f2ebe"
+  integrity sha512-1ojZwE9+lOXzcWdWmO6TbUzDfqLD39CmEhN8+2cX9XkDo5yW1OpgfejfliysR2AWLpMamTiOiAp/mtroaymhpw==
   dependencies:
-    "@babel/types" "^7.15.4"
+    "@babel/types" "^7.16.8"
     jsesc "^2.5.1"
     source-map "^0.5.0"
 
-"@babel/helper-annotate-as-pure@^7.14.5", "@babel/helper-annotate-as-pure@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.15.4.tgz#3d0e43b00c5e49fdb6c57e421601a7a658d5f835"
-  integrity sha512-QwrtdNvUNsPCj2lfNQacsGSQvGX8ee1ttrBrcozUP2Sv/jylewBP/8QFe6ZkBsC8T/GYWonNAWJV4aRR9AL2DA==
+"@babel/helper-annotate-as-pure@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz#bb2339a7534a9c128e3102024c60760a3a7f3862"
+  integrity sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==
   dependencies:
-    "@babel/types" "^7.15.4"
+    "@babel/types" "^7.16.7"
 
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.14.5":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.15.4.tgz#21ad815f609b84ee0e3058676c33cf6d1670525f"
-  integrity sha512-P8o7JP2Mzi0SdC6eWr1zF+AEYvrsZa7GSY1lTayjF5XJhVH0kjLYUZPvTMflP7tBgZoe9gIhTa60QwFpqh/E0Q==
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz#38d138561ea207f0f69eb1626a418e4f7e6a580b"
+  integrity sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA==
   dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.15.4"
-    "@babel/types" "^7.15.4"
+    "@babel/helper-explode-assignable-expression" "^7.16.7"
+    "@babel/types" "^7.16.7"
 
-"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.4.tgz#cf6d94f30fbefc139123e27dd6b02f65aeedb7b9"
-  integrity sha512-rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ==
+"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.7.tgz#06e66c5f299601e6c7da350049315e83209d551b"
+  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"
 
-"@babel/helper-create-class-features-plugin@^7.14.5", "@babel/helper-create-class-features-plugin@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.15.4.tgz#7f977c17bd12a5fba363cb19bea090394bf37d2e"
-  integrity sha512-7ZmzFi+DwJx6A7mHRwbuucEYpyBwmh2Ca0RvI6z2+WLZYCqV0JOaLb+u0zbtmDicebgKBZgqbYfLaKNqSgv5Pw==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.15.4"
-    "@babel/helper-function-name" "^7.15.4"
-    "@babel/helper-member-expression-to-functions" "^7.15.4"
-    "@babel/helper-optimise-call-expression" "^7.15.4"
-    "@babel/helper-replace-supers" "^7.15.4"
-    "@babel/helper-split-export-declaration" "^7.15.4"
-
-"@babel/helper-create-regexp-features-plugin@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.5.tgz#c7d5ac5e9cf621c26057722fb7a8a4c5889358c4"
-  integrity sha512-TLawwqpOErY2HhWbGJ2nZT5wSkR192QpN+nBg1THfBfftrlvOh+WbhrxXCH4q4xJ9Gl16BGPR/48JA+Ryiho/A==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.14.5"
+"@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7":
+  version "7.16.10"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.10.tgz#8a6959b9cc818a88815ba3c5474619e9c0f2c21c"
+  integrity sha512-wDeej0pu3WN/ffTxMNCPW5UCiOav8IcLRxSIyp/9+IF2xJUM9h/OYjg0IJLHaL6F8oU8kqMz9nc1vryXhMsgXg==
+  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-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/helper-create-regexp-features-plugin@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.16.7.tgz#0cb82b9bac358eb73bfbd73985a776bfa6b14d48"
+  integrity sha512-fk5A6ymfp+O5+p2yCkXAu5Kyj6v0xh0RBeNcAkYUMDvvAAoxvSKXn+Jb37t/yWFiQVDFK1ELpUTD8/aLhCPu+g==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.16.7"
     regexpu-core "^4.7.1"
 
-"@babel/helper-define-polyfill-provider@^0.2.2":
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.3.tgz#0525edec5094653a282688d34d846e4c75e9c0b6"
-  integrity sha512-RH3QDAfRMzj7+0Nqu5oqgO5q9mFtQEVvCRsi8qCEfzLR9p2BHfn5FzhSB2oj1fF7I2+DcTORkYaQ6aTR9Cofew==
+"@babel/helper-define-polyfill-provider@^0.3.1":
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz#52411b445bdb2e676869e5a74960d2d3826d2665"
+  integrity sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==
   dependencies:
     "@babel/helper-compilation-targets" "^7.13.0"
     "@babel/helper-module-imports" "^7.12.13"
@@ -110,295 +111,310 @@
     resolve "^1.14.2"
     semver "^6.1.2"
 
-"@babel/helper-explode-assignable-expression@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.15.4.tgz#f9aec9d219f271eaf92b9f561598ca6b2682600c"
-  integrity sha512-J14f/vq8+hdC2KoWLIQSsGrC9EFBKE4NFts8pfMpymfApds+fPqR30AOUWc4tyr56h9l/GA1Sxv2q3dLZWbQ/g==
-  dependencies:
-    "@babel/types" "^7.15.4"
-
-"@babel/helper-function-name@^7.14.5", "@babel/helper-function-name@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.15.4.tgz#845744dafc4381a4a5fb6afa6c3d36f98a787ebc"
-  integrity sha512-Z91cOMM4DseLIGOnog+Z8OI6YseR9bua+HpvLAQ2XayUGU+neTtX+97caALaLdyu53I/fjhbeCnWnRH1O3jFOw==
-  dependencies:
-    "@babel/helper-get-function-arity" "^7.15.4"
-    "@babel/template" "^7.15.4"
-    "@babel/types" "^7.15.4"
-
-"@babel/helper-get-function-arity@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.15.4.tgz#098818934a137fce78b536a3e015864be1e2879b"
-  integrity sha512-1/AlxSF92CmGZzHnC515hm4SirTxtpDnLEJ0UyEMgTMZN+6bxXKg04dKhiRx5Enel+SUA1G1t5Ed/yQia0efrA==
-  dependencies:
-    "@babel/types" "^7.15.4"
-
-"@babel/helper-hoist-variables@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.15.4.tgz#09993a3259c0e918f99d104261dfdfc033f178df"
-  integrity sha512-VTy085egb3jUGVK9ycIxQiPbquesq0HUQ+tPO0uv5mPEBZipk+5FkRKiWq5apuyTE9FUrjENB0rCf8y+n+UuhA==
-  dependencies:
-    "@babel/types" "^7.15.4"
-
-"@babel/helper-member-expression-to-functions@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.4.tgz#bfd34dc9bba9824a4658b0317ec2fd571a51e6ef"
-  integrity sha512-cokOMkxC/BTyNP1AlY25HuBWM32iCEsLPI4BHDpJCHHm1FU2E7dKWWIXJgQgSFiu4lp8q3bL1BIKwqkSUviqtA==
+"@babel/helper-environment-visitor@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz#ff484094a839bde9d89cd63cba017d7aae80ecd7"
+  integrity sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==
   dependencies:
-    "@babel/types" "^7.15.4"
-
-"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.14.5", "@babel/helper-module-imports@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.15.4.tgz#e18007d230632dea19b47853b984476e7b4e103f"
-  integrity sha512-jeAHZbzUwdW/xHgHQ3QmWR4Jg6j15q4w/gCfwZvtqOxoo5DKtLHk8Bsf4c5RZRC7NmLEs+ohkdq8jFefuvIxAA==
+    "@babel/types" "^7.16.7"
+
+"@babel/helper-explode-assignable-expression@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz#12a6d8522fdd834f194e868af6354e8650242b7a"
+  integrity sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ==
   dependencies:
-    "@babel/types" "^7.15.4"
+    "@babel/types" "^7.16.7"
 
-"@babel/helper-module-transforms@^7.14.5", "@babel/helper-module-transforms@^7.15.4":
-  version "7.15.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.15.7.tgz#7da80c8cbc1f02655d83f8b79d25866afe50d226"
-  integrity sha512-ZNqjjQG/AuFfekFTY+7nY4RgBSklgTu970c7Rj3m/JOhIu5KPBUuTA9AY6zaKcUvk4g6EbDXdBnhi35FAssdSw==
+"@babel/helper-function-name@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz#f1ec51551fb1c8956bc8dd95f38523b6cf375f8f"
+  integrity sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==
   dependencies:
-    "@babel/helper-module-imports" "^7.15.4"
-    "@babel/helper-replace-supers" "^7.15.4"
-    "@babel/helper-simple-access" "^7.15.4"
-    "@babel/helper-split-export-declaration" "^7.15.4"
-    "@babel/helper-validator-identifier" "^7.15.7"
-    "@babel/template" "^7.15.4"
-    "@babel/traverse" "^7.15.4"
-    "@babel/types" "^7.15.6"
+    "@babel/helper-get-function-arity" "^7.16.7"
+    "@babel/template" "^7.16.7"
+    "@babel/types" "^7.16.7"
 
-"@babel/helper-optimise-call-expression@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.15.4.tgz#f310a5121a3b9cc52d9ab19122bd729822dee171"
-  integrity sha512-E/z9rfbAOt1vDW1DR7k4SzhzotVV5+qMciWV6LaG1g4jeFrkDlJedjtV4h0i4Q/ITnUu+Pk08M7fczsB9GXBDw==
+"@babel/helper-get-function-arity@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz#ea08ac753117a669f1508ba06ebcc49156387419"
+  integrity sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==
   dependencies:
-    "@babel/types" "^7.15.4"
-
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz#5ac822ce97eec46741ab70a517971e443a70c5a9"
-  integrity sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==
+    "@babel/types" "^7.16.7"
 
-"@babel/helper-remap-async-to-generator@^7.14.5", "@babel/helper-remap-async-to-generator@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.15.4.tgz#2637c0731e4c90fbf58ac58b50b2b5a192fc970f"
-  integrity sha512-v53MxgvMK/HCwckJ1bZrq6dNKlmwlyRNYM6ypaRTdXWGOE2c1/SCa6dL/HimhPulGhZKw9W0QhREM583F/t0vQ==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.15.4"
-    "@babel/helper-wrap-function" "^7.15.4"
-    "@babel/types" "^7.15.4"
-
-"@babel/helper-replace-supers@^7.14.5", "@babel/helper-replace-supers@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.15.4.tgz#52a8ab26ba918c7f6dee28628b07071ac7b7347a"
-  integrity sha512-/ztT6khaXF37MS47fufrKvIsiQkx1LBRvSJNzRqmbyeZnTwU9qBxXYLaaT/6KaxfKhjs2Wy8kG8ZdsFUuWBjzw==
-  dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.15.4"
-    "@babel/helper-optimise-call-expression" "^7.15.4"
-    "@babel/traverse" "^7.15.4"
-    "@babel/types" "^7.15.4"
-
-"@babel/helper-simple-access@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.15.4.tgz#ac368905abf1de8e9781434b635d8f8674bcc13b"
-  integrity sha512-UzazrDoIVOZZcTeHHEPYrr1MvTR/K+wgLg6MY6e1CJyaRhbibftF6fR2KU2sFRtI/nERUZR9fBd6aKgBlIBaPg==
-  dependencies:
-    "@babel/types" "^7.15.4"
-
-"@babel/helper-skip-transparent-expression-wrappers@^7.14.5", "@babel/helper-skip-transparent-expression-wrappers@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.15.4.tgz#707dbdba1f4ad0fa34f9114fc8197aec7d5da2eb"
-  integrity sha512-BMRLsdh+D1/aap19TycS4eD1qELGrCBJwzaY9IE8LrpJtJb+H7rQkPIdsfgnMtLBA6DJls7X9z93Z4U8h7xw0A==
-  dependencies:
-    "@babel/types" "^7.15.4"
-
-"@babel/helper-split-export-declaration@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.15.4.tgz#aecab92dcdbef6a10aa3b62ab204b085f776e257"
-  integrity sha512-HsFqhLDZ08DxCpBdEVtKmywj6PQbwnF6HHybur0MAnkAKnlS6uHkwnmRIkElB2Owpfb4xL4NwDmDLFubueDXsw==
-  dependencies:
-    "@babel/types" "^7.15.4"
-
-"@babel/helper-validator-identifier@^7.14.5", "@babel/helper-validator-identifier@^7.14.9", "@babel/helper-validator-identifier@^7.15.7":
-  version "7.15.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389"
-  integrity sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==
-
-"@babel/helper-validator-option@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3"
-  integrity sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==
-
-"@babel/helper-wrap-function@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.15.4.tgz#6f754b2446cfaf3d612523e6ab8d79c27c3a3de7"
-  integrity sha512-Y2o+H/hRV5W8QhIfTpRIBwl57y8PrZt6JM3V8FOo5qarjshHItyH5lXlpMfBfmBefOqSCpKZs/6Dxqp0E/U+uw==
-  dependencies:
-    "@babel/helper-function-name" "^7.15.4"
-    "@babel/template" "^7.15.4"
-    "@babel/traverse" "^7.15.4"
-    "@babel/types" "^7.15.4"
-
-"@babel/helpers@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.15.4.tgz#5f40f02050a3027121a3cf48d497c05c555eaf43"
-  integrity sha512-V45u6dqEJ3w2rlryYYXf6i9rQ5YMNu4FLS6ngs8ikblhu2VdR1AqAd6aJjBzmf2Qzh6KOLqKHxEN9+TFbAkAVQ==
-  dependencies:
-    "@babel/template" "^7.15.4"
-    "@babel/traverse" "^7.15.4"
-    "@babel/types" "^7.15.4"
-
-"@babel/highlight@^7.10.4", "@babel/highlight@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz#6861a52f03966405001f6aa534a01a24d99e8cd9"
-  integrity sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.14.5"
+"@babel/helper-hoist-variables@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz#86bcb19a77a509c7b77d0e22323ef588fa58c246"
+  integrity sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==
+  dependencies:
+    "@babel/types" "^7.16.7"
+
+"@babel/helper-member-expression-to-functions@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.7.tgz#42b9ca4b2b200123c3b7e726b0ae5153924905b0"
+  integrity sha512-VtJ/65tYiU/6AbMTDwyoXGPKHgTsfRarivm+YbB5uAzKUyuPjgZSgAFeG87FCigc7KNHu2Pegh1XIT3lXjvz3Q==
+  dependencies:
+    "@babel/types" "^7.16.7"
+
+"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz#25612a8091a999704461c8a222d0efec5d091437"
+  integrity sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==
+  dependencies:
+    "@babel/types" "^7.16.7"
+
+"@babel/helper-module-transforms@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.16.7.tgz#7665faeb721a01ca5327ddc6bba15a5cb34b6a41"
+  integrity sha512-gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng==
+  dependencies:
+    "@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.16.7"
+    "@babel/types" "^7.16.7"
+
+"@babel/helper-optimise-call-expression@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz#a34e3560605abbd31a18546bd2aad3e6d9a174f2"
+  integrity sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==
+  dependencies:
+    "@babel/types" "^7.16.7"
+
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz#aa3a8ab4c3cceff8e65eb9e73d87dc4ff320b2f5"
+  integrity sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==
+
+"@babel/helper-remap-async-to-generator@^7.16.8":
+  version "7.16.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz#29ffaade68a367e2ed09c90901986918d25e57e3"
+  integrity sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.16.7"
+    "@babel/helper-wrap-function" "^7.16.8"
+    "@babel/types" "^7.16.8"
+
+"@babel/helper-replace-supers@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz#e9f5f5f32ac90429c1a4bdec0f231ef0c2838ab1"
+  integrity sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw==
+  dependencies:
+    "@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"
+
+"@babel/helper-simple-access@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.16.7.tgz#d656654b9ea08dbb9659b69d61063ccd343ff0f7"
+  integrity sha512-ZIzHVyoeLMvXMN/vok/a4LWRy8G2v205mNP0XOuf9XRLyX5/u9CnVulUtDgUTama3lT+bf/UqucuZjqiGuTS1g==
+  dependencies:
+    "@babel/types" "^7.16.7"
+
+"@babel/helper-skip-transparent-expression-wrappers@^7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz#0ee3388070147c3ae051e487eca3ebb0e2e8bb09"
+  integrity sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==
+  dependencies:
+    "@babel/types" "^7.16.0"
+
+"@babel/helper-split-export-declaration@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz#0b648c0c42da9d3920d85ad585f2778620b8726b"
+  integrity sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==
+  dependencies:
+    "@babel/types" "^7.16.7"
+
+"@babel/helper-validator-identifier@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad"
+  integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==
+
+"@babel/helper-validator-option@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz#b203ce62ce5fe153899b617c08957de860de4d23"
+  integrity sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==
+
+"@babel/helper-wrap-function@^7.16.8":
+  version "7.16.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz#58afda087c4cd235de92f7ceedebca2c41274200"
+  integrity sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==
+  dependencies:
+    "@babel/helper-function-name" "^7.16.7"
+    "@babel/template" "^7.16.7"
+    "@babel/traverse" "^7.16.8"
+    "@babel/types" "^7.16.8"
+
+"@babel/helpers@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.16.7.tgz#7e3504d708d50344112767c3542fc5e357fffefc"
+  integrity sha512-9ZDoqtfY7AuEOt3cxchfii6C7GDyyMBffktR5B2jvWv8u2+efwvpnVKXMWzNehqy68tKgAfSwfdw/lWpthS2bw==
+  dependencies:
+    "@babel/template" "^7.16.7"
+    "@babel/traverse" "^7.16.7"
+    "@babel/types" "^7.16.7"
+
+"@babel/highlight@^7.10.4", "@babel/highlight@^7.16.7":
+  version "7.16.10"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.10.tgz#744f2eb81579d6eea753c227b0f570ad785aba88"
+  integrity sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.16.7"
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.15.4", "@babel/parser@^7.15.5":
-  version "7.15.7"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.15.7.tgz#0c3ed4a2eb07b165dfa85b3cc45c727334c4edae"
-  integrity sha512-rycZXvQ+xS9QyIcJ9HXeDWf1uxqlbVFAUq0Rq0dbc50Zb/+wUe/ehyfzGfm9KZZF0kBejYgxltBXocP+gKdL2g==
+"@babel/parser@^7.16.10", "@babel/parser@^7.16.12", "@babel/parser@^7.16.7":
+  version "7.16.12"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.12.tgz#9474794f9a650cf5e2f892444227f98e28cdf8b6"
+  integrity sha512-VfaV15po8RiZssrkPweyvbGVSe4x2y+aciFCgn0n0/SJMR22cwofRV1mtnJQYcSB1wUTaA/X1LnA3es66MCO5A==
 
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.15.4.tgz#dbdeabb1e80f622d9f0b583efb2999605e0a567e"
-  integrity sha512-eBnpsl9tlhPhpI10kU06JHnrYXwg3+V6CaP2idsCXNef0aeslpqyITXQ74Vfk5uHgY7IG7XP0yIH8b42KSzHog==
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz#4eda6d6c2a0aa79c70fa7b6da67763dfe2141050"
+  integrity sha512-anv/DObl7waiGEnC24O9zqL0pSuI9hljihqiDuFHC8d7/bjr/4RLGPWuc8rYOff/QPzbEPSkzG8wGG9aDuhHRg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.15.4"
-    "@babel/plugin-proposal-optional-chaining" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-proposal-async-generator-functions@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.15.4.tgz#f82aabe96c135d2ceaa917feb9f5fca31635277e"
-  integrity sha512-2zt2g5vTXpMC3OmK6uyjvdXptbhBXfA77XGrd3gh93zwG8lZYBLOBImiGBEG0RANu3JqKEACCz5CGk73OJROBw==
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7.tgz#cc001234dfc139ac45f6bcf801866198c8c72ff9"
+  integrity sha512-di8vUHRdf+4aJ7ltXhaDbPoszdkh59AQtJM5soLsuHpQJdFQZOA4uGj0V2u/CZ8bJ/u8ULDL5yq6FO/bCXnKHw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-    "@babel/helper-remap-async-to-generator" "^7.15.4"
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
+    "@babel/plugin-proposal-optional-chaining" "^7.16.7"
+
+"@babel/plugin-proposal-async-generator-functions@^7.16.8":
+  version "7.16.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz#3bdd1ebbe620804ea9416706cd67d60787504bc8"
+  integrity sha512-71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-remap-async-to-generator" "^7.16.8"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
 
-"@babel/plugin-proposal-class-properties@^7.14.5", "@babel/plugin-proposal-class-properties@^7.8.3":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.14.5.tgz#40d1ee140c5b1e31a350f4f5eed945096559b42e"
-  integrity sha512-q/PLpv5Ko4dVc1LYMpCY7RVAAO4uk55qPwrIuJ5QJ8c6cVuAmhu7I/49JOppXL6gXf7ZHzpRVEUZdYoPLM04Gg==
+"@babel/plugin-proposal-class-properties@^7.14.5", "@babel/plugin-proposal-class-properties@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz#925cad7b3b1a2fcea7e59ecc8eb5954f961f91b0"
+  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"
 
-"@babel/plugin-proposal-class-static-block@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.15.4.tgz#3e7ca6128453c089e8b477a99f970c63fc1cb8d7"
-  integrity sha512-M682XWrrLNk3chXCjoPUQWOyYsB93B9z3mRyjtqqYJWDf2mfCdIYgDrA11cgNVhAQieaq6F2fn2f3wI0U4aTjA==
+"@babel/plugin-proposal-class-static-block@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.16.7.tgz#712357570b612106ef5426d13dc433ce0f200c2a"
+  integrity sha512-dgqJJrcZoG/4CkMopzhPJjGxsIe9A8RlkQLnL/Vhhx8AA9ZuaRwGSlscSh42hazc7WSrya/IK7mTeoF0DP9tEw==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.15.4"
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-create-class-features-plugin" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
 
-"@babel/plugin-proposal-dynamic-import@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.5.tgz#0c6617df461c0c1f8fff3b47cd59772360101d2c"
-  integrity sha512-ExjiNYc3HDN5PXJx+bwC50GIx/KKanX2HiggnIUAYedbARdImiCU4RhhHfdf0Kd7JNXGpsBBBCOm+bBVy3Gb0g==
+"@babel/plugin-proposal-dynamic-import@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz#c19c897eaa46b27634a00fee9fb7d829158704b2"
+  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"
 
-"@babel/plugin-proposal-export-namespace-from@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.5.tgz#dbad244310ce6ccd083072167d8cea83a52faf76"
-  integrity sha512-g5POA32bXPMmSBu5Dx/iZGLGnKmKPc5AiY7qfZgurzrCYgIztDlHFbznSNCoQuv57YQLnQfaDi7dxCtLDIdXdA==
+"@babel/plugin-proposal-export-namespace-from@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.7.tgz#09de09df18445a5786a305681423ae63507a6163"
+  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"
 
-"@babel/plugin-proposal-json-strings@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.5.tgz#38de60db362e83a3d8c944ac858ddf9f0c2239eb"
-  integrity sha512-NSq2fczJYKVRIsUJyNxrVUMhB27zb7N7pOFGQOhBKJrChbGcgEAqyZrmZswkPk18VMurEeJAaICbfm57vUeTbQ==
+"@babel/plugin-proposal-json-strings@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.7.tgz#9732cb1d17d9a2626a08c5be25186c195b6fa6e8"
+  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"
 
-"@babel/plugin-proposal-logical-assignment-operators@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.5.tgz#6e6229c2a99b02ab2915f82571e0cc646a40c738"
-  integrity sha512-YGn2AvZAo9TwyhlLvCCWxD90Xq8xJ4aSgaX3G5D/8DW94L8aaT+dS5cSP+Z06+rCJERGSr9GxMBZ601xoc2taw==
+"@babel/plugin-proposal-logical-assignment-operators@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz#be23c0ba74deec1922e639832904be0bea73cdea"
+  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"
 
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.5.tgz#ee38589ce00e2cc59b299ec3ea406fcd3a0fdaf6"
-  integrity sha512-gun/SOnMqjSb98Nkaq2rTKMwervfdAoz6NphdY0vTfuzMfryj+tDGb2n6UkDKwez+Y8PZDhE3D143v6Gepp4Hg==
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz#141fc20b6857e59459d430c850a0011e36561d99"
+  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"
 
-"@babel/plugin-proposal-numeric-separator@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.5.tgz#83631bf33d9a51df184c2102a069ac0c58c05f18"
-  integrity sha512-yiclALKe0vyZRZE0pS6RXgjUOt87GWv6FYa5zqj15PvhOGFO69R5DusPlgK/1K5dVnCtegTiWu9UaBSrLLJJBg==
+"@babel/plugin-proposal-numeric-separator@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz#d6b69f4af63fb38b6ca2558442a7fb191236eba9"
+  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"
 
-"@babel/plugin-proposal-object-rest-spread@^7.15.6", "@babel/plugin-proposal-object-rest-spread@^7.9.0":
-  version "7.15.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.15.6.tgz#ef68050c8703d07b25af402cb96cf7f34a68ed11"
-  integrity sha512-qtOHo7A1Vt+O23qEAX+GdBpqaIuD3i9VRrWgCJeq7WO6H2d14EK3q11urj5Te2MAeK97nMiIdRpwd/ST4JFbNg==
+"@babel/plugin-proposal-object-rest-spread@^7.14.7", "@babel/plugin-proposal-object-rest-spread@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.16.7.tgz#94593ef1ddf37021a25bdcb5754c4a8d534b01d8"
+  integrity sha512-3O0Y4+dw94HA86qSg9IHfyPktgR7q3gpNVAeiKQd+8jBKFaU5NQS1Yatgo4wY+UFNuLjvxcSmzcsHqrhgTyBUA==
   dependencies:
-    "@babel/compat-data" "^7.15.0"
-    "@babel/helper-compilation-targets" "^7.15.4"
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/compat-data" "^7.16.4"
+    "@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.15.4"
+    "@babel/plugin-transform-parameters" "^7.16.7"
 
-"@babel/plugin-proposal-optional-catch-binding@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.5.tgz#939dd6eddeff3a67fdf7b3f044b5347262598c3c"
-  integrity sha512-3Oyiixm0ur7bzO5ybNcZFlmVsygSIQgdOa7cTfOYCMY+wEPAYhZAJxi3mixKFCTCKUhQXuCTtQ1MzrpL3WT8ZQ==
+"@babel/plugin-proposal-optional-catch-binding@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz#c623a430674ffc4ab732fd0a0ae7722b67cb74cf"
+  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"
 
-"@babel/plugin-proposal-optional-chaining@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.5.tgz#fa83651e60a360e3f13797eef00b8d519695b603"
-  integrity sha512-ycz+VOzo2UbWNI1rQXxIuMOzrDdHGrI23fRiz/Si2R4kv2XZQ1BK8ccdHwehMKBlcH/joGW/tzrUmo67gbJHlQ==
+"@babel/plugin-proposal-optional-chaining@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz#7cd629564724816c0e8a969535551f943c64c39a"
+  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"
 
-"@babel/plugin-proposal-private-methods@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.14.5.tgz#37446495996b2945f30f5be5b60d5e2aa4f5792d"
-  integrity sha512-838DkdUA1u+QTCplatfq4B7+1lnDa/+QMI89x5WZHBcnNv+47N8QEj2k9I2MUU9xIv8XJ4XvPCviM/Dj7Uwt9g==
+"@babel/plugin-proposal-private-methods@^7.16.11":
+  version "7.16.11"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz#e8df108288555ff259f4527dbe84813aac3a1c50"
+  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"
 
-"@babel/plugin-proposal-private-property-in-object@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.15.4.tgz#55c5e3b4d0261fd44fe637e3f624cfb0f484e3e5"
-  integrity sha512-X0UTixkLf0PCCffxgu5/1RQyGGbgZuKoI+vXP4iSbJSYwPb7hu06omsFGBvQ9lJEvwgrxHdS8B5nbfcd8GyUNA==
+"@babel/plugin-proposal-private-property-in-object@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.7.tgz#b0b8cef543c2c3d57e59e2c611994861d46a3fce"
+  integrity sha512-rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.15.4"
-    "@babel/helper-create-class-features-plugin" "^7.15.4"
-    "@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"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.14.5", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.14.5.tgz#0f95ee0e757a5d647f378daa0eca7e93faa8bbe8"
-  integrity sha512-6axIeOU5LnY471KenAB9vI8I5j7NQ2d652hIYwVyRfgaZT5UpiqFKCuVXCDMSrU+3VFafnu2c5m3lrWIlr6A5Q==
+"@babel/plugin-proposal-unicode-property-regex@^7.16.7", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.7.tgz#635d18eb10c6214210ffc5ff4932552de08188a2"
+  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"
 
 "@babel/plugin-syntax-async-generators@^7.8.4":
   version "7.8.4"
@@ -498,291 +514,294 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-arrow-functions@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.14.5.tgz#f7187d9588a768dd080bf4c9ffe117ea62f7862a"
-  integrity sha512-KOnO0l4+tD5IfOdi4x8C1XmEIRWUjNRV8wc6K2vz/3e8yAOoZZvsRXRRIF/yo/MAOFb4QjtAw9xSxMXbSMRy8A==
+"@babel/plugin-transform-arrow-functions@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.7.tgz#44125e653d94b98db76369de9c396dc14bef4154"
+  integrity sha512-9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-async-to-generator@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.14.5.tgz#72c789084d8f2094acb945633943ef8443d39e67"
-  integrity sha512-szkbzQ0mNk0rpu76fzDdqSyPu0MuvpXgC+6rz5rpMb5OIRxdmHfQxrktL8CYolL2d8luMCZTR0DpIMIdL27IjA==
+"@babel/plugin-transform-async-to-generator@^7.16.8":
+  version "7.16.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.8.tgz#b83dff4b970cf41f1b819f8b49cc0cfbaa53a808"
+  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"
 
-"@babel/plugin-transform-block-scoped-functions@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.14.5.tgz#e48641d999d4bc157a67ef336aeb54bc44fd3ad4"
-  integrity sha512-dtqWqdWZ5NqBX3KzsVCWfQI3A53Ft5pWFCT2eCVUftWZgjc5DpDponbIF1+c+7cSGk2wN0YK7HGL/ezfRbpKBQ==
+"@babel/plugin-transform-block-scoped-functions@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz#4d0d57d9632ef6062cdf354bb717102ee042a620"
+  integrity sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-block-scoping@^7.15.3":
-  version "7.15.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.15.3.tgz#94c81a6e2fc230bcce6ef537ac96a1e4d2b3afaf"
-  integrity sha512-nBAzfZwZb4DkaGtOes1Up1nOAp9TDRRFw4XBzBBSG9QK7KVFmYzgj9o9sbPv7TX5ofL4Auq4wZnxCoPnI/lz2Q==
+"@babel/plugin-transform-block-scoping@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.7.tgz#f50664ab99ddeaee5bc681b8f3a6ea9d72ab4f87"
+  integrity sha512-ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-classes@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.15.4.tgz#50aee17aaf7f332ae44e3bce4c2e10534d5d3bf1"
-  integrity sha512-Yjvhex8GzBmmPQUvpXRPWQ9WnxXgAFuZSrqOK/eJlOGIXwvv8H3UEdUigl1gb/bnjTrln+e8bkZUYCBt/xYlBg==
+"@babel/plugin-transform-classes@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.7.tgz#8f4b9562850cd973de3b498f1218796eb181ce00"
+  integrity sha512-WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.15.4"
-    "@babel/helper-function-name" "^7.15.4"
-    "@babel/helper-optimise-call-expression" "^7.15.4"
-    "@babel/helper-plugin-utils" "^7.14.5"
-    "@babel/helper-replace-supers" "^7.15.4"
-    "@babel/helper-split-export-declaration" "^7.15.4"
+    "@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@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.14.5.tgz#1b9d78987420d11223d41195461cc43b974b204f"
-  integrity sha512-pWM+E4283UxaVzLb8UBXv4EIxMovU4zxT1OPnpHJcmnvyY9QbPPTKZfEj31EUvG3/EQRbYAGaYEUZ4yWOBC2xg==
+"@babel/plugin-transform-computed-properties@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.7.tgz#66dee12e46f61d2aae7a73710f591eb3df616470"
+  integrity sha512-gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-destructuring@^7.14.7", "@babel/plugin-transform-destructuring@^7.8.8":
-  version "7.14.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.7.tgz#0ad58ed37e23e22084d109f185260835e5557576"
-  integrity sha512-0mDE99nK+kVh3xlc5vKwB6wnP9ecuSj+zQCa/n0voENtP/zymdT4HH6QEb65wjjcbqr1Jb/7z9Qp7TF5FtwYGw==
+"@babel/plugin-transform-destructuring@^7.14.7", "@babel/plugin-transform-destructuring@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.16.7.tgz#ca9588ae2d63978a4c29d3f33282d8603f618e23"
+  integrity sha512-VqAwhTHBnu5xBVDCvrvqJbtLUa++qZaWC0Fgr2mqokBlulZARGyIvZDoqbPlPaKImQ9dKAcCzbv+ul//uqu70A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-dotall-regex@^7.14.5", "@babel/plugin-transform-dotall-regex@^7.4.4":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.14.5.tgz#2f6bf76e46bdf8043b4e7e16cf24532629ba0c7a"
-  integrity sha512-loGlnBdj02MDsFaHhAIJzh7euK89lBrGIdM9EAtHFo6xKygCUGuuWe07o1oZVk287amtW1n0808sQM99aZt3gw==
+"@babel/plugin-transform-dotall-regex@^7.16.7", "@babel/plugin-transform-dotall-regex@^7.4.4":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz#6b2d67686fab15fb6a7fd4bd895d5982cfc81241"
+  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"
 
-"@babel/plugin-transform-duplicate-keys@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.14.5.tgz#365a4844881bdf1501e3a9f0270e7f0f91177954"
-  integrity sha512-iJjbI53huKbPDAsJ8EmVmvCKeeq21bAze4fu9GBQtSLqfvzj2oRuHVx4ZkDwEhg1htQ+5OBZh/Ab0XDf5iBZ7A==
+"@babel/plugin-transform-duplicate-keys@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.7.tgz#2207e9ca8f82a0d36a5a67b6536e7ef8b08823c9"
+  integrity sha512-03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-exponentiation-operator@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.14.5.tgz#5154b8dd6a3dfe6d90923d61724bd3deeb90b493"
-  integrity sha512-jFazJhMBc9D27o9jDnIE5ZErI0R0m7PbKXVq77FFvqFbzvTMuv8jaAwLZ5PviOLSFttqKIW0/wxNSDbjLk0tYA==
+"@babel/plugin-transform-exponentiation-operator@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz#efa9862ef97e9e9e5f653f6ddc7b665e8536fe9b"
+  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"
 
-"@babel/plugin-transform-for-of@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.15.4.tgz#25c62cce2718cfb29715f416e75d5263fb36a8c2"
-  integrity sha512-DRTY9fA751AFBDh2oxydvVm4SYevs5ILTWLs6xKXps4Re/KG5nfUkr+TdHCrRWB8C69TlzVgA9b3RmGWmgN9LA==
+"@babel/plugin-transform-for-of@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.7.tgz#649d639d4617dff502a9a158c479b3b556728d8c"
+  integrity sha512-/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-function-name@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.14.5.tgz#e81c65ecb900746d7f31802f6bed1f52d915d6f2"
-  integrity sha512-vbO6kv0fIzZ1GpmGQuvbwwm+O4Cbm2NrPzwlup9+/3fdkuzo1YqOZcXw26+YUJB84Ja7j9yURWposEHLYwxUfQ==
+"@babel/plugin-transform-function-name@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz#5ab34375c64d61d083d7d2f05c38d90b97ec65cf"
+  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"
 
-"@babel/plugin-transform-literals@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.14.5.tgz#41d06c7ff5d4d09e3cf4587bd3ecf3930c730f78"
-  integrity sha512-ql33+epql2F49bi8aHXxvLURHkxJbSmMKl9J5yHqg4PLtdE6Uc48CH1GS6TQvZ86eoB/ApZXwm7jlA+B3kra7A==
+"@babel/plugin-transform-literals@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.7.tgz#254c9618c5ff749e87cb0c0cef1a0a050c0bdab1"
+  integrity sha512-6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-member-expression-literals@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.14.5.tgz#b39cd5212a2bf235a617d320ec2b48bcc091b8a7"
-  integrity sha512-WkNXxH1VXVTKarWFqmso83xl+2V3Eo28YY5utIkbsmXoItO8Q3aZxN4BTS2k0hz9dGUloHK26mJMyQEYfkn/+Q==
+"@babel/plugin-transform-member-expression-literals@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz#6e5dcf906ef8a098e630149d14c867dd28f92384"
+  integrity sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-modules-amd@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.5.tgz#4fd9ce7e3411cb8b83848480b7041d83004858f7"
-  integrity sha512-3lpOU8Vxmp3roC4vzFpSdEpGUWSMsHFreTWOMMLzel2gNGfHE5UWIh/LN6ghHs2xurUp4jRFYMUIZhuFbody1g==
+"@babel/plugin-transform-modules-amd@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.7.tgz#b28d323016a7daaae8609781d1f8c9da42b13186"
+  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"
 
-"@babel/plugin-transform-modules-commonjs@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.4.tgz#8201101240eabb5a76c08ef61b2954f767b6b4c1"
-  integrity sha512-qg4DPhwG8hKp4BbVDvX1s8cohM8a6Bvptu4l6Iingq5rW+yRUAhe/YRup/YcW2zCOlrysEWVhftIcKzrEZv3sA==
+"@babel/plugin-transform-modules-commonjs@^7.16.8":
+  version "7.16.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.8.tgz#cdee19aae887b16b9d331009aa9a219af7c86afe"
+  integrity sha512-oflKPvsLT2+uKQopesJt3ApiaIS2HW+hzHFcwRNtyDGieAeC/dIHZX8buJQ2J2X1rxGPy4eRcUijm3qcSPjYcA==
   dependencies:
-    "@babel/helper-module-transforms" "^7.15.4"
-    "@babel/helper-plugin-utils" "^7.14.5"
-    "@babel/helper-simple-access" "^7.15.4"
+    "@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@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.15.4.tgz#b42890c7349a78c827719f1d2d0cd38c7d268132"
-  integrity sha512-fJUnlQrl/mezMneR72CKCgtOoahqGJNVKpompKwzv3BrEXdlPspTcyxrZ1XmDTIr9PpULrgEQo3qNKp6dW7ssw==
+"@babel/plugin-transform-modules-systemjs@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.7.tgz#887cefaef88e684d29558c2b13ee0563e287c2d7"
+  integrity sha512-DuK5E3k+QQmnOqBR9UkusByy5WZWGRxfzV529s9nPra1GE7olmxfqO2FHobEOYSPIjPBTr4p66YDcjQnt8cBmw==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.15.4"
-    "@babel/helper-module-transforms" "^7.15.4"
-    "@babel/helper-plugin-utils" "^7.14.5"
-    "@babel/helper-validator-identifier" "^7.14.9"
+    "@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@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.5.tgz#fb662dfee697cce274a7cda525190a79096aa6e0"
-  integrity sha512-RfPGoagSngC06LsGUYyM9QWSXZ8MysEjDJTAea1lqRjNECE3y0qIJF/qbvJxc4oA4s99HumIMdXOrd+TdKaAAA==
+"@babel/plugin-transform-modules-umd@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.7.tgz#23dad479fa585283dbd22215bff12719171e7618"
+  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"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.14.9":
-  version "7.14.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.9.tgz#c68f5c5d12d2ebaba3762e57c2c4f6347a46e7b2"
-  integrity sha512-l666wCVYO75mlAtGFfyFwnWmIXQm3kSH0C3IRnJqWcZbWkoihyAdDhFm2ZWaxWTqvBvhVFfJjMRQ0ez4oN1yYA==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.16.8":
+  version "7.16.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.8.tgz#7f860e0e40d844a02c9dcf9d84965e7dfd666252"
+  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"
 
-"@babel/plugin-transform-new-target@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.14.5.tgz#31bdae8b925dc84076ebfcd2a9940143aed7dbf8"
-  integrity sha512-Nx054zovz6IIRWEB49RDRuXGI4Gy0GMgqG0cII9L3MxqgXz/+rgII+RU58qpo4g7tNEx1jG7rRVH4ihZoP4esQ==
+"@babel/plugin-transform-new-target@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.7.tgz#9967d89a5c243818e0800fdad89db22c5f514244"
+  integrity sha512-xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-object-super@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.14.5.tgz#d0b5faeac9e98597a161a9cf78c527ed934cdc45"
-  integrity sha512-MKfOBWzK0pZIrav9z/hkRqIk/2bTv9qvxHzPQc12RcVkMOzpIKnFCNYJip00ssKWYkd8Sf5g0Wr7pqJ+cmtuFg==
+"@babel/plugin-transform-object-super@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz#ac359cf8d32cf4354d27a46867999490b6c32a94"
+  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"
 
-"@babel/plugin-transform-parameters@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.15.4.tgz#5f2285cc3160bf48c8502432716b48504d29ed62"
-  integrity sha512-9WB/GUTO6lvJU3XQsSr6J/WKvBC2hcs4Pew8YxZagi6GkTdniyqp8On5kqdK8MN0LMeu0mGbhPN+O049NV/9FQ==
+"@babel/plugin-transform-parameters@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.7.tgz#a1721f55b99b736511cb7e0152f61f17688f331f"
+  integrity sha512-AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-property-literals@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.14.5.tgz#0ddbaa1f83db3606f1cdf4846fa1dfb473458b34"
-  integrity sha512-r1uilDthkgXW8Z1vJz2dKYLV1tuw2xsbrp3MrZmD99Wh9vsfKoob+JTgri5VUb/JqyKRXotlOtwgu4stIYCmnw==
+"@babel/plugin-transform-property-literals@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz#2dadac85155436f22c696c4827730e0fe1057a55"
+  integrity sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-regenerator@^7.14.5", "@babel/plugin-transform-regenerator@^7.8.7":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.14.5.tgz#9676fd5707ed28f522727c5b3c0aa8544440b04f"
-  integrity sha512-NVIY1W3ITDP5xQl50NgTKlZ0GrotKtLna08/uGY6ErQt6VEQZXla86x/CTddm5gZdcr+5GSsvMeTmWA5Ii6pkg==
+"@babel/plugin-transform-regenerator@^7.14.5", "@babel/plugin-transform-regenerator@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.7.tgz#9e7576dc476cb89ccc5096fff7af659243b4adeb"
+  integrity sha512-mF7jOgGYCkSJagJ6XCujSQg+6xC1M77/03K2oBmVJWoFGNUtnVJO4WHKJk3dnPC8HCcj4xBQP1Egm8DWh3Pb3Q==
   dependencies:
     regenerator-transform "^0.14.2"
 
-"@babel/plugin-transform-reserved-words@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.14.5.tgz#c44589b661cfdbef8d4300dcc7469dffa92f8304"
-  integrity sha512-cv4F2rv1nD4qdexOGsRQXJrOcyb5CrgjUH9PKrrtyhSDBNWGxd0UIitjyJiWagS+EbUGjG++22mGH1Pub8D6Vg==
+"@babel/plugin-transform-reserved-words@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.7.tgz#1d798e078f7c5958eec952059c460b220a63f586"
+  integrity sha512-KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-runtime@^7.9.0":
-  version "7.15.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.15.0.tgz#d3aa650d11678ca76ce294071fda53d7804183b3"
-  integrity sha512-sfHYkLGjhzWTq6xsuQ01oEsUYjkHRux9fW1iUA68dC7Qd8BS1Unq4aZ8itmQp95zUzIcyR2EbNMTzAicFj+guw==
+"@babel/plugin-transform-runtime@^7.15.0":
+  version "7.16.10"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.16.10.tgz#53d9fd3496daedce1dd99639097fa5d14f4c7c2c"
+  integrity sha512-9nwTiqETv2G7xI4RvXHNfpGdr8pAA+Q/YtN3yLK7OoK7n9OibVm/xymJ838a9A6E/IciOLPj82lZk0fW6O4O7w==
   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"
+    "@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@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.14.5.tgz#97f13855f1409338d8cadcbaca670ad79e091a58"
-  integrity sha512-xLucks6T1VmGsTB+GWK5Pl9Jl5+nRXD1uoFdA5TSO6xtiNjtXTjKkmPdFXVLGlK5A2/or/wQMKfmQ2Y0XJfn5g==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-
-"@babel/plugin-transform-spread@^7.14.6":
-  version "7.14.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.14.6.tgz#6bd40e57fe7de94aa904851963b5616652f73144"
-  integrity sha512-Zr0x0YroFJku7n7+/HH3A2eIrGMjbmAIbJSVv0IZ+t3U2WUQUA64S/oeied2e+MaGSjmt4alzBCsK9E8gh+fag==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.14.5"
-
-"@babel/plugin-transform-sticky-regex@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.14.5.tgz#5b617542675e8b7761294381f3c28c633f40aeb9"
-  integrity sha512-Z7F7GyvEMzIIbwnziAZmnSNpdijdr4dWt+FJNBnBLz5mwDFkqIXU9wmBcWWad3QeJF5hMTkRe4dAq2sUZiG+8A==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-
-"@babel/plugin-transform-template-literals@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.14.5.tgz#a5f2bc233937d8453885dc736bdd8d9ffabf3d93"
-  integrity sha512-22btZeURqiepOfuy/VkFr+zStqlujWaarpMErvay7goJS6BWwdd6BY9zQyDLDa4x2S3VugxFb162IZ4m/S/+Gg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-
-"@babel/plugin-transform-typeof-symbol@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.14.5.tgz#39af2739e989a2bd291bf6b53f16981423d457d4"
-  integrity sha512-lXzLD30ffCWseTbMQzrvDWqljvZlHkXU+CnseMhkMNqU1sASnCsz3tSzAaH3vCUXb9PHeUb90ZT1BdFTm1xxJw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-
-"@babel/plugin-transform-unicode-escapes@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.14.5.tgz#9d4bd2a681e3c5d7acf4f57fa9e51175d91d0c6b"
-  integrity sha512-crTo4jATEOjxj7bt9lbYXcBAM3LZaUrbP2uUdxb6WIorLmjNKSpHfIybgY4B8SRpbf8tEVIWH3Vtm7ayCrKocA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-
-"@babel/plugin-transform-unicode-regex@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.14.5.tgz#4cd09b6c8425dd81255c7ceb3fb1836e7414382e"
-  integrity sha512-UygduJpC5kHeCiRw/xDVzC+wj8VaYSoKl5JNVmbP7MadpNinAm3SvZCxZ42H37KZBKztz46YC73i9yV34d0Tzw==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.14.5"
-    "@babel/helper-plugin-utils" "^7.14.5"
-
-"@babel/preset-env@^7.9.0":
-  version "7.15.6"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.15.6.tgz#0f3898db9d63d320f21b17380d8462779de57659"
-  integrity sha512-L+6jcGn7EWu7zqaO2uoTDjjMBW+88FXzV8KvrBl2z6MtRNxlsmUNRlZPaNNPUTgqhyC5DHNFk/2Jmra+ublZWw==
-  dependencies:
-    "@babel/compat-data" "^7.15.0"
-    "@babel/helper-compilation-targets" "^7.15.4"
-    "@babel/helper-plugin-utils" "^7.14.5"
-    "@babel/helper-validator-option" "^7.14.5"
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.15.4"
-    "@babel/plugin-proposal-async-generator-functions" "^7.15.4"
-    "@babel/plugin-proposal-class-properties" "^7.14.5"
-    "@babel/plugin-proposal-class-static-block" "^7.15.4"
-    "@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.15.6"
-    "@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.15.4"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.14.5"
+"@babel/plugin-transform-shorthand-properties@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz#e8549ae4afcf8382f711794c0c7b6b934c5fbd2a"
+  integrity sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+
+"@babel/plugin-transform-spread@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.7.tgz#a303e2122f9f12e0105daeedd0f30fb197d8ff44"
+  integrity sha512-+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
+
+"@babel/plugin-transform-sticky-regex@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz#c84741d4f4a38072b9a1e2e3fd56d359552e8660"
+  integrity sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+
+"@babel/plugin-transform-template-literals@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.7.tgz#f3d1c45d28967c8e80f53666fc9c3e50618217ab"
+  integrity sha512-VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+
+"@babel/plugin-transform-typeof-symbol@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.7.tgz#9cdbe622582c21368bd482b660ba87d5545d4f7e"
+  integrity sha512-p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+
+"@babel/plugin-transform-unicode-escapes@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz#da8717de7b3287a2c6d659750c964f302b31ece3"
+  integrity sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+
+"@babel/plugin-transform-unicode-regex@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz#0f7aa4a501198976e25e82702574c34cfebe9ef2"
+  integrity sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
+
+"@babel/preset-env@^7.15.0":
+  version "7.16.11"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.16.11.tgz#5dd88fd885fae36f88fd7c8342475c9f0abe2982"
+  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"
@@ -797,50 +816,50 @@
     "@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.15.3"
-    "@babel/plugin-transform-classes" "^7.15.4"
-    "@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.15.4"
-    "@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.4"
-    "@babel/plugin-transform-modules-systemjs" "^7.15.4"
-    "@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.15.4"
-    "@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.6"
-    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"
 
-"@babel/preset-modules@^0.1.4":
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.4.tgz#362f2b68c662842970fdb5e254ffc8fc1c2e415e"
-  integrity sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==
+"@babel/preset-modules@^0.1.5":
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.5.tgz#ef939d6e7f268827e1841638dc6ff95515e115d9"
+  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"
@@ -848,43 +867,44 @@
     "@babel/types" "^7.4.4"
     esutils "^2.0.2"
 
-"@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.4.tgz#fd17d16bfdf878e6dd02d19753a39fa8a8d9c84a"
-  integrity sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==
+"@babel/runtime@^7.15.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.16.7.tgz#03ff99f64106588c9c403c6ecb8c3bafbbdff1fa"
+  integrity sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ==
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/template@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.15.4.tgz#51898d35dcf3faa670c4ee6afcfd517ee139f194"
-  integrity sha512-UgBAfEa1oGuYgDIPM2G+aHa4Nlo9Lh6mGD2bDBGMTbYnc38vulXPuC1MGjYILIEmlwl6Rd+BPR9ee3gm20CBtg==
-  dependencies:
-    "@babel/code-frame" "^7.14.5"
-    "@babel/parser" "^7.15.4"
-    "@babel/types" "^7.15.4"
-
-"@babel/traverse@^7.13.0", "@babel/traverse@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.15.4.tgz#ff8510367a144bfbff552d9e18e28f3e2889c22d"
-  integrity sha512-W6lQD8l4rUbQR/vYgSuCAE75ADyyQvOpFVsvPPdkhf6lATXAsQIG9YdtOcu8BB1dZ0LKu+Zo3c1wEcbKeuhdlA==
-  dependencies:
-    "@babel/code-frame" "^7.14.5"
-    "@babel/generator" "^7.15.4"
-    "@babel/helper-function-name" "^7.15.4"
-    "@babel/helper-hoist-variables" "^7.15.4"
-    "@babel/helper-split-export-declaration" "^7.15.4"
-    "@babel/parser" "^7.15.4"
-    "@babel/types" "^7.15.4"
+"@babel/template@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz#8d126c8701fde4d66b264b3eba3d96f07666d155"
+  integrity sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==
+  dependencies:
+    "@babel/code-frame" "^7.16.7"
+    "@babel/parser" "^7.16.7"
+    "@babel/types" "^7.16.7"
+
+"@babel/traverse@^7.13.0", "@babel/traverse@^7.16.10", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8":
+  version "7.16.10"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.10.tgz#448f940defbe95b5a8029975b051f75993e8239f"
+  integrity sha512-yzuaYXoRJBGMlBhsMJoUW7G1UmSb/eXr/JHYM/MsOJgavJibLwASijW7oXBdw3NQ6T0bW7Ty5P/VarOs9cHmqw==
+  dependencies:
+    "@babel/code-frame" "^7.16.7"
+    "@babel/generator" "^7.16.8"
+    "@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.16.10"
+    "@babel/types" "^7.16.8"
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.15.4", "@babel/types@^7.15.6", "@babel/types@^7.4.4":
-  version "7.15.6"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.15.6.tgz#99abdc48218b2881c058dd0a7ab05b99c9be758f"
-  integrity sha512-BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig==
+"@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.4.4":
+  version "7.16.8"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.16.8.tgz#0ba5da91dd71e0a4e7781a30f22770831062e3c1"
+  integrity sha512-smN2DQc5s4M7fntyjGtyIPbRJv6wW4rU/94fmYJ7PKQuZkC0qGMHXJbg6sNGt12JmVr4k5YaptI/XtiLJBnmIg==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.14.9"
+    "@babel/helper-validator-identifier" "^7.16.7"
     to-fast-properties "^2.0.0"
 
 "@csstools/convert-colors@^1.4.0":
@@ -907,6 +927,11 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
+"@gar/promisify@^1.0.1":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.2.tgz#30aa825f11d438671d585bd44e7fd564535fc210"
+  integrity sha512-82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw==
+
 "@humanwhocodes/config-array@^0.5.0":
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9"
@@ -917,9 +942,46 @@
     minimatch "^3.0.4"
 
 "@humanwhocodes/object-schema@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz#87de7af9c231826fdd68ac7258f77c429e0e5fcf"
-  integrity sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
+  integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
+
+"@nodelib/fs.scandir@2.1.5":
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
+  integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==
+  dependencies:
+    "@nodelib/fs.stat" "2.0.5"
+    run-parallel "^1.1.9"
+
+"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
+  integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
+
+"@nodelib/fs.walk@^1.2.3":
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
+  integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
+  dependencies:
+    "@nodelib/fs.scandir" "2.1.5"
+    fastq "^1.6.0"
+
+"@npmcli/fs@^1.0.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-1.1.0.tgz#bec1d1b89c170d40e1b73ad6c943b0b75e7d2951"
+  integrity sha512-VhP1qZLXcrXRIaPoqb4YA55JQxLNF3jNR4T55IdOJa3+IFJKNYHtPvtXx8slmeMavj37vCzCfrqQM1vWLsYKLA==
+  dependencies:
+    "@gar/promisify" "^1.0.1"
+    semver "^7.3.5"
+
+"@npmcli/move-file@^1.0.1":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674"
+  integrity sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==
+  dependencies:
+    mkdirp "^1.0.4"
+    rimraf "^3.0.2"
 
 "@rails/actioncable@^6.0.3-1":
   version "6.1.4"
@@ -938,59 +1000,107 @@
   resolved "https://registry.yarnpkg.com/@rails/ujs/-/ujs-6.1.4.tgz#093d5341595a02089ed309dec40f3c37da7b1b10"
   integrity sha512-O3lEzL5DYbxppMdsFSw36e4BHIlfz/xusynwXGv3l2lhSlvah41qviRpsoAlKXxl37nZAqK+UUF5cnGGK45Mfw==
 
-"@rails/webpacker@5.1.1":
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/@rails/webpacker/-/webpacker-5.1.1.tgz#3c937aa719e46341f037a3f37349ef58085950df"
-  integrity sha512-ho5Stv9naZgG4HbHNFPqbA1OLPJyj6QXfgAc7VGCu4kkMe/RnVFLoLJFW6TZ9wYelKodBjRA2tKKiCaugv0sZw==
+"@rails/webpacker@5.4.3":
+  version "5.4.3"
+  resolved "https://registry.yarnpkg.com/@rails/webpacker/-/webpacker-5.4.3.tgz#cfe2d8faffe7db5001bad50a1534408b4f2efb2f"
+  integrity sha512-tEM8tpUtfx6FxKwcuQ9+v6pzgqM5LeAdhT6IJ4Te3BPKFO1xrGrXugqeRuZ+gE8ASDZRTOK6yuQkapOpuX5JdA==
   dependencies:
-    "@babel/core" "^7.9.0"
-    "@babel/plugin-proposal-class-properties" "^7.8.3"
-    "@babel/plugin-proposal-object-rest-spread" "^7.9.0"
+    "@babel/core" "^7.15.0"
+    "@babel/plugin-proposal-class-properties" "^7.14.5"
+    "@babel/plugin-proposal-object-rest-spread" "^7.14.7"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
-    "@babel/plugin-transform-destructuring" "^7.8.8"
-    "@babel/plugin-transform-regenerator" "^7.8.7"
-    "@babel/plugin-transform-runtime" "^7.9.0"
-    "@babel/preset-env" "^7.9.0"
-    "@babel/runtime" "^7.9.2"
-    babel-loader "^8.1.0"
-    babel-plugin-dynamic-import-node "^2.3.0"
+    "@babel/plugin-transform-destructuring" "^7.14.7"
+    "@babel/plugin-transform-regenerator" "^7.14.5"
+    "@babel/plugin-transform-runtime" "^7.15.0"
+    "@babel/preset-env" "^7.15.0"
+    "@babel/runtime" "^7.15.3"
+    babel-loader "^8.2.2"
+    babel-plugin-dynamic-import-node "^2.3.3"
     babel-plugin-macros "^2.8.0"
-    case-sensitive-paths-webpack-plugin "^2.3.0"
-    compression-webpack-plugin "^3.1.0"
-    core-js "^3.6.4"
-    css-loader "^3.4.2"
-    file-loader "^6.0.0"
-    flatted "^2.0.1"
-    glob "^7.1.6"
-    js-yaml "^3.13.1"
+    case-sensitive-paths-webpack-plugin "^2.4.0"
+    compression-webpack-plugin "^4.0.1"
+    core-js "^3.16.2"
+    css-loader "^3.6.0"
+    file-loader "^6.2.0"
+    flatted "^3.2.2"
+    glob "^7.1.7"
+    js-yaml "^3.14.1"
     mini-css-extract-plugin "^0.9.0"
-    node-sass "^4.13.1"
-    optimize-css-assets-webpack-plugin "^5.0.3"
+    optimize-css-assets-webpack-plugin "^5.0.8"
     path-complete-extname "^1.0.0"
-    pnp-webpack-plugin "^1.6.4"
-    postcss-flexbugs-fixes "^4.2.0"
+    pnp-webpack-plugin "^1.7.0"
+    postcss-flexbugs-fixes "^4.2.1"
     postcss-import "^12.0.1"
     postcss-loader "^3.0.0"
     postcss-preset-env "^6.7.0"
     postcss-safe-parser "^4.0.2"
-    regenerator-runtime "^0.13.5"
-    sass-loader "^8.0.2"
-    style-loader "^1.1.3"
-    terser-webpack-plugin "^2.3.5"
-    webpack "^4.42.1"
+    regenerator-runtime "^0.13.9"
+    sass "^1.38.0"
+    sass-loader "10.1.1"
+    style-loader "^1.3.0"
+    terser-webpack-plugin "^4.2.3"
+    webpack "^4.46.0"
     webpack-assets-manifest "^3.1.1"
-    webpack-cli "^3.3.11"
+    webpack-cli "^3.3.12"
     webpack-sources "^1.4.3"
 
-"@types/glob@^7.1.1":
-  version "7.1.4"
-  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.4.tgz#ea59e21d2ee5c517914cb4bc8e4153b99e566672"
-  integrity sha512-w+LsMxKyYQm347Otw+IfBXOv9UWVjpHpCDdbBMt8Kz/xbvCYNjP+0qPh91Km3iKfSRLBB0P7fAMf0KHrPu+MyA==
+"@types/body-parser@*":
+  version "1.19.2"
+  resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0"
+  integrity sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==
+  dependencies:
+    "@types/connect" "*"
+    "@types/node" "*"
+
+"@types/bonjour@^3.5.9":
+  version "3.5.10"
+  resolved "https://registry.yarnpkg.com/@types/bonjour/-/bonjour-3.5.10.tgz#0f6aadfe00ea414edc86f5d106357cda9701e275"
+  integrity sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==
   dependencies:
-    "@types/minimatch" "*"
     "@types/node" "*"
 
-"@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8":
+"@types/connect-history-api-fallback@^1.3.5":
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz#d1f7a8a09d0ed5a57aee5ae9c18ab9b803205dae"
+  integrity sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==
+  dependencies:
+    "@types/express-serve-static-core" "*"
+    "@types/node" "*"
+
+"@types/connect@*":
+  version "3.4.35"
+  resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1"
+  integrity sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==
+  dependencies:
+    "@types/node" "*"
+
+"@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18":
+  version "4.17.28"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz#c47def9f34ec81dc6328d0b1b5303d1ec98d86b8"
+  integrity sha512-P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig==
+  dependencies:
+    "@types/node" "*"
+    "@types/qs" "*"
+    "@types/range-parser" "*"
+
+"@types/express@*":
+  version "4.17.13"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034"
+  integrity sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA==
+  dependencies:
+    "@types/body-parser" "*"
+    "@types/express-serve-static-core" "^4.17.18"
+    "@types/qs" "*"
+    "@types/serve-static" "*"
+
+"@types/http-proxy@^1.17.8":
+  version "1.17.8"
+  resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.8.tgz#968c66903e7e42b483608030ee85800f22d03f55"
+  integrity sha512-5kPLG5BKpWYkw/LVOGWpiq3nEVqxiN32rTgI53Sk12/xHFQ2rG3ehI9IO+O3W2QoKeyB92dJkoka8SUm6BX1pA==
+  dependencies:
+    "@types/node" "*"
+
+"@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
   version "7.0.9"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d"
   integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==
@@ -1000,15 +1110,15 @@
   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
   integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
 
-"@types/minimatch@*":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
-  integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==
+"@types/mime@^1":
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
+  integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==
 
 "@types/node@*":
-  version "16.10.2"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.10.2.tgz#5764ca9aa94470adb4e1185fe2e9f19458992b2e"
-  integrity sha512-zCclL4/rx+W5SQTzFs9wyvvyCwoK9QtBpratqz2IYJ3O8Umrn0m3nsTv0wQBk9sRGpvUe9CwPDrQFB10f1FIjQ==
+  version "17.0.12"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.12.tgz#f7aa331b27f08244888c47b7df126184bc2339c5"
+  integrity sha512-4YpbAsnJXWYK/fpTVFlMIcUIho2AYCi4wg5aNPrG1ng7fn/1/RZfCIpRCiBX+12RVa34RluilnvCqD+g3KiSiA==
 
 "@types/parse-json@^4.0.0":
   version "4.0.0"
@@ -1020,6 +1130,50 @@
   resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.5.tgz#75a2a8e7d8ab4b230414505d92335d1dcb53a6df"
   integrity sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ==
 
+"@types/qs@*":
+  version "6.9.7"
+  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb"
+  integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==
+
+"@types/range-parser@*":
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc"
+  integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==
+
+"@types/retry@^0.12.0":
+  version "0.12.1"
+  resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.1.tgz#d8f1c0d0dc23afad6dc16a9e993a0865774b4065"
+  integrity sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g==
+
+"@types/serve-index@^1.9.1":
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/@types/serve-index/-/serve-index-1.9.1.tgz#1b5e85370a192c01ec6cec4735cf2917337a6278"
+  integrity sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==
+  dependencies:
+    "@types/express" "*"
+
+"@types/serve-static@*":
+  version "1.13.10"
+  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.10.tgz#f5e0ce8797d2d7cc5ebeda48a52c96c4fa47a8d9"
+  integrity sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==
+  dependencies:
+    "@types/mime" "^1"
+    "@types/node" "*"
+
+"@types/sockjs@^0.3.33":
+  version "0.3.33"
+  resolved "https://registry.yarnpkg.com/@types/sockjs/-/sockjs-0.3.33.tgz#570d3a0b99ac995360e3136fd6045113b1bd236f"
+  integrity sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==
+  dependencies:
+    "@types/node" "*"
+
+"@types/ws@^8.2.2":
+  version "8.2.2"
+  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.2.2.tgz#7c5be4decb19500ae6b3d563043cd407bf366c21"
+  integrity sha512-NOn5eIcgWLOo6qW8AcuLZ7G8PycXu0xTxxkS6Q18VWFxgPUSOwV0pBj2a/4viNZVu25i7RIB7GttdkAIUUXOOg==
+  dependencies:
+    "@types/node" "*"
+
 "@webassemblyjs/ast@1.9.0":
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964"
@@ -1175,11 +1329,6 @@
   resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
   integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
 
-abbrev@1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
-  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
-
 accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
   version "1.3.7"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
@@ -1221,12 +1370,26 @@ ajv-errors@^1.0.0:
   resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
   integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==
 
+ajv-formats@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520"
+  integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==
+  dependencies:
+    ajv "^8.0.0"
+
 ajv-keywords@^3.1.0, ajv-keywords@^3.4.1, ajv-keywords@^3.5.2:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
   integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
 
-ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:
+ajv-keywords@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16"
+  integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==
+  dependencies:
+    fast-deep-equal "^3.1.3"
+
+ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.4, ajv@^6.12.5:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -1236,10 +1399,10 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^8.0.1:
-  version "8.6.3"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.6.3.tgz#11a66527761dc3e9a3845ea775d2d3c0414e8764"
-  integrity sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw==
+ajv@^8.0.0, ajv@^8.0.1, ajv@^8.8.0:
+  version "8.9.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.9.0.tgz#738019146638824dea25edcf299dcba1b0e7eb18"
+  integrity sha512-qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ==
   dependencies:
     fast-deep-equal "^3.1.1"
     json-schema-traverse "^1.0.0"
@@ -1251,11 +1414,6 @@ alphanum-sort@^1.0.0:
   resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
   integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=
 
-amdefine@>=0.0.4:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
-  integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
-
 ansi-colors@^3.0.0:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
@@ -1266,20 +1424,10 @@ ansi-colors@^4.1.1:
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
   integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
 
-ansi-html@0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
-  integrity sha1-gTWEAhliqenm/QOflA0S9WynhZ4=
-
-ansi-regex@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
-
-ansi-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
-  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
+ansi-html-community@^0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41"
+  integrity sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==
 
 ansi-regex@^4.1.0:
   version "4.1.0"
@@ -1291,10 +1439,10 @@ ansi-regex@^5.0.1:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
 
-ansi-styles@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
-  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
+ansi-regex@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a"
+  integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==
 
 ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   version "3.2.1"
@@ -1326,19 +1474,11 @@ anymatch@~3.1.2:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
-aproba@^1.0.3, aproba@^1.1.1:
+aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
   integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
 
-are-we-there-yet@~1.1.2:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz#b15474a932adab4ff8a50d9adfa7e4e926f21146"
-  integrity sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==
-  dependencies:
-    delegates "^1.0.0"
-    readable-stream "^2.0.6"
-
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -1361,11 +1501,6 @@ arr-union@^3.1.0:
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
   integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
 
-array-find-index@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
-  integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=
-
 array-flatten@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
@@ -1376,42 +1511,35 @@ array-flatten@^2.1.0:
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099"
   integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
 
-array-includes@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.3.tgz#c7f619b382ad2afaf5326cddfdc0afc61af7690a"
-  integrity sha512-gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A==
+array-includes@^3.1.4:
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.4.tgz#f5b493162c760f3539631f005ba2bb46acb45ba9"
+  integrity sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw==
   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"
-
-array-union@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
-  integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
-  dependencies:
-    array-uniq "^1.0.1"
+    is-string "^1.0.7"
 
-array-uniq@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
-  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
+array-union@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
+  integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
 
 array-unique@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
   integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
-array.prototype.flat@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz#6ef638b43312bd401b4c6199fdec7e2dc9e9a123"
-  integrity sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg==
+array.prototype.flat@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.5.tgz#07e0975d84bbc7c48cd1879d609e682598d33e13"
+  integrity sha512-KaYU+S+ndVqyUnignHftkwc58o3uVU1jzczILJ1tN2YaIZpFIKBiP/x/j97E5MVPsaCloPbqWLB/8qCTVvT2qg==
   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"
 
 arraybuffer.slice@~0.0.7:
   version "0.0.7"
@@ -1428,18 +1556,6 @@ asn1.js@^5.2.0:
     minimalistic-assert "^1.0.0"
     safer-buffer "^2.1.0"
 
-asn1@~0.2.3:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
-  integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
-  dependencies:
-    safer-buffer "~2.1.0"
-
-assert-plus@1.0.0, assert-plus@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
-
 assert@^1.1.1:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb"
@@ -1463,16 +1579,6 @@ async-each@^1.0.1:
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
   integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==
 
-async-foreach@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542"
-  integrity sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=
-
-async-limiter@~1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
-  integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
-
 async@^2.6.2:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
@@ -1480,50 +1586,35 @@ async@^2.6.2:
   dependencies:
     lodash "^4.17.14"
 
-asynckit@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
-
 atob@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
 autoprefixer@^9.6.1:
-  version "9.8.7"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.7.tgz#e3c12de18a800af1a1a8155fbc01dc7de29ea184"
-  integrity sha512-7Hg99B1eTH5+LgmUBUSmov1Z3bsggQJS7v3IMGo6wcScnbRuvtMc871J9J+4bSbIqa9LSX/zypFXJ8sXHpMJeQ==
+  version "9.8.8"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.8.tgz#fd4bd4595385fa6f06599de749a4d5f7a474957a"
+  integrity sha512-eM9d/swFopRt5gdJ7jrpCwgvEMIayITpojhkkSMRsFHYuH5bkSQ4p/9qTEHtmNudUZh22Tehu7I6CxAW0IXTKA==
   dependencies:
     browserslist "^4.12.0"
     caniuse-lite "^1.0.30001109"
-    nanocolors "^0.2.8"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
+    picocolors "^0.2.1"
     postcss "^7.0.32"
     postcss-value-parser "^4.1.0"
 
-aws-sign2@~0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
-  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
-
-aws4@^1.8.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
-  integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
-
-babel-loader@^8.1.0:
-  version "8.2.2"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.2.tgz#9363ce84c10c9a40e6c753748e1441b60c8a0b81"
-  integrity sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g==
+babel-loader@^8.2.2:
+  version "8.2.3"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.3.tgz#8986b40f1a64cacfcb4b8429320085ef68b1342d"
+  integrity sha512-n4Zeta8NC3QAsuyiizu0GkmRcQ6clkV9WFUnUf1iXP//IeSKbWjofW3UHyZVwlOB4y039YQKefawyTn64Zwbuw==
   dependencies:
     find-cache-dir "^3.3.1"
     loader-utils "^1.4.0"
     make-dir "^3.1.0"
     schema-utils "^2.6.5"
 
-babel-plugin-dynamic-import-node@^2.3.0, babel-plugin-dynamic-import-node@^2.3.3:
+babel-plugin-dynamic-import-node@^2.3.3:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3"
   integrity sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==
@@ -1539,29 +1630,29 @@ babel-plugin-macros@^2.8.0:
     cosmiconfig "^6.0.0"
     resolve "^1.12.0"
 
-babel-plugin-polyfill-corejs2@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.2.tgz#e9124785e6fd94f94b618a7954e5693053bf5327"
-  integrity sha512-kISrENsJ0z5dNPq5eRvcctITNHYXWOA4DUZRFYCz3jYCcvTb/A546LIddmoGNMVYg2U38OyFeNosQwI9ENTqIQ==
+babel-plugin-polyfill-corejs2@^0.3.0:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz#440f1b70ccfaabc6b676d196239b138f8a2cfba5"
+  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"
 
-babel-plugin-polyfill-corejs3@^0.2.2:
-  version "0.2.5"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.5.tgz#2779846a16a1652244ae268b1e906ada107faf92"
-  integrity sha512-ninF5MQNwAX9Z7c9ED+H2pGt1mXdP4TqzlHKyPIYmJIYz0N+++uwdM7RnJukklhzJ54Q84vA4ZJkgs7lu5vqcw==
+babel-plugin-polyfill-corejs3@^0.5.0:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.1.tgz#d66183bf10976ea677f4149a7fcc4d8df43d4060"
+  integrity sha512-TihqEe4sQcb/QcPJvxe94/9RZuLQuF1+To4WqQcRvc+3J3gLCPIPgDKzGLG6zmQLfH3nn25heRuDNkS2KR4I8A==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.2.2"
-    core-js-compat "^3.16.2"
+    "@babel/helper-define-polyfill-provider" "^0.3.1"
+    core-js-compat "^3.20.0"
 
-babel-plugin-polyfill-regenerator@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.2.tgz#b310c8d642acada348c1fa3b3e6ce0e851bee077"
-  integrity sha512-Goy5ghsc21HgPDFtzRkSirpZVW35meGoTmTOb2bxqdl60ghub4xOidgNTHaZfQ2FaxQsKmwvXtOAkcIS4SMBWg==
+babel-plugin-polyfill-regenerator@^0.3.0:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz#2c0678ea47c75c8cc2fbb1852278d8fb68233990"
+  integrity sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.2.2"
+    "@babel/helper-define-polyfill-provider" "^0.3.1"
 
 backo2@1.0.2:
   version "1.0.2"
@@ -1606,13 +1697,6 @@ batch@0.6.1:
   resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
   integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=
 
-bcrypt-pbkdf@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
-  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
-  dependencies:
-    tweetnacl "^0.14.3"
-
 big.js@^5.2.2:
   version "5.2.2"
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
@@ -1640,13 +1724,6 @@ blob@0.0.5:
   resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683"
   integrity sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==
 
-block-stream@*:
-  version "0.0.9"
-  resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
-  integrity sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=
-  dependencies:
-    inherits "~2.0.0"
-
 bluebird@^3.5.5:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
@@ -1662,21 +1739,21 @@ bn.js@^5.0.0, bn.js@^5.1.1:
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.0.tgz#358860674396c6997771a9d051fcc1b57d4ae002"
   integrity sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==
 
-body-parser@1.19.0, body-parser@^1.19.0:
-  version "1.19.0"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a"
-  integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==
+body-parser@1.19.1, body-parser@^1.19.0:
+  version "1.19.1"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.1.tgz#1499abbaa9274af3ecc9f6f10396c995943e31d4"
+  integrity sha512-8ljfQi5eBk8EJfECMrgqNGWPEY5jWP+1IzkzkGdFFEwFQZZyaZ21UqdaHktgiMlH0xLHqIFtE/u2OYE5dOtViA==
   dependencies:
-    bytes "3.1.0"
+    bytes "3.1.1"
     content-type "~1.0.4"
     debug "2.6.9"
     depd "~1.1.2"
-    http-errors "1.7.2"
+    http-errors "1.8.1"
     iconv-lite "0.4.24"
     on-finished "~2.3.0"
-    qs "6.7.0"
-    raw-body "2.4.0"
-    type-is "~1.6.17"
+    qs "6.9.6"
+    raw-body "2.4.2"
+    type-is "~1.6.18"
 
 bonjour@^3.5.0:
   version "3.5.0"
@@ -1739,7 +1816,7 @@ braces@^2.3.1, braces@^2.3.2:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
-braces@^3.0.2, braces@~3.0.2:
+braces@^3.0.1, braces@^3.0.2, braces@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
   integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
@@ -1812,16 +1889,16 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.16.6, browserslist@^4.17.1, browserslist@^4.6.4:
-  version "4.17.2"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.17.2.tgz#aa15dbd2fab399a399fe4df601bb09363c5458a6"
-  integrity sha512-jSDZyqJmkKMEMi7SZAgX5UltFdR5NAO43vY0AwTpu4X3sGH7GLLQ83KiUomgrnvZRCeW0yPPnKqnxPqQOER9zQ==
+browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.17.5, browserslist@^4.19.1, browserslist@^4.6.4:
+  version "4.19.1"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.19.1.tgz#4ac0435b35ab655896c31d53018b6dd5e9e4c9a3"
+  integrity sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A==
   dependencies:
-    caniuse-lite "^1.0.30001261"
-    electron-to-chromium "^1.3.854"
+    caniuse-lite "^1.0.30001286"
+    electron-to-chromium "^1.4.17"
     escalade "^3.1.1"
-    nanocolors "^0.2.12"
-    node-releases "^1.1.76"
+    node-releases "^2.0.1"
+    picocolors "^1.0.0"
 
 buffer-from@^1.0.0:
   version "1.1.2"
@@ -1857,10 +1934,10 @@ bytes@3.0.0:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
   integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
 
-bytes@3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
-  integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
+bytes@3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.1.tgz#3f018291cb4cbad9accb6e6970bca9c8889e879a"
+  integrity sha512-dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg==
 
 cacache@^12.0.2:
   version "12.0.4"
@@ -1883,28 +1960,28 @@ cacache@^12.0.2:
     unique-filename "^1.1.1"
     y18n "^4.0.0"
 
-cacache@^13.0.1:
-  version "13.0.1"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-13.0.1.tgz#a8000c21697089082f85287a1aec6e382024a71c"
-  integrity sha512-5ZvAxd05HDDU+y9BVvcqYu2LLXmPnQ0hW62h32g4xBTgL/MppR4/04NHfj/ycM2y6lmTnbw6HVi+1eN0Psba6w==
+cacache@^15.0.5:
+  version "15.3.0"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.3.0.tgz#dc85380fb2f556fe3dda4c719bfa0ec875a7f1eb"
+  integrity sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==
   dependencies:
-    chownr "^1.1.2"
-    figgy-pudding "^3.5.1"
+    "@npmcli/fs" "^1.0.0"
+    "@npmcli/move-file" "^1.0.1"
+    chownr "^2.0.0"
     fs-minipass "^2.0.0"
     glob "^7.1.4"
-    graceful-fs "^4.2.2"
     infer-owner "^1.0.4"
-    lru-cache "^5.1.1"
-    minipass "^3.0.0"
+    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 "^0.5.1"
-    move-concurrently "^1.0.1"
-    p-map "^3.0.0"
+    mkdirp "^1.0.3"
+    p-map "^4.0.0"
     promise-inflight "^1.0.1"
-    rimraf "^2.7.1"
-    ssri "^7.0.0"
+    rimraf "^3.0.2"
+    ssri "^8.0.1"
+    tar "^6.0.2"
     unique-filename "^1.1.1"
 
 cache-base@^1.0.1:
@@ -1954,19 +2031,6 @@ callsites@^3.0.0:
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
-camelcase-keys@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
-  integrity sha1-MIvur/3ygRkFHvodkyITyRuPkuc=
-  dependencies:
-    camelcase "^2.0.0"
-    map-obj "^1.0.0"
-
-camelcase@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
-  integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=
-
 camelcase@^5.0.0, camelcase@^5.3.1:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
@@ -1982,32 +2046,16 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001261:
-  version "1.0.30001263"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001263.tgz#7ce7a6fb482a137585cbc908aaf38e90c53a16a4"
-  integrity sha512-doiV5dft6yzWO1WwU19kt8Qz8R0/8DgEziz6/9n2FxUasteZNwNNYSmJO3GLBH8lCVE73AB1RPDPAeYbcO5Cvw==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001286:
+  version "1.0.30001302"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001302.tgz#da57ce61c51177ef3661eeed7faef392d3790aaa"
+  integrity sha512-YYTMO+tfwvgUN+1ZnRViE53Ma1S/oETg+J2lISsqi/ZTNThj3ZYBOKP2rHwJc37oCsPqAzJ3w2puZHn0xlLPPw==
 
-case-sensitive-paths-webpack-plugin@^2.3.0:
+case-sensitive-paths-webpack-plugin@^2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz#db64066c6422eed2e08cc14b986ca43796dbc6d4"
   integrity sha512-roIFONhcxog0JSSWbvVAh3OocukmSgpqOH6YpMkCvav/ySIV3JKg4Dc8vYtQjYi/UxpNE36r/9v+VqTQqgkYmw==
 
-caseless@~0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
-  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
-
-chalk@^1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
-  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"
-
 chalk@^2.0, chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
@@ -2048,6 +2096,21 @@ chartjs-color@^2.1.0:
     chartjs-color-string "^0.6.0"
     color-convert "^1.9.3"
 
+"chokidar@>=3.0.0 <4.0.0", chokidar@^3.4.1, chokidar@^3.4.2, chokidar@^3.5.2:
+  version "3.5.3"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
+  integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
+  dependencies:
+    anymatch "~3.1.2"
+    braces "~3.0.2"
+    glob-parent "~5.1.2"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.6.0"
+  optionalDependencies:
+    fsevents "~2.3.2"
+
 chokidar@^2.1.8:
   version "2.1.8"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
@@ -2067,26 +2130,16 @@ chokidar@^2.1.8:
   optionalDependencies:
     fsevents "^1.2.7"
 
-chokidar@^3.4.1, chokidar@^3.4.2:
-  version "3.5.2"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75"
-  integrity sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==
-  dependencies:
-    anymatch "~3.1.2"
-    braces "~3.0.2"
-    glob-parent "~5.1.2"
-    is-binary-path "~2.1.0"
-    is-glob "~4.0.1"
-    normalize-path "~3.0.0"
-    readdirp "~3.6.0"
-  optionalDependencies:
-    fsevents "~2.3.2"
-
-chownr@^1.1.1, chownr@^1.1.2:
+chownr@^1.1.1:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
   integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
 
+chownr@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
+  integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
+
 chrome-trace-event@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac"
@@ -2151,11 +2204,6 @@ coa@^2.0.2:
     chalk "^2.4.1"
     q "^1.1.2"
 
-code-point-at@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
-  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
-
 collection-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
@@ -2189,9 +2237,9 @@ color-name@^1.0.0, color-name@~1.1.4:
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
 color-string@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.6.0.tgz#c3915f61fe267672cb7e1e064c9d692219f6c312"
-  integrity sha512-c/hGS+kRWJutUBEngKKmk4iH3sD59MBkoxVapS/0wgpCz2u7XsNloxknyvBhzwEs1IbV36D9PwqLPJ2DTu3vMA==
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.9.0.tgz#63b6ebd1bec11999d1df3a79a7569451ac2be8aa"
+  integrity sha512-9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ==
   dependencies:
     color-name "^1.0.0"
     simple-swizzle "^0.2.2"
@@ -2204,18 +2252,16 @@ color@^3.0.0:
     color-convert "^1.9.3"
     color-string "^1.6.0"
 
+colorette@^2.0.10:
+  version "2.0.16"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da"
+  integrity sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==
+
 colors@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
   integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
 
-combined-stream@^1.0.6, combined-stream@~1.0.6:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
-  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
-  dependencies:
-    delayed-stream "~1.0.0"
-
 commander@^2.20.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
@@ -2253,17 +2299,16 @@ compressible@~2.0.16:
   dependencies:
     mime-db ">= 1.43.0 < 2"
 
-compression-webpack-plugin@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-3.1.0.tgz#9f510172a7b5fae5aad3b670652e8bd7997aeeca"
-  integrity sha512-iqTHj3rADN4yHwXMBrQa/xrncex/uEQy8QHlaTKxGchT/hC0SdlJlmL/5eRqffmWq2ep0/Romw6Ld39JjTR/ug==
+compression-webpack-plugin@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-4.0.1.tgz#33eda97f1170dd38c5556771de10f34245aa0274"
+  integrity sha512-0mg6PgwTsUe5LEcUrOu3ob32vraDx2VdbMGAT1PARcOV+UJWDYZFdkSo6RbHoGQ061mmmkC7XpRKOlvwm/gzJQ==
   dependencies:
-    cacache "^13.0.1"
-    find-cache-dir "^3.0.0"
-    neo-async "^2.5.0"
-    schema-utils "^2.6.1"
-    serialize-javascript "^2.1.2"
-    webpack-sources "^1.0.1"
+    cacache "^15.0.5"
+    find-cache-dir "^3.3.1"
+    schema-utils "^2.7.0"
+    serialize-javascript "^4.0.0"
+    webpack-sources "^1.4.3"
 
 compression@^1.7.4:
   version "1.7.4"
@@ -2294,9 +2339,9 @@ concat-stream@^1.5.0:
     typedarray "^0.0.6"
 
 confusing-browser-globals@^1.0.10:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.10.tgz#30d1e7f3d1b882b25ec4933d1d1adac353d20a59"
-  integrity sha512-gNld/3lySHwuhaVluJUKLePYirM3QNCKzVxqAdhJII9/WXKVX5PURzMVJspS1jTslSqjeuG4KMVTSouit5YPHA==
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz#ae40e9b57cdd3915408a2805ebd3a5585608dc81"
+  integrity sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==
 
 connect-history-api-fallback@^1.6.0:
   version "1.6.0"
@@ -2318,22 +2363,17 @@ console-browserify@^1.1.0:
   resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
   integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==
 
-console-control-strings@^1.0.0, console-control-strings@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
-  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
-
 constants-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
   integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=
 
-content-disposition@0.5.3:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd"
-  integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==
+content-disposition@0.5.4:
+  version "0.5.4"
+  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe"
+  integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==
   dependencies:
-    safe-buffer "5.1.2"
+    safe-buffer "5.2.1"
 
 content-type@~1.0.4:
   version "1.0.4"
@@ -2352,12 +2392,7 @@ cookie-signature@1.0.6:
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
   integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
 
-cookie@0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
-  integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==
-
-cookie@~0.4.1:
+cookie@0.4.1, cookie@~0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1"
   integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==
@@ -2379,23 +2414,18 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
-core-js-compat@^3.16.0, core-js-compat@^3.16.2:
-  version "3.18.1"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.18.1.tgz#01942a0877caf9c6e5007c027183cf0bdae6a191"
-  integrity sha512-XJMYx58zo4W0kLPmIingVZA10+7TuKrMLPt83+EzDmxFJQUMcTVVmQ+n5JP4r6Z14qSzhQBRi3NSWoeVyKKXUg==
+core-js-compat@^3.20.0, core-js-compat@^3.20.2:
+  version "3.20.3"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.20.3.tgz#d71f85f94eb5e4bea3407412e549daa083d23bd6"
+  integrity sha512-c8M5h0IkNZ+I92QhIpuSijOxGAcj3lgpsWdkCqmUTZNwidujF4r3pi6x1DCN+Vcs5qTS2XWWMfWSuCqyupX8gw==
   dependencies:
-    browserslist "^4.17.1"
+    browserslist "^4.19.1"
     semver "7.0.0"
 
-core-js@^3.6.4, core-js@^3.6.5:
-  version "3.18.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.18.1.tgz#289d4be2ce0085d40fc1244c0b1a54c00454622f"
-  integrity sha512-vJlUi/7YdlCZeL6fXvWNaLUPh/id12WXj3MbkMw5uOyF0PfWPBNOCNbs53YqgrvtujLNlt9JQpruyIKkUZ+PKA==
-
-core-util-is@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
+core-js@^3.16.2, core-js@^3.6.5:
+  version "3.20.3"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.20.3.tgz#c710d0a676e684522f3db4ee84e5e18a9d11d69a"
+  integrity sha512-vVl8j8ph6tRS3B8qir40H7yw7voy17xL0piAjlbBUsH7WIfzoedL/ZOr1OV9FyZQLWXsayOJyV4tnRyXR85/ag==
 
 core-util-is@~1.0.0:
   version "1.0.3"
@@ -2454,15 +2484,7 @@ create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
-cross-spawn@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982"
-  integrity sha1-ElYDfsufDF9549bvE14wdwGEuYI=
-  dependencies:
-    lru-cache "^4.0.1"
-    which "^1.2.9"
-
-cross-spawn@^6.0.0, cross-spawn@^6.0.5:
+cross-spawn@^6.0.5:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
   integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
@@ -2473,7 +2495,7 @@ cross-spawn@^6.0.0, cross-spawn@^6.0.5:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-cross-spawn@^7.0.2:
+cross-spawn@^7.0.2, cross-spawn@^7.0.3:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
   integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
@@ -2527,7 +2549,7 @@ css-has-pseudo@^0.10.0:
     postcss "^7.0.6"
     postcss-selector-parser "^5.0.0-rc.4"
 
-css-loader@^3.4.2:
+css-loader@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.6.0.tgz#2e4b2c7e6e2d27f8c8f28f61bffcd2e6c91ef645"
   integrity sha512-M5lSukoWi1If8dhQAUCvj4H8vUt3vOnwbQBH9DdTm/s4Ym2B/3dPMtYZeJmq7Q3S3Pa+I94DcZ7pc9bP14cWIQ==
@@ -2679,13 +2701,6 @@ csso@^4.0.2:
   dependencies:
     css-tree "^1.1.2"
 
-currently-unhandled@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
-  integrity sha1-mI3zP+qxke95mmE2nddsF635V+o=
-  dependencies:
-    array-find-index "^1.0.1"
-
 custom-event@~1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425"
@@ -2696,22 +2711,10 @@ cyclist@^1.0.1:
   resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
   integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=
 
-dashdash@^1.12.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
-  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
-  dependencies:
-    assert-plus "^1.0.0"
-
-date-format@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/date-format/-/date-format-2.1.0.tgz#31d5b5ea211cf5fd764cd38baf9d033df7e125cf"
-  integrity sha512-bYQuGLeFxhkxNOF3rcMtiZxvCBAquGzZm6oWA1oZ0g2THUzivaRhv8uOhdr19LmoobSOLoIAxeUK2RdbM8IFTA==
-
-date-format@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/date-format/-/date-format-3.0.0.tgz#eb8780365c7d2b1511078fb491e6479780f3ad95"
-  integrity sha512-eyTcpKOcamdhWJXj56DpQMo1ylSQpcGtGKXcU0Tb97+K56/CF5amAqqqNj0+KvA0iw2ynxtHWFsPDSClCxe48w==
+date-format@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/date-format/-/date-format-4.0.3.tgz#f63de5dc08dc02efd8ef32bf2a6918e486f35873"
+  integrity sha512-7P3FyqDcfeznLZp2b+OMitV9Sz2lUnsT87WaTat9nVwqsBkTzPG3lPLNwW3en6F4pHUiWzr6vb8CLhjdK9bcxQ==
 
 debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.9:
   version "2.6.9"
@@ -2720,17 +2723,17 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.9:
   dependencies:
     ms "2.0.0"
 
-debug@^3.1.1, debug@^3.2.6, debug@^3.2.7:
+debug@^3.1.1, debug@^3.2.7:
   version "3.2.7"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
   integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
   dependencies:
     ms "^2.1.1"
 
-debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b"
-  integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==
+debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.3:
+  version "4.3.3"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664"
+  integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==
   dependencies:
     ms "2.1.2"
 
@@ -2748,7 +2751,7 @@ debug@~4.1.0:
   dependencies:
     ms "^2.1.1"
 
-decamelize@^1.1.2, decamelize@^1.2.0:
+decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
@@ -2775,13 +2778,17 @@ deep-is@^0.1.3:
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
   integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
 
-default-gateway@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.2.0.tgz#167104c7500c2115f6dd69b0a536bb8ed720552b"
-  integrity sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==
+default-gateway@^6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-6.0.3.tgz#819494c888053bdb743edbf343d6cdf7f2943a71"
+  integrity sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==
   dependencies:
-    execa "^1.0.0"
-    ip-regex "^2.1.0"
+    execa "^5.0.0"
+
+define-lazy-prop@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f"
+  integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==
 
 define-properties@^1.1.3:
   version "1.1.3"
@@ -2812,28 +2819,19 @@ define-property@^2.0.2:
     is-descriptor "^1.0.2"
     isobject "^3.0.1"
 
-del@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/del/-/del-4.1.1.tgz#9e8f117222ea44a31ff3a156c049b99052a9f0b4"
-  integrity sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==
-  dependencies:
-    "@types/glob" "^7.1.1"
-    globby "^6.1.0"
-    is-path-cwd "^2.0.0"
-    is-path-in-cwd "^2.0.0"
-    p-map "^2.0.0"
-    pify "^4.0.1"
-    rimraf "^2.6.3"
-
-delayed-stream@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
-
-delegates@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
+del@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/del/-/del-6.0.0.tgz#0b40d0332cea743f1614f818be4feb717714c952"
+  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"
 
 depd@~1.1.2:
   version "1.1.2"
@@ -2877,6 +2875,13 @@ diffie-hellman@^5.0.0:
     miller-rabin "^4.0.0"
     randombytes "^2.0.0"
 
+dir-glob@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
+  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
+  dependencies:
+    path-type "^4.0.0"
+
 dns-equal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
@@ -2969,23 +2974,15 @@ duplexify@^3.4.2, duplexify@^3.6.0:
     readable-stream "^2.0.0"
     stream-shift "^1.0.0"
 
-ecc-jsbn@~0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
-  integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
-  dependencies:
-    jsbn "~0.1.0"
-    safer-buffer "^2.1.0"
-
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
-electron-to-chromium@^1.3.854:
-  version "1.3.856"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.856.tgz#75dee0eef9702bffabbf4c1293c989cd3cacb7ba"
-  integrity sha512-lSezYIe1/p5qkEswAfaQUseOBiwGwuCvRl/MKzOEVe++DcmQ92+43dznDl4rFJ4Zpu+kevhwyIf7KjJevyDA/A==
+electron-to-chromium@^1.4.17:
+  version "1.4.53"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.53.tgz#5d80a91c399b44952ef485857fb5b9d4387d2e60"
+  integrity sha512-rFveSKQczlcav+H3zkKqykU6ANseFwXwkl855jOIap5/0gnEcuIhv2ecz6aoTrXavF6I/CEBeRnBnkB51k06ew==
 
 elliptic@^6.5.3:
   version "6.5.4"
@@ -3100,17 +3097,17 @@ errno@^0.1.3, errno@~0.1.7:
   dependencies:
     prr "~1.0.1"
 
-error-ex@^1.2.0, error-ex@^1.3.1:
+error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
   integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.17.2, es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2, es-abstract@^1.18.2:
-  version "1.19.0"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.0.tgz#0a6e6682268e7f5bdc1c740b33ce2578d64538d3"
-  integrity sha512-oWPrF+7P1nGv/rw9oIInwdkmI1qediEJSvVfHFryBd8mWllCKB5tke3aKyf51J6chgyKmi6mODqdnin2yb88Nw==
+es-abstract@^1.17.2, es-abstract@^1.19.0, es-abstract@^1.19.1:
+  version "1.19.1"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3"
+  integrity sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==
   dependencies:
     call-bind "^1.0.2"
     es-to-primitive "^1.2.1"
@@ -3152,7 +3149,7 @@ escape-html@~1.0.3:
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
   integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
 
-escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
+escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
@@ -3190,34 +3187,32 @@ eslint-loader@^4.0.2:
     object-hash "^2.0.3"
     schema-utils "^2.6.5"
 
-eslint-module-utils@^2.6.2:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.2.tgz#94e5540dd15fe1522e8ffa3ec8db3b7fa7e7a534"
-  integrity sha512-QG8pcgThYOuqxupd06oYTZoNOGaUdTY1PqK+oS6ElF6vs4pBdk/aYxFVQQXzcrAqp9m7cl7lb2ubazX+g16k2Q==
+eslint-module-utils@^2.7.2:
+  version "2.7.2"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.2.tgz#1d0aa455dcf41052339b63cada8ab5fd57577129"
+  integrity sha512-zquepFnWCY2ISMFwD/DqzaM++H+7PDzOpUvotJWm/y1BAFt5R4oeULgdrTejKqLkz7MA/tgstsUMNYc7wNdTrg==
   dependencies:
     debug "^3.2.7"
-    pkg-dir "^2.0.0"
+    find-up "^2.1.0"
 
 eslint-plugin-import@^2.21.1:
-  version "2.24.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.24.2.tgz#2c8cd2e341f3885918ee27d18479910ade7bb4da"
-  integrity sha512-hNVtyhiEtZmpsabL4neEj+6M5DCLgpYyG9nzJY8lZQeQXEn5UPW1DpUdsMHMXsq98dbNm7nt1w9ZMSVpfJdi8Q==
+  version "2.25.4"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.25.4.tgz#322f3f916a4e9e991ac7af32032c25ce313209f1"
+  integrity sha512-/KJBASVFxpu0xg1kIBn9AUa8hQVnszpwgE7Ld0lKAlx7Ie87yzEzCgSkekt+le/YVhiaosO4Y14GDAOc41nfxA==
   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.6"
-    eslint-module-utils "^2.6.2"
-    find-up "^2.0.0"
+    eslint-module-utils "^2.7.2"
     has "^1.0.3"
-    is-core-module "^2.6.0"
+    is-core-module "^2.8.0"
+    is-glob "^4.0.3"
     minimatch "^3.0.4"
-    object.values "^1.1.4"
-    pkg-up "^2.0.0"
-    read-pkg-up "^3.0.0"
+    object.values "^1.1.5"
     resolve "^1.20.0"
-    tsconfig-paths "^3.11.0"
+    tsconfig-paths "^3.12.0"
 
 eslint-scope@^4.0.3:
   version "4.0.3"
@@ -3332,9 +3327,9 @@ estraverse@^4.1.1:
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
 
 estraverse@^5.1.0, estraverse@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880"
-  integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
+  integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
 
 esutils@^2.0.2:
   version "2.0.3"
@@ -3356,13 +3351,6 @@ events@^3.0.0:
   resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
   integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
 
-eventsource@^1.0.7:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.1.0.tgz#00e8ca7c92109e94b0ddf32dac677d841028cfaf"
-  integrity sha512-VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg==
-  dependencies:
-    original "^1.0.0"
-
 evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
@@ -3371,18 +3359,20 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
     md5.js "^1.3.4"
     safe-buffer "^5.1.1"
 
-execa@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
-  integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
+execa@^5.0.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
+  integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==
   dependencies:
-    cross-spawn "^6.0.0"
-    get-stream "^4.0.0"
-    is-stream "^1.1.0"
-    npm-run-path "^2.0.0"
-    p-finally "^1.0.0"
-    signal-exit "^3.0.0"
-    strip-eof "^1.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"
 
 expand-brackets@^2.1.4:
   version "2.1.4"
@@ -3405,16 +3395,16 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2:
     homedir-polyfill "^1.0.1"
 
 express@^4.17.1:
-  version "4.17.1"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
-  integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==
+  version "4.17.2"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.17.2.tgz#c18369f265297319beed4e5558753cc8c1364cb3"
+  integrity sha512-oxlxJxcQlYwqPWKVJJtvQiwHgosH/LrLSPA+H4UxpyvSS6jC5aH+5MoHFM+KABgTOt0APue4w66Ha8jCUo9QGg==
   dependencies:
     accepts "~1.3.7"
     array-flatten "1.1.1"
-    body-parser "1.19.0"
-    content-disposition "0.5.3"
+    body-parser "1.19.1"
+    content-disposition "0.5.4"
     content-type "~1.0.4"
-    cookie "0.4.0"
+    cookie "0.4.1"
     cookie-signature "1.0.6"
     debug "2.6.9"
     depd "~1.1.2"
@@ -3428,13 +3418,13 @@ express@^4.17.1:
     on-finished "~2.3.0"
     parseurl "~1.3.3"
     path-to-regexp "0.1.7"
-    proxy-addr "~2.0.5"
-    qs "6.7.0"
+    proxy-addr "~2.0.7"
+    qs "6.9.6"
     range-parser "~1.2.1"
-    safe-buffer "5.1.2"
-    send "0.17.1"
-    serve-static "1.14.1"
-    setprototypeof "1.1.1"
+    safe-buffer "5.2.1"
+    send "0.17.2"
+    serve-static "1.14.2"
+    setprototypeof "1.2.0"
     statuses "~1.5.0"
     type-is "~1.6.18"
     utils-merge "1.0.1"
@@ -3455,7 +3445,7 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
-extend@^3.0.0, extend@~3.0.2:
+extend@^3.0.0:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
@@ -3474,21 +3464,22 @@ extglob@^2.0.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-extsprintf@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
-  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
-
-extsprintf@^1.2.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
-  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
-
 fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
+fast-glob@^3.2.9:
+  version "3.2.11"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9"
+  integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==
+  dependencies:
+    "@nodelib/fs.stat" "^2.0.2"
+    "@nodelib/fs.walk" "^1.2.3"
+    glob-parent "^5.1.2"
+    merge2 "^1.3.0"
+    micromatch "^4.0.4"
+
 fast-json-stable-stringify@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
@@ -3499,6 +3490,13 @@ fast-levenshtein@^2.0.6:
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
+fastq@^1.6.0:
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c"
+  integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==
+  dependencies:
+    reusify "^1.0.4"
+
 faye-websocket@^0.11.3:
   version "0.11.4"
   resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.4.tgz#7f0d9275cfdd86a1c963dc8b65fcc451edcbb1da"
@@ -3518,7 +3516,7 @@ file-entry-cache@^6.0.1:
   dependencies:
     flat-cache "^3.0.4"
 
-file-loader@^6.0.0:
+file-loader@^6.2.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d"
   integrity sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==
@@ -3570,7 +3568,7 @@ find-cache-dir@^2.1.0:
     make-dir "^2.0.0"
     pkg-dir "^3.0.0"
 
-find-cache-dir@^3.0.0, find-cache-dir@^3.3.1:
+find-cache-dir@^3.3.1:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b"
   integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==
@@ -3579,15 +3577,7 @@ find-cache-dir@^3.0.0, find-cache-dir@^3.3.1:
     make-dir "^3.0.2"
     pkg-dir "^4.1.0"
 
-find-up@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
-  integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=
-  dependencies:
-    path-exists "^2.0.0"
-    pinkie-promise "^2.0.0"
-
-find-up@^2.0.0, find-up@^2.1.0:
+find-up@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
   integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
@@ -3627,15 +3617,10 @@ flat-cache@^3.0.4:
     flatted "^3.1.0"
     rimraf "^3.0.2"
 
-flatted@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"
-  integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==
-
-flatted@^3.1.0:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.2.tgz#64bfed5cb68fe3ca78b3eb214ad97b63bedce561"
-  integrity sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==
+flatted@^3.1.0, flatted@^3.2.2, flatted@^3.2.4:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.4.tgz#28d9969ea90661b5134259f312ab6aa7929ac5e2"
+  integrity sha512-8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw==
 
 flatten@^1.0.2:
   version "1.0.3"
@@ -3651,29 +3636,15 @@ flush-write-stream@^1.0.0:
     readable-stream "^2.3.6"
 
 follow-redirects@^1.0.0:
-  version "1.14.4"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.4.tgz#838fdf48a8bbdd79e52ee51fb1c94e3ed98b9379"
-  integrity sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g==
+  version "1.14.7"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685"
+  integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==
 
 for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
   integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
 
-forever-agent@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
-  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
-
-form-data@~2.3.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
-  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.6"
-    mime-types "^2.1.12"
-
 forwarded@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811"
@@ -3699,6 +3670,15 @@ from2@^2.1.0:
     inherits "^2.0.1"
     readable-stream "^2.0.0"
 
+fs-extra@^10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.0.tgz#9ff61b655dde53fb34a82df84bb214ce802e17c1"
+  integrity sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==
+  dependencies:
+    graceful-fs "^4.2.0"
+    jsonfile "^6.0.1"
+    universalify "^2.0.0"
+
 fs-extra@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
@@ -3715,6 +3695,11 @@ fs-minipass@^2.0.0:
   dependencies:
     minipass "^3.0.0"
 
+fs-monkey@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3"
+  integrity sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==
+
 fs-write-stream-atomic@^1.0.8:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
@@ -3743,16 +3728,6 @@ fsevents@~2.3.2:
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
   integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
 
-fstream@^1.0.0, fstream@^1.0.12:
-  version "1.0.12"
-  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045"
-  integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==
-  dependencies:
-    graceful-fs "^4.1.2"
-    inherits "~2.0.0"
-    mkdirp ">=0.5 0"
-    rimraf "2"
-
 function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
@@ -3763,27 +3738,6 @@ functional-red-black-tree@^1.0.1:
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
   integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
 
-gauge@~2.7.3:
-  version "2.7.4"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
-  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
-  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"
-
-gaze@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a"
-  integrity sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==
-  dependencies:
-    globule "^1.0.0"
-
 gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
@@ -3803,17 +3757,10 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1:
     has "^1.0.3"
     has-symbols "^1.0.1"
 
-get-stdin@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
-  integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=
-
-get-stream@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
-  integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
-  dependencies:
-    pump "^3.0.0"
+get-stream@^6.0.0:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
+  integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
 
 get-symbol-description@^1.0.0:
   version "1.0.0"
@@ -3828,13 +3775,6 @@ get-value@^2.0.3, get-value@^2.0.6:
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
   integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
 
-getpass@^0.1.1:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
-  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
-  dependencies:
-    assert-plus "^1.0.0"
-
 glob-parent@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
@@ -3850,7 +3790,7 @@ glob-parent@^5.1.2, glob-parent@~5.1.2:
   dependencies:
     is-glob "^4.0.1"
 
-glob@^7.0.0, glob@^7.0.3, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
+glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
   integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
@@ -3862,18 +3802,6 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@~7.1.1:
-  version "7.1.7"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
-  integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
 global-modules@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
@@ -3916,62 +3844,34 @@ globals@^11.1.0:
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
 globals@^13.6.0, globals@^13.9.0:
-  version "13.11.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.11.0.tgz#40ef678da117fe7bd2e28f1fab24951bd0255be7"
-  integrity sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==
+  version "13.12.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.12.0.tgz#4d733760304230a0082ed96e21e5c565f898089e"
+  integrity sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==
   dependencies:
     type-fest "^0.20.2"
 
-globby@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
-  integrity sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=
-  dependencies:
-    array-union "^1.0.1"
-    glob "^7.0.3"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-
-globule@^1.0.0:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/globule/-/globule-1.3.3.tgz#811919eeac1ab7344e905f2e3be80a13447973c2"
-  integrity sha512-mb1aYtDbIjTu4ShMB85m3UzjX9BVKe9WCzsnfMSZk+K5GpIbBOexgg4PPCt5eHDEG5/ZQAUX2Kct02zfiPLsKg==
+globby@^11.0.1:
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
+  integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
   dependencies:
-    glob "~7.1.1"
-    lodash "~4.17.10"
-    minimatch "~3.0.2"
+    array-union "^2.1.0"
+    dir-glob "^3.0.1"
+    fast-glob "^3.2.9"
+    ignore "^5.2.0"
+    merge2 "^1.4.1"
+    slash "^3.0.0"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.4:
-  version "4.2.8"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a"
-  integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6:
+  version "4.2.9"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96"
+  integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==
 
 handle-thing@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e"
   integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==
 
-har-schema@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
-  integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
-
-har-validator@~5.1.3:
-  version "5.1.5"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
-  integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
-  dependencies:
-    ajv "^6.12.3"
-    har-schema "^2.0.0"
-
-has-ansi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
-  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
-  dependencies:
-    ansi-regex "^2.0.0"
-
 has-bigints@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113"
@@ -4011,11 +3911,6 @@ has-tostringtag@^1.0.0:
   dependencies:
     has-symbols "^1.0.2"
 
-has-unicode@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
-  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
-
 has-value@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
@@ -4092,11 +3987,6 @@ homedir-polyfill@^1.0.1:
   dependencies:
     parse-passwd "^1.0.0"
 
-hosted-git-info@^2.1.4:
-  version "2.8.9"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
-  integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
-
 hpack.js@^2.1.6:
   version "2.1.6"
   resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2"
@@ -4117,26 +4007,26 @@ hsla-regex@^1.0.0:
   resolved "https://registry.yarnpkg.com/hsla-regex/-/hsla-regex-1.0.0.tgz#c1ce7a3168c8c6614033a4b5f7877f3b225f9c38"
   integrity sha1-wc56MWjIxmFAM6S194d/OyJfnDg=
 
-html-entities@^1.3.1:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.4.0.tgz#cfbd1b01d2afaf9adca1b10ae7dffab98c71d2dc"
-  integrity sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==
+html-entities@^2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.3.2.tgz#760b404685cb1d794e4f4b744332e3b00dcfe488"
+  integrity sha512-c3Ab/url5ksaT0WyleslpBEthOzWhrjQbg75y7XUsfSzi3Dgzt0l8w5e7DylRn15MTlMMD58dTfzddNS2kcAjQ==
 
 http-deceiver@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
   integrity sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=
 
-http-errors@1.7.2:
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f"
-  integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==
+http-errors@1.8.1:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c"
+  integrity sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==
   dependencies:
     depd "~1.1.2"
-    inherits "2.0.3"
-    setprototypeof "1.1.1"
+    inherits "2.0.4"
+    setprototypeof "1.2.0"
     statuses ">= 1.5.0 < 2"
-    toidentifier "1.0.0"
+    toidentifier "1.0.1"
 
 http-errors@~1.6.2:
   version "1.6.3"
@@ -4148,33 +4038,23 @@ http-errors@~1.6.2:
     setprototypeof "1.1.0"
     statuses ">= 1.4.0 < 2"
 
-http-errors@~1.7.2:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06"
-  integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==
-  dependencies:
-    depd "~1.1.2"
-    inherits "2.0.4"
-    setprototypeof "1.1.1"
-    statuses ">= 1.5.0 < 2"
-    toidentifier "1.0.0"
-
 http-parser-js@>=0.5.1:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.3.tgz#01d2709c79d41698bb01d4decc5e9da4e4a033d9"
-  integrity sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==
+  version "0.5.5"
+  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.5.tgz#d7c30d5d3c90d865b4a2e870181f9d6f22ac7ac5"
+  integrity sha512-x+JVEkO2PoM8qqpbPbOL3cqHPwerep7OwzK7Ay+sMQjKzaKCqWvjoXm5tqMP9tXWWTnTzAjIhXg+J99XYuPhPA==
 
-http-proxy-middleware@0.19.1:
-  version "0.19.1"
-  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz#183c7dc4aa1479150306498c210cdaf96080a43a"
-  integrity sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==
+http-proxy-middleware@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.2.tgz#94d7593790aad6b3de48164f13792262f656c332"
+  integrity sha512-XtmDN5w+vdFTBZaYhdJAbMqn0DP/EhkUaAeo963mojwpKMMbw6nivtFKw07D7DDOH745L5k0VL0P8KRYNEVF/g==
   dependencies:
-    http-proxy "^1.17.0"
-    is-glob "^4.0.0"
-    lodash "^4.17.11"
-    micromatch "^3.1.10"
+    "@types/http-proxy" "^1.17.8"
+    http-proxy "^1.18.1"
+    is-glob "^4.0.1"
+    is-plain-obj "^3.0.0"
+    micromatch "^4.0.2"
 
-http-proxy@^1.17.0, http-proxy@^1.18.1:
+http-proxy@^1.18.1:
   version "1.18.1"
   resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549"
   integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==
@@ -4183,20 +4063,16 @@ http-proxy@^1.17.0, http-proxy@^1.18.1:
     follow-redirects "^1.0.0"
     requires-port "^1.0.0"
 
-http-signature@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
-  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
-  dependencies:
-    assert-plus "^1.0.0"
-    jsprim "^1.2.2"
-    sshpk "^1.7.0"
-
 https-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
   integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
 
+human-signals@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
+  integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
+
 iconv-lite@0.4.24:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
@@ -4226,6 +4102,16 @@ ignore@^4.0.6:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
   integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
 
+ignore@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
+  integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
+
+immutable@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.0.0.tgz#b86f78de6adef3608395efb269a91462797e2c23"
+  integrity sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw==
+
 import-cwd@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9"
@@ -4269,18 +4155,6 @@ imurmurhash@^0.1.4:
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
   integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
 
-in-publish@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.1.tgz#948b1a535c8030561cea522f73f78f4be357e00c"
-  integrity sha512-oDM0kUSNFC31ShNxHKUyfZKy8ZeXZBWMjMdZHKLOk13uvT27VTL/QzRGfRUcevJhpkZAvlhPYuXkF7eNWrtyxQ==
-
-indent-string@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
-  integrity sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=
-  dependencies:
-    repeating "^2.0.0"
-
 indent-string@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
@@ -4309,7 +4183,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
+inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -4329,14 +4203,6 @@ ini@^1.3.4, ini@^1.3.5:
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
   integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
-internal-ip@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz#845452baad9d2ca3b69c635a137acb9a0dad0907"
-  integrity sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==
-  dependencies:
-    default-gateway "^4.2.0"
-    ipaddr.js "^1.9.0"
-
 internal-slot@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c"
@@ -4351,31 +4217,26 @@ interpret@^1.4.0:
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e"
   integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==
 
-ip-regex@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
-  integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=
-
-ip@^1.1.0, ip@^1.1.5:
+ip@^1.1.0:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
   integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
 
-ipaddr.js@1.9.1, ipaddr.js@^1.9.0:
+ipaddr.js@1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
   integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
 
+ipaddr.js@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.0.1.tgz#eca256a7a877e917aeb368b0a7497ddf42ef81c0"
+  integrity sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==
+
 is-absolute-url@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
   integrity sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=
 
-is-absolute-url@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-3.0.3.tgz#96c6a22b6a23929b11ea0afb1836c36ad4a5d698"
-  integrity sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==
-
 is-accessor-descriptor@^0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
@@ -4459,10 +4320,10 @@ is-color-stop@^1.0.0:
     rgb-regex "^1.0.1"
     rgba-regex "^1.0.0"
 
-is-core-module@^2.2.0, is-core-module@^2.6.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.7.0.tgz#3c0ef7d31b4acfc574f80c58409d568a836848e3"
-  integrity sha512-ByY+tjCciCr+9nLryBYcSD50EOGWt95c7tIsKTG1J2ixKKXPvF7Ej3AVd+UfDydAJom3biBGDBALaO79ktwgEQ==
+is-core-module@^2.8.0, is-core-module@^2.8.1:
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211"
+  integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==
   dependencies:
     has "^1.0.3"
 
@@ -4510,6 +4371,11 @@ is-directory@^0.3.1:
   resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
   integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=
 
+is-docker@^2.0.0, is-docker@^2.1.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
+  integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
+
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
@@ -4527,18 +4393,6 @@ is-extglob@^2.1.0, is-extglob@^2.1.1:
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
-is-finite@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.1.0.tgz#904135c77fb42c0641d6aa1bcdbc4daa8da082f3"
-  integrity sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==
-
-is-fullwidth-code-point@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
-  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
-  dependencies:
-    number-is-nan "^1.0.0"
-
 is-fullwidth-code-point@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
@@ -4556,7 +4410,7 @@ is-glob@^3.1.0:
   dependencies:
     is-extglob "^2.1.0"
 
-is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
+is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
   integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
@@ -4564,9 +4418,9 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
     is-extglob "^2.1.1"
 
 is-negative-zero@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24"
-  integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"
+  integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==
 
 is-number-object@^1.0.4:
   version "1.0.6"
@@ -4592,30 +4446,26 @@ is-obj@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982"
   integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==
 
-is-path-cwd@^2.0.0:
+is-path-cwd@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb"
   integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==
 
-is-path-in-cwd@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz#bfe2dca26c69f397265a4009963602935a053acb"
-  integrity sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==
-  dependencies:
-    is-path-inside "^2.1.0"
-
-is-path-inside@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-2.1.0.tgz#7c9810587d659a40d27bcdb4d5616eab059494b2"
-  integrity sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==
-  dependencies:
-    path-is-inside "^1.0.2"
+is-path-inside@^3.0.2:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
+  integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
 
 is-plain-obj@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
   integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
 
+is-plain-obj@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7"
+  integrity sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==
+
 is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
@@ -4641,10 +4491,10 @@ is-shared-array-buffer@^1.0.1:
   resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz#97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6"
   integrity sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==
 
-is-stream@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
-  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
+is-stream@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
+  integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
 
 is-string@^1.0.5, is-string@^1.0.7:
   version "1.0.7"
@@ -4660,22 +4510,12 @@ is-symbol@^1.0.2, is-symbol@^1.0.3:
   dependencies:
     has-symbols "^1.0.2"
 
-is-typedarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
-  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
-
-is-utf8@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
-  integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
-
 is-weakref@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.1.tgz#842dba4ec17fa9ac9850df2d6efbc1737274f2a2"
-  integrity sha512-b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ==
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2"
+  integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==
   dependencies:
-    call-bind "^1.0.0"
+    call-bind "^1.0.2"
 
 is-windows@^1.0.1, is-windows@^1.0.2:
   version "1.0.2"
@@ -4687,6 +4527,13 @@ is-wsl@^1.1.0:
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
   integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
 
+is-wsl@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
+  integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==
+  dependencies:
+    is-docker "^2.0.0"
+
 isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
@@ -4719,29 +4566,25 @@ isobject@^3.0.0, isobject@^3.0.1:
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
-isstream@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
-  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
-
-jasmine-core@^3.5.0, jasmine-core@~3.9.0:
-  version "3.9.0"
-  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.9.0.tgz#09a3c8169fe98ec69440476d04a0e4cb4d59e452"
-  integrity sha512-Tv3kVbPCGVrjsnHBZ38NsPU3sDOtNa0XmbG2baiyJqdb5/SPpDO6GVwJYtUryl6KB4q1Ssckwg612ES9Z0dreQ==
+jasmine-core@^3.5.0, jasmine-core@~3.99.0:
+  version "3.99.0"
+  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.99.0.tgz#99a3da0d38ba2de82614d9198b7b1bc1c32a5960"
+  integrity sha512-+ZDaJlEfRopINQqgE+hvzRyDIQDeKfqqTvF8RzXsvU1yE3pBDRud2+Qfh9WvGgRpuzqxyQJVI6Amy5XQ11r/3w==
 
 jasmine@^3.5.0:
-  version "3.9.0"
-  resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-3.9.0.tgz#286c4f9f88b69defc24acf3989af5533d5c6a0e6"
-  integrity sha512-JgtzteG7xnqZZ51fg7N2/wiQmXon09szkALcRMTgCMX4u/m17gVJFjObnvw5FXkZOWuweHPaPRVB6DI2uN0wVA==
+  version "3.99.0"
+  resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-3.99.0.tgz#7cc7aeda7ade2d57694fc818a374f778cbb4ea62"
+  integrity sha512-YIThBuHzaIIcjxeuLmPD40SjxkEcc8i//sGMDKCgkRMVgIwRJf5qyExtlJpQeh7pkeoBSOe6lQEdg+/9uKg9mw==
   dependencies:
     glob "^7.1.6"
-    jasmine-core "~3.9.0"
+    jasmine-core "~3.99.0"
 
-jest-worker@^25.4.0:
-  version "25.5.0"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-25.5.0.tgz#2611d071b79cea0f43ee57a3d118593ac1547db1"
-  integrity sha512-/dsSmUkIy5EBGfv/IjjqmFxrNAUpBERfGs1oHROyD7yxjG/w+t0GOJDX8O1k32ySmd7+a5IhnJU2qQFcJ4n1vw==
+jest-worker@^26.5.0:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed"
+  integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==
   dependencies:
+    "@types/node" "*"
     merge-stream "^2.0.0"
     supports-color "^7.0.0"
 
@@ -4751,20 +4594,17 @@ jquery-ui-sass@^0.0.1:
   integrity sha1-0RfrGoL79QcuZ5fjcMIbJEb7CGE=
 
 jquery-ui@^1.12.1:
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.12.1.tgz#bcb4045c8dd0539c134bc1488cdd3e768a7a9e51"
-  integrity sha1-vLQEXI3QU5wTS8FIjN0+dop6nlE=
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.13.1.tgz#d0b7a42e73a04c31bb5706adf86f6f8942f64eaa"
+  integrity sha512-2VlU59N5P4HaumDK1Z3XEVjSvegFbEOQRgpHUBaB2Ak98Axl3hFhJ6RFcNQNuk9SfL6WxIbuLst8dW/U56NSiA==
+  dependencies:
+    jquery ">=1.8.0 <4.0.0"
 
-jquery@^3.5.1:
+"jquery@>=1.8.0 <4.0.0", jquery@^3.5.1:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470"
   integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==
 
-js-base64@^2.1.8:
-  version "2.6.4"
-  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.4.tgz#f4e686c5de1ea1f867dbcad3d46d969428df98c4"
-  integrity sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==
-
 js-cookie@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.1.tgz#69e106dc5d5806894562902aa5baec3744e9b2b8"
@@ -4775,7 +4615,7 @@ js-tokens@^4.0.0:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-js-yaml@^3.13.1:
+js-yaml@^3.13.1, js-yaml@^3.14.1:
   version "3.14.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
   integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
@@ -4783,11 +4623,6 @@ js-yaml@^3.13.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-jsbn@~0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
-  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
-
 jsesc@^2.5.1:
   version "2.5.2"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
@@ -4818,26 +4653,11 @@ json-schema-traverse@^1.0.0:
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
   integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
 
-json-schema@0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
-  integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
-
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
   integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
 
-json-stringify-safe@~5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
-
-json3@^3.3.3:
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81"
-  integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==
-
 json5@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
@@ -4859,15 +4679,14 @@ jsonfile@^4.0.0:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
-jsprim@^1.2.2:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
-  integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
+jsonfile@^6.0.1:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
+  integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==
   dependencies:
-    assert-plus "1.0.0"
-    extsprintf "1.3.0"
-    json-schema "0.2.3"
-    verror "1.10.0"
+    universalify "^2.0.0"
+  optionalDependencies:
+    graceful-fs "^4.1.6"
 
 karma-babel-preprocessor@^8.0.1:
   version "8.0.1"
@@ -4949,11 +4768,6 @@ karma@^5.0.9:
     ua-parser-js "0.7.22"
     yargs "^15.3.1"
 
-killable@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
-  integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==
-
 kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
@@ -4978,6 +4792,11 @@ kind-of@^6.0.0, kind-of@^6.0.2:
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
+klona@^2.0.4:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc"
+  integrity sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==
+
 last-call-webpack-plugin@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/last-call-webpack-plugin/-/last-call-webpack-plugin-3.0.0.tgz#9742df0e10e3cf46e5c0381c2de90d3a7a2d7555"
@@ -4995,30 +4814,9 @@ levn@^0.4.1:
     type-check "~0.4.0"
 
 lines-and-columns@^1.1.6:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
-  integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=
-
-load-json-file@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
-  integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=
-  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"
-
-load-json-file@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
-  integrity sha1-L19Fq5HjMhYjT9U62rZo607AmTs=
-  dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^4.0.0"
-    pify "^3.0.0"
-    strip-bom "^3.0.0"
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
+  integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
 
 loader-runner@^2.4.0:
   version "2.4.0"
@@ -5035,9 +4833,9 @@ loader-utils@^1.1.0, loader-utils@^1.2.3, loader-utils@^1.4.0:
     json5 "^1.0.1"
 
 loader-utils@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0"
-  integrity sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.2.tgz#d6e3b4fb81870721ae4e0868ab11dd638368c129"
+  integrity sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==
   dependencies:
     big.js "^5.2.2"
     emojis-list "^3.0.0"
@@ -5066,11 +4864,6 @@ locate-path@^5.0.0:
   dependencies:
     p-locate "^4.1.0"
 
-lodash.clonedeep@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
-  integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
-
 lodash.debounce@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
@@ -5111,42 +4904,21 @@ lodash.uniq@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
-lodash@^4.0.0, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.5, lodash@~4.17.10:
+lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.5:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
 log4js@^6.2.1:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/log4js/-/log4js-6.3.0.tgz#10dfafbb434351a3e30277a00b9879446f715bcb"
-  integrity sha512-Mc8jNuSFImQUIateBFwdOQcmC6Q5maU0VVvdC2R6XMb66/VnT+7WS4D/0EeNMZu1YODmJe5NIn2XftCzEocUgw==
-  dependencies:
-    date-format "^3.0.0"
-    debug "^4.1.1"
-    flatted "^2.0.1"
-    rfdc "^1.1.4"
-    streamroller "^2.2.4"
-
-loglevel@^1.6.8:
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.1.tgz#005fde2f5e6e47068f935ff28573e125ef72f197"
-  integrity sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==
-
-loud-rejection@^1.0.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
-  integrity sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=
-  dependencies:
-    currently-unhandled "^0.4.1"
-    signal-exit "^3.0.0"
-
-lru-cache@^4.0.1:
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
-  integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/log4js/-/log4js-6.4.1.tgz#9d3a8bf2c31c1e213fe3fc398a6053f7a2bc53e8"
+  integrity sha512-iUiYnXqAmNKiIZ1XSAitQ4TmNs8CdZYTAWINARF3LjnsLN8tY5m0vRwd6uuWj/yNY0YHxeZodnbmxKFUOM2rMg==
   dependencies:
-    pseudomap "^1.0.2"
-    yallist "^2.1.2"
+    date-format "^4.0.3"
+    debug "^4.3.3"
+    flatted "^3.2.4"
+    rfdc "^1.3.0"
+    streamroller "^3.0.2"
 
 lru-cache@^5.1.1:
   version "5.1.1"
@@ -5182,11 +4954,6 @@ map-cache@^0.2.2:
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
   integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
 
-map-obj@^1.0.0, map-obj@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
-  integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=
-
 map-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
@@ -5218,6 +4985,13 @@ media-typer@0.3.0:
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
   integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
 
+memfs@^3.2.2:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.4.1.tgz#b78092f466a0dce054d63d39275b24c71d3f1305"
+  integrity sha512-1c9VPVvW5P7I85c35zAdEr1TD5+F11IToIHIlrVIcflfnzPkJa0ZoYEoEdYDP8KgPFoSZ/opDrUsAoZWym3mtw==
+  dependencies:
+    fs-monkey "1.0.3"
+
 memory-fs@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
@@ -5234,22 +5008,6 @@ memory-fs@^0.5.0:
     errno "^0.1.3"
     readable-stream "^2.0.1"
 
-meow@^3.7.0:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
-  integrity sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=
-  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"
-
 merge-descriptors@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
@@ -5260,6 +5018,11 @@ merge-stream@^2.0.0:
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
   integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
 
+merge2@^1.3.0, merge2@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
+  integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
+
 methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
@@ -5284,6 +5047,14 @@ micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
+micromatch@^4.0.2, micromatch@^4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9"
+  integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
+  dependencies:
+    braces "^3.0.1"
+    picomatch "^2.2.3"
+
 miller-rabin@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
@@ -5292,22 +5063,17 @@ miller-rabin@^4.0.0:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
-mime-db@1.49.0:
-  version "1.49.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.49.0.tgz#f3dfde60c99e9cf3bc9701d687778f537001cbed"
-  integrity sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA==
-
-"mime-db@>= 1.43.0 < 2":
-  version "1.50.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.50.0.tgz#abd4ac94e98d3c0e185016c67ab45d5fde40c11f"
-  integrity sha512-9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A==
+mime-db@1.51.0, "mime-db@>= 1.43.0 < 2":
+  version "1.51.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c"
+  integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==
 
-mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24:
-  version "2.1.32"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.32.tgz#1d00e89e7de7fe02008db61001d9e02852670fd5"
-  integrity sha512-hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A==
+mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.24:
+  version "2.1.34"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24"
+  integrity sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==
   dependencies:
-    mime-db "1.49.0"
+    mime-db "1.51.0"
 
 mime@1.6.0:
   version "1.6.0"
@@ -5315,9 +5081,14 @@ mime@1.6.0:
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
 mime@^2.4.4, mime@^2.4.5:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz#6e3dc6cc2b9510643830e5f19d5cb753da5eeabe"
-  integrity sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367"
+  integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==
+
+mimic-fn@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
+  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
 mini-css-extract-plugin@^0.9.0:
   version "0.9.0"
@@ -5339,14 +5110,14 @@ minimalistic-crypto-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
   integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
 
-minimatch@^3.0.4, minimatch@~3.0.2:
+minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5:
+minimist@^1.2.0, minimist@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
   integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
@@ -5373,10 +5144,18 @@ minipass-pipeline@^1.2.2:
     minipass "^3.0.0"
 
 minipass@^3.0.0, minipass@^3.1.1:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.5.tgz#71f6251b0a33a49c01b3cf97ff77eda030dff732"
-  integrity sha512-+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw==
+  version "3.1.6"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.6.tgz#3b8150aa688a711a1521af5e8779c1d3bb4f45ee"
+  integrity sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ==
+  dependencies:
+    yallist "^4.0.0"
+
+minizlib@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
+  integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
   dependencies:
+    minipass "^3.0.0"
     yallist "^4.0.0"
 
 mississippi@^3.0.0:
@@ -5403,13 +5182,18 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-"mkdirp@>=0.5 0", mkdirp@^0.5, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5, mkdirp@~0.5.1:
+mkdirp@^0.5, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5, mkdirp@~0.5.1:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
   integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
   dependencies:
     minimist "^1.2.5"
 
+mkdirp@^1.0.3, mkdirp@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
+  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
+
 moment@^2.10.2:
   version "2.29.1"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
@@ -5432,17 +5216,12 @@ ms@2.0.0:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
   integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
-ms@2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
-  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
-
 ms@2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-ms@^2.1.1:
+ms@2.1.3, ms@^2.1.1:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
@@ -5460,16 +5239,11 @@ multicast-dns@^6.0.1:
     dns-packet "^1.3.1"
     thunky "^1.0.2"
 
-nan@^2.12.1, nan@^2.13.2:
+nan@^2.12.1:
   version "2.15.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee"
   integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==
 
-nanocolors@^0.2.12, nanocolors@^0.2.2, nanocolors@^0.2.8:
-  version "0.2.12"
-  resolved "https://registry.yarnpkg.com/nanocolors/-/nanocolors-0.2.12.tgz#4d05932e70116078673ea4cc6699a1c56cc77777"
-  integrity sha512-SFNdALvzW+rVlzqexid6epYdt8H9Zol7xDoQarioEFcFN0JHo4CYNztAxmtfgGTVRCmFlEOqqhBpoFGKqSAMug==
-
 nanomatch@^1.2.9:
   version "1.2.13"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
@@ -5497,7 +5271,7 @@ negotiator@0.6.2:
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
   integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
 
-neo-async@^2.5.0, neo-async@^2.6.1:
+neo-async@^2.5.0, neo-async@^2.6.1, neo-async@^2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
@@ -5507,28 +5281,10 @@ nice-try@^1.0.4:
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
   integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
-node-forge@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3"
-  integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==
-
-node-gyp@^3.8.0:
-  version "3.8.0"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c"
-  integrity sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==
-  dependencies:
-    fstream "^1.0.0"
-    glob "^7.0.3"
-    graceful-fs "^4.1.2"
-    mkdirp "^0.5.0"
-    nopt "2 || 3"
-    npmlog "0 || 1 || 2 || 3 || 4"
-    osenv "0"
-    request "^2.87.0"
-    rimraf "2"
-    semver "~5.3.0"
-    tar "^2.0.0"
-    which "1"
+node-forge@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.2.1.tgz#82794919071ef2eb5c509293325cec8afd0fd53c"
+  integrity sha512-Fcvtbb+zBcZXbTTVwqGA5W+MKBj56UjVRevvchv5XrcyXbmNdesfZL37nlcWOfpgHhgmxApw3tQbTr4CqNmX4w==
 
 node-libs-browser@^2.2.1:
   version "2.2.1"
@@ -5556,53 +5312,13 @@ node-libs-browser@^2.2.1:
     timers-browserify "^2.0.4"
     tty-browserify "0.0.0"
     url "^0.11.0"
-    util "^0.11.0"
-    vm-browserify "^1.0.1"
-
-node-releases@^1.1.76:
-  version "1.1.76"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.76.tgz#df245b062b0cafbd5282ab6792f7dccc2d97f36e"
-  integrity sha512-9/IECtNr8dXNmPWmFXepT0/7o5eolGesHUa3mtr0KlgnCvnZxwh2qensKL42JJY2vQKC3nIBXetFAqR+PW1CmA==
-
-node-sass@^4.13.1:
-  version "4.14.1"
-  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.14.1.tgz#99c87ec2efb7047ed638fb4c9db7f3a42e2217b5"
-  integrity sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==
-  dependencies:
-    async-foreach "^0.1.3"
-    chalk "^1.1.1"
-    cross-spawn "^3.0.0"
-    gaze "^1.0.0"
-    get-stdin "^4.0.1"
-    glob "^7.0.3"
-    in-publish "^2.0.0"
-    lodash "^4.17.15"
-    meow "^3.7.0"
-    mkdirp "^0.5.1"
-    nan "^2.13.2"
-    node-gyp "^3.8.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"
-
-"nopt@2 || 3":
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
-  integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k=
-  dependencies:
-    abbrev "1"
+    util "^0.11.0"
+    vm-browserify "^1.0.1"
 
-normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
-  integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
-  dependencies:
-    hosted-git-info "^2.1.4"
-    resolve "^1.10.0"
-    semver "2 || 3 || 4 || 5"
-    validate-npm-package-license "^3.0.1"
+node-releases@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.1.tgz#3d1d395f204f1f2f29a54358b9fb678765ad2fc5"
+  integrity sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==
 
 normalize-path@^2.1.1:
   version "2.1.1"
@@ -5636,22 +5352,12 @@ normalize-url@^3.0.0:
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559"
   integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==
 
-npm-run-path@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
-  integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
-  dependencies:
-    path-key "^2.0.0"
-
-"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
-  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
+npm-run-path@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
+  integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
   dependencies:
-    are-we-there-yet "~1.1.2"
-    console-control-strings "~1.1.0"
-    gauge "~2.7.3"
-    set-blocking "~2.0.0"
+    path-key "^3.0.0"
 
 nth-check@^1.0.2:
   version "1.0.2"
@@ -5665,20 +5371,10 @@ num2fraction@^1.2.2:
   resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
   integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=
 
-number-is-nan@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
-  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
-
 number-to-text@^0.3.8:
-  version "0.3.8"
-  resolved "https://registry.yarnpkg.com/number-to-text/-/number-to-text-0.3.8.tgz#99f3af4cf30945a7a91102185931de069360cad4"
-  integrity sha512-K4CPj4uV1bzx2BSVxWCon9gEwdzbYCi0P3wxMIoYpeYs3aixQsdvhrWW4/ugISyc93sKDi9NXbevmhUlGcynSA==
-
-oauth-sign@~0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
-  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
+  version "0.3.9"
+  resolved "https://registry.yarnpkg.com/number-to-text/-/number-to-text-0.3.9.tgz#dda29a3f762e73d9b5a15b3b6a13551813043969"
+  integrity sha512-BWJ/e9IJZQWAg43DExXH02GGb30u2Lbd8SB5AWKMw/gbCSqL/J9+Zb5bj5MVZ+RZqhlyNUeUMxuyln12WQuj0g==
 
 object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
@@ -5700,9 +5396,9 @@ object-hash@^2.0.3:
   integrity sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw==
 
 object-inspect@^1.11.0, object-inspect@^1.9.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1"
-  integrity sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==
+  version "1.12.0"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz#6e2c120e868fd1fd18cb4f18c31741d0d6e776f0"
+  integrity sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==
 
 object-is@^1.0.1:
   version "1.1.5"
@@ -5735,22 +5431,22 @@ object.assign@^4.1.0, object.assign@^4.1.2:
     object-keys "^1.1.1"
 
 object.entries@^1.1.2:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.4.tgz#43ccf9a50bc5fd5b649d45ab1a579f24e088cafd"
-  integrity sha512-h4LWKWE+wKQGhtMjZEBud7uLGhqyLwj8fpHOarZhD2uY3C9cRtk57VQ89ke3moByLXMedqs3XCHzyb4AmA2DjA==
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.5.tgz#e1acdd17c4de2cd96d5a08487cfb9db84d881861"
+  integrity sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==
   dependencies:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
-    es-abstract "^1.18.2"
+    es-abstract "^1.19.1"
 
 object.getownpropertydescriptors@^2.1.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.2.tgz#1bd63aeacf0d5d2d2f31b5e393b03a7c601a23f7"
-  integrity sha512-WtxeKSzfBjlzL+F9b7M7hewDzMwy+C8NRssHd1YrNlzHzIDrXcXiNOMrezdAEM4UXixgV+vvnyBeN7Rygl2ttQ==
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.3.tgz#b223cf38e17fefb97a63c10c91df72ccb386df9e"
+  integrity sha512-VdDoCwvJI4QdC6ndjpqFmoL3/+HxffFBbcJzKi5hwLLqqx3mdbedRpfZDdK0SrOSauj8X4GzBvnDZl4vTN7dOw==
   dependencies:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.2"
+    es-abstract "^1.19.1"
 
 object.pick@^1.3.0:
   version "1.3.0"
@@ -5759,14 +5455,14 @@ object.pick@^1.3.0:
   dependencies:
     isobject "^3.0.1"
 
-object.values@^1.1.0, object.values@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.4.tgz#0d273762833e816b693a637d30073e7051535b30"
-  integrity sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg==
+object.values@^1.1.0, object.values@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac"
+  integrity sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==
   dependencies:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
-    es-abstract "^1.18.2"
+    es-abstract "^1.19.1"
 
 obuf@^1.0.0, obuf@^1.1.2:
   version "1.1.2"
@@ -5792,14 +5488,23 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0:
   dependencies:
     wrappy "1"
 
-opn@^5.5.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc"
-  integrity sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==
+onetime@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
+  integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
   dependencies:
-    is-wsl "^1.1.0"
+    mimic-fn "^2.1.0"
+
+open@^8.0.9:
+  version "8.4.0"
+  resolved "https://registry.yarnpkg.com/open/-/open-8.4.0.tgz#345321ae18f8138f82565a910fdc6b39e8c244f8"
+  integrity sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==
+  dependencies:
+    define-lazy-prop "^2.0.0"
+    is-docker "^2.1.1"
+    is-wsl "^2.2.0"
 
-optimize-css-assets-webpack-plugin@^5.0.3:
+optimize-css-assets-webpack-plugin@^5.0.8:
   version "5.0.8"
   resolved "https://registry.yarnpkg.com/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.8.tgz#cbccdcf5a6ef61d4f8cc78cf083a67446e5f402a"
   integrity sha512-mgFS1JdOtEGzD8l+EuISqL57cKO+We9GcoiQEmdCWRqqck+FGNmYJtx9qfAPzEz+lRrlThWMuGDaRkI/yWNx/Q==
@@ -5819,41 +5524,11 @@ optionator@^0.9.1:
     type-check "^0.4.0"
     word-wrap "^1.2.3"
 
-original@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f"
-  integrity sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==
-  dependencies:
-    url-parse "^1.4.3"
-
 os-browserify@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
   integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
 
-os-homedir@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
-  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
-
-os-tmpdir@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
-  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
-
-osenv@0:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
-  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
-  dependencies:
-    os-homedir "^1.0.0"
-    os-tmpdir "^1.0.0"
-
-p-finally@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
-  integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
-
 p-limit@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
@@ -5861,13 +5536,20 @@ p-limit@^1.1.0:
   dependencies:
     p-try "^1.0.0"
 
-p-limit@^2.0.0, p-limit@^2.2.0, p-limit@^2.3.0:
+p-limit@^2.0.0, p-limit@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
   integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
   dependencies:
     p-try "^2.0.0"
 
+p-limit@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
+  integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
+  dependencies:
+    yocto-queue "^0.1.0"
+
 p-locate@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
@@ -5889,24 +5571,20 @@ p-locate@^4.1.0:
   dependencies:
     p-limit "^2.2.0"
 
-p-map@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"
-  integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==
-
-p-map@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-3.0.0.tgz#d704d9af8a2ba684e2600d9a215983d4141a979d"
-  integrity sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==
+p-map@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
+  integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==
   dependencies:
     aggregate-error "^3.0.0"
 
-p-retry@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-3.0.1.tgz#316b4c8893e2c8dc1cfa891f406c4b422bebf328"
-  integrity sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==
+p-retry@^4.5.0:
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.1.tgz#8fcddd5cdf7a67a0911a9cf2ef0e5df7f602316c"
+  integrity sha512-e2xXGNhZOZ0lfgR9kL34iGlU8N/KO0xZnQxVEwdeOvpqNDQfdnxIYizvWtK8RglUa3bGqI8g0R/BdfzLMxRkiA==
   dependencies:
-    retry "^0.12.0"
+    "@types/retry" "^0.12.0"
+    retry "^0.13.1"
 
 p-try@^1.0.0:
   version "1.0.0"
@@ -5950,13 +5628,6 @@ parse-asn1@^5.0.0, parse-asn1@^5.1.5:
     pbkdf2 "^3.0.3"
     safe-buffer "^5.1.1"
 
-parse-json@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
-  integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=
-  dependencies:
-    error-ex "^1.2.0"
-
 parse-json@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
@@ -6015,13 +5686,6 @@ path-dirname@^1.0.0:
   resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
   integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
 
-path-exists@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
-  integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=
-  dependencies:
-    pinkie-promise "^2.0.0"
-
 path-exists@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
@@ -6037,22 +5701,17 @@ path-is-absolute@^1.0.0:
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
-path-is-inside@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
-  integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
-
-path-key@^2.0.0, path-key@^2.0.1:
+path-key@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
   integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
 
-path-key@^3.1.0:
+path-key@^3.0.0, path-key@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
 
-path-parse@^1.0.6:
+path-parse@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
@@ -6062,22 +5721,6 @@ path-to-regexp@0.1.7:
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
   integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
 
-path-type@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
-  integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=
-  dependencies:
-    graceful-fs "^4.1.2"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-
-path-type@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
-  integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==
-  dependencies:
-    pify "^3.0.0"
-
 path-type@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
@@ -6094,50 +5737,31 @@ pbkdf2@^3.0.3:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
-performance-now@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
-  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
+picocolors@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f"
+  integrity sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==
 
-picomatch@^2.0.4, picomatch@^2.2.1:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972"
-  integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==
+picocolors@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
+  integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
+
+picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
+  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
-pify@^2.0.0, pify@^2.3.0:
+pify@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
   integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
 
-pify@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
-  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
-
 pify@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
   integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
 
-pinkie-promise@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
-  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
-  dependencies:
-    pinkie "^2.0.0"
-
-pinkie@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
-  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
-
-pkg-dir@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
-  integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=
-  dependencies:
-    find-up "^2.1.0"
-
 pkg-dir@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
@@ -6152,14 +5776,7 @@ pkg-dir@^4.1.0:
   dependencies:
     find-up "^4.0.0"
 
-pkg-up@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f"
-  integrity sha1-yBmscoBZpGHKscOImivjxJoATX8=
-  dependencies:
-    find-up "^2.1.0"
-
-pnp-webpack-plugin@^1.6.4:
+pnp-webpack-plugin@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/pnp-webpack-plugin/-/pnp-webpack-plugin-1.7.0.tgz#65741384f6d8056f36e2255a8d67ffc20866f5c9"
   integrity sha512-2Rb3vm+EXble/sMXNSu6eoBx8e79gKqhNq9F5ZWW6ERNCTE/Q0wQNne5541tE5vKjfM8hpNCYL+LGc1YTfI0dg==
@@ -6171,7 +5788,7 @@ popper.js@^1.16.1:
   resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz#2a223cb3dc7b6213d740e40372be40de43e65b1b"
   integrity sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==
 
-portfinder@^1.0.26:
+portfinder@^1.0.28:
   version "1.0.28"
   resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778"
   integrity sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==
@@ -6338,7 +5955,7 @@ postcss-env-function@^2.0.2:
     postcss "^7.0.2"
     postcss-values-parser "^2.0.0"
 
-postcss-flexbugs-fixes@^4.2.0:
+postcss-flexbugs-fixes@^4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-4.2.1.tgz#9218a65249f30897deab1033aced8578562a6690"
   integrity sha512-9SiofaZ9CWpQWxOwRh1b/r85KD5y7GgvsNt1056k6OYLvWUun0czCvogfJgylC22uJTwW1KzY3Gz65NZRlvoiQ==
@@ -6773,9 +6390,9 @@ postcss-selector-parser@^5.0.0-rc.3, postcss-selector-parser@^5.0.0-rc.4:
     uniq "^1.0.1"
 
 postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2:
-  version "6.0.6"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz#2c5bba8174ac2f6981ab631a42ab0ee54af332ea"
-  integrity sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==
+  version "6.0.9"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.9.tgz#ee71c3b9ff63d9cd130838876c13a2ec1a992b2f"
+  integrity sha512-UO3SgnZOVTwu4kyLR22UQ1xZh086RyNZppb7lLAKBFK8a32ttG5i87Y/P3+2bRSjZNyJ1B7hfFNo273tKe9YxQ==
   dependencies:
     cssesc "^3.0.0"
     util-deprecate "^1.0.2"
@@ -6804,9 +6421,9 @@ postcss-value-parser@^3.0.0, postcss-value-parser@^3.2.3:
   integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
 
 postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb"
-  integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
+  integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
 postcss-values-parser@^2.0.0, postcss-values-parser@^2.0.1:
   version "2.0.1"
@@ -6818,11 +6435,11 @@ postcss-values-parser@^2.0.0, postcss-values-parser@^2.0.1:
     uniq "^1.0.1"
 
 postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.26, postcss@^7.0.27, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6:
-  version "7.0.38"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.38.tgz#5365a9c5126643d977046ad239f60eadda2491d6"
-  integrity sha512-wNrSHWjHDQJR/IZL5IKGxRtFgrYNaAA/UrkW2WqbtZO6uxSLMxMN+s2iqUMwnAWm3fMROlDYZB41dr0Mt7vBwQ==
+  version "7.0.39"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.39.tgz#9624375d965630e2e1f2c02a935c82a59cb48309"
+  integrity sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==
   dependencies:
-    nanocolors "^0.2.2"
+    picocolors "^0.2.1"
     source-map "^0.6.1"
 
 prelude-ls@^1.2.1:
@@ -6855,7 +6472,7 @@ promise-inflight@^1.0.1:
   resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
   integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
 
-proxy-addr@~2.0.5:
+proxy-addr@~2.0.7:
   version "2.0.7"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025"
   integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==
@@ -6868,16 +6485,6 @@ prr@~1.0.1:
   resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
   integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
 
-pseudomap@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
-  integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
-
-psl@^1.1.28:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
-  integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
-
 public-encrypt@^4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"
@@ -6925,7 +6532,7 @@ punycode@^1.2.4:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
   integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
 
-punycode@^2.1.0, punycode@^2.1.1:
+punycode@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
@@ -6940,15 +6547,10 @@ qjobs@^1.2.0:
   resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.2.0.tgz#c45e9c61800bd087ef88d7e256423bdd49e5d071"
   integrity sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==
 
-qs@6.7.0:
-  version "6.7.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
-  integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
-
-qs@~6.5.2:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
-  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
+qs@6.9.6:
+  version "6.9.6"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.6.tgz#26ed3c8243a431b2924aca84cc90471f35d5a0ee"
+  integrity sha512-TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ==
 
 query-string@^4.1.0:
   version "4.3.4"
@@ -6968,10 +6570,10 @@ querystring@0.2.0:
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
   integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
 
-querystringify@^2.1.1:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
-  integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
+queue-microtask@^1.2.2:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
+  integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
 
 rails-erb-loader@^5.5.2:
   version "5.5.2"
@@ -7001,13 +6603,13 @@ range-parser@^1.2.1, range-parser@~1.2.1:
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
   integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
 
-raw-body@2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332"
-  integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==
+raw-body@2.4.2:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.2.tgz#baf3e9c21eebced59dd6533ac872b71f7b61cb32"
+  integrity sha512-RPMAFUJP19WIet/99ngh6Iv8fzAbqum4Li7AD6DtGaW2RpMB/11xDoalPiJMTbu6I3hkbMVkATvZrqb9EEqeeQ==
   dependencies:
-    bytes "3.1.0"
-    http-errors "1.7.2"
+    bytes "3.1.1"
+    http-errors "1.8.1"
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
@@ -7018,41 +6620,7 @@ read-cache@^1.0.0:
   dependencies:
     pify "^2.3.0"
 
-read-pkg-up@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
-  integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=
-  dependencies:
-    find-up "^1.0.0"
-    read-pkg "^1.0.0"
-
-read-pkg-up@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07"
-  integrity sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=
-  dependencies:
-    find-up "^2.0.0"
-    read-pkg "^3.0.0"
-
-read-pkg@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
-  integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=
-  dependencies:
-    load-json-file "^1.0.0"
-    normalize-package-data "^2.3.2"
-    path-type "^1.0.0"
-
-read-pkg@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
-  integrity sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=
-  dependencies:
-    load-json-file "^4.0.0"
-    normalize-package-data "^2.3.2"
-    path-type "^3.0.0"
-
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
   version "2.3.7"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
   integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
@@ -7090,14 +6658,6 @@ readdirp@~3.6.0:
   dependencies:
     picomatch "^2.2.1"
 
-redent@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
-  integrity sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=
-  dependencies:
-    indent-string "^2.1.0"
-    strip-indent "^1.0.1"
-
 regenerate-unicode-properties@^9.0.0:
   version "9.0.0"
   resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-9.0.0.tgz#54d09c7115e1f53dc2314a974b32c1c344efe326"
@@ -7110,7 +6670,7 @@ regenerate@^1.4.2:
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
   integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
 
-regenerator-runtime@^0.13.4, regenerator-runtime@^0.13.5:
+regenerator-runtime@^0.13.4, regenerator-runtime@^0.13.5, regenerator-runtime@^0.13.9:
   version "0.13.9"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52"
   integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==
@@ -7131,9 +6691,9 @@ regex-not@^1.0.0, regex-not@^1.0.2:
     safe-regex "^1.1.0"
 
 regexp.prototype.flags@^1.2.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz#7ef352ae8d159e758c0eadca6f8fcb4eef07be26"
-  integrity sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.1.tgz#b3f4c0059af9e47eca9f3f660e51d81307e72307"
+  integrity sha512-pMR7hBVUUGI7PMA37m2ofIdQCsomVnas+Jn5UPGAHQ+/LlwKm/aTLJHdasmHRzlfeZwHiAOaRSo2rbBDm3nNUQ==
   dependencies:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
@@ -7182,39 +6742,6 @@ repeat-string@^1.6.1:
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
   integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
 
-repeating@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
-  integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=
-  dependencies:
-    is-finite "^1.0.0"
-
-request@^2.87.0, request@^2.88.0:
-  version "2.88.2"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
-  integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
-  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"
-
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -7265,25 +6792,31 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve@^1.1.7, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.20.0:
-  version "1.20.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
-  integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
+resolve@^1.1.7, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.20.0:
+  version "1.22.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198"
+  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"
 
 ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
   integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
 
-retry@^0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
-  integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=
+retry@^0.13.1:
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658"
+  integrity sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==
+
+reusify@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
+  integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
-rfdc@^1.1.4:
+rfdc@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz#d0b7c441ab2720d05dc4cf26e01c89631d9da08b"
   integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==
@@ -7298,7 +6831,7 @@ rgba-regex@^1.0.0:
   resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3"
   integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=
 
-rimraf@2, rimraf@^2.5.4, rimraf@^2.6.3, rimraf@^2.7.1:
+rimraf@^2.5.4, rimraf@^2.6.3:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
   integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
@@ -7320,6 +6853,13 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
     hash-base "^3.0.0"
     inherits "^2.0.1"
 
+run-parallel@^1.1.9:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
+  integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==
+  dependencies:
+    queue-microtask "^1.2.2"
+
 run-queue@^1.0.0, run-queue@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
@@ -7332,7 +6872,7 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
-safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0:
+safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
@@ -7344,31 +6884,30 @@ safe-regex@^1.1.0:
   dependencies:
     ret "~0.1.10"
 
-"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
+"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-sass-graph@2.2.5:
-  version "2.2.5"
-  resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.5.tgz#a981c87446b8319d96dce0671e487879bd24c2e8"
-  integrity sha512-VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag==
+sass-loader@10.1.1:
+  version "10.1.1"
+  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.1.1.tgz#4ddd5a3d7638e7949065dd6e9c7c04037f7e663d"
+  integrity sha512-W6gVDXAd5hR/WHsPicvZdjAWHBcEJ44UahgxcIE196fW2ong0ZHMPO1kZuI5q0VlvMQZh32gpv69PLWQm70qrw==
   dependencies:
-    glob "^7.0.0"
-    lodash "^4.0.0"
-    scss-tokenizer "^0.2.3"
-    yargs "^13.3.2"
+    klona "^2.0.4"
+    loader-utils "^2.0.0"
+    neo-async "^2.6.2"
+    schema-utils "^3.0.0"
+    semver "^7.3.2"
 
-sass-loader@^8.0.2:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-8.0.2.tgz#debecd8c3ce243c76454f2e8290482150380090d"
-  integrity sha512-7o4dbSK8/Ol2KflEmSco4jTjQoV988bM82P9CZdmo9hR3RLnvNc0ufMNdMrB0caq38JQ/FgF4/7RcbcfKzxoFQ==
+sass@^1.38.0:
+  version "1.49.0"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.49.0.tgz#65ec1b1d9a6bc1bae8d2c9d4b392c13f5d32c078"
+  integrity sha512-TVwVdNDj6p6b4QymJtNtRS2YtLJ/CqZriGg0eIAbAKMlN8Xy6kbv33FsEZSF7FufFFM705SQviHjjThfaQ4VNw==
   dependencies:
-    clone-deep "^4.0.1"
-    loader-utils "^1.2.3"
-    neo-async "^2.6.1"
-    schema-utils "^2.6.1"
-    semver "^6.3.0"
+    chokidar ">=3.0.0 <4.0.0"
+    immutable "^4.0.0"
+    source-map-js ">=0.6.2 <2.0.0"
 
 sax@~1.2.4:
   version "1.2.4"
@@ -7384,7 +6923,7 @@ schema-utils@^1.0.0:
     ajv-errors "^1.0.0"
     ajv-keywords "^3.1.0"
 
-schema-utils@^2.6.1, schema-utils@^2.6.5, schema-utils@^2.6.6, schema-utils@^2.7.0:
+schema-utils@^2.6.5, schema-utils@^2.7.0:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"
   integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==
@@ -7402,57 +6941,54 @@ schema-utils@^3.0.0:
     ajv "^6.12.5"
     ajv-keywords "^3.5.2"
 
-scss-tokenizer@^0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1"
-  integrity sha1-jrBtualyMzOCTT9VMGQRSYR85dE=
+schema-utils@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.0.0.tgz#60331e9e3ae78ec5d16353c467c34b3a0a1d3df7"
+  integrity sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==
   dependencies:
-    js-base64 "^2.1.8"
-    source-map "^0.4.2"
+    "@types/json-schema" "^7.0.9"
+    ajv "^8.8.0"
+    ajv-formats "^2.1.1"
+    ajv-keywords "^5.0.0"
 
 select-hose@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
   integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
 
-selfsigned@^1.10.8:
-  version "1.10.11"
-  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.11.tgz#24929cd906fe0f44b6d01fb23999a739537acbe9"
-  integrity sha512-aVmbPOfViZqOZPgRBT0+3u4yZFHpmnIghLMlAcb5/xhp5ZtB/RVnKhz5vl2M32CLXAqR4kha9zfhNg0Lf/sxKA==
+selfsigned@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.0.0.tgz#e927cd5377cbb0a1075302cff8df1042cc2bce5b"
+  integrity sha512-cUdFiCbKoa1mZ6osuJs2uDHrs0k0oprsKveFiiaBKCNq3SYyb5gs2HxhQyDNLCmL51ZZThqi4YNDpCK6GOP1iQ==
   dependencies:
-    node-forge "^0.10.0"
-
-"semver@2 || 3 || 4 || 5", semver@^5.5.0, semver@^5.6.0:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
-  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+    node-forge "^1.2.0"
 
 semver@7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
+semver@^5.5.0, semver@^5.6.0:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
+  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+
 semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@^7.2.1:
+semver@^7.2.1, semver@^7.3.2, semver@^7.3.5:
   version "7.3.5"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
   integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
   dependencies:
     lru-cache "^6.0.0"
 
-semver@~5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
-  integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8=
-
-send@0.17.1:
-  version "0.17.1"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
-  integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==
+send@0.17.2:
+  version "0.17.2"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.17.2.tgz#926622f76601c41808012c8bf1688fe3906f7820"
+  integrity sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==
   dependencies:
     debug "2.6.9"
     depd "~1.1.2"
@@ -7461,18 +6997,13 @@ send@0.17.1:
     escape-html "~1.0.3"
     etag "~1.8.1"
     fresh "0.5.2"
-    http-errors "~1.7.2"
+    http-errors "1.8.1"
     mime "1.6.0"
-    ms "2.1.1"
+    ms "2.1.3"
     on-finished "~2.3.0"
     range-parser "~1.2.1"
     statuses "~1.5.0"
 
-serialize-javascript@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61"
-  integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==
-
 serialize-javascript@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa"
@@ -7480,6 +7011,13 @@ serialize-javascript@^4.0.0:
   dependencies:
     randombytes "^2.1.0"
 
+serialize-javascript@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz#7886ec848049a462467a97d3d918ebb2aaf934f4"
+  integrity sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==
+  dependencies:
+    randombytes "^2.1.0"
+
 serve-index@^1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
@@ -7493,17 +7031,17 @@ serve-index@^1.9.1:
     mime-types "~2.1.17"
     parseurl "~1.3.2"
 
-serve-static@1.14.1:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9"
-  integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==
+serve-static@1.14.2:
+  version "1.14.2"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.2.tgz#722d6294b1d62626d41b43a013ece4598d292bfa"
+  integrity sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==
   dependencies:
     encodeurl "~1.0.2"
     escape-html "~1.0.3"
     parseurl "~1.3.3"
-    send "0.17.1"
+    send "0.17.2"
 
-set-blocking@^2.0.0, set-blocking@~2.0.0:
+set-blocking@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
@@ -7528,10 +7066,10 @@ setprototypeof@1.1.0:
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
   integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
 
-setprototypeof@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
-  integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==
+setprototypeof@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
+  integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
 
 sha.js@^2.4.0, sha.js@^2.4.8:
   version "2.4.11"
@@ -7581,10 +7119,10 @@ side-channel@^1.0.4:
     get-intrinsic "^1.0.2"
     object-inspect "^1.9.0"
 
-signal-exit@^3.0.0:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.5.tgz#9e3e8cc0c75a99472b44321033a7702e7738252f"
-  integrity sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ==
+signal-exit@^3.0.3:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af"
+  integrity sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==
 
 simple-swizzle@^0.2.2:
   version "0.2.2"
@@ -7593,6 +7131,11 @@ simple-swizzle@^0.2.2:
   dependencies:
     is-arrayish "^0.3.1"
 
+slash@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
+  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
+
 slice-ansi@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b"
@@ -7684,25 +7227,13 @@ socket.io@^2.3.0:
     socket.io-client "2.4.0"
     socket.io-parser "~3.4.0"
 
-sockjs-client@^1.5.0:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.5.2.tgz#4bc48c2da9ce4769f19dc723396b50f5c12330a3"
-  integrity sha512-ZzRxPBISQE7RpzlH4tKJMQbHM9pabHluk0WBaxAQ+wm/UieeBVBou0p4wVnSQGN9QmpAZygQ0cDIypWuqOFmFQ==
-  dependencies:
-    debug "^3.2.6"
-    eventsource "^1.0.7"
-    faye-websocket "^0.11.3"
-    inherits "^2.0.4"
-    json3 "^3.3.3"
-    url-parse "^1.5.3"
-
 sockjs@^0.3.21:
-  version "0.3.21"
-  resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.21.tgz#b34ffb98e796930b60a0cfa11904d6a339a7d417"
-  integrity sha512-DhbPFGpxjc6Z3I+uX07Id5ZO2XwYsWOrYjaSeieES78cq+JaJvVe5q/m1uvjIQhXinhIeCFRH6JgXe+mvVMyXw==
+  version "0.3.24"
+  resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.24.tgz#c9bc8995f33a111bea0395ec30aa3206bdb5ccce"
+  integrity sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==
   dependencies:
     faye-websocket "^0.11.3"
-    uuid "^3.4.0"
+    uuid "^8.3.2"
     websocket-driver "^0.7.4"
 
 sort-keys@^1.0.0:
@@ -7717,6 +7248,11 @@ source-list-map@^2.0.0:
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
   integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
 
+"source-map-js@>=0.6.2 <2.0.0":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
+  integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
+
 source-map-resolve@^0.5.0:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
@@ -7728,10 +7264,10 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@~0.5.12:
-  version "0.5.20"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.20.tgz#12166089f8f5e5e8c56926b377633392dd2cb6c9"
-  integrity sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==
+source-map-support@~0.5.12, source-map-support@~0.5.20:
+  version "0.5.21"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
+  integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
@@ -7741,13 +7277,6 @@ source-map-url@^0.4.0:
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56"
   integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==
 
-source-map@^0.4.2:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
-  integrity sha1-66T12pwNyZneaAMti092FzZSA2s=
-  dependencies:
-    amdefine ">=0.0.4"
-
 source-map@^0.5.0, source-map@^0.5.6:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
@@ -7758,7 +7287,7 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
-source-map@^0.7.3:
+source-map@^0.7.3, source-map@~0.7.2:
   version "0.7.3"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
   integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
@@ -7768,32 +7297,6 @@ spark-md5@^3.0.0:
   resolved "https://registry.yarnpkg.com/spark-md5/-/spark-md5-3.0.2.tgz#7952c4a30784347abcee73268e473b9c0167e3fc"
   integrity sha512-wcFzz9cDfbuqe0FZzfi2or1sgyIrsDwmPwfZC4hiNidPdPINjeUwNfv5kldczoEAcjl9Y1L3SM7Uz2PUEQzxQw==
 
-spdx-correct@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
-  integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==
-  dependencies:
-    spdx-expression-parse "^3.0.0"
-    spdx-license-ids "^3.0.0"
-
-spdx-exceptions@^2.1.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d"
-  integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==
-
-spdx-expression-parse@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
-  integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
-  dependencies:
-    spdx-exceptions "^2.1.0"
-    spdx-license-ids "^3.0.0"
-
-spdx-license-ids@^3.0.0:
-  version "3.0.10"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz#0d9becccde7003d6c658d487dd48a32f0bf3014b"
-  integrity sha512-oie3/+gKf7QtpitB0LYLETe+k8SifzsX4KixvpOsbI6S0kRiRQ5MKOio8eMSAKQ17N06+wdEOXRiId+zOxo0hA==
-
 spdy-transport@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31"
@@ -7829,21 +7332,6 @@ sprintf-js@~1.0.2:
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
   integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
 
-sshpk@^1.7.0:
-  version "1.16.1"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
-  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"
-
 ssri@^6.0.1:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz#157939134f20464e7301ddba3e90ffa8f7728ac5"
@@ -7851,12 +7339,11 @@ ssri@^6.0.1:
   dependencies:
     figgy-pudding "^3.5.1"
 
-ssri@^7.0.0:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-7.1.1.tgz#33e44f896a967158e3c63468e47ec46613b95b5f"
-  integrity sha512-w+daCzXN89PseTL99MkA+fxJEcU3wfaE/ah0i0lnOlpG1CYLJ2ZjzEry68YBKfLs4JfoTShrTEsJkAZuNZ/stw==
+ssri@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af"
+  integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==
   dependencies:
-    figgy-pudding "^3.5.1"
     minipass "^3.1.1"
 
 stable@^0.1.8:
@@ -7877,13 +7364,6 @@ static-extend@^0.1.1:
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
   integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
 
-stdout-stream@^1.4.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.1.tgz#5ac174cdd5cd726104aa0c0b2bd83815d8d535de"
-  integrity sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==
-  dependencies:
-    readable-stream "^2.0.1"
-
 stream-browserify@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b"
@@ -7916,37 +7396,20 @@ stream-shift@^1.0.0:
   resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"
   integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==
 
-streamroller@^2.2.4:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-2.2.4.tgz#c198ced42db94086a6193608187ce80a5f2b0e53"
-  integrity sha512-OG79qm3AujAM9ImoqgWEY1xG4HX+Lw+yY6qZj9R1K2mhF5bEmQ849wvrb+4vt4jLMLzwXttJlQbOdPOQVRv7DQ==
+streamroller@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-3.0.2.tgz#30418d0eee3d6c93ec897f892ed098e3a81e68b7"
+  integrity sha512-ur6y5S5dopOaRXBuRIZ1u6GC5bcEXHRZKgfBjfCglMhmIf+roVCECjvkEYzNQOXIN2/JPnkMPW/8B3CZoKaEPA==
   dependencies:
-    date-format "^2.1.0"
+    date-format "^4.0.3"
     debug "^4.1.1"
-    fs-extra "^8.1.0"
+    fs-extra "^10.0.0"
 
 strict-uri-encode@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
   integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=
 
-string-width@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
-  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
-  dependencies:
-    code-point-at "^1.0.0"
-    is-fullwidth-code-point "^1.0.0"
-    strip-ansi "^3.0.0"
-
-"string-width@^1.0.2 || 2":
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
-  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
-  dependencies:
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^4.0.0"
-
 string-width@^3.0.0, string-width@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
@@ -7995,20 +7458,6 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-strip-ansi@^3.0.0, strip-ansi@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
-  dependencies:
-    ansi-regex "^2.0.0"
-
-strip-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
-  dependencies:
-    ansi-regex "^3.0.0"
-
 strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
@@ -8023,36 +7472,29 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   dependencies:
     ansi-regex "^5.0.1"
 
-strip-bom@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
-  integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=
+strip-ansi@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2"
+  integrity sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==
   dependencies:
-    is-utf8 "^0.2.0"
+    ansi-regex "^6.0.1"
 
 strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
   integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
 
-strip-eof@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
-  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
-
-strip-indent@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
-  integrity sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=
-  dependencies:
-    get-stdin "^4.0.1"
+strip-final-newline@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
+  integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
 
 strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
-style-loader@^1.1.3:
+style-loader@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-1.3.0.tgz#828b4a3b3b7e7aa5847ce7bae9e874512114249e"
   integrity sha512-V7TCORko8rs9rIqkSrlMfkqA63DfoGBBJmK1kKGCcSi+BWb4cqz0SRsnp4l6rU5iwOEd0/2ePv68SV22VXon4Q==
@@ -8069,11 +7511,6 @@ stylehacks@^4.0.0:
     postcss "^7.0.0"
     postcss-selector-parser "^3.0.0"
 
-supports-color@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
-
 supports-color@^5.3.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
@@ -8095,6 +7532,11 @@ supports-color@^7.0.0, supports-color@^7.1.0:
   dependencies:
     has-flag "^4.0.0"
 
+supports-preserve-symlinks-flag@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
+  integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
+
 svgo@^1.0.0:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.3.2.tgz#b6dc511c063346c9e415b81e43401145b96d4167"
@@ -8115,12 +7557,11 @@ svgo@^1.0.0:
     util.promisify "~1.0.0"
 
 table@^6.0.9:
-  version "6.7.2"
-  resolved "https://registry.yarnpkg.com/table/-/table-6.7.2.tgz#a8d39b9f5966693ca8b0feba270a78722cbaf3b0"
-  integrity sha512-UFZK67uvyNivLeQbVtkiUs8Uuuxv24aSL4/Vil2PJVtMgU8Lx0CYkP12uCGa3kjyQzOSgV1+z9Wkb82fCGsO0g==
+  version "6.8.0"
+  resolved "https://registry.yarnpkg.com/table/-/table-6.8.0.tgz#87e28f14fa4321c3377ba286f07b79b281a3b3ca"
+  integrity sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==
   dependencies:
     ajv "^8.0.1"
-    lodash.clonedeep "^4.5.0"
     lodash.truncate "^4.4.2"
     slice-ansi "^4.0.0"
     string-width "^4.2.3"
@@ -8131,14 +7572,17 @@ tapable@^1.0.0, tapable@^1.1.3:
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
   integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
 
-tar@^2.0.0:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.2.tgz#0ca8848562c7299b8b446ff6a4d60cdbb23edc40"
-  integrity sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==
+tar@^6.0.2:
+  version "6.1.11"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
+  integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==
   dependencies:
-    block-stream "*"
-    fstream "^1.0.12"
-    inherits "2"
+    chownr "^2.0.0"
+    fs-minipass "^2.0.0"
+    minipass "^3.0.0"
+    minizlib "^2.1.1"
+    mkdirp "^1.0.3"
+    yallist "^4.0.0"
 
 terser-webpack-plugin@^1.4.3:
   version "1.4.5"
@@ -8155,22 +7599,22 @@ terser-webpack-plugin@^1.4.3:
     webpack-sources "^1.4.0"
     worker-farm "^1.7.0"
 
-terser-webpack-plugin@^2.3.5:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.3.8.tgz#894764a19b0743f2f704e7c2a848c5283a696724"
-  integrity sha512-/fKw3R+hWyHfYx7Bv6oPqmk4HGQcrWLtV3X6ggvPuwPNHSnzvVV51z6OaaCOus4YLjutYGOz3pEpbhe6Up2s1w==
+terser-webpack-plugin@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-4.2.3.tgz#28daef4a83bd17c1db0297070adc07fc8cfc6a9a"
+  integrity sha512-jTgXh40RnvOrLQNgIkwEKnQ8rmHjHK4u+6UBEi+W+FPmvb+uo+chJXntKe7/3lW5mNysgSWD60KyesnhW8D6MQ==
   dependencies:
-    cacache "^13.0.1"
+    cacache "^15.0.5"
     find-cache-dir "^3.3.1"
-    jest-worker "^25.4.0"
-    p-limit "^2.3.0"
-    schema-utils "^2.6.6"
-    serialize-javascript "^4.0.0"
+    jest-worker "^26.5.0"
+    p-limit "^3.0.2"
+    schema-utils "^3.0.0"
+    serialize-javascript "^5.0.1"
     source-map "^0.6.1"
-    terser "^4.6.12"
+    terser "^5.3.4"
     webpack-sources "^1.4.3"
 
-terser@^4.1.2, terser@^4.6.12:
+terser@^4.1.2:
   version "4.8.0"
   resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17"
   integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==
@@ -8179,6 +7623,15 @@ terser@^4.1.2, terser@^4.6.12:
     source-map "~0.6.1"
     source-map-support "~0.5.12"
 
+terser@^5.3.4:
+  version "5.10.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.10.0.tgz#b86390809c0389105eb0a0b62397563096ddafcc"
+  integrity sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA==
+  dependencies:
+    commander "^2.20.0"
+    source-map "~0.7.2"
+    source-map-support "~0.5.20"
+
 text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
@@ -8273,40 +7726,20 @@ to-regex@^3.0.1, to-regex@^3.0.2:
     regex-not "^1.0.2"
     safe-regex "^1.1.0"
 
-toidentifier@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
-  integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
-
-tough-cookie@~2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
-  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
-  dependencies:
-    psl "^1.1.28"
-    punycode "^2.1.1"
-
-trim-newlines@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
-  integrity sha1-WIeWa7WCpFA6QetST301ARgVphM=
-
-"true-case-path@^1.0.2":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-1.0.3.tgz#f813b5a8c86b40da59606722b144e3225799f47d"
-  integrity sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==
-  dependencies:
-    glob "^7.1.2"
+toidentifier@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
+  integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
 
 ts-pnp@^1.1.6:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz#a500ad084b0798f1c3071af391e65912c86bca92"
   integrity sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==
 
-tsconfig-paths@^3.11.0:
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.11.0.tgz#954c1fe973da6339c78e06b03ce2e48810b65f36"
-  integrity sha512-7ecdYDnIdmv639mmDwslG6KQg1Z9STTz1j7Gcz0xa+nshh/gKDAHcPxRbWOsA3SPp0tXP2leTcY9Kw+NAkfZzA==
+tsconfig-paths@^3.12.0:
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.12.0.tgz#19769aca6ee8f6a1a341e38c8fa45dd9fb18899b"
+  integrity sha512-e5adrnOYT6zqVnWqZu7i/BQ3BnhzvGbjEjejFXO20lKIKpwTaupkCPgEfv4GZK1IBciJUEhYs3J3p75FdaTFVg==
   dependencies:
     "@types/json5" "^0.0.29"
     json5 "^1.0.1"
@@ -8318,23 +7751,11 @@ tty-browserify@0.0.0:
   resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
   integrity sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=
 
-tunnel-agent@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
-  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
-  dependencies:
-    safe-buffer "^5.0.1"
-
 turbolinks@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/turbolinks/-/turbolinks-5.2.0.tgz#e6877a55ea5c1cb3bb225f0a4ae303d6d32ff77c"
   integrity sha512-pMiez3tyBo6uRHFNNZoYMmrES/IaGgMhQQM+VFF36keryjb5ms0XkVpmKHkfW/4Vy96qiGW3K9bz0tF5sK9bBw==
 
-tweetnacl@^0.14.3, tweetnacl@~0.14.0:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
-  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
-
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
@@ -8347,7 +7768,7 @@ type-fest@^0.20.2:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
   integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
 
-type-is@~1.6.17, type-is@~1.6.18:
+type-is@~1.6.18:
   version "1.6.18"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
   integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
@@ -8437,6 +7858,11 @@ universalify@^0.1.0:
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
   integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
 
+universalify@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
+  integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
+
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
@@ -8472,14 +7898,6 @@ urix@^0.1.0:
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
   integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
 
-url-parse@^1.4.3, url-parse@^1.5.3:
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.3.tgz#71c1303d38fb6639ade183c2992c8cc0686df862"
-  integrity sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==
-  dependencies:
-    querystringify "^2.1.1"
-    requires-port "^1.0.0"
-
 url@^0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
@@ -8527,24 +7945,21 @@ utils-merge@1.0.1:
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
   integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
 
-uuid@^3.3.2, uuid@^3.4.0:
+uuid@^3.3.2:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
+uuid@^8.3.2:
+  version "8.3.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
+  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
+
 v8-compile-cache@^2.0.3, v8-compile-cache@^2.1.1:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
   integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
 
-validate-npm-package-license@^3.0.1:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
-  integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
-  dependencies:
-    spdx-correct "^3.0.0"
-    spdx-expression-parse "^3.0.0"
-
 vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
@@ -8555,15 +7970,6 @@ vendors@^1.0.0:
   resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz#e2b800a53e7a29b93506c3cf41100d16c4c4ad8e"
   integrity sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==
 
-verror@1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
-  integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
-  dependencies:
-    assert-plus "^1.0.0"
-    core-util-is "1.0.2"
-    extsprintf "^1.2.0"
-
 vm-browserify@^1.0.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
@@ -8612,7 +8018,7 @@ webpack-assets-manifest@^3.1.1:
     tapable "^1.0.0"
     webpack-sources "^1.0.0"
 
-webpack-cli@^3.3.11:
+webpack-cli@^3.3.12:
   version "3.3.12"
   resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.12.tgz#94e9ada081453cd0aa609c99e500012fd3ad2d4a"
   integrity sha512-NVWBaz9k839ZH/sinurM+HcDvJOTXwSjYp1ku+5XKeOC03z8v5QitnK/x+lAxGXFyhdayoIf/GOpv85z3/xPag==
@@ -8629,7 +8035,7 @@ webpack-cli@^3.3.11:
     v8-compile-cache "^2.1.1"
     yargs "^13.3.2"
 
-webpack-dev-middleware@^3.7.0, webpack-dev-middleware@^3.7.2:
+webpack-dev-middleware@^3.7.0:
   version "3.7.3"
   resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.3.tgz#0639372b143262e2b84ab95d3b91a7597061c2c5"
   integrity sha512-djelc/zGiz9nZj/U7PTBi2ViorGJXEWo/3ltkPbDyxCXhhEXkW0ce99falaok4TPj+AsxLiXJR0EBOb0zh9fKQ==
@@ -8640,44 +8046,51 @@ webpack-dev-middleware@^3.7.0, webpack-dev-middleware@^3.7.2:
     range-parser "^1.2.1"
     webpack-log "^2.0.0"
 
-webpack-dev-server@^3.11.0:
-  version "3.11.2"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.2.tgz#695ebced76a4929f0d5de7fd73fafe185fe33708"
-  integrity sha512-A80BkuHRQfCiNtGBS1EMf2ChTUs0x+B3wGDFmOeT4rmJOHhHTCH2naNxIHhmkr0/UillP4U3yeIyv1pNp+QDLQ==
+webpack-dev-middleware@^5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.0.tgz#8fc02dba6e72e1d373eca361623d84610f27be7c"
+  integrity sha512-MouJz+rXAm9B1OTOYaJnn6rtD/lWZPy2ufQCH3BPs8Rloh/Du6Jze4p7AeLYHkVi0giJnYLaSGDC7S+GM9arhg==
   dependencies:
-    ansi-html "0.0.7"
+    colorette "^2.0.10"
+    memfs "^3.2.2"
+    mime-types "^2.1.31"
+    range-parser "^1.2.1"
+    schema-utils "^4.0.0"
+
+webpack-dev-server@^4.7.3:
+  version "4.7.3"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.7.3.tgz#4e995b141ff51fa499906eebc7906f6925d0beaa"
+  integrity sha512-mlxq2AsIw2ag016nixkzUkdyOE8ST2GTy34uKSABp1c4nhjZvH90D5ZRR+UOLSsG4Z3TFahAi72a3ymRtfRm+Q==
+  dependencies:
+    "@types/bonjour" "^3.5.9"
+    "@types/connect-history-api-fallback" "^1.3.5"
+    "@types/serve-index" "^1.9.1"
+    "@types/sockjs" "^0.3.33"
+    "@types/ws" "^8.2.2"
+    ansi-html-community "^0.0.8"
     bonjour "^3.5.0"
-    chokidar "^2.1.8"
+    chokidar "^3.5.2"
+    colorette "^2.0.10"
     compression "^1.7.4"
     connect-history-api-fallback "^1.6.0"
-    debug "^4.1.1"
-    del "^4.1.1"
+    default-gateway "^6.0.3"
+    del "^6.0.0"
     express "^4.17.1"
-    html-entities "^1.3.1"
-    http-proxy-middleware "0.19.1"
-    import-local "^2.0.0"
-    internal-ip "^4.3.0"
-    ip "^1.1.5"
-    is-absolute-url "^3.0.3"
-    killable "^1.0.1"
-    loglevel "^1.6.8"
-    opn "^5.5.0"
-    p-retry "^3.0.1"
-    portfinder "^1.0.26"
-    schema-utils "^1.0.0"
-    selfsigned "^1.10.8"
-    semver "^6.3.0"
+    graceful-fs "^4.2.6"
+    html-entities "^2.3.2"
+    http-proxy-middleware "^2.0.0"
+    ipaddr.js "^2.0.1"
+    open "^8.0.9"
+    p-retry "^4.5.0"
+    portfinder "^1.0.28"
+    schema-utils "^4.0.0"
+    selfsigned "^2.0.0"
     serve-index "^1.9.1"
     sockjs "^0.3.21"
-    sockjs-client "^1.5.0"
     spdy "^4.0.2"
-    strip-ansi "^3.0.1"
-    supports-color "^6.1.0"
-    url "^0.11.0"
-    webpack-dev-middleware "^3.7.2"
-    webpack-log "^2.0.0"
-    ws "^6.2.1"
-    yargs "^13.3.2"
+    strip-ansi "^7.0.0"
+    webpack-dev-middleware "^5.3.0"
+    ws "^8.1.0"
 
 webpack-log@^2.0.0:
   version "2.0.0"
@@ -8687,7 +8100,7 @@ webpack-log@^2.0.0:
     ansi-colors "^3.0.0"
     uuid "^3.3.2"
 
-webpack-sources@^1.0.0, webpack-sources@^1.0.1, webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1, webpack-sources@^1.4.3:
+webpack-sources@^1.0.0, webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1, webpack-sources@^1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933"
   integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==
@@ -8695,7 +8108,7 @@ webpack-sources@^1.0.0, webpack-sources@^1.0.1, webpack-sources@^1.1.0, webpack-
     source-list-map "^2.0.0"
     source-map "~0.6.1"
 
-webpack@^4.42.1:
+webpack@^4.42.1, webpack@^4.46.0:
   version "4.46.0"
   resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.46.0.tgz#bf9b4404ea20a073605e0a011d188d77cb6ad542"
   integrity sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==
@@ -8754,7 +8167,7 @@ which-module@^2.0.0:
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
-which@1, which@^1.2.1, which@^1.2.14, which@^1.2.9, which@^1.3.1:
+which@^1.2.1, which@^1.2.14, which@^1.2.9, which@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
@@ -8768,13 +8181,6 @@ which@^2.0.1:
   dependencies:
     isexe "^2.0.0"
 
-wide-align@^1.1.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
-  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
-  dependencies:
-    string-width "^1.0.2 || 2"
-
 word-wrap@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
@@ -8810,12 +8216,10 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
-ws@^6.2.1:
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.2.tgz#dd5cdbd57a9979916097652d78f1cc5faea0c32e"
-  integrity sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==
-  dependencies:
-    async-limiter "~1.0.0"
+ws@^8.1.0:
+  version "8.4.2"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.4.2.tgz#18e749868d8439f2268368829042894b6907aa0b"
+  integrity sha512-Kbk4Nxyq7/ZWqr/tarI9yIt/+iNNFOjBXEWgTb4ydaNHBNGgvf2QHbS9fdfsndfjFlFwEd4Al+mw83YkaD10ZA==
 
 ws@~7.4.2:
   version "7.4.6"
@@ -8837,11 +8241,6 @@ y18n@^4.0.0:
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
   integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==
 
-yallist@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
-  integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
-
 yallist@^3.0.2:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
@@ -8910,3 +8309,8 @@ yeast@0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
   integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk=
+
+yocto-queue@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
+  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==