diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index bb88e0b..5bcc26b 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -5,7 +5,7 @@ on:
   pull_request:
 
 env:
-  RUBY_VERSION: 3.0.2
+  RUBY_VERSION: 3.1.1
 
 jobs:
   lint-report:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 236ae6f..7da6fd2 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -5,8 +5,8 @@ on:
   pull_request:
 
 env:
-  RUBY_VERSION: 3.0.2
-  NODE_VERSION: 16.9.1
+  RUBY_VERSION: 3.1.1
+  NODE_VERSION: 18.17.1
 
 jobs:
   test-report:
diff --git a/.rubocop.yml b/.rubocop.yml
index 7f2bd1d..7aa7be0 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -14,3 +14,8 @@ AllCops:
     - "node_modules/**/*"
     - "db/schema.rb"
     - "vendor/**/*"
+
+RSpec/DescribeClass:
+  Exclude:
+  - "spec/*"
+  - "spec/system/*"
diff --git a/Gemfile b/Gemfile
index 10190d4..f0b59b0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,7 @@ source "https://rubygems.org"
 
 ruby RUBY_VERSION
 
-DECIDIM_VERSION = "0.27.2"
+DECIDIM_VERSION = "0.28.2"
 
 gem "decidim", DECIDIM_VERSION
 gem "decidim-alternative_landing", path: "."
@@ -14,7 +14,7 @@ gem "bootsnap", "~> 1.4"
 gem "puma", ">= 5.0.0"
 gem "uglifier", "~> 4.1"
 
-gem "faker", "~> 2.14"
+gem "faker"
 
 group :development, :test do
   gem "byebug", "~> 11.0", platform: :mri
diff --git a/Gemfile.lock b/Gemfile.lock
index a43abde..c3e6699 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,47 +2,47 @@ PATH
   remote: .
   specs:
     decidim-alternative_landing (0.4.0)
-      decidim-admin (>= 0.27.0, < 0.28)
-      decidim-core (>= 0.27.0, < 0.28)
+      decidim-admin (>= 0.28.0, < 0.29)
+      decidim-core (>= 0.28.0, < 0.29)
       redcarpet (~> 3.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.7.3)
-      actionpack (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+    actioncable (6.1.7.8)
+      actionpack (= 6.1.7.8)
+      activesupport (= 6.1.7.8)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.7.3)
-      actionpack (= 6.1.7.3)
-      activejob (= 6.1.7.3)
-      activerecord (= 6.1.7.3)
-      activestorage (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+    actionmailbox (6.1.7.8)
+      actionpack (= 6.1.7.8)
+      activejob (= 6.1.7.8)
+      activerecord (= 6.1.7.8)
+      activestorage (= 6.1.7.8)
+      activesupport (= 6.1.7.8)
       mail (>= 2.7.1)
-    actionmailer (6.1.7.3)
-      actionpack (= 6.1.7.3)
-      actionview (= 6.1.7.3)
-      activejob (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+    actionmailer (6.1.7.8)
+      actionpack (= 6.1.7.8)
+      actionview (= 6.1.7.8)
+      activejob (= 6.1.7.8)
+      activesupport (= 6.1.7.8)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.7.3)
-      actionview (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+    actionpack (6.1.7.8)
+      actionview (= 6.1.7.8)
+      activesupport (= 6.1.7.8)
       rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.7.3)
-      actionpack (= 6.1.7.3)
-      activerecord (= 6.1.7.3)
-      activestorage (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+    actiontext (6.1.7.8)
+      actionpack (= 6.1.7.8)
+      activerecord (= 6.1.7.8)
+      activestorage (= 6.1.7.8)
+      activesupport (= 6.1.7.8)
       nokogiri (>= 1.8.5)
-    actionview (6.1.7.3)
-      activesupport (= 6.1.7.3)
+    actionview (6.1.7.8)
+      activesupport (= 6.1.7.8)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -50,69 +50,63 @@ GEM
     active_link_to (1.0.5)
       actionpack
       addressable
-    activejob (6.1.7.3)
-      activesupport (= 6.1.7.3)
+    activejob (6.1.7.8)
+      activesupport (= 6.1.7.8)
       globalid (>= 0.3.6)
-    activemodel (6.1.7.3)
-      activesupport (= 6.1.7.3)
-    activerecord (6.1.7.3)
-      activemodel (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
-    activestorage (6.1.7.3)
-      actionpack (= 6.1.7.3)
-      activejob (= 6.1.7.3)
-      activerecord (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+    activemodel (6.1.7.8)
+      activesupport (= 6.1.7.8)
+    activerecord (6.1.7.8)
+      activemodel (= 6.1.7.8)
+      activesupport (= 6.1.7.8)
+    activestorage (6.1.7.8)
+      actionpack (= 6.1.7.8)
+      activejob (= 6.1.7.8)
+      activerecord (= 6.1.7.8)
+      activesupport (= 6.1.7.8)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (6.1.7.3)
+    activesupport (6.1.7.8)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    acts_as_list (0.9.19)
-      activerecord (>= 3.0)
-    addressable (2.8.1)
-      public_suffix (>= 2.0.2, < 6.0)
+    acts_as_list (1.2.2)
+      activerecord (>= 6.1)
+      activesupport (>= 6.1)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     ast (2.4.2)
-    axe-core-api (4.6.0)
-      dumb_delegator
-      virtus
-    axe-core-rspec (4.1.0)
-      axe-core-api
-      dumb_delegator
-      virtus
-    axiom-types (0.1.1)
-      descendants_tracker (~> 0.0.4)
-      ice_nine (~> 0.11.0)
-      thread_safe (~> 0.3, >= 0.3.1)
+    base64 (0.2.0)
     batch-loader (1.5.0)
-    bcrypt (3.1.18)
-    better_html (1.0.16)
-      actionview (>= 4.0)
-      activesupport (>= 4.0)
+    bcrypt (3.1.20)
+    better_html (2.1.1)
+      actionview (>= 6.0)
+      activesupport (>= 6.0)
       ast (~> 2.0)
       erubi (~> 1.4)
-      html_tokenizer (~> 0.0.6)
       parser (>= 2.4)
       smart_properties
+    bigdecimal (3.1.8)
     bindex (0.8.1)
     bootsnap (1.16.0)
       msgpack (~> 1.2)
     browser (2.7.1)
-    builder (3.2.4)
+    builder (3.3.0)
+    bullet (7.2.0)
+      activesupport (>= 3.0.0)
+      uniform_notifier (~> 1.11)
     byebug (11.1.3)
-    capybara (3.38.0)
+    capybara (3.40.0)
       addressable
       matrix
       mini_mime (>= 0.1.3)
-      nokogiri (~> 1.8)
+      nokogiri (~> 1.11)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    carrierwave (2.2.3)
+    carrierwave (2.2.6)
       activemodel (>= 5.0.0)
       activesupport (>= 5.0.0)
       addressable (~> 2.6)
@@ -131,96 +125,85 @@ GEM
     cells-rails (0.1.5)
       actionpack (>= 5.0)
       cells (>= 4.1.6, < 5.0.0)
-    charlock_holmes (0.7.7)
-    chef-utils (18.1.29)
-      concurrent-ruby
-    childprocess (4.1.0)
-    codecov (0.6.0)
-      simplecov (>= 0.15, < 0.22)
-    coercible (1.0.0)
-      descendants_tracker (~> 0.0.1)
-    coffee-rails (5.0.0)
-      coffee-script (>= 2.2.0)
-      railties (>= 5.2.0)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.12.2)
-    commonmarker (0.23.8)
-    concurrent-ruby (1.2.2)
-    crack (0.4.5)
+    charlock_holmes (0.7.9)
+    codecov (0.2.12)
+      json
+      simplecov
+    commonmarker (0.23.10)
+    concurrent-ruby (1.3.3)
+    crack (1.0.0)
+      bigdecimal
       rexml
     crass (1.0.6)
-    css_parser (1.14.0)
+    css_parser (1.17.1)
       addressable
-    date (3.3.3)
+    csv (3.3.0)
+    date (3.3.4)
     date_validator (0.12.0)
       activemodel (>= 3)
       activesupport (>= 3)
-    db-query-matchers (0.10.0)
-      activesupport (>= 4.0, < 7)
-      rspec (~> 3.0)
-    decidim (0.27.2)
-      decidim-accountability (= 0.27.2)
-      decidim-admin (= 0.27.2)
-      decidim-api (= 0.27.2)
-      decidim-assemblies (= 0.27.2)
-      decidim-blogs (= 0.27.2)
-      decidim-budgets (= 0.27.2)
-      decidim-comments (= 0.27.2)
-      decidim-core (= 0.27.2)
-      decidim-debates (= 0.27.2)
-      decidim-forms (= 0.27.2)
-      decidim-generators (= 0.27.2)
-      decidim-meetings (= 0.27.2)
-      decidim-pages (= 0.27.2)
-      decidim-participatory_processes (= 0.27.2)
-      decidim-proposals (= 0.27.2)
-      decidim-sortitions (= 0.27.2)
-      decidim-surveys (= 0.27.2)
-      decidim-system (= 0.27.2)
-      decidim-templates (= 0.27.2)
-      decidim-verifications (= 0.27.2)
-    decidim-accountability (0.27.2)
-      decidim-comments (= 0.27.2)
-      decidim-core (= 0.27.2)
-    decidim-admin (0.27.2)
+    decidim (0.28.2)
+      decidim-accountability (= 0.28.2)
+      decidim-admin (= 0.28.2)
+      decidim-api (= 0.28.2)
+      decidim-assemblies (= 0.28.2)
+      decidim-blogs (= 0.28.2)
+      decidim-budgets (= 0.28.2)
+      decidim-comments (= 0.28.2)
+      decidim-core (= 0.28.2)
+      decidim-debates (= 0.28.2)
+      decidim-forms (= 0.28.2)
+      decidim-generators (= 0.28.2)
+      decidim-meetings (= 0.28.2)
+      decidim-pages (= 0.28.2)
+      decidim-participatory_processes (= 0.28.2)
+      decidim-proposals (= 0.28.2)
+      decidim-sortitions (= 0.28.2)
+      decidim-surveys (= 0.28.2)
+      decidim-system (= 0.28.2)
+      decidim-templates (= 0.28.2)
+      decidim-verifications (= 0.28.2)
+    decidim-accountability (0.28.2)
+      decidim-comments (= 0.28.2)
+      decidim-core (= 0.28.2)
+    decidim-admin (0.28.2)
       active_link_to (~> 1.0)
-      decidim-core (= 0.27.2)
+      decidim-core (= 0.28.2)
       devise (~> 4.7)
       devise-i18n (~> 1.2)
-      devise_invitable (~> 2.0)
-    decidim-api (0.27.2)
-      graphql (~> 1.12, < 1.13)
-      graphql-docs (~> 2.1.0)
+      devise_invitable (~> 2.0, >= 2.0.9)
+    decidim-api (0.28.2)
+      commonmarker (~> 0.23.0, >= 0.23.9)
+      decidim-core (= 0.28.2)
+      graphql (~> 2.0.0)
+      graphql-docs (~> 3.0.1)
       rack-cors (~> 1.0)
-    decidim-assemblies (0.27.2)
-      decidim-core (= 0.27.2)
-    decidim-blogs (0.27.2)
-      decidim-admin (= 0.27.2)
-      decidim-comments (= 0.27.2)
-      decidim-core (= 0.27.2)
-    decidim-budgets (0.27.2)
-      decidim-comments (= 0.27.2)
-      decidim-core (= 0.27.2)
-    decidim-comments (0.27.2)
-      decidim-core (= 0.27.2)
+    decidim-assemblies (0.28.2)
+      decidim-core (= 0.28.2)
+    decidim-blogs (0.28.2)
+      decidim-admin (= 0.28.2)
+      decidim-comments (= 0.28.2)
+      decidim-core (= 0.28.2)
+    decidim-budgets (0.28.2)
+      decidim-comments (= 0.28.2)
+      decidim-core (= 0.28.2)
+    decidim-comments (0.28.2)
+      decidim-core (= 0.28.2)
       redcarpet (~> 3.5, >= 3.5.1)
-    decidim-core (0.27.2)
+    decidim-core (0.28.2)
       active_link_to (~> 1.0)
-      acts_as_list (~> 0.9)
+      acts_as_list (~> 1.0)
       batch-loader (~> 1.2)
       browser (~> 2.7)
-      carrierwave (~> 2.2.1)
+      carrierwave (~> 2.2.5, >= 2.2.5)
       cells-erb (~> 0.1.0)
       cells-rails (~> 0.1.3)
       charlock_holmes (~> 0.7)
       date_validator (~> 0.12.0)
-      decidim-api (= 0.27.2)
       devise (~> 4.7)
-      devise-i18n (~> 1.2)
+      devise-i18n (~> 1.2, < 1.11.1)
       diffy (~> 3.3)
-      doorkeeper (~> 5.1)
+      doorkeeper (~> 5.6, >= 5.6.6)
       doorkeeper-i18n (~> 4.0)
       file_validators (~> 3.0)
       fog-local (~> 0.6)
@@ -229,110 +212,108 @@ GEM
       hashdiff (>= 0.4.0, < 2.0.0)
       invisible_captcha (~> 0.12)
       kaminari (~> 1.2, >= 1.2.1)
-      loofah (~> 2.3.1)
+      loofah (~> 2.19, >= 2.19.1)
       mime-types (>= 1.16, < 4.0)
       mini_magick (~> 4.9)
-      mustache (~> 1.1.0)
+      net-smtp (~> 0.3.1)
       omniauth (~> 2.0)
       omniauth-facebook (~> 5.0)
       omniauth-google-oauth2 (~> 1.0)
       omniauth-rails_csrf_protection (~> 1.0)
       omniauth-twitter (~> 1.4)
       paper_trail (~> 12.0)
-      pg (~> 1.1.4, < 2)
+      pg (~> 1.4.0, < 2)
       pg_search (~> 2.2)
       premailer-rails (~> 1.10)
-      rack (~> 2.2, >= 2.2.3)
+      psych (~> 4.0)
+      rack (~> 2.2, >= 2.2.6.4)
       rack-attack (~> 6.0)
-      rails (~> 6.1.0)
+      rails (~> 6.1.7, >= 6.1.7.4)
       rails-i18n (~> 6.0)
-      ransack (~> 2.4.1)
+      ransack (~> 3.2.1)
       redis (~> 4.1)
       request_store (~> 1.5.0)
       rubyXL (~> 3.4)
       rubyzip (~> 2.0)
       seven_zip_ruby (~> 1.3)
-      social-share-button (~> 1.2, >= 1.2.1)
-      valid_email2 (~> 2.1)
-      webpacker (= 6.0.0.rc.5)
-      webpush (~> 1.1)
+      shakapacker (~> 7.1.0)
+      valid_email2 (~> 4.0)
+      web-push (~> 3.0)
       wisper (~> 2.0)
-    decidim-debates (0.27.2)
-      decidim-comments (= 0.27.2)
-      decidim-core (= 0.27.2)
-    decidim-dev (0.27.2)
-      axe-core-rspec (~> 4.1.0)
+    decidim-debates (0.28.2)
+      decidim-comments (= 0.28.2)
+      decidim-core (= 0.28.2)
+    decidim-dev (0.28.2)
+      bullet (~> 7.0)
       byebug (~> 11.0)
-      capybara (~> 3.24)
-      db-query-matchers (~> 0.10.0)
-      decidim (= 0.27.2)
-      erb_lint (~> 0.0.35)
-      factory_bot_rails (~> 4.8)
-      i18n-tasks (~> 0.9.18)
-      mdl (~> 0.5)
-      nokogiri (~> 1.13)
-      parallel_tests (~> 3.7)
-      puma (~> 5.0)
+      capybara (~> 3.39)
+      decidim (= 0.28.2)
+      erb_lint (~> 0.4.0)
+      factory_bot_rails (~> 6.2)
+      faker (~> 3.2)
+      i18n-tasks (~> 1.0)
+      nokogiri (~> 1.14, >= 1.14.3)
+      parallel_tests (~> 4.2)
+      puma (~> 6.2, >= 6.3.1)
       rails-controller-testing (~> 1.0)
+      rspec (~> 3.12)
       rspec-cells (~> 0.3.7)
-      rspec-html-matchers (~> 0.9.1)
-      rspec-rails (~> 4.0)
+      rspec-html-matchers (~> 0.10)
+      rspec-rails (~> 6.0)
       rspec-retry (~> 0.6.2)
-      rspec_junit_formatter (~> 0.3.0)
-      rubocop (~> 1.28.0)
-      rubocop-rails (~> 2.14)
-      rubocop-rspec (~> 2.10)
-      selenium-webdriver (~> 4.1.0)
-      simplecov (~> 0.21.0)
+      rspec_junit_formatter (~> 0.6.0)
+      rubocop (~> 1.50.0)
+      rubocop-faker (~> 1.1)
+      rubocop-rails (~> 2.19)
+      rubocop-rspec (~> 2.20)
+      selenium-webdriver (~> 4.9)
+      simplecov (~> 0.22.0)
       simplecov-cobertura (~> 2.1.0)
       w3c_rspec_validators (~> 0.3.0)
-      webmock (~> 3.6)
+      webmock (~> 3.18)
       wisper-rspec (~> 1.0)
-    decidim-forms (0.27.2)
-      decidim-core (= 0.27.2)
+    decidim-forms (0.28.2)
+      decidim-core (= 0.28.2)
       wicked_pdf (~> 2.1)
       wkhtmltopdf-binary (~> 0.12)
-    decidim-generators (0.27.2)
-      decidim-core (= 0.27.2)
-    decidim-meetings (0.27.2)
-      decidim-core (= 0.27.2)
-      decidim-forms (= 0.27.2)
+    decidim-generators (0.28.2)
+      decidim-core (= 0.28.2)
+    decidim-meetings (0.28.2)
+      decidim-core (= 0.28.2)
+      decidim-forms (= 0.28.2)
       icalendar (~> 2.5)
-    decidim-pages (0.27.2)
-      decidim-core (= 0.27.2)
-    decidim-participatory_processes (0.27.2)
-      decidim-core (= 0.27.2)
-    decidim-proposals (0.27.2)
-      decidim-comments (= 0.27.2)
-      decidim-core (= 0.27.2)
-      doc2text (~> 0.4.5)
+    decidim-pages (0.28.2)
+      decidim-core (= 0.28.2)
+    decidim-participatory_processes (0.28.2)
+      decidim-core (= 0.28.2)
+    decidim-proposals (0.28.2)
+      decidim-comments (= 0.28.2)
+      decidim-core (= 0.28.2)
+      doc2text (~> 0.4.6)
       redcarpet (~> 3.5, >= 3.5.1)
-    decidim-sortitions (0.27.2)
-      decidim-admin (= 0.27.2)
-      decidim-comments (= 0.27.2)
-      decidim-core (= 0.27.2)
-      decidim-proposals (= 0.27.2)
-    decidim-surveys (0.27.2)
-      decidim-core (= 0.27.2)
-      decidim-forms (= 0.27.2)
-      decidim-templates (= 0.27.2)
-    decidim-system (0.27.2)
+    decidim-sortitions (0.28.2)
+      decidim-admin (= 0.28.2)
+      decidim-comments (= 0.28.2)
+      decidim-core (= 0.28.2)
+      decidim-proposals (= 0.28.2)
+    decidim-surveys (0.28.2)
+      decidim-core (= 0.28.2)
+      decidim-forms (= 0.28.2)
+    decidim-system (0.28.2)
       active_link_to (~> 1.0)
-      decidim-core (= 0.27.2)
+      decidim-core (= 0.28.2)
       devise (~> 4.7)
       devise-i18n (~> 1.2)
-      devise_invitable (~> 2.0)
-    decidim-templates (0.27.2)
-      decidim-core (= 0.27.2)
-      decidim-forms (= 0.27.2)
-    decidim-verifications (0.27.2)
-      decidim-core (= 0.27.2)
+      devise_invitable (~> 2.0, >= 2.0.9)
+    decidim-templates (0.28.2)
+      decidim-core (= 0.28.2)
+      decidim-forms (= 0.28.2)
+    decidim-verifications (0.28.2)
+      decidim-core (= 0.28.2)
     declarative-builder (0.1.0)
       declarative-option (< 0.2.0)
     declarative-option (0.1.0)
-    descendants_tracker (0.0.4)
-      thread_safe (~> 0.3, >= 0.3.1)
-    devise (4.9.0)
+    devise (4.9.4)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
@@ -340,51 +321,50 @@ GEM
       warden (~> 1.2.3)
     devise-i18n (1.11.0)
       devise (>= 4.9.0)
-    devise_invitable (2.0.7)
+    devise_invitable (2.0.9)
       actionmailer (>= 5.0)
       devise (>= 4.6)
-    diff-lcs (1.5.0)
+    diff-lcs (1.5.1)
     diffy (3.4.2)
-    doc2text (0.4.5)
-      nokogiri (>= 1.13.2, < 1.14.0)
+    doc2text (0.4.7)
+      nokogiri (>= 1.13.2, < 1.17.0)
       rubyzip (~> 2.3.0)
     docile (1.4.0)
-    doorkeeper (5.6.6)
+    doorkeeper (5.7.1)
       railties (>= 5)
     doorkeeper-i18n (4.0.1)
-    dumb_delegator (1.0.0)
-    erb_lint (0.0.37)
+    erb_lint (0.4.0)
       activesupport
-      better_html (~> 1.0.7)
-      html_tokenizer
+      better_html (>= 2.0.1)
       parser (>= 2.7.1.4)
       rainbow
       rubocop
       smart_properties
     erbse (0.1.4)
       temple
-    erubi (1.12.0)
-    escape_utils (1.3.0)
-    excon (0.99.0)
-    execjs (2.8.1)
+    erubi (1.13.0)
+    escape_utils (1.2.2)
+    excon (0.111.0)
+    execjs (2.9.1)
     extended-markdown-filter (0.7.0)
       html-pipeline (~> 2.9)
-    factory_bot (4.11.1)
-      activesupport (>= 3.0.0)
-    factory_bot_rails (4.11.1)
-      factory_bot (~> 4.11.1)
-      railties (>= 3.0.0)
-    faker (2.23.0)
+    factory_bot (6.4.6)
+      activesupport (>= 5.0.0)
+    factory_bot_rails (6.4.3)
+      factory_bot (~> 6.4)
+      railties (>= 5.0.0)
+    faker (3.4.2)
       i18n (>= 1.8.11, < 2)
-    faraday (2.7.4)
-      faraday-net_http (>= 2.0, < 3.1)
-      ruby2_keywords (>= 0.0.4)
-    faraday-net_http (3.0.2)
-    ffi (1.15.5)
+    faraday (2.10.0)
+      faraday-net_http (>= 2.0, < 3.2)
+      logger
+    faraday-net_http (3.1.1)
+      net-http
+    ffi (1.17.0)
     file_validators (3.0.0)
       activemodel (>= 3.2)
       mime-types (>= 1.0)
-    fog-core (2.3.0)
+    fog-core (2.4.0)
       builder
       excon (~> 0.71)
       formatador (>= 0.2, < 2.0)
@@ -398,32 +378,35 @@ GEM
       activesupport (>= 4.1, < 7.1)
       railties (>= 4.1, < 7.1)
     gemoji (3.0.1)
-    geocoder (1.8.1)
-    globalid (1.1.0)
-      activesupport (>= 5.0)
-    graphql (1.12.24)
-    graphql-docs (2.1.0)
+    geocoder (1.8.3)
+      base64 (>= 0.1.0)
+      csv (>= 3.0.0)
+    globalid (1.2.1)
+      activesupport (>= 6.1)
+    graphql (2.0.31)
+      base64
+    graphql-docs (3.0.1)
       commonmarker (~> 0.16)
-      escape_utils (~> 1.2)
+      escape_utils (~> 1.2.2)
       extended-markdown-filter (~> 0.4)
       gemoji (~> 3.0)
-      graphql (~> 1.12)
+      graphql (~> 2.0)
       html-pipeline (~> 2.9)
       sass (~> 3.4)
-    hashdiff (1.0.1)
+    hashdiff (1.1.0)
     hashie (5.0.0)
-    highline (2.1.0)
-    hkdf (0.3.0)
+    highline (3.1.0)
+      reline
     html-pipeline (2.14.3)
       activesupport (>= 2)
       nokogiri (>= 1.4)
-    html_tokenizer (0.0.7)
     htmlentities (4.3.4)
-    i18n (1.12.0)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
-    i18n-tasks (0.9.37)
+    i18n-tasks (1.0.12)
       activesupport (>= 4.0.2)
       ast (>= 2.1.0)
+      better_html (>= 1.0, < 3.0)
       erubi
       highline (>= 2.0.0)
       i18n
@@ -431,17 +414,18 @@ GEM
       rails-i18n
       rainbow (>= 2.2.2, < 4.0)
       terminal-table (>= 1.5.1)
-    icalendar (2.8.0)
+    icalendar (2.10.2)
       ice_cube (~> 0.16)
-    ice_cube (0.16.4)
-    ice_nine (0.11.2)
-    image_processing (1.12.2)
+    ice_cube (0.17.0)
+    image_processing (1.13.0)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
     invisible_captcha (0.13.0)
       rails (>= 3.2.0)
-    json (2.6.3)
-    jwt (2.7.0)
+    io-console (0.7.2)
+    json (2.7.2)
+    jwt (2.8.2)
+      base64
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
       kaminari-actionview (= 1.2.2)
@@ -454,10 +438,6 @@ GEM
       activerecord
       kaminari-core (= 1.2.2)
     kaminari-core (1.2.2)
-    kramdown (2.4.0)
-      rexml
-    kramdown-parser-gfm (1.1.0)
-      kramdown (~> 2.0)
     launchy (2.5.2)
       addressable (~> 2.8)
     letter_opener (1.8.1)
@@ -469,50 +449,41 @@ GEM
     listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.3.1)
+    logger (1.6.0)
+    loofah (2.22.0)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
+      nokogiri (>= 1.12.0)
     mail (2.8.1)
       mini_mime (>= 0.1.1)
       net-imap
       net-pop
       net-smtp
-    marcel (1.0.2)
+    marcel (1.0.4)
     matrix (0.4.2)
-    mdl (0.12.0)
-      kramdown (~> 2.3)
-      kramdown-parser-gfm (~> 1.1)
-      mixlib-cli (~> 2.1, >= 2.1.1)
-      mixlib-config (>= 2.2.1, < 4)
-      mixlib-shellout
-    method_source (1.0.0)
-    mime-types (3.4.1)
+    method_source (1.1.0)
+    mime-types (3.5.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2023.0218.1)
-    mini_magick (4.12.0)
-    mini_mime (1.1.2)
-    mini_portile2 (2.8.1)
-    minitest (5.18.0)
-    mixlib-cli (2.1.8)
-    mixlib-config (3.0.27)
-      tomlrb
-    mixlib-shellout (3.2.7)
-      chef-utils
+    mime-types-data (3.2024.0702)
+    mini_magick (4.13.2)
+    mini_mime (1.1.5)
+    mini_portile2 (2.8.7)
+    minitest (5.24.1)
     msgpack (1.7.0)
     multi_xml (0.6.0)
-    mustache (1.1.1)
-    net-imap (0.3.4)
+    net-http (0.4.1)
+      uri
+    net-imap (0.4.14)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
-    net-protocol (0.2.1)
+    net-protocol (0.2.2)
       timeout
-    net-smtp (0.3.3)
+    net-smtp (0.3.4)
       net-protocol
-    nio4r (2.5.8)
-    nokogiri (1.13.10)
-      mini_portile2 (~> 2.8.0)
+    nio4r (2.7.3)
+    nokogiri (1.16.7)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oauth (1.1.0)
       oauth-tty (~> 1.0, >= 1.0.1)
@@ -527,43 +498,45 @@ GEM
       rack (>= 1.2, < 4)
       snaky_hash (~> 2.0)
       version_gem (~> 1.1)
-    omniauth (2.1.1)
+    omniauth (2.1.2)
       hashie (>= 3.4.6)
       rack (>= 2.2.3)
       rack-protection
     omniauth-facebook (5.0.0)
       omniauth-oauth2 (~> 1.2)
-    omniauth-google-oauth2 (1.1.1)
+    omniauth-google-oauth2 (1.1.2)
       jwt (>= 2.0)
-      oauth2 (~> 2.0.6)
+      oauth2 (~> 2.0)
       omniauth (~> 2.0)
-      omniauth-oauth2 (~> 1.8.0)
+      omniauth-oauth2 (~> 1.8)
     omniauth-oauth (1.2.0)
       oauth
       omniauth (>= 1.0, < 3)
     omniauth-oauth2 (1.8.0)
       oauth2 (>= 1.4, < 3)
       omniauth (~> 2.0)
-    omniauth-rails_csrf_protection (1.0.1)
+    omniauth-rails_csrf_protection (1.0.2)
       actionpack (>= 4.2)
       omniauth (~> 2.0)
     omniauth-twitter (1.4.0)
       omniauth-oauth (~> 1.1)
       rack
+    openssl (3.2.0)
     orm_adapter (0.5.0)
     paper_trail (12.3.0)
       activerecord (>= 5.2)
       request_store (~> 1.1)
     parallel (1.22.1)
-    parallel_tests (3.13.0)
+    parallel_tests (4.7.1)
       parallel
-    parser (3.2.1.1)
+    parser (3.3.4.2)
       ast (~> 2.4.1)
-    pg (1.1.4)
+      racc
+    pg (1.4.6)
     pg_search (2.3.6)
       activerecord (>= 5.2)
       activesupport (>= 5.2)
-    premailer (1.21.0)
+    premailer (1.23.0)
       addressable
       css_parser (>= 1.12.0)
       htmlentities (>= 4.0.0)
@@ -571,128 +544,143 @@ GEM
       actionmailer (>= 3)
       net-smtp
       premailer (~> 1.7, >= 1.7.9)
-    public_suffix (5.0.1)
-    puma (5.6.5)
+    psych (4.0.6)
+      stringio
+    public_suffix (6.0.1)
+    puma (6.4.2)
       nio4r (~> 2.0)
-    racc (1.6.2)
-    rack (2.2.6.4)
-    rack-attack (6.6.1)
-      rack (>= 1.0, < 3)
+    racc (1.8.1)
+    rack (2.2.9)
+    rack-attack (6.7.0)
+      rack (>= 1.0, < 4)
     rack-cors (1.1.1)
       rack (>= 2.0.0)
-    rack-protection (3.0.5)
-      rack
-    rack-proxy (0.7.6)
+    rack-protection (3.2.0)
+      base64 (>= 0.1.0)
+      rack (~> 2.2, >= 2.2.4)
+    rack-proxy (0.7.7)
       rack
     rack-test (2.1.0)
       rack (>= 1.3)
-    rails (6.1.7.3)
-      actioncable (= 6.1.7.3)
-      actionmailbox (= 6.1.7.3)
-      actionmailer (= 6.1.7.3)
-      actionpack (= 6.1.7.3)
-      actiontext (= 6.1.7.3)
-      actionview (= 6.1.7.3)
-      activejob (= 6.1.7.3)
-      activemodel (= 6.1.7.3)
-      activerecord (= 6.1.7.3)
-      activestorage (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+    rails (6.1.7.8)
+      actioncable (= 6.1.7.8)
+      actionmailbox (= 6.1.7.8)
+      actionmailer (= 6.1.7.8)
+      actionpack (= 6.1.7.8)
+      actiontext (= 6.1.7.8)
+      actionview (= 6.1.7.8)
+      activejob (= 6.1.7.8)
+      activemodel (= 6.1.7.8)
+      activerecord (= 6.1.7.8)
+      activestorage (= 6.1.7.8)
+      activesupport (= 6.1.7.8)
       bundler (>= 1.15.0)
-      railties (= 6.1.7.3)
+      railties (= 6.1.7.8)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
       activesupport (>= 5.0.1.rc1)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.3)
-      loofah (~> 2.3)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
     rails-i18n (6.0.0)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 7)
-    railties (6.1.7.3)
-      actionpack (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+    railties (6.1.7.8)
+      actionpack (= 6.1.7.8)
+      activesupport (= 6.1.7.8)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
     rainbow (3.1.1)
-    rake (13.0.6)
-    ransack (2.4.2)
-      activerecord (>= 5.2.4)
-      activesupport (>= 5.2.4)
+    rake (13.2.1)
+    ransack (3.2.1)
+      activerecord (>= 6.1.5)
+      activesupport (>= 6.1.5)
       i18n
     rb-fsevent (0.11.2)
-    rb-inotify (0.10.1)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
     redcarpet (3.6.0)
     redis (4.8.1)
     regexp_parser (2.7.0)
+    reline (0.5.9)
+      io-console (~> 0.5)
     request_store (1.5.1)
       rack (>= 1.4)
-    responders (3.1.0)
+    responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
     rexml (3.2.5)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-cells (0.3.8)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-cells (0.3.9)
       cells (>= 4.0.0, < 6.0.0)
-      rspec-rails (>= 3.0.0, < 6.1.0)
-    rspec-core (3.12.1)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.2)
+      rspec-rails (>= 3.0.0, < 6.2.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-html-matchers (0.9.4)
+      rspec-support (~> 3.13.0)
+    rspec-html-matchers (0.10.0)
       nokogiri (~> 1)
-      rspec (>= 3.0.0.a, < 4)
-    rspec-mocks (3.12.5)
+      rspec (>= 3.0.0.a)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-rails (4.1.2)
-      actionpack (>= 4.2)
-      activesupport (>= 4.2)
-      railties (>= 4.2)
-      rspec-core (~> 3.10)
-      rspec-expectations (~> 3.10)
-      rspec-mocks (~> 3.10)
-      rspec-support (~> 3.10)
+      rspec-support (~> 3.13.0)
+    rspec-rails (6.1.3)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
+      railties (>= 6.1)
+      rspec-core (~> 3.13)
+      rspec-expectations (~> 3.13)
+      rspec-mocks (~> 3.13)
+      rspec-support (~> 3.13)
     rspec-retry (0.6.2)
       rspec-core (> 3.3)
-    rspec-support (3.12.0)
-    rspec_junit_formatter (0.3.0)
+    rspec-support (3.13.1)
+    rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.28.2)
+    rubocop (1.50.2)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.17.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.28.0)
-      parser (>= 3.2.1.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.31.2)
+      parser (>= 3.3.0.4)
+    rubocop-capybara (2.20.0)
+      rubocop (~> 1.41)
+    rubocop-factory_bot (2.25.1)
+      rubocop (~> 1.41)
     rubocop-faker (1.1.0)
       faker (>= 2.12.0)
       rubocop (>= 0.82.0)
-    rubocop-rails (2.15.2)
+    rubocop-rails (2.24.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 1.7.0, < 2.0)
-    rubocop-rspec (2.11.1)
-      rubocop (~> 1.19)
+      rubocop (>= 1.33.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+    rubocop-rspec (2.27.1)
+      rubocop (~> 1.40)
+      rubocop-capybara (~> 2.17)
+      rubocop-factory_bot (~> 2.22)
     ruby-progressbar (1.13.0)
-    ruby-vips (2.1.4)
+    ruby-vips (2.2.2)
       ffi (~> 1.12)
-    ruby2_keywords (0.0.5)
-    rubyXL (3.4.25)
+      logger
+    rubyXL (3.4.27)
       nokogiri (>= 1.10.8)
       rubyzip (>= 1.3.0)
     rubyzip (2.3.2)
@@ -701,13 +689,20 @@ GEM
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    selenium-webdriver (4.1.0)
-      childprocess (>= 0.5, < 5.0)
+    selenium-webdriver (4.23.0)
+      base64 (~> 0.2)
+      logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
-      rubyzip (>= 1.2.2)
+      rubyzip (>= 1.2.2, < 3.0)
+      websocket (~> 1.0)
     semantic_range (3.0.0)
     seven_zip_ruby (1.3.0)
-    simplecov (0.21.2)
+    shakapacker (7.1.0)
+      activesupport (>= 5.2)
+      rack-proxy (>= 0.6.1)
+      railties (>= 5.2)
+      semantic_range (>= 2.3.0)
+    simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
@@ -720,42 +715,37 @@ GEM
     snaky_hash (2.0.1)
       hashie
       version_gem (~> 1.1, >= 1.1.1)
-    social-share-button (1.2.4)
-      coffee-rails
     spring (2.1.1)
     spring-watcher-listen (2.0.1)
       listen (>= 2.7, < 4.0)
       spring (>= 1.2, < 3.0)
-    sprockets (4.2.0)
+    sprockets (4.2.1)
       concurrent-ruby (~> 1.0)
       rack (>= 2.2.4, < 4)
-    sprockets-rails (3.4.2)
-      actionpack (>= 5.2)
-      activesupport (>= 5.2)
+    sprockets-rails (3.5.1)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
       sprockets (>= 3.0.0)
-    ssrf_filter (1.1.1)
-    temple (0.10.0)
+    ssrf_filter (1.1.2)
+    stringio (3.1.1)
+    temple (0.10.3)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    thor (1.2.1)
-    thread_safe (0.3.6)
-    tilt (2.1.0)
-    timeout (0.3.2)
-    tomlrb (2.0.3)
+    thor (1.3.1)
+    tilt (2.4.0)
+    timeout (0.4.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     uber (0.1.0)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (2.4.2)
-    valid_email2 (2.3.1)
+    uniform_notifier (1.16.0)
+    uri (0.13.0)
+    valid_email2 (4.0.6)
       activemodel (>= 3.2)
       mail (~> 2.5)
-    version_gem (1.1.2)
-    virtus (2.0.0)
-      axiom-types (~> 0.1)
-      coercible (~> 1.0)
-      descendants_tracker (~> 0.0, >= 0.0.3)
+    version_gem (1.1.4)
     w3c_rspec_validators (0.3.0)
       rails
       rspec
@@ -771,29 +761,25 @@ GEM
       activemodel (>= 5.0)
       bindex (>= 0.4.0)
       railties (>= 5.0)
-    webmock (3.18.1)
+    web-push (3.0.1)
+      jwt (~> 2.0)
+      openssl (~> 3.0)
+    webmock (3.23.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    webpacker (6.0.0.rc.5)
-      activesupport (>= 5.2)
-      rack-proxy (>= 0.6.1)
-      railties (>= 5.2)
-      semantic_range (>= 2.3.0)
-    webpush (1.1.0)
-      hkdf (~> 0.2)
-      jwt (~> 2.0)
-    websocket-driver (0.7.5)
+    websocket (1.2.11)
+    websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    wicked_pdf (2.6.3)
+    wicked_pdf (2.8.0)
       activesupport
     wisper (2.0.1)
     wisper-rspec (1.1.0)
-    wkhtmltopdf-binary (0.12.6.6)
+    wkhtmltopdf-binary (0.12.6.7)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.7)
+    zeitwerk (2.6.17)
 
 PLATFORMS
   ruby
@@ -802,10 +788,10 @@ DEPENDENCIES
   bootsnap (~> 1.4)
   byebug (~> 11.0)
   codecov
-  decidim (= 0.27.2)
+  decidim (= 0.28.2)
   decidim-alternative_landing!
-  decidim-dev (= 0.27.2)
-  faker (~> 2.14)
+  decidim-dev (= 0.28.2)
+  faker
   letter_opener_web (~> 1.3)
   listen (~> 3.1)
   puma (>= 5.0.0)
@@ -816,7 +802,7 @@ DEPENDENCIES
   web-console (~> 3.5)
 
 RUBY VERSION
-   ruby 3.0.2p107
+   ruby 3.1.1p18
 
 BUNDLED WITH
-   2.2.22
+   2.5.15
diff --git a/Rakefile b/Rakefile
index 61ba449..c37388b 100644
--- a/Rakefile
+++ b/Rakefile
@@ -27,7 +27,7 @@ end
 def fix_babel_config(path)
   Dir.chdir(path) do
     babel_config = "#{Dir.pwd}/babel.config.json"
-    File.delete(babel_config) if File.exist?(babel_config)
+    FileUtils.rm_f(babel_config)
     FileUtils.cp("#{__dir__}/babel.config.json", Dir.pwd)
 
     # Temporary fix to overcome the issue with sass-embedded, see:
diff --git a/app/cells/decidim/alternative_landing/content_blocks/alternative_upcoming_meetings/show.erb b/app/cells/decidim/alternative_landing/content_blocks/alternative_upcoming_meetings/show.erb
index 37e4fbd..228e432 100644
--- a/app/cells/decidim/alternative_landing/content_blocks/alternative_upcoming_meetings/show.erb
+++ b/app/cells/decidim/alternative_landing/content_blocks/alternative_upcoming_meetings/show.erb
@@ -1,16 +1,16 @@
-<section class="alternative-landing upcoming-meetings">
-  <div class="row">
-    <h3 class="section-heading">
+<div class="layout-2col__main content-block">
+  <section id="meetings" class="layout-main__section layout-main__heading alternative-landing upcoming-meetings">
+    <h2 class="h2 decorator">
       <%= section_title %>
       <%= section_link %>
-    </h3>
-    <div class="row small-up-1 medium-up-2 mediumlarge-up-3 large-up-3 card-grid">
+    </h2>
+    <div class="card__list-list">
       <% meetings.each do |meeting| %>
         <%= cell "decidim/meetings/meeting", meeting %>
       <% end %>
     </div>
-  </div>
-</section>
+  </section>
+</div>
 
 <script>
 $(document).ready(() => {
diff --git a/app/cells/decidim/alternative_landing/content_blocks/calendar/show.erb b/app/cells/decidim/alternative_landing/content_blocks/calendar/show.erb
index bf00176..a15f428 100644
--- a/app/cells/decidim/alternative_landing/content_blocks/calendar/show.erb
+++ b/app/cells/decidim/alternative_landing/content_blocks/calendar/show.erb
@@ -2,17 +2,14 @@
          data-resources="<%= CGI.escapeHTML(resources.to_json) %>"
          data-events="<%= CGI.escapeHTML(render_events.html_safe) %>"
          data-locale="<%= I18n.locale %>">
-  <div class="row">
-    <div class="columns large-12">
-      <div class="calendar-filters button-group">
-        <% resources.each do |t| %>
-          <button class="button tiny cal-filter <%= t %>" id="<%= t %>"><%= t(".filters.#{t}") %></button>
-        <% end %>
-      </div>
-      <div id="calendar"></div>
+  <div class="calendar-container py-8">
+    <div class="calendar-filters button-group">
+      <% resources.each do |t| %>
+        <button class="button button__sm tiny cal-filter <%= t %>" id="<%= t %>"><%= t(".filters.#{t}") %></button>
+      <% end %>
     </div>
+    <div class="py-6" id="calendar"></div>
   </div>
 </section>
 
-<%= javascript_pack_tag "fullcalendar" %>
-<%= javascript_pack_tag "decidim_fullcalendar" %>
+<%= append_javascript_pack_tag "fullcalendar", "decidim_fullcalendar" %>
diff --git a/app/cells/decidim/alternative_landing/content_blocks/cover_full/show.erb b/app/cells/decidim/alternative_landing/content_blocks/cover_full/show.erb
index b4bbad4..8e6e8e4 100644
--- a/app/cells/decidim/alternative_landing/content_blocks/cover_full/show.erb
+++ b/app/cells/decidim/alternative_landing/content_blocks/cover_full/show.erb
@@ -1,17 +1,15 @@
-<section class="alternative-landing cover-full" style="background-image:url(<%= background_image %>);">
-  <div class="row">
-    <div class="columns large-6 cover-text">
-      <h1 class="cover-title heading1">
-        <%= decidim_sanitize translated_title %>
-      </h1>
-      <div class="cover-body">
-        <%== translated_body %>
-      </div>
+<section id="<%= id_type %>" class="alternative-landing cover-full" style="background-image:url(<%= background_image %>);">
+  <div class="cover-text">
+    <h1 class="cover-title heading1 h1">
+      <%= decidim_sanitize translated_title %>
+    </h1>
+    <div class="cover-body">
+      <%== translated_body %>
     </div>
   </div>
 </section>
 <style media="all">
-  .alternative-landing.cover-full,
+  .cover-full,
   .navbar {
     <%= css %>
   }
diff --git a/app/cells/decidim/alternative_landing/content_blocks/cover_full_cell.rb b/app/cells/decidim/alternative_landing/content_blocks/cover_full_cell.rb
index 4ce8fc3..2f28bee 100644
--- a/app/cells/decidim/alternative_landing/content_blocks/cover_full_cell.rb
+++ b/app/cells/decidim/alternative_landing/content_blocks/cover_full_cell.rb
@@ -15,6 +15,11 @@ def translated_body
         def background_image
           model.images_container.attached_uploader(:background_image).path(variant: :big)
         end
+
+        def id_type
+          process_group_url = "processes_groups"
+          request.url.include?(process_group_url) ? "hero-1" : ""
+        end
       end
     end
   end
diff --git a/app/cells/decidim/alternative_landing/content_blocks/cover_half/show.erb b/app/cells/decidim/alternative_landing/content_blocks/cover_half/show.erb
index d81b9e7..70287ca 100644
--- a/app/cells/decidim/alternative_landing/content_blocks/cover_half/show.erb
+++ b/app/cells/decidim/alternative_landing/content_blocks/cover_half/show.erb
@@ -1,18 +1,18 @@
-<section class="alternative-landing cover-half">
+<section class="cover-half layout-2col__main content-block">
   <div class="cover-text">
-    <h1 class="cover-title heading1">
+    <h1 class="cover-title h1 decorator">
       <%= decidim_sanitize translated_title %>
     </h1>
     <div class="cover-body">
       <%== translated_body %>
     </div>
-    <%== translated_link(classes: "button button--sc primary") %>
+    <%== translated_link(classes: "button button__lg button__primary") %>
   </div>
   <div class="cover-image" style="background-image:url(<%= background_image %>);">
   </div>
 </section>
 <style media="all">
-  .alternative-landing.cover-half {
+  .cover-half {
     <%= css %>
   }
 </style>
diff --git a/app/cells/decidim/alternative_landing/content_blocks/extra_information/show.erb b/app/cells/decidim/alternative_landing/content_blocks/extra_information/show.erb
index 4da9917..1ea003f 100644
--- a/app/cells/decidim/alternative_landing/content_blocks/extra_information/show.erb
+++ b/app/cells/decidim/alternative_landing/content_blocks/extra_information/show.erb
@@ -1,9 +1,5 @@
 <section class="section alternative-landing extra-information">
-  <div class="row">
-    <div class="columns large-<%= columns %>">
-      <div class="extra-metadata-body">
-        <%== translated_body %>
-      </div>
-    </div>
+  <div class="extra-metadata-body py-10">
+    <%== translated_body %>
   </div>
 </section>
diff --git a/app/cells/decidim/alternative_landing/content_blocks/extra_information_settings_form/show.erb b/app/cells/decidim/alternative_landing/content_blocks/extra_information_settings_form/show.erb
index ce5a5be..185a4c0 100644
--- a/app/cells/decidim/alternative_landing/content_blocks/extra_information_settings_form/show.erb
+++ b/app/cells/decidim/alternative_landing/content_blocks/extra_information_settings_form/show.erb
@@ -1,11 +1,3 @@
 <% form.fields_for :settings, form.object.settings do |settings_fields| %>
   <%= settings_fields.translated :editor, :body, label: t(".body") %>
-  <div class="grid-x">
-    <div class="medium-12 large-6">
-      <%= settings_fields.number_field :columns, label: t(".columns") %>
-      <p class="help-text">
-        <%= t(".columns_help") %>
-      </p>
-    </div>
-  </div>
 <% end %>
diff --git a/app/cells/decidim/alternative_landing/content_blocks/extra_title/show.erb b/app/cells/decidim/alternative_landing/content_blocks/extra_title/show.erb
index ae5c3cc..296e08c 100644
--- a/app/cells/decidim/alternative_landing/content_blocks/extra_title/show.erb
+++ b/app/cells/decidim/alternative_landing/content_blocks/extra_title/show.erb
@@ -1,38 +1,38 @@
-<section class="section alternative-landing extra-title">
-  <h2 class="heading2"><%= translated_attribute(participatory_process_group.title) %></h2>
-  <div class="row">
-    <div class="columns medium-9">
-      <%= decidim_sanitize_editor_admin translated_attribute(participatory_process_group.description) %>
-      <div class="row">
-        <div class="column medium-2 text-muted">
-          <%= icon "grid-three-up", role: "img", class: "mr-xs" %>
-          <%= t("decidim.participatory_process_groups.content_blocks.title.participatory_processes", count: participatory_processes_count) %>
-        </div>
-        <% if has_meta_scope? %>
-          <div class="column medium-3 end text-muted">
-            <%= icon "globe", class: "mr-xs" %>
-            <strong><%= t("decidim.participatory_process_groups.content_blocks.title.meta_scope") %></strong>
-            <%= translated_attribute(meta_scope) %>
-          </div>
-        <% end %>
-      </div>
-    </div>
-    <div class="columns medium-3">
-      <% if has_group_url? %>
-        <div class="mb-s text-muted">
-          <%= icon "external-link", class: "mr-xs" %>
-          <%= link_to(
-            group_url_text,
-            group_url,
-            target: "_blank"
-          ) %>
-        </div>
-      <% end %>
+<section class="content-block participatory-space-group__content-block extra-title">
+  <h2 class="h2 decorator"><%= translated_attribute(participatory_process_group.title) %></h2>
+
+  <div class="editor-content content-block__description">
+    <%= decidim_sanitize_editor_admin translated_attribute(participatory_process_group.description) %>
+  </div>
+
+  <div class="participatory-space-group__content-block-metadata">
+    <span>
+      <%= icon "grid-line", role: "img", class: "fill-gray w-4 h-4" %>
+      <%= t("decidim.participatory_process_groups.content_blocks.title.participatory_processes", count: participatory_processes_count) %>
+    </span>
+    <% if has_meta_scope? %>
+      <span>
+        <%= icon "globe-line", class: "fill-gray w-4 h-4" %>
+        <strong><%= t("decidim.participatory_process_groups.content_blocks.title.meta_scope") %></strong>
+        <%= translated_attribute(meta_scope) %>
+      </span>
+    <% end %>
+  </div>
+
+  <div class="participatory-space-group__content-block-metadata">
+    <% if has_group_url? %>
+      <span>
+        <%= icon "external-link-line", class: "fill-gray w-4 h-4" %>
+        <%= link_to(group_url_text, group_url, target: "_blank") %>
+      </span>
+    <% end %>
+    <span class="links-list">
       <% links.each do |link| %>
-        <div class="mb-s text-muted">
+        <span class="link">
           <%= link %>
-        </div>
+        </span>
       <% end %>
-    </div>
+    </span>
   </div>
+
 </section>
diff --git a/app/cells/decidim/alternative_landing/content_blocks/latest_blog_posts/show.erb b/app/cells/decidim/alternative_landing/content_blocks/latest_blog_posts/show.erb
index 8629489..9b8c6bd 100644
--- a/app/cells/decidim/alternative_landing/content_blocks/latest_blog_posts/show.erb
+++ b/app/cells/decidim/alternative_landing/content_blocks/latest_blog_posts/show.erb
@@ -1,13 +1,11 @@
-<section class="alternative-landing latest-blog-posts">
-  <div class="row">
-    <h3 class="section-heading">
+<div class="layout-2col__main content-block">
+  <section id="blogs" class="layout-main__section layout-main__heading latest-blog-posts">
+    <h2 class="h2 decorator">
       <%= section_title %>
       <%= section_link %>
-    </h3>
-    <div class="row small-up-1 medium-up-2 mediumlarge-up-3 large-up-3 card-grid">
-      <% posts.each do |post| %>
-        <%= cell "decidim/blogs/post", post %>
-      <% end %>
-    </div>
-  </div>
-</section>
+    </h2>
+    <% posts.each do |post| %>
+      <%= cell "decidim/blogs/post", post %>
+    <% end %>
+  </section>
+</div>
diff --git a/app/cells/decidim/alternative_landing/content_blocks/stack_horizontal/show.erb b/app/cells/decidim/alternative_landing/content_blocks/stack_horizontal/show.erb
index fcb459c..0a0c75c 100644
--- a/app/cells/decidim/alternative_landing/content_blocks/stack_horizontal/show.erb
+++ b/app/cells/decidim/alternative_landing/content_blocks/stack_horizontal/show.erb
@@ -1,24 +1,20 @@
-<section class="alternative-landing stack-horizontal">
-  <div class="row">
-    <h1 class="heading1">
-      <%= decidim_sanitize translated_title %>
-    </h1>
-  </div>
-  <div class="row">
-    <% 1.upto(3) do |item_number| %>
-      <div class="stack-item">
-        <div class="stack-image">
-          <%= image_tag image(item_number) if image(item_number).present? %>
+<section class="stack-horizontal layout-2col__main content-block">
+  <h1 class="h1 decorator">
+    <%= decidim_sanitize translated_title %>
+  </h1>
+  <% 1.upto(3) do |item_number| %>
+    <div class="stack-item">
+      <div class="stack-image">
+        <%= image_tag image(item_number) if image(item_number).present? %>
+      </div>
+      <div class="stack-body">
+        <div>
+          <%= decidim_sanitize translated_body(item_number) %>
         </div>
-        <div class="stack-body">
-          <div>
-            <%= decidim_sanitize translated_body(item_number) %>
-          </div>
-          <div class="stack-link">
-            <%= translated_link(item_number, classes: "button button--sc secondary expanded") %>
-          </div>
+        <div class="stack-link">
+          <%= translated_link(item_number, classes: "button button__lg button__primary") %>
         </div>
       </div>
-    <% end %>
-  </div>
+    </div>
+  <% end %>
 </section>
diff --git a/app/cells/decidim/alternative_landing/content_blocks/stack_horizontal_settings_form/show.erb b/app/cells/decidim/alternative_landing/content_blocks/stack_horizontal_settings_form/show.erb
index 63e94d7..c100392 100644
--- a/app/cells/decidim/alternative_landing/content_blocks/stack_horizontal_settings_form/show.erb
+++ b/app/cells/decidim/alternative_landing/content_blocks/stack_horizontal_settings_form/show.erb
@@ -3,10 +3,10 @@
 
     <% 1.upto(3) do |item_number| %>
       <div class="grid-x">
-        <div class="large-6 p-xs">
+        <div class="large">
           <%= settings_fields.translated :text_area, :"body_#{item_number}", rows: 5, label: t(".body_n", item_number: item_number) %>
         </div>
-        <div class="large-6 p-xs">
+        <div class="large">
           <%= settings_fields.translated :text_field, :"link_text_#{item_number}", label: t(".link_text_n", item_number: item_number) %>
           <%= settings_fields.translated :text_field, :"link_url_#{item_number}", label: t(".link_url_n", item_number: item_number) %>
         </div>
@@ -17,7 +17,7 @@
 <% form.fields_for :images, form.object.images do |images_fields| %>
   <div class="grid-x">
     <% 1.upto(3) do |item_number| %>
-      <div class="large-4 p-xs">
+      <div class="large">
         <%= images_fields.upload :"image_#{item_number}", label: t(".image_n", item_number: item_number) %>
       </div>
     <% end %>
diff --git a/app/cells/decidim/alternative_landing/content_blocks/stack_vertical/show.erb b/app/cells/decidim/alternative_landing/content_blocks/stack_vertical/show.erb
index 27ee257..826ebbc 100644
--- a/app/cells/decidim/alternative_landing/content_blocks/stack_vertical/show.erb
+++ b/app/cells/decidim/alternative_landing/content_blocks/stack_vertical/show.erb
@@ -1,29 +1,25 @@
-<section class="alternative-landing stack-vertical">
-  <div class="row">
-    <h1 class="heading1">
-      <%= decidim_sanitize translated_title %>
-    </h1>
-  </div>
-  <div class="row">
-    <div class="stack">
-      <% 1.upto(3) do |item_number| %>
-        <div class="stack-item">
-          <div class="stack-image">
-            <%= image_tag image(item_number) if image(item_number).present? %>
-          </div>
-          <ul class="stack-tags tags">
-            <li>
-              <%= translated_tag(item_number, classes: "") %>
-            </li>
-          </ul>
-          <div class="stack-body">
-            <%= decidim_sanitize translated_body(item_number) %>
-          </div>
-          <div class="stack-link">
-            <%= translated_link(item_number, classes: "button button--sc expanded") %>
-          </div>
+<section class="stack-vertical layout-2col__main content-block">
+  <h1 class="h1 decorator">
+    <%= decidim_sanitize translated_title %>
+  </h1>
+  <div class="stack">
+    <% 1.upto(3) do |item_number| %>
+      <div class="stack-item">
+        <div class="stack-image">
+          <%= image_tag image(item_number) if image(item_number).present? %>
+        </div>
+        <ul class="stack-tags tags">
+          <li>
+            <%= translated_tag(item_number, classes: "label success") %>
+          </li>
+        </ul>
+        <div class="stack-body">
+          <%= decidim_sanitize translated_body(item_number) %>
+        </div>
+        <div class="stack-link">
+          <%= translated_link(item_number, classes: "button button__lg button__primary stack-button") %>
         </div>
-      <% end %>
-    </div>
+      </div>
+    <% end %>
   </div>
 </section>
diff --git a/app/cells/decidim/alternative_landing/content_blocks/tiles/show.erb b/app/cells/decidim/alternative_landing/content_blocks/tiles/show.erb
index 2a4946e..9311f11 100644
--- a/app/cells/decidim/alternative_landing/content_blocks/tiles/show.erb
+++ b/app/cells/decidim/alternative_landing/content_blocks/tiles/show.erb
@@ -1,13 +1,13 @@
-<section class="alternative-landing tiles-4">
+<section id="<%= id_type %>" class="alternative-landing tiles-4">
   <div class="tiles">
-    <h1 class="tile tile-heading heading1">
+    <h1 class="tile tile-heading heading1 h1">
       <%= decidim_sanitize translated_title %>
     </h1>
     <% 1.upto(4) do |item_number| %>
       <div class="tile tile-<%= item_number %>" style="background-image:url(<%= background_image(item_number) %>);">
         <div class="tile-body">
-          <h2><%= decidim_sanitize translated_title(item_number) %></h2>
-          <div><%= decidim_sanitize translated_body(item_number) %></div>
+          <h2 class="h2"><%= decidim_sanitize translated_title(item_number) %></h2>
+          <div class="rich-text-display"><p><br><%= decidim_sanitize translated_body(item_number) %></p></div>
         </div>
       </div>
     <% end %>
diff --git a/app/cells/decidim/alternative_landing/content_blocks/tiles_cell.rb b/app/cells/decidim/alternative_landing/content_blocks/tiles_cell.rb
index 188f426..00c812e 100644
--- a/app/cells/decidim/alternative_landing/content_blocks/tiles_cell.rb
+++ b/app/cells/decidim/alternative_landing/content_blocks/tiles_cell.rb
@@ -25,6 +25,11 @@ def translated_url(item_number)
         def background_image(item_number)
           model.images_container.attached_uploader("background_image_#{item_number}".to_sym).path(variant: :landscape)
         end
+
+        def id_type
+          process_group_url = "processes_groups"
+          request.url.include?(process_group_url) ? "hero-1" : ""
+        end
       end
     end
   end
diff --git a/app/cells/decidim/alternative_landing/content_blocks/tiles_settings_form/show.erb b/app/cells/decidim/alternative_landing/content_blocks/tiles_settings_form/show.erb
index e56ae2e..02d8751 100644
--- a/app/cells/decidim/alternative_landing/content_blocks/tiles_settings_form/show.erb
+++ b/app/cells/decidim/alternative_landing/content_blocks/tiles_settings_form/show.erb
@@ -3,7 +3,7 @@
 
   <div class="grid-x">
     <% 1.upto(4) do |item_number| %>
-      <div class="large-3 p-xs">
+      <div class="large">
         <%= settings_fields.translated :text_field, :"title_#{item_number}", label: t(".title_n", item_number: item_number) %>
         <%= settings_fields.translated :text_area, :"body_#{item_number}", rows: 3, label: t(".body_n", item_number: item_number) %>
         <%= settings_fields.translated :text_field, :"link_url_#{item_number}", label: t(".link_url_n", item_number: item_number) %>
@@ -15,7 +15,7 @@
 <% form.fields_for :images, form.object.images do |images_fields| %>
   <div class="grid-x">
     <% 1.upto(4) do |item_number| %>
-      <div class="large-3 p-xs">
+      <div class="large">
         <%= images_fields.upload :"background_image_#{item_number}", label: t(".background_image_n", item_number: item_number) %>
       </div>
     <% end %>
diff --git a/app/cells/decidim/participatory_process_groups/content_blocks/title_cell.rb b/app/cells/decidim/participatory_process_groups/content_blocks/title_cell.rb
new file mode 100644
index 0000000..7822ca6
--- /dev/null
+++ b/app/cells/decidim/participatory_process_groups/content_blocks/title_cell.rb
@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcessGroups
+    module ContentBlocks
+      class TitleCell < Decidim::ViewModel
+        include Decidim::SanitizeHelper
+        include Decidim::IconHelper
+        include Decidim::TwitterSearchHelper
+
+        delegate :group_url, to: :participatory_process_group
+
+        def participatory_process_group
+          @participatory_process_group ||= Decidim::ParticipatoryProcessGroup.find(model.scoped_resource_id)
+        end
+
+        def hashtag_text
+          @hashtag_text ||= decidim_html_escape(participatory_process_group.hashtag || "")
+        end
+
+        def has_hashtag?
+          hashtag_text.present?
+        end
+
+        def has_group_url?
+          group_url.present?
+        end
+
+        def meta_scope
+          @meta_scope ||= translated_attribute(participatory_process_group.meta_scope)
+        end
+
+        def has_meta_scope?
+          meta_scope.present?
+        end
+
+        def group_url_text
+          group_uri.host + group_uri.path
+        end
+
+        def decidim_participatory_processes
+          Decidim::ParticipatoryProcesses::Engine.routes.url_helpers
+        end
+
+        def participatory_processes_count
+          @participatory_processes_count ||= processes.count
+        end
+
+        private
+
+        def processes
+          @processes ||= Decidim::ParticipatoryProcesses::GroupPublishedParticipatoryProcesses.new(
+            participatory_process_group,
+            current_user
+          ).query
+        end
+
+        def group_uri
+          @group_uri = URI.parse(group_url)
+        end
+      end
+    end
+  end
+end
diff --git a/app/packs/images/decidim/alternative_landing/chevron-left.svg b/app/packs/images/decidim/alternative_landing/chevron-left.svg
new file mode 100644
index 0000000..87c3f08
--- /dev/null
+++ b/app/packs/images/decidim/alternative_landing/chevron-left.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="15" width="13" viewBox="0 0 320 512"><!--!Font Awesome Free 6.6.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path fill="#ffffff" d="M9.4 233.4c-12.5 12.5-12.5 32.8 0 45.3l192 192c12.5 12.5 32.8 12.5 45.3 0s12.5-32.8 0-45.3L77.3 256 246.6 86.6c12.5-12.5 12.5-32.8 0-45.3s-32.8-12.5-45.3 0l-192 192z"/></svg>
\ No newline at end of file
diff --git a/app/packs/images/decidim/alternative_landing/chevron-right.svg b/app/packs/images/decidim/alternative_landing/chevron-right.svg
new file mode 100644
index 0000000..caefa0e
--- /dev/null
+++ b/app/packs/images/decidim/alternative_landing/chevron-right.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="15" width="13" viewBox="0 0 320 512"><!--!Font Awesome Free 6.6.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path fill="#ffffff" d="M310.6 233.4c12.5 12.5 12.5 32.8 0 45.3l-192 192c-12.5 12.5-32.8 12.5-45.3 0s-12.5-32.8 0-45.3L242.7 256 73.4 86.6c-12.5-12.5-12.5-32.8 0-45.3s32.8-12.5 45.3 0l192 192z"/></svg>
\ No newline at end of file
diff --git a/app/packs/src/decidim/alternative_landing/decidim_fullcalendar.js b/app/packs/src/decidim/alternative_landing/decidim_fullcalendar.js
index dfac575..1c775fb 100644
--- a/app/packs/src/decidim/alternative_landing/decidim_fullcalendar.js
+++ b/app/packs/src/decidim/alternative_landing/decidim_fullcalendar.js
@@ -6,16 +6,15 @@ $(() => {
     return filters.filter((element) => element !== filter)
   }
 
+  const events = JSON.parse(decodeURIComponent(target.dataset.events)).map((event, index) => ({
+    id: index + 1,
+    ...event
+  }));
+
   const calendarEl = document.getElementById('calendar');
   const calendar = new Calendar(calendarEl, {
     plugins: [timeGridPlugin, dayGridPlugin],
-    defaultView: "dayGridMonth",
     locale: "es",
-    header: {
-      left: "prev,next today",
-      center: "title",
-      right: "dayGridMonth,dayGridWeek,dayGridDay"
-    },
     height: "auto",
     eventTimeFormat: {
       hour: "2-digit",
@@ -23,18 +22,13 @@ $(() => {
       hour12: false,
       omitZeroMinute: false
     },
-    events: JSON.parse(decodeURIComponent(target.dataset.events)),
-    eventRender: function(info) {
-      if ("subtitle" in info.event.extendedProps) {
-        title = "<span class=\"fc-title\"><b>" + info.event.title + "</b> - " + info.event.extendedProps.subtitle + "</span>"
-        info.el.firstChild.innerHTML = title
-      }
-      return filters.includes(info.event.extendedProps.resourceId);
-    }
+    events: events
   });
+
   $(function() {
     calendar.setOption('locale', target.dataset.locale);
     calendar.render();
+    const initialEvents = calendar.getEvents()
     $(".cal-filter").on("click", function() {
       $(this).toggleClass("hollow");
       let filter = $(this).attr("id");
@@ -43,7 +37,33 @@ $(() => {
       } else {
         filters.push(filter)
       }
-      calendar.rerenderEvents()
+      filterEvents(initialEvents);
     });
   });
+
+  function getCurrentEventsIds() {
+    return calendar.getEvents().map(event => event.id);
+  }
+
+  function filterEvents(initialEvents) {
+    const currentEventsIds = getCurrentEventsIds();
+    const currentEvents = calendar.getEvents();
+    
+    initialEvents.forEach(event => {
+      if (filters.includes(event._def.extendedProps.resourceId) && !currentEventsIds.includes(event.id)) {
+        calendar.addEvent(event);
+      }
+    });
+
+    const eventsToRemove = currentEvents.filter(event => 
+      !filters.includes(event._def.extendedProps.resourceId)
+    ).map(event => event.id);
+  
+    eventsToRemove.forEach(eventId => {
+      const event = calendar.getEventById(eventId);
+      if (event) {
+        event.remove();
+      }
+    });
+  }
 });
diff --git a/app/packs/stylesheets/decidim/alternative_landing/alternative_landing.scss b/app/packs/stylesheets/decidim/alternative_landing/alternative_landing.scss
index db64b51..d56cea1 100644
--- a/app/packs/stylesheets/decidim/alternative_landing/alternative_landing.scss
+++ b/app/packs/stylesheets/decidim/alternative_landing/alternative_landing.scss
@@ -1,6 +1,7 @@
 @import "stylesheets/decidim/alternative_landing/content_blocks/variables";
 @import "stylesheets/decidim/alternative_landing/content_blocks/calendar";
 @import "stylesheets/decidim/alternative_landing/content_blocks/cover";
+@import "stylesheets/decidim/alternative_landing/content_blocks/extra_title";
 @import "stylesheets/decidim/alternative_landing/content_blocks/shared";
 @import "stylesheets/decidim/alternative_landing/content_blocks/stack_vertical";
 @import "stylesheets/decidim/alternative_landing/content_blocks/stack_horizontal";
diff --git a/app/packs/stylesheets/decidim/alternative_landing/content_blocks/calendar.scss b/app/packs/stylesheets/decidim/alternative_landing/content_blocks/calendar.scss
index 48fb2f9..9dc4838 100644
--- a/app/packs/stylesheets/decidim/alternative_landing/content_blocks/calendar.scss
+++ b/app/packs/stylesheets/decidim/alternative_landing/content_blocks/calendar.scss
@@ -41,6 +41,14 @@ $calendar-button-color: $dark-gray;
 }
 
 #calendar {
+  .fc-icon.fc-icon-chevron-left::before {
+    content: url("images/decidim/alternative_landing/chevron-left.svg");
+  }
+
+  .fc-icon.fc-icon-chevron-right::before {
+    content: url("images/decidim/alternative_landing/chevron-right.svg");
+  }
+
   table {
     margin-bottom: 0;
   }
@@ -49,6 +57,10 @@ $calendar-button-color: $dark-gray;
     border-color: $light-gray !important;
   }
 
+  .fc-timegrid-slots tr:nth-child(even) {
+    background-color: #F2F2F2;
+  }
+
   .fc-button-primary {
     @include calendar-button-style($calendar-button-color);
 
diff --git a/app/packs/stylesheets/decidim/alternative_landing/content_blocks/cover.scss b/app/packs/stylesheets/decidim/alternative_landing/content_blocks/cover.scss
index 6ca9f84..681aa15 100644
--- a/app/packs/stylesheets/decidim/alternative_landing/content_blocks/cover.scss
+++ b/app/packs/stylesheets/decidim/alternative_landing/content_blocks/cover.scss
@@ -12,6 +12,13 @@
 .cover-half {
   .cover-body {
     font-size: 1.25em;
+    padding-top: $gap;
+  }
+
+  .cover-body p {
+    padding-top: 1rem;
+    margin-bottom: 1rem;
+    line-height: 1.6;
   }
 }
 
@@ -22,8 +29,18 @@
 
   .cover-text {
     background-color: rgba(var(--color_background_text-rgb), var(--opacity_background_text));
-    padding: $gap * 2;
+    padding: $gap * 4;
+    width: 50%;
+  }
+
+  @include breakpoint(medium down) {
+    .cover-text {
+      width: 100%;
+      padding: 5%;
+      justify-content: center;
+    }
   }
+
 }
 
 .cover-half {
@@ -36,10 +53,6 @@
     @include cover-background-image(var(--color_background_image-rgb), var(--opacity_background_image));
   }
 
-  .cover-text {
-    padding: $gap * 3;
-  }
-
   @include breakpoint(medium down) {
     display: block;
 
@@ -49,6 +62,7 @@
 
     .cover-text {
       padding: $gap;
+      width: 100%;
     }
   }
 }
@@ -58,3 +72,7 @@
   position: relative;
   margin-bottom: -50px;
 }
+
+.heading1 {
+  font-size: 4em;
+}
diff --git a/app/packs/stylesheets/decidim/alternative_landing/content_blocks/extra_title.scss b/app/packs/stylesheets/decidim/alternative_landing/content_blocks/extra_title.scss
new file mode 100644
index 0000000..58a7cd0
--- /dev/null
+++ b/app/packs/stylesheets/decidim/alternative_landing/content_blocks/extra_title.scss
@@ -0,0 +1,38 @@
+@import "stylesheets/decidim/alternative_landing/content_blocks/variables";
+
+.extra-title {
+   .links-list {
+      display: flex;
+      flex-direction: column;
+   }
+
+   .links-list span {
+      display: inline-flex;
+      align-items: center;
+      gap: 0.25rem;
+      font-size: 16px;
+      line-height: 20px;
+      --tw-text-opacity: 1;
+   }
+
+   .link {
+      display: flex;
+   }
+
+   .link svg {
+      height: 0.875rem;
+      width: 0.875rem;
+      fill: currentColor;
+      color: #6B7280CC;
+   }
+
+   @include breakpoint(medium down) {
+      display: flex;
+      flex-direction: column;
+
+      .participatory-space-group__content-block-metadata {
+         display: flex;
+         flex-direction: column;
+      }
+   }
+}
diff --git a/app/packs/stylesheets/decidim/alternative_landing/content_blocks/stack_horizontal.scss b/app/packs/stylesheets/decidim/alternative_landing/content_blocks/stack_horizontal.scss
index 047292b..565b742 100644
--- a/app/packs/stylesheets/decidim/alternative_landing/content_blocks/stack_horizontal.scss
+++ b/app/packs/stylesheets/decidim/alternative_landing/content_blocks/stack_horizontal.scss
@@ -2,9 +2,10 @@
 
 .stack-horizontal {
   .stack-item {
-    border: 1px solid black;
+    border: 4px solid rgb(243 244 247);
     padding: $gap;
     margin: $gap auto;
+    width: 100%;
 
     display: flex;
     gap: $gap;
@@ -29,7 +30,7 @@
   }
 
   .stack-link .button {
-    max-width: 15em;
+    width: 25%;
     margin: 0;
     float: right;
   }
@@ -45,7 +46,7 @@
 
     .stack-link .button {
       margin: $gap auto 0;
-      max-width: none;
+      width: 100%;
       float: none;
     }
   }
diff --git a/app/packs/stylesheets/decidim/alternative_landing/content_blocks/stack_vertical.scss b/app/packs/stylesheets/decidim/alternative_landing/content_blocks/stack_vertical.scss
index cc41330..ff7ee40 100644
--- a/app/packs/stylesheets/decidim/alternative_landing/content_blocks/stack_vertical.scss
+++ b/app/packs/stylesheets/decidim/alternative_landing/content_blocks/stack_vertical.scss
@@ -3,7 +3,6 @@
 .stack-vertical {
   .stack {
     display: flex;
-    gap: $gap;
 
     .stack-item {
       display: flex;
@@ -16,6 +15,10 @@
         min-height: 15em;
         object-fit: cover;
       }
+
+      .stack-body {
+        line-height: 1.3;
+      }
     }
 
     .stack-tags {
@@ -26,6 +29,10 @@
       }
     }
 
+    .stack-button {
+      width: 100%;
+    }
+
     @include breakpoint(medium down) {
       flex-direction: column;
     }
diff --git a/app/packs/stylesheets/decidim/alternative_landing/content_blocks/tiles.scss b/app/packs/stylesheets/decidim/alternative_landing/content_blocks/tiles.scss
index ed5dcba..023686f 100644
--- a/app/packs/stylesheets/decidim/alternative_landing/content_blocks/tiles.scss
+++ b/app/packs/stylesheets/decidim/alternative_landing/content_blocks/tiles.scss
@@ -3,12 +3,13 @@
 .tiles-4 {
   .tiles {
     display: grid;
-    grid-template-columns: 30% 30% 40%;
+    grid-template-columns: 29% 29% 40%;
     grid-template-rows: repeat(2, 1fr);
     min-height: 100vh;
     color: white;
-
-    gap: $gap;
+    gap: 1%;
+    padding-bottom: $gap;
+    overflow-x: hidden;
   }
 
   .tile {
@@ -20,7 +21,7 @@
     padding: $gap;
 
     .tile-body {
-      max-width: 20em;
+      max-width: 14em;
       background: $alternative-color-1;
       padding: $gap;
 
@@ -58,6 +59,7 @@
 @include breakpoint(medium down) {
   .tiles {
     display: block;
+    grid-template-columns: 29% 29% 40%;
   }
 
   .tile {
diff --git a/lib/decidim/alternative_landing/test/factories.rb b/lib/decidim/alternative_landing/test/factories.rb
index 2858677..b0cf564 100644
--- a/lib/decidim/alternative_landing/test/factories.rb
+++ b/lib/decidim/alternative_landing/test/factories.rb
@@ -182,7 +182,7 @@
       {
         link_text_1: Decidim::Faker::Localized.word,
         link_url_1: "https://decidim.org",
-        link_icon_name_1: "instagram"
+        link_icon_name_1: "instagram-line"
       }
     end
     # rubocop:enable Naming/VariableNumber
diff --git a/lib/decidim/alternative_landing/version.rb b/lib/decidim/alternative_landing/version.rb
index 02b98b1..e8d0c74 100644
--- a/lib/decidim/alternative_landing/version.rb
+++ b/lib/decidim/alternative_landing/version.rb
@@ -5,6 +5,6 @@ module Decidim
   module AlternativeLanding
     VERSION = "0.4.0"
     DECIDIM_VERSION = "0.27.2"
-    COMPAT_DECIDIM_VERSION = [">= 0.27.0", "< 0.28"].freeze
+    COMPAT_DECIDIM_VERSION = [">= 0.28.0", "< 0.29"].freeze
   end
 end
diff --git a/spec/lib/overrides_spec.rb b/spec/lib/overrides_spec.rb
index 21ff9bb..0578337 100644
--- a/spec/lib/overrides_spec.rb
+++ b/spec/lib/overrides_spec.rb
@@ -9,24 +9,20 @@
   {
     package: "decidim-core",
     files: {
-      "/app/controllers/decidim/homepage_controller.rb" => "32b76eccc946735d60a4ae9244137bb2"
+      "/app/controllers/decidim/homepage_controller.rb" => "9fe738a33e271c92071e641be10a2833"
     }
   },
   {
     package: "decidim-participatory_processes",
     files: {
-      "/app/cells/decidim/participatory_process_groups/content_blocks/title_cell.rb" => "65d3f0094c1e57f8ae48e171c1f83b7e",
-      "/app/cells/decidim/participatory_process_groups/content_blocks/title/show.erb" => "9739bffc9bbba8017bd8b5b5920065fe",
-      "/app/controllers/decidim/participatory_processes/participatory_process_groups_controller.rb" => "dfcb6e08afd32f34b43a5caa93281973"
+      "/app/controllers/decidim/participatory_processes/participatory_process_groups_controller.rb" => "ea8695da6fa62b2de904d0413579bf49"
     }
   }
 ]
 
 describe "Overriden files", type: :view do
   checksums.each do |item|
-    # rubocop:disable Rails/DynamicFindBy
-    spec = ::Gem::Specification.find_by_name(item[:package])
-    # rubocop:enable Rails/DynamicFindBy
+    spec = Gem::Specification.find_by_name(item[:package])
     item[:files].each do |file, signature|
       it "#{spec.gem_dir}#{file} matches checksum" do
         expect(md5("#{spec.gem_dir}#{file}")).to eq(signature)
diff --git a/spec/shared/system_admin_homepage_examples.rb b/spec/shared/system_admin_homepage_examples.rb
index 824b159..c0eca51 100644
--- a/spec/shared/system_admin_homepage_examples.rb
+++ b/spec/shared/system_admin_homepage_examples.rb
@@ -1,6 +1,11 @@
 # frozen_string_literal: true
 
 shared_examples "increase number of content blocks" do |text|
+  before do
+    click_on "Add content block"
+    click_on text
+  end
+
   it "increases the number of active content blocks" do
     content_block = find("ul.js-list-availables li", text: text)
     active_blocks_list = find("ul.js-list-actives")
@@ -12,14 +17,14 @@
 
 shared_examples "updates the content block" do |manifest_name|
   it "updates the settings of the content block" do
-    visit decidim_admin.edit_organization_homepage_content_block_path(manifest_name.to_sym)
+    visit decidim_admin.edit_organization_homepage_content_block_path(id)
 
     fill_in(
       :content_block_settings_title_en,
       with: "Custom #{manifest_name} title text!"
     )
 
-    click_button "Update"
+    click_on "Update"
     visit decidim.root_path
     expect(page).to have_content(/Custom #{manifest_name} title text!/i)
   end
diff --git a/spec/shared/system_admin_process_group_landing_examples.rb b/spec/shared/system_admin_process_group_landing_examples.rb
index 764937a..8e2d639 100644
--- a/spec/shared/system_admin_process_group_landing_examples.rb
+++ b/spec/shared/system_admin_process_group_landing_examples.rb
@@ -2,7 +2,7 @@
 
 shared_examples "updates the content block extra title" do
   it "updates the settings of the content block" do
-    visit "/admin/participatory_process_groups/#{participatory_process_group.id}/landing_page/content_blocks/extra_title/edit"
+    visit "/admin/participatory_process_groups/#{participatory_process_group.id}/landing_page/content_blocks/#{id}/edit"
 
     fill_in(
       :content_block_settings_link_text_1_en,
@@ -14,7 +14,7 @@
       with: "https://google.es"
     )
     # rubocop:enable Naming/VariableNumber
-    click_button "Update"
+    click_on "Update"
     visit decidim_participatory_processes.participatory_process_group_path(participatory_process_group)
     expect(page).to have_content(/Custom extra title link text!/i)
   end
@@ -22,19 +22,13 @@
 
 shared_examples "updates the content block extra information" do
   it "updates the settings of the content block" do
-    visit "/admin/participatory_process_groups/#{participatory_process_group.id}/landing_page/content_blocks/extra_information/edit"
+    visit "/admin/participatory_process_groups/#{participatory_process_group.id}/landing_page/content_blocks/#{id}/edit"
 
-    editor = find(".ql-editor")
+    editor = find(".editor-input > div:first-child")
     editor.set("Custom extra information body text!")
 
-    fill_in(
-      :content_block_settings_columns,
-      with: 2
-    )
-
-    click_button "Update"
+    click_on "Update"
     visit decidim_participatory_processes.participatory_process_group_path(participatory_process_group)
     expect(page).to have_content(/Custom extra information body text!/i)
-    expect(page).to have_css(".columns.large-2")
   end
 end
diff --git a/spec/shared/system_homepage_examples.rb b/spec/shared/system_homepage_examples.rb
index 9fa3459..dc8d6aa 100644
--- a/spec/shared/system_homepage_examples.rb
+++ b/spec/shared/system_homepage_examples.rb
@@ -8,8 +8,8 @@
 
   it "renders all elements" do
     visit decidim.root_path
-    expect(page).to have_selector(".alternative-landing.#{type}")
-    within ".alternative-landing.#{type}" do
+    expect(page).to have_css(".#{type}")
+    within ".#{type}" do
       expect(page).to have_i18n_content(content_block.settings.title)
 
       1.upto(3) do |item_number|
@@ -29,14 +29,14 @@
               expect(page).to have_i18n_content(content_block.settings.send(:"body_#{item_number}"))
 
               within ".stack-link" do
-                expect(page).to have_i18n_content(content_block.settings.send(:"link_text_#{item_number}"), upcase: true)
-                expect(page).to have_selector("a[href='/link?external_url=#{CGI.escape(translated(content_block.settings.send(:"link_url_#{item_number}")))}']")
+                expect(page).to have_i18n_content(content_block.settings.send(:"link_text_#{item_number}"))
+                expect(page).to have_css("a[href='#{translated(content_block.settings.send(:"link_url_#{item_number}"))}']")
               end
             end
           else
             within ".stack-tags" do
               expect(page).to have_i18n_content(content_block.settings.send(:"tag_text_#{item_number}"))
-              expect(page).to have_selector("a[href='/link?external_url=#{CGI.escape(translated(content_block.settings.send(:"tag_url_#{item_number}")))}']")
+              expect(page).to have_css("a[href='#{translated(content_block.settings.send(:"tag_url_#{item_number}"))}']")
             end
 
             within ".stack-body" do
@@ -44,8 +44,8 @@
             end
 
             within ".stack-link" do
-              expect(page).to have_i18n_content(content_block.settings.send(:"link_text_#{item_number}"), upcase: true)
-              expect(page).to have_selector("a[href='/link?external_url=#{CGI.escape(translated(content_block.settings.send(:"link_url_#{item_number}")))}']")
+              expect(page).to have_i18n_content(content_block.settings.send(:"link_text_#{item_number}"))
+              expect(page).to have_css("a[href='#{translated(content_block.settings.send(:"link_url_#{item_number}"))}']")
             end
           end
         end
@@ -62,7 +62,7 @@
 
   it "renders all elements" do
     visit decidim.root_path
-    expect(page).to have_selector(".alternative-landing.#{type}")
+    expect(page).to have_css(".#{type}")
     # ActiveStorage is generating an url with a different token per session, example:
     # /rails/active_storage/representation/redirect/same-hash--different-token/same-file-name
     # That's why we are splitting by "--" and comparing the first
@@ -72,7 +72,7 @@
       expect(page.find(".cover-image")[:style]).to match(/#{regex}/) if type == "cover-half"
     end
 
-    within ".alternative-landing.#{type}" do
+    within ".#{type}" do
       within ".cover-text" do
         within ".cover-title" do
           expect(page).to have_i18n_content(content_block.settings.title)
@@ -90,7 +90,7 @@
 
   it "renders all elements" do
     visit decidim.root_path
-    expect(page).to have_selector(".alternative-landing.tiles-4")
+    expect(page).to have_css(".alternative-landing.tiles-4")
     within ".alternative-landing.tiles-4" do
       within ".tiles" do
         within ".tile-heading" do
diff --git a/spec/system/admin_homepage_spec.rb b/spec/system/admin_homepage_spec.rb
index 4f2efa1..f5babe8 100644
--- a/spec/system/admin_homepage_spec.rb
+++ b/spec/system/admin_homepage_spec.rb
@@ -3,15 +3,15 @@
 require "spec_helper"
 require "shared/system_admin_homepage_examples"
 
-describe "Admin visits homepage settings", type: :system do
+describe "Admin visits homepage settings" do
   include ActionView::Helpers::SanitizeHelper
 
   let(:organization) { create(:organization) }
   let(:user) { create(:user, :admin, :confirmed, organization: organization) }
-  let(:blogs_component) { create(:component, manifest_name: "blogs", organization: organization) }
-  let(:meetings_component) { create(:component, manifest_name: "meetings", organization: organization) }
+  let(:blogs_component) { create(:component, manifest_name: "blogs", skip_injection: true, organization: organization) }
+  let(:meetings_component) { create(:component, manifest_name: "meetings", skip_injection: true, organization: organization) }
   let!(:post) { create(:post, component: blogs_component) }
-  let!(:meeting) { create :meeting, component: meetings_component }
+  let!(:meeting) { create(:meeting, component: meetings_component) }
 
   before do
     switch_to_host(organization.host)
@@ -29,6 +29,7 @@
     end
 
     it "renders all alternative landing content blocks" do
+      click_on "Add content block"
       expect(page).to have_content("Upcoming meetings (Alternative)")
       expect(page).to have_content("Stack of 3 custom items (Horizontal)")
       expect(page).to have_content("Stack of 3 custom items (Vertical)")
@@ -53,28 +54,42 @@
     end
 
     context "when editing a persisted content block" do
-      let!(:alternative_upcoming_meetings_block) { create :alternative_upcoming_meetings_block, organization: organization, scope_name: :homepage, component_id: meetings_component.id }
-      let!(:cover_full_block) { create :content_block, organization: organization, manifest_name: "cover_full", scope_name: :homepage }
-      let!(:cover_half_block) { create :cover_half_block, organization: organization, scope_name: :homepage }
-      let!(:latest_blog_posts_block) { create :latest_blog_posts_block, organization: organization, scope_name: :homepage, component_id: blogs_component.id }
-      let!(:stack_horizontal_block) { create :stack_horizontal_block, organization: organization, scope_name: :homepage }
-      let!(:stack_vertical_block) { create :stack_vertical_block, organization: organization, scope_name: :homepage }
-      let!(:tiles_block) { create :tiles_block, organization: organization, scope_name: :homepage }
+      let!(:alternative_upcoming_meetings_block) { create(:alternative_upcoming_meetings_block, organization: organization, scope_name: :homepage, component_id: meetings_component.id) }
+      let!(:cover_full_block) { create(:content_block, organization: organization, manifest_name: "cover_full", scope_name: :homepage) }
+      let!(:cover_half_block) { create(:cover_half_block, organization: organization, scope_name: :homepage) }
+      let!(:latest_blog_posts_block) { create(:latest_blog_posts_block, organization: organization, scope_name: :homepage, component_id: blogs_component.id) }
+      let!(:stack_horizontal_block) { create(:stack_horizontal_block, organization: organization, scope_name: :homepage) }
+      let!(:stack_vertical_block) { create(:stack_vertical_block, organization: organization, scope_name: :homepage) }
+      let!(:tiles_block) { create(:tiles_block, organization: organization, scope_name: :homepage) }
 
-      it_behaves_like "updates the content block", "alternative_upcoming_meetings"
-      it_behaves_like "updates the content block", "cover_full"
-      it_behaves_like "updates the content block", "cover_half"
-      it_behaves_like "updates the content block", "latest_blog_posts"
-      it_behaves_like "updates the content block", "stack_horizontal"
-      it_behaves_like "updates the content block", "stack_vertical"
-      it_behaves_like "updates the content block", "tiles"
+      it_behaves_like "updates the content block", "alternative_upcoming_meetings" do
+        let!(:id) { alternative_upcoming_meetings_block.id }
+      end
+      it_behaves_like "updates the content block", "cover_full" do
+        let!(:id) { cover_full_block.id }
+      end
+      it_behaves_like "updates the content block", "cover_half" do
+        let!(:id) { cover_half_block.id }
+      end
+      it_behaves_like "updates the content block", "latest_blog_posts" do
+        let!(:id) { latest_blog_posts_block.id }
+      end
+      it_behaves_like "updates the content block", "stack_horizontal" do
+        let!(:id) { stack_horizontal_block.id }
+      end
+      it_behaves_like "updates the content block", "stack_vertical" do
+        let!(:id) { stack_vertical_block.id }
+      end
+      it_behaves_like "updates the content block", "tiles" do
+        let!(:id) { tiles_block.id }
+      end
 
       it "updates the images of the content block" do
-        visit decidim_admin.edit_organization_homepage_content_block_path(:cover_full)
+        visit decidim_admin.edit_organization_homepage_content_block_path(cover_full_block.id)
 
         dynamically_attach_file(:content_block_images_background_image, Decidim::Dev.asset("city2.jpeg"))
 
-        click_button "Update"
+        click_on "Update"
         visit decidim.root_path
         expect(page.html).to include("city2.jpeg")
       end
diff --git a/spec/system/admin_spec.rb b/spec/system/admin_spec.rb
index 82710e8..95c4c97 100644
--- a/spec/system/admin_spec.rb
+++ b/spec/system/admin_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "Admin manages organization homepage", type: :system do
+describe "Admin manages organization homepage" do
   let(:organization) { create(:organization) }
   let(:user) { create(:user, :admin, :confirmed, organization: organization) }
 
@@ -12,10 +12,10 @@
   end
 
   context "when editing a cover_full content block" do
-    let!(:cover_full_block) { create :cover_full_block, organization: organization }
+    let!(:cover_full_block) { create(:cover_full_block, organization: organization) }
 
     before do
-      visit decidim_admin.edit_organization_homepage_content_block_path(:cover_full)
+      visit decidim_admin.edit_organization_homepage_content_block_path(cover_full_block.id)
     end
 
     it "updates the settings of the content block" do
@@ -23,7 +23,7 @@
         :content_block_settings_title_en,
         with: "Custom welcome text!"
       )
-      click_button "Update"
+      click_on "Update"
       visit decidim.root_path
       expect(page).to have_content("Custom welcome text!")
     end
@@ -31,17 +31,17 @@
     it "updates the images of the content block" do
       dynamically_attach_file(:content_block_images_background_image, Decidim::Dev.asset("city2.jpeg"), remove_before: true)
 
-      click_button "Update"
+      click_on "Update"
       visit decidim.root_path
       expect(page.html).to include("city2.jpeg")
     end
   end
 
   context "when editing a cover_half content block" do
-    let!(:cover_half_block) { create :cover_half_block, organization: organization }
+    let!(:cover_half_block) { create(:cover_half_block, organization: organization) }
 
     before do
-      visit decidim_admin.edit_organization_homepage_content_block_path(:cover_half)
+      visit decidim_admin.edit_organization_homepage_content_block_path(cover_half_block.id)
     end
 
     it "updates the settings of the content block" do
@@ -49,7 +49,7 @@
         :content_block_settings_title_en,
         with: "Hello there people!"
       )
-      click_button "Update"
+      click_on "Update"
       visit decidim.root_path
       expect(page).to have_content("Hello there people!")
     end
@@ -57,7 +57,7 @@
     it "updates the images of the content block" do
       dynamically_attach_file(:content_block_images_background_image, Decidim::Dev.asset("city3.jpeg"), remove_before: true)
 
-      click_button "Update"
+      click_on "Update"
       visit decidim.root_path
       expect(page.html).to include("city3.jpeg")
     end
@@ -73,7 +73,7 @@
     let!(:other_organization_blog_posts) { create_list(:post, 2, component: other_organization_blogs_component) }
 
     before do
-      visit decidim_admin.edit_organization_homepage_content_block_path(:latest_blog_posts)
+      visit decidim_admin.edit_organization_homepage_content_block_path(latest_blog_posts_block.id)
     end
 
     it "updates the settings of the content block" do
@@ -82,11 +82,11 @@
       fill_in :content_block_settings_link_url_en, with: "example.org/example-path"
       fill_in :content_block_settings_count, with: 4
 
-      click_button "Update"
+      click_on "Update"
       visit decidim.root_path
 
-      within ".alternative-landing.latest-blog-posts" do
-        expect(page).to have_content "LATEST BLOG POSTS"
+      within ".latest-blog-posts" do
+        expect(page).to have_content "Latest blog posts"
         expect(page).to have_link "See all", href: "example.org/example-path"
 
         blog_posts.each do |blog_post|
@@ -102,13 +102,13 @@
         end
       end
 
-      visit decidim_admin.edit_organization_homepage_content_block_path(:latest_blog_posts)
+      visit decidim_admin.edit_organization_homepage_content_block_path(latest_blog_posts_block.id)
       select blogs_component.name["en"], from: "Component"
 
-      click_button "Update"
+      click_on "Update"
       visit decidim.root_path
 
-      within ".alternative-landing.latest-blog-posts" do
+      within ".latest-blog-posts" do
         blog_posts.each do |blog_post|
           expect(page).to have_i18n_content(blog_post.title)
         end
@@ -134,7 +134,7 @@
     let!(:other_organization_meetings) { create_list(:meeting, 2, :upcoming, component: other_organization_meetings_component) }
 
     before do
-      visit decidim_admin.edit_organization_homepage_content_block_path(:alternative_upcoming_meetings)
+      visit decidim_admin.edit_organization_homepage_content_block_path(alternative_upcoming_meetings_block.id)
     end
 
     it "updates the settings of the content block" do
@@ -143,11 +143,11 @@
       fill_in :content_block_settings_link_url_en, with: "example.org/example-path"
       fill_in :content_block_settings_count, with: 4
 
-      click_button "Update"
+      click_on "Update"
       visit decidim.root_path
 
       within ".alternative-landing.upcoming-meetings" do
-        expect(page).to have_content "UPCOMING MEETINGS"
+        expect(page).to have_content "Upcoming meetings"
         expect(page).to have_link "See all", href: "example.org/example-path"
 
         meetings.each do |meeting|
@@ -163,10 +163,10 @@
         end
       end
 
-      visit decidim_admin.edit_organization_homepage_content_block_path(:alternative_upcoming_meetings)
+      visit decidim_admin.edit_organization_homepage_content_block_path(alternative_upcoming_meetings_block.id)
       select meetings_component.name["en"], from: "Component"
 
-      click_button "Update"
+      click_on "Update"
       visit decidim.root_path
 
       within ".alternative-landing.upcoming-meetings" do
diff --git a/spec/system/custom_colors_spec.rb b/spec/system/custom_colors_spec.rb
index d8fdf1f..97103b5 100644
--- a/spec/system/custom_colors_spec.rb
+++ b/spec/system/custom_colors_spec.rb
@@ -2,8 +2,8 @@
 
 require "spec_helper"
 
-describe "Custom colors", type: :system, perform_enqueued: true do
-  let(:organization) { create :organization, available_locales: [:en] }
+describe "Custom colors", :perform_enqueued do
+  let(:organization) { create(:organization, available_locales: [:en]) }
 
   let(:settings) { {} }
   let!(:cover_full_block) { create(:cover_full_block, organization: organization, settings: settings) }
diff --git a/spec/system/custom_opacities_spec.rb b/spec/system/custom_opacities_spec.rb
index c172e5a..6b04aaa 100644
--- a/spec/system/custom_opacities_spec.rb
+++ b/spec/system/custom_opacities_spec.rb
@@ -2,8 +2,8 @@
 
 require "spec_helper"
 
-describe "Custom opacities", type: :system, perform_enqueued: true do
-  let(:organization) { create :organization, available_locales: [:en] }
+describe "Custom opacities", :perform_enqueued do
+  let(:organization) { create(:organization, available_locales: [:en]) }
 
   let(:settings) { {} }
   let!(:cover_full_block) { create(:cover_full_block, organization: organization, settings: settings) }
diff --git a/spec/system/homepage_spec.rb b/spec/system/homepage_spec.rb
index 4985fd8..b6c5901 100644
--- a/spec/system/homepage_spec.rb
+++ b/spec/system/homepage_spec.rb
@@ -2,8 +2,8 @@
 
 require "spec_helper"
 
-describe "Visit the home page", type: :system, perform_enqueued: true do
-  let(:organization) { create :organization, available_locales: [:en] }
+describe "Visit the home page", :perform_enqueued do
+  let(:organization) { create(:organization, available_locales: [:en]) }
 
   before do
     switch_to_host(organization.host)
@@ -33,14 +33,14 @@
     end
 
     it "renders them" do
-      expect(page).to have_selector(".alternative-landing")
-      expect(page).to have_selector(".alternative-landing.cover-full")
-      expect(page).to have_selector(".alternative-landing.cover-half")
-      expect(page).to have_selector(".alternative-landing.stack-horizontal")
-      expect(page).to have_selector(".alternative-landing.stack-vertical")
-      expect(page).to have_selector(".alternative-landing.tiles-4")
-      expect(page).to have_selector(".alternative-landing.latest-blog-posts")
-      expect(page).to have_selector(".alternative-landing.upcoming-meetings")
+      expect(page).to have_css(".alternative-landing")
+      expect(page).to have_css(".alternative-landing.cover-full")
+      expect(page).to have_css(".cover-half")
+      expect(page).to have_css(".stack-horizontal")
+      expect(page).to have_css(".stack-vertical")
+      expect(page).to have_css(".alternative-landing.tiles-4")
+      expect(page).to have_css(".latest-blog-posts")
+      expect(page).to have_css(".alternative-landing.upcoming-meetings")
     end
 
     describe "cover blocks" do
@@ -80,9 +80,9 @@
 
     describe "latest_blog_posts block" do
       it "renders all elements" do
-        within ".alternative-landing.latest-blog-posts" do
-          expect(page).to have_i18n_content(latest_blog_posts_block.settings.title, upcase: true)
-          expect(page).to have_i18n_content(latest_blog_posts_block.settings.link_text, upcase: true)
+        within ".latest-blog-posts" do
+          expect(page).to have_i18n_content(latest_blog_posts_block.settings.title)
+          expect(page).to have_i18n_content(latest_blog_posts_block.settings.link_text)
           blog_posts.last(3).each do |blog_post|
             expect(page).to have_i18n_content(blog_post.title)
           end
@@ -96,8 +96,8 @@
     describe "alternative_upcoming_meetings block" do
       it "renders all elements" do
         within ".alternative-landing.upcoming-meetings" do
-          expect(page).to have_i18n_content(alternative_upcoming_meetings_block.settings.title, upcase: true)
-          expect(page).to have_i18n_content(alternative_upcoming_meetings_block.settings.link_text, upcase: true)
+          expect(page).to have_i18n_content(alternative_upcoming_meetings_block.settings.title)
+          expect(page).to have_i18n_content(alternative_upcoming_meetings_block.settings.link_text)
           sorted_meetings.last(3).each do |meeting|
             expect(page).to have_i18n_content(meeting.title)
           end
diff --git a/spec/system/latest_blog_posts_spec.rb b/spec/system/latest_blog_posts_spec.rb
index 219c8eb..f84fb49 100644
--- a/spec/system/latest_blog_posts_spec.rb
+++ b/spec/system/latest_blog_posts_spec.rb
@@ -2,8 +2,8 @@
 
 require "spec_helper"
 
-describe "Visit the home page", type: :system, perform_enqueued: true do
-  let(:organization) { create :organization, available_locales: [:en] }
+describe "Visit the home page", :perform_enqueued do
+  let(:organization) { create(:organization, available_locales: [:en]) }
 
   before do
     switch_to_host(organization.host)
@@ -27,13 +27,13 @@
       end
 
       it "renders it" do
-        expect(page).to have_selector(".alternative-landing.latest-blog-posts")
+        expect(page).to have_css(".latest-blog-posts")
       end
 
       it "renders all elements" do
-        within ".alternative-landing.latest-blog-posts" do
-          expect(page).to have_i18n_content(latest_blog_posts_block.settings.title, upcase: true)
-          expect(page).to have_i18n_content(latest_blog_posts_block.settings.link_text, upcase: true)
+        within ".latest-blog-posts" do
+          expect(page).to have_i18n_content(latest_blog_posts_block.settings.title)
+          expect(page).to have_i18n_content(latest_blog_posts_block.settings.link_text)
           blog_posts.last(3).each do |blog_post|
             expect(page).to have_i18n_content(blog_post.title)
           end
@@ -49,7 +49,7 @@
         let!(:other_blog_posts) { create_list(:post, 6, component: other_blogs_component) }
 
         it "renders only posts from that component" do
-          within ".alternative-landing.latest-blog-posts" do
+          within ".latest-blog-posts" do
             other_blog_posts.each do |blog_post|
               expect(page).not_to have_i18n_content(blog_post.title)
             end
diff --git a/spec/system/process_group_landing_spec.rb b/spec/system/process_group_landing_spec.rb
index ac01257..feda08b 100644
--- a/spec/system/process_group_landing_spec.rb
+++ b/spec/system/process_group_landing_spec.rb
@@ -3,17 +3,17 @@
 require "spec_helper"
 require "shared/system_admin_process_group_landing_examples"
 
-describe "Visit a process group's landing page", type: :system, perform_enqueued: true do
-  let!(:organization) { create :organization, available_locales: [:en] }
+describe "Visit a process group's landing page", :perform_enqueued do
+  let!(:organization) { create(:organization, available_locales: [:en]) }
   let(:user) { create(:user, :admin, :confirmed, organization: organization) }
-  let!(:participatory_process_group) { create :participatory_process_group, :with_participatory_processes, organization: organization }
+  let!(:participatory_process_group) { create(:participatory_process_group, :with_participatory_processes, skip_injection: true, organization: organization) }
   let!(:processes) { participatory_process_group.participatory_processes }
 
   context "when there are active alternative landing content blocks" do
     let!(:extra_title_block) { create(:extra_title_block, organization: organization, scoped_resource_id: participatory_process_group.id) }
     let!(:extra_information_block) { create(:extra_information_block, organization: organization, scoped_resource_id: participatory_process_group.id) }
     let!(:calendar_block) { create(:calendar_block, organization: organization, scoped_resource_id: participatory_process_group.id) }
-    let!(:meetings_component) { create(:component, manifest_name: "meetings", participatory_space: processes.first) }
+    let!(:meetings_component) { create(:component, manifest_name: "meetings", skip_injection: true, participatory_space: processes.first) }
     let!(:meeting) { create(:meeting, start_time: Time.zone.now, end_time: 1.hour.from_now, component: meetings_component) }
 
     before do
@@ -23,19 +23,21 @@
     end
 
     it "renders them" do
-      expect(page).to have_selector(".alternative-landing.calendar")
+      expect(page).to have_css(".calendar")
     end
 
     describe "extra title block" do
       it "renders all elements" do
-        within "section.alternative-landing.extra-title" do
+        within "section.extra-title" do
           expect(page).to have_i18n_content(extra_title_block.settings.link_text_1)
-          expect(page).to have_selector("[href='/link?external_url=#{CGI.escape(extra_title_block.settings.link_url_1)}']")
-          expect(page).to have_selector(".icon--instagram")
+          expect(page).to have_css("[href='#{extra_title_block.settings.link_url_1}']")
+          expect(page).to have_css(".mr-xs")
         end
       end
 
-      it_behaves_like "updates the content block extra title", "extra_title"
+      it_behaves_like "updates the content block extra title" do
+        let!(:id) { extra_title_block.id }
+      end
     end
 
     describe "extra information block" do
@@ -45,12 +47,14 @@
         end
       end
 
-      it_behaves_like "updates the content block extra information", "extra_information"
+      it_behaves_like "updates the content block extra information" do
+        let!(:id) { extra_information_block.id }
+      end
     end
 
     describe "calendar block" do
       it "renders all elements" do
-        within ".alternative-landing.calendar" do
+        within ".calendar" do
           within ".calendar-filters" do
             expect(page).to have_button("Debate")
             expect(page).to have_button("Meeting")