diff --git a/app/cells/decidim/newsletter_agenda/agenda_events/show.erb b/app/cells/decidim/newsletter_agenda/agenda_events/show.erb
index 8ca2eee..62af718 100644
--- a/app/cells/decidim/newsletter_agenda/agenda_events/show.erb
+++ b/app/cells/decidim/newsletter_agenda/agenda_events/show.erb
@@ -1,2 +1 @@
-<% theme_partial_name = "themes/#{Decidim::NewsletterAgenda.current_theme}" %>
-<%= render theme_partial_name %>
+<%= render "themes/#{theme}" %>
diff --git a/app/cells/decidim/newsletter_agenda/agenda_events/themes/capitalitat.erb b/app/cells/decidim/newsletter_agenda/agenda_events/themes/capitalitat.erb
index dbe771b..d2db0c5 100644
--- a/app/cells/decidim/newsletter_agenda/agenda_events/themes/capitalitat.erb
+++ b/app/cells/decidim/newsletter_agenda/agenda_events/themes/capitalitat.erb
@@ -1,7 +1,13 @@
 <style>
+  table.container th {
+    padding-left: 0;
+    padding-right: 0;
+  }
+
+  .introduction-text,
   .introduction-text p {
     font-size: 18px !important;
-    color: #ffffff;
+    color: #ffffff !important;
   }
 
   .intro-button a {
diff --git a/app/cells/decidim/newsletter_agenda/agenda_events_cell.rb b/app/cells/decidim/newsletter_agenda/agenda_events_cell.rb
index 371b86c..f3b7401 100644
--- a/app/cells/decidim/newsletter_agenda/agenda_events_cell.rb
+++ b/app/cells/decidim/newsletter_agenda/agenda_events_cell.rb
@@ -13,6 +13,10 @@ def show
         render :show
       end
 
+      def theme
+        model.manifest_name.gsub("_agenda_events", "")
+      end
+
       def has_image?(attribute)
         # for previews
         return true unless model&.id
diff --git a/lib/decidim/newsletter_agenda.rb b/lib/decidim/newsletter_agenda.rb
index f392086..efb372a 100644
--- a/lib/decidim/newsletter_agenda.rb
+++ b/lib/decidim/newsletter_agenda.rb
@@ -38,11 +38,6 @@ module NewsletterAgenda
       [:canodrom, :capitalitat]
     end
 
-    def self.current_theme
-      # This method should return the currently selected theme, e.g., :canodrom or :capitalitat
-      :capitalitat
-    end
-
     # To define the default first day for the agenda ranges.
     # This is the next monday:
     def self.next_first_day
diff --git a/lib/decidim/newsletter_agenda/engine.rb b/lib/decidim/newsletter_agenda/engine.rb
index d6fbd97..4db1b2f 100644
--- a/lib/decidim/newsletter_agenda/engine.rb
+++ b/lib/decidim/newsletter_agenda/engine.rb
@@ -17,184 +17,186 @@ class Engine < ::Rails::Engine
       end
 
       initializer "decidim-newsletter_agenda.newsletter_templates" do
-        Decidim.content_blocks.register(:newsletter_template, :agenda_events) do |content_block|
-          content_block.cell = "decidim/newsletter_agenda/agenda_events"
-          content_block.settings_form_cell = "decidim/newsletter_agenda/agenda_events_settings_form"
-          content_block.public_name_key = "decidim.newsletter_templates.agenda_events.name"
+        Decidim::NewsletterAgenda.themes.each do |theme|
+          Decidim.content_blocks.register(:newsletter_template, "#{theme}_agenda_events") do |content_block|
+            content_block.cell = "decidim/newsletter_agenda/agenda_events"
+            content_block.settings_form_cell = "decidim/newsletter_agenda/agenda_events_settings_form"
+            content_block.public_name_key = "decidim.newsletter_templates.agenda_events.name"
 
-          content_block.images = [
-            {
-              name: :main_image,
-              uploader: "Decidim::NewsletterTemplateImageUploader"
-            }
-          ]
+            content_block.images = [
+              {
+                name: :main_image,
+                uploader: "Decidim::NewsletterTemplateImageUploader"
+              }
+            ]
 
-          (1..4).each do |i|
-            content_block.images << {
-              name: :"body_box_image_#{i}",
-              uploader: "Decidim::NewsletterTemplateImageUploader",
-              preview: -> { ActionController::Base.helpers.asset_pack_path("media/images/placeholder.jpg") }
-            }
-          end
+            (1..4).each do |i|
+              content_block.images << {
+                name: :"body_box_image_#{i}",
+                uploader: "Decidim::NewsletterTemplateImageUploader",
+                preview: -> { ActionController::Base.helpers.asset_pack_path("media/images/placeholder.jpg") }
+              }
+            end
 
-          (1..3).each do |i|
-            content_block.images << {
-              name: :"footer_box_image_#{i}",
-              uploader: "Decidim::NewsletterTemplateImageUploader",
-              preview: -> { ActionController::Base.helpers.asset_pack_path("media/images/placeholder.jpg") }
-            }
-          end
+            (1..3).each do |i|
+              content_block.images << {
+                name: :"footer_box_image_#{i}",
+                uploader: "Decidim::NewsletterTemplateImageUploader",
+                preview: -> { ActionController::Base.helpers.asset_pack_path("media/images/placeholder.jpg") }
+              }
+            end
 
-          content_block.settings do |settings|
-            settings.attribute(
-              :background_color,
-              type: :text,
-              preview: -> { Decidim::NewsletterAgenda.default_background_color || "#733BCE" }
-            )
-            settings.attribute(
-              :font_color_over_bg,
-              type: :text,
-              preview: -> { Decidim::NewsletterAgenda.default_font_color_over_bg || "#FFFFFF" }
-            )
-            settings.attribute(
-              :intro_title,
-              type: :text,
-              translated: true,
-              preview: -> { I18n.t("decidim.newsletter_templates.agenda_events.intro_title_preview") }
-            )
-            settings.attribute(
-              :intro_text,
-              type: :text,
-              translated: true,
-              preview: -> { I18n.t("decidim.newsletter_templates.agenda_events.intro_text_preview") }
-            )
-            settings.attribute(
-              :intro_link_text,
-              type: :text,
-              translated: true,
-              preview: -> { I18n.t("decidim.newsletter_templates.agenda_events.intro_link_text_preview") }
-            )
-            settings.attribute(
-              :intro_link_url,
-              type: :text,
-              preview: -> { "https://example.com" }
-            )
-            settings.attribute(
-              :body_title,
-              type: :text,
-              translated: true,
-              preview: -> { I18n.t("decidim.newsletter_templates.agenda_events.body_title_preview") }
-            )
-            settings.attribute(
-              :body_subtitle,
-              type: :text,
-              translated: true,
-              preview: -> { DateRangeFormatter.format(Decidim::NewsletterAgenda.next_first_day, Decidim::NewsletterAgenda.next_last_day) }
-            )
-            settings.attribute(
-              :boxes_number,
-              type: :integer,
-              preview: -> { 4 }
-            )
-            (1..4).each do |i|
+            content_block.settings do |settings|
               settings.attribute(
-                "body_box_title_#{i}",
+                :background_color,
                 type: :text,
-                translated: true,
-                preview: -> { I18n.t("decidim.newsletter_templates.agenda_events.body_box_title_preview") }
+                preview: -> { Decidim::NewsletterAgenda.default_background_color || "#733BCE" }
               )
               settings.attribute(
-                "body_box_date_time_#{i}",
+                :font_color_over_bg,
                 type: :text,
-                translated: true,
-                preview: -> { DateRangeFormatter.format(Decidim::NewsletterAgenda.next_first_day - 14 + i, Decidim::NewsletterAgenda.next_last_day - 15 + i) }
+                preview: -> { Decidim::NewsletterAgenda.default_font_color_over_bg || "#FFFFFF" }
               )
               settings.attribute(
-                "body_box_description_#{i}",
+                :intro_title,
                 type: :text,
                 translated: true,
-                preview: -> { I18n.t("decidim.newsletter_templates.agenda_events.body_box_description_preview") }
+                preview: -> { I18n.t("decidim.newsletter_templates.agenda_events.intro_title_preview") }
               )
               settings.attribute(
-                "body_box_link_text_#{i}",
+                :intro_text,
                 type: :text,
                 translated: true,
-                preview: -> { I18n.t("decidim.newsletter_templates.agenda_events.body_box_link_text_preview") }
+                preview: -> { I18n.t("decidim.newsletter_templates.agenda_events.intro_text_preview") }
               )
               settings.attribute(
-                "body_box_link_url_#{i}",
+                :intro_link_text,
                 type: :text,
                 translated: true,
-                preview: -> { "https://decidim.org" }
+                preview: -> { I18n.t("decidim.newsletter_templates.agenda_events.intro_link_text_preview") }
               )
-            end
-            settings.attribute(
-              :body_final_text,
-              type: :text,
-              translated: true,
-              preview: -> { I18n.t("decidim.newsletter_templates.agenda_events.body_final_text_preview") }
-            )
-            settings.attribute(
-              :footer_title,
-              type: :text,
-              translated: true,
-              preview: -> { I18n.t("decidim.newsletter_templates.agenda_events.footer_title_preview") }
-            )
-            (1..3).each do |i|
               settings.attribute(
-                "footer_box_date_time_#{i}",
+                :intro_link_url,
                 type: :text,
-                translated: true,
-                preview: -> { DateRangeFormatter.format(Decidim::NewsletterAgenda.next_first_day - 14 + i, Decidim::NewsletterAgenda.next_last_day - 15 + i) }
+                preview: -> { "https://example.com" }
               )
               settings.attribute(
-                "footer_box_title_#{i}",
+                :body_title,
                 type: :text,
                 translated: true,
-                preview: -> { I18n.t("decidim.newsletter_templates.agenda_events.footer_box_title_preview") }
+                preview: -> { I18n.t("decidim.newsletter_templates.agenda_events.body_title_preview") }
               )
               settings.attribute(
-                "footer_box_description_#{i}",
+                :body_subtitle,
                 type: :text,
                 translated: true,
-                preview: -> { I18n.t("decidim.newsletter_templates.agenda_events.footer_box_description_preview") }
+                preview: -> { DateRangeFormatter.format(Decidim::NewsletterAgenda.next_first_day, Decidim::NewsletterAgenda.next_last_day) }
+              )
+              settings.attribute(
+                :boxes_number,
+                type: :integer,
+                preview: -> { 4 }
               )
+              (1..4).each do |i|
+                settings.attribute(
+                  "body_box_title_#{i}",
+                  type: :text,
+                  translated: true,
+                  preview: -> { I18n.t("decidim.newsletter_templates.agenda_events.body_box_title_preview") }
+                )
+                settings.attribute(
+                  "body_box_date_time_#{i}",
+                  type: :text,
+                  translated: true,
+                  preview: -> { DateRangeFormatter.format(Decidim::NewsletterAgenda.next_first_day - 14 + i, Decidim::NewsletterAgenda.next_last_day - 15 + i) }
+                )
+                settings.attribute(
+                  "body_box_description_#{i}",
+                  type: :text,
+                  translated: true,
+                  preview: -> { I18n.t("decidim.newsletter_templates.agenda_events.body_box_description_preview") }
+                )
+                settings.attribute(
+                  "body_box_link_text_#{i}",
+                  type: :text,
+                  translated: true,
+                  preview: -> { I18n.t("decidim.newsletter_templates.agenda_events.body_box_link_text_preview") }
+                )
+                settings.attribute(
+                  "body_box_link_url_#{i}",
+                  type: :text,
+                  translated: true,
+                  preview: -> { "https://decidim.org" }
+                )
+              end
               settings.attribute(
-                "footer_box_link_text_#{i}",
+                :body_final_text,
                 type: :text,
                 translated: true,
-                preview: -> { I18n.t("decidim.newsletter_templates.agenda_events.footer_box_link_text_preview") }
+                preview: -> { I18n.t("decidim.newsletter_templates.agenda_events.body_final_text_preview") }
               )
               settings.attribute(
-                "footer_box_link_url_#{i}",
+                :footer_title,
                 type: :text,
                 translated: true,
-                preview: -> { "https://decidim.org" }
+                preview: -> { I18n.t("decidim.newsletter_templates.agenda_events.footer_title_preview") }
               )
-            end
-            settings.attribute(
-              :footer_address_text,
-              type: :text,
-              translated: false,
-              preview: -> { NewsletterAgenda.default_address_text }
-            )
-            settings.attribute(
-              :footer_social_links_title,
-              type: :text,
-              translated: true,
-              preview: -> { I18n.t("decidim.newsletter_templates.agenda_events.footer_social_links_title_preview") }
-            )
-            Decidim::NewsletterAgenda.additional_social_handlers.each do |handler|
+              (1..3).each do |i|
+                settings.attribute(
+                  "footer_box_date_time_#{i}",
+                  type: :text,
+                  translated: true,
+                  preview: -> { DateRangeFormatter.format(Decidim::NewsletterAgenda.next_first_day - 14 + i, Decidim::NewsletterAgenda.next_last_day - 15 + i) }
+                )
+                settings.attribute(
+                  "footer_box_title_#{i}",
+                  type: :text,
+                  translated: true,
+                  preview: -> { I18n.t("decidim.newsletter_templates.agenda_events.footer_box_title_preview") }
+                )
+                settings.attribute(
+                  "footer_box_description_#{i}",
+                  type: :text,
+                  translated: true,
+                  preview: -> { I18n.t("decidim.newsletter_templates.agenda_events.footer_box_description_preview") }
+                )
+                settings.attribute(
+                  "footer_box_link_text_#{i}",
+                  type: :text,
+                  translated: true,
+                  preview: -> { I18n.t("decidim.newsletter_templates.agenda_events.footer_box_link_text_preview") }
+                )
+                settings.attribute(
+                  "footer_box_link_url_#{i}",
+                  type: :text,
+                  translated: true,
+                  preview: -> { "https://decidim.org" }
+                )
+              end
               settings.attribute(
-                "#{handler}_handler",
+                :footer_address_text,
                 type: :text,
                 translated: false,
-                preview: -> { "https://#{handler}.com/#{handler}" }
+                preview: -> { NewsletterAgenda.default_address_text }
+              )
+              settings.attribute(
+                :footer_social_links_title,
+                type: :text,
+                translated: true,
+                preview: -> { I18n.t("decidim.newsletter_templates.agenda_events.footer_social_links_title_preview") }
               )
+              Decidim::NewsletterAgenda.additional_social_handlers.each do |handler|
+                settings.attribute(
+                  "#{handler}_handler",
+                  type: :text,
+                  translated: false,
+                  preview: -> { "https://#{handler}.com/#{handler}" }
+                )
+              end
             end
-          end
 
-          content_block.default!
+            content_block.default!
+          end
         end
       end