diff --git a/app/views/admin/communication/blocks/templates/call_to_action/_preview.html.erb b/app/views/admin/communication/blocks/templates/call_to_action/_preview.html.erb
index 7098c991b7dc82a6203b1a12cabf4eb8671eb883..f53fb430bc5d7283500e45fb17343a67d2478a63 100644
--- a/app/views/admin/communication/blocks/templates/call_to_action/_preview.html.erb
+++ b/app/views/admin/communication/blocks/templates/call_to_action/_preview.html.erb
@@ -1,23 +1,22 @@
-<div class="card">
-  <div class="card-body">
-    <div style= "max-width: 200px;" class="me-3">
-      <%= block_component_preview :image,
-          label: t('admin.communication.blocks.components.image.input.label'),
-          remove: t('admin.communication.blocks.components.image.input.remove') %><br>
-      <%= block_component_preview :alt,
-          label: t('admin.communication.blocks.components.image.alt.label'),
-          placeholder: t('admin.communication.blocks.components.image.alt.placeholder') %>
-    </div>
-    <hr>
 
-    <% @block.template.elements.each do |element| %>
-      <a  href="<%= block_component_preview :url, template: element %>" class="btn btn-primary"
-        <% if element.target_blank === true %>
-          target="_blank"
+<%= block_component_preview :image %><br>
+<%= block_component_preview :alt %>
+
+<div>
+  <% if @block.template.elements%>
+    <div {{ if gt (len .buttons) 1 }}role="group"{{ end -}}>
+      <% @block.template.elements.each do |element| %>
+        <% if element.title %>
+          <a href="<%= block_component_preview :url, template: element %>"
+            <% if element.target_blank %>
+              title="{{ i18n 'commons.link.blank_aria' (dict 'Title' $title) }}"
+              target="_blank"
+            <% else %>
+              title="<%= block_component_preview :title, template: element %>"
+            <% end %>
+            ><%= block_component_preview :title, template: element %></a>
         <% end %>
-        rel="noopener">
-        <%= block_component_preview :title, template: element %>
-      </a>
-    <% end %>
-  </div>
-</div>
+      <% end %>
+    </div>
+  <% end %>
+</div>
\ No newline at end of file
diff --git a/app/views/admin/communication/blocks/templates/chapter/_preview.html.erb b/app/views/admin/communication/blocks/templates/chapter/_preview.html.erb
index d0ccddf6fb680bba7b0830b4eaf268ba468e0fd3..a7476fa18f180dcb1166cab63d949cbf5d0edb63 100644
--- a/app/views/admin/communication/blocks/templates/chapter/_preview.html.erb
+++ b/app/views/admin/communication/blocks/templates/chapter/_preview.html.erb
@@ -1,9 +1,14 @@
-<%= block_component_preview :image %>
-<div class="small">
-  <p class="mb-0">
-    <%= block_component_preview :alt %>
-  </p>
-  <%= block_component_preview :credit %>
+<div class="chapter">
+  <div>
+    <%= block_component_preview :text %>
+  </div>
+  <div class="notes">
+    <%= block_component_preview :notes %>
+  </div>
 </div>
-<%= block_component_preview :text %>
-<%= block_component_preview :notes %>
+<figure>
+    <%= block_component_preview :image %>
+    <figcaption>
+      <%= block_component_preview :credit %>
+    </figcaption>
+</figure>
diff --git a/app/views/admin/communication/blocks/templates/datatable/_preview.html.erb b/app/views/admin/communication/blocks/templates/datatable/_preview.html.erb
index 72c62a69602bf18b39f8d8cb66d4d08e75eb0431..8b60311edd586990d2784fea40df45f7c3326ed1 100644
--- a/app/views/admin/communication/blocks/templates/datatable/_preview.html.erb
+++ b/app/views/admin/communication/blocks/templates/datatable/_preview.html.erb
@@ -1,4 +1,5 @@
 <div class="table-responsive">
+  <caption><%= block_component_preview :caption %></caption>
   <table class="table">
     <thead>
       <tr>
@@ -14,5 +15,3 @@
     </tbody>
   </table>
 </div>
-
-<%= block_component_preview :caption %>
diff --git a/app/views/admin/communication/blocks/templates/definitions/_preview.html.erb b/app/views/admin/communication/blocks/templates/definitions/_preview.html.erb
index cf94cd3c9a5b2ceff4c796b4f04e6db827674274..c6b542a6b504be026b7718c7f2e534fb94b4024f 100644
--- a/app/views/admin/communication/blocks/templates/definitions/_preview.html.erb
+++ b/app/views/admin/communication/blocks/templates/definitions/_preview.html.erb
@@ -1,8 +1,11 @@
-<% @block.template.elements.each do |element| %>
-  <p class="lead mb-0">
-    <b>
-      <%= block_component_preview :title, template: element %>
-    </b>
-  </p>
-  <%= block_component_preview :description, template: element %>
-<% end %>
+<div class="definitions">
+  <% @block.template.elements.each do |element| %>
+    <details itemscope itemtype="https://schema.org/DefinedTerm">
+      <summary itemprop="name">
+      <b>
+        <%= block_component_preview :title, template: element %>
+      </b></summary>
+      <p itemprop="description"><%= block_component_preview :description, template: element %></p>
+    </details>
+  <% end %>
+</div>
\ No newline at end of file
diff --git a/app/views/admin/communication/blocks/templates/files/_preview.html.erb b/app/views/admin/communication/blocks/templates/files/_preview.html.erb
index f7e976917bebcd69d2ed4080e7948d589be3bdb7..d4335a6f54e742415bb3061c68575d21900b9f86 100644
--- a/app/views/admin/communication/blocks/templates/files/_preview.html.erb
+++ b/app/views/admin/communication/blocks/templates/files/_preview.html.erb
@@ -1,12 +1,13 @@
-<%= block_component_preview :description %>
+<div class="description">
+  <%= block_component_preview :description %>
+</div>
 <ul>
   <% @block.template.elements.each do |element| %>
     <% next unless element.blob %>
     <li>
-      <a href="<%= element.blob.url %>" download>
-        <%= element.title %>
-        <small>(<%= element.blob.filename %>)</small>
+      <a href="<%= element.blob.url %>" download="{{ partial 'PrepareHTML' $file.name }}" target="_blank" title="{{ i18n 'commons.link.blank_aria' (dict 'Title' $title_with_size) }}">
+        <span><%= element.title %><br><span>(<%= element.blob.filename %>)</span></span>
       </a>
     </li>
   <% end %>
-</ul>
+</ul>
\ No newline at end of file
diff --git a/app/views/admin/communication/blocks/templates/image/_preview.html.erb b/app/views/admin/communication/blocks/templates/image/_preview.html.erb
index c898f4de2014b85de1f306f6264a19d617682a3f..1e267cefa01ec8ebd60a6d133c4428241b6df2db 100644
--- a/app/views/admin/communication/blocks/templates/image/_preview.html.erb
+++ b/app/views/admin/communication/blocks/templates/image/_preview.html.erb
@@ -1,8 +1,10 @@
-<%= block_component_preview :image %>
-<div class="small">
-  <p class="mb-0">
-    <%= block_component_preview :alt %>
-  </p>
-  <%= block_component_preview :credit %>
-</div>
-<%= block_component_preview :text %>
+<figure>
+  <a class="glightbox" data-glightbox="type: image;" href='{{ partial "GetImageUrl" (dict "url" $url "size" $lightbox_sizes ) }}'>
+    <%= block_component_preview :image %>
+  </a>
+  <figcaption>
+      <p><%= block_component_preview :alt %></p>
+      <p><%= block_component_preview :text %></p>
+      <p><small><%= block_component_preview :credit %></small></p>
+  </figcaption>
+</figure>
\ No newline at end of file
diff --git a/app/views/admin/communication/blocks/templates/key_figures/_preview.html.erb b/app/views/admin/communication/blocks/templates/key_figures/_preview.html.erb
index 6a35281aab1f692963be115685ad5950d51affc4..85893fa61e9b00d7ead114e89a1b9e6814b4dc07 100644
--- a/app/views/admin/communication/blocks/templates/key_figures/_preview.html.erb
+++ b/app/views/admin/communication/blocks/templates/key_figures/_preview.html.erb
@@ -1,12 +1,15 @@
-<%= block_component_preview :description %>
-<% @block.template.elements.each do |element| %>
-  <p class="lead mb-0">
-    <b>
-      <%= block_component_preview :number, template: element %>
-    </b>
-    <span class="small">
-      <%= block_component_preview :unit, template: element %>
-    </span>
-  </p>
-  <%= block_component_preview :description, template: element %>
-<% end %>
+<div class="top">
+  <div class="description">
+    <%= block_component_preview :description %>
+  </div>
+</div>
+<ul>
+  <% @block.template.elements.each do |element| %>
+    <li>
+        <dl>
+            <dt><strong><%= block_component_preview :number, template: element %></strong><%= block_component_preview :unit, template: element %></dt>
+            <dd><%= block_component_preview :description, template: element %></dd>
+        </dl>
+    </li>
+  <% end %>
+</ul>
diff --git a/app/views/admin/communication/blocks/templates/organization_chart/_preview.html.erb b/app/views/admin/communication/blocks/templates/organization_chart/_preview.html.erb
index 561a79b74d6cbf04a7ae9a5a31ce611b40126cd8..9c8fc151c0aaee30c7ea849e8e353f3ef68ed37d 100644
--- a/app/views/admin/communication/blocks/templates/organization_chart/_preview.html.erb
+++ b/app/views/admin/communication/blocks/templates/organization_chart/_preview.html.erb
@@ -1,18 +1,37 @@
-<%= block_component_preview :description %>
-<% @block.template.elements.each do |element|
-      person = element.person
-      next if person.nil?
-      %>
-  <article class="card">
-    <div class="card-body">
-      <% if person.best_picture.attached? %>
-        <div style="max-width: 80px" class="float-end">
-          <%= kamifusen_tag person.best_picture,
-                            class: 'img-fluid rounded-circle' %>
+<div class="top">
+  <div class="description">
+    <%= block_component_preview :description %>
+  </div>
+</div>
+
+<div class="persons">
+  <% @block.template.elements.each do |element|
+    person = element.person
+    next if person.nil?
+    %>
+    <div>
+      <article class="person" itemscope itemtype="https://schema.org/Person">
+        <div>
+          <p class="name" itemprop="name">
+            <% if @block.template.with_link %>
+              <%= link_to person, [:admin, person] %>    
+              <% else %>  
+                <%= element.person %>
+            <% end %>    
+          </p>
+          <p itemprop="jobTitle"><%= element.role %></p>
         </div>
-      <% end %>
-      <h3 class="card-title h5"><%= link_to person, [:admin, person] %></h3>
-      <p class="mb-0"><%= element.role %></p>
+        <% if @block.template.with_photo %>
+          <div class="avatar" itemprop="image">
+            <% if person.best_picture.attached? %>
+              <div style="max-width: 80px" class="float-end">
+                <%= kamifusen_tag person.best_picture,
+                                  class: 'img-fluid rounded-circle' %>
+              </div>
+            <% end %>
+          </div>
+        <% end %>
+      </article>
     </div>
-  </article>
-<% end %>
+  <% end %>
+</div>
\ No newline at end of file
diff --git a/app/views/admin/communication/blocks/templates/pages/_preview.html.erb b/app/views/admin/communication/blocks/templates/pages/_preview.html.erb
index 089fb5fcd5958c993f6ecc9af29e570360d52eaf..a6d774fc34add2227c03d2502b77f8ece0b3056a 100644
--- a/app/views/admin/communication/blocks/templates/pages/_preview.html.erb
+++ b/app/views/admin/communication/blocks/templates/pages/_preview.html.erb
@@ -1,13 +1,12 @@
 <% if @block.data %>
   <% if @block.template.page %>
-    <h2 class="h5 mb-4"><%= @block.template.page.slug %></h2>
+    <%= @block.template.page.slug %>
   <% end %>
-  <% @block.template.selected_pages.each do |element| %>
-    <div class="card mb-4">
-      <div class="card-header">
-        <h3 class="card-title h5"><%= element %></h3>
-      </div>
-      <div class="card-body">
+
+  <div class="pages">
+    <% @block.template.selected_pages.each do |element| %>
+      <div>
+        <%= element %>
         <% if @block.template.show_image && element.featured_image.attached? %>
           <%= kamifusen_tag element.featured_image,
                             class: 'img-fluid mb-3' %>
@@ -16,6 +15,6 @@
           <p><%= element.description_short %></p>
         <% end %>
       </div>
-    </div>
-  <% end %>
-<% end %>
+    <% end %>
+  </div>
+<% end %>
\ No newline at end of file
diff --git a/app/views/admin/communication/blocks/templates/partners/_preview.html.erb b/app/views/admin/communication/blocks/templates/partners/_preview.html.erb
index a747c3c94b48045004a7889d3e7fecf38cc02abc..7aa1a91ba82a254aa518c676833095be17c70a3e 100644
--- a/app/views/admin/communication/blocks/templates/partners/_preview.html.erb
+++ b/app/views/admin/communication/blocks/templates/partners/_preview.html.erb
@@ -1,16 +1,24 @@
-<%= block_component_preview :description %>
-<div class="row">
+<div class="organizations">
   <% @block.template.elements.each do |element| %>
-    <div class="col-6 mb-3">
-      <%= kamifusen_tag element.best_logo,
+    <div>
+      <article class="organization">
+        <div>
+          <p class="title">
+            <% if element.best_url %>
+              <a href="<%= element.best_url %>" target="_blank">
+            <% end %>
+            <%= element.best_name %>
+            <% if element.best_url%>
+              </a>
+            <% end %>
+          </p>
+        </div>
+        <div class="media">
+          <%= kamifusen_tag element.best_logo,
                         width: 600,
                         class: 'img-fluid mb-2' unless element.best_logo.nil? %>
-      <p>
-        <%= element.best_name %><br>
-        <span class="small">
-          <%= element.best_url %>
-        </span>
-      </p>
+        </div>
+      </article>
     </div>
   <% end %>
-</div>
+</div>
\ No newline at end of file
diff --git a/app/views/admin/communication/blocks/templates/testimonials/_preview.html.erb b/app/views/admin/communication/blocks/templates/testimonials/_preview.html.erb
index fc8ca728c4f42b954c2a5977262def70fc05c5bd..ffa1ba471740424c046b23b48ea081b41bba90eb 100644
--- a/app/views/admin/communication/blocks/templates/testimonials/_preview.html.erb
+++ b/app/views/admin/communication/blocks/templates/testimonials/_preview.html.erb
@@ -1,22 +1,39 @@
-<% @block.template.elements.each do |element| %>
-
-  <article class="card">
-    <div class="card-body">
-      <p class="lead">
-        <%= block_component_preview :text, template: element %>
-      </p>
-      <div class="d-flex align-items-center">
-        <% if element.photo  %>
-          <div style="max-width: 80px;" class="me-3">
-             <%= block_component_preview :photo, template: element %>
-          </div>
-        <% end %>
-        <p class="flex-fill mb-0">
-          <b><%= block_component_preview :author, template: element %></b><br>
-          <%= block_component_preview :job, template: element %>
-        </p>
+<div class="testimonials">
+  <% if !@block.template.elements.one? %>
+    <div class="splide" data-splide='{"arrows":false,"autoplay":true,"pauseOnHover":false,"pauseOnFocus":false,"type":"loop","autoHeight":true}'>
+      <div class="splide__slider">
+        <div class="splide__track">
+          <div class="splide__list">
+          <% end %>
+          <% @block.template.elements.each do |element| %>
+            <figure <% if !@block.template.elements.one? %> class="splide__slide" <% end %>>
+              <blockquote {{- if $is_long }} class="is-long" {{- end }}>
+                <p><%= block_component_preview :text, template: element %></p>
+              </blockquote>
+              <figcaption>
+                <% if element.photo  %>
+                  <div class="avatar">
+                    <div style="max-width: 80px;" class="me-3">
+                      <%= block_component_preview :photo, template: element %>
+                    </div>
+                  </div>
+                <% end %>
+                <span>
+                  <b><%= block_component_preview :author, template: element %></b><br>
+                  <%= block_component_preview :job, template: element %>
+                </span>
+              </figcaption>
+            </figure>
+          <% end %>
+        <% if !@block.template.elements.one? %>
+        </div>
       </div>
     </div>
-  </article>
 
-<% end %>
+    <div class="splide__autoplay is-active">
+      <button class="splide__play"></button>
+      <button class="splide__pause"></button>
+    </div>
+  </div>
+  <% end %>
+</div>
\ No newline at end of file
diff --git a/app/views/admin/communication/blocks/templates/timeline/_preview.html.erb b/app/views/admin/communication/blocks/templates/timeline/_preview.html.erb
index a98de248b24481fc3272b1db348b3979cf128c8e..9a5a570f8773f9e09a9b1a2555287fd012b27ec8 100644
--- a/app/views/admin/communication/blocks/templates/timeline/_preview.html.erb
+++ b/app/views/admin/communication/blocks/templates/timeline/_preview.html.erb
@@ -1,9 +1,9 @@
 <%= block_component_preview :layout %>
+<div class="events">
 <% @block.template.elements.each do |element| %>
-  <article class="card">
-    <div class="card-body">
-      <p class="lead"><%= block_component_preview :title, template: element %></p>
-      <p><%= block_component_preview :text, template: element %></p>
-    </div>
-  </article>
+  <div class="event">
+    <%= block_component_preview :title, template: element %>
+    <%= block_component_preview :text, template: element %>
+  </div>
 <% end %>
+</div>
\ No newline at end of file
diff --git a/app/views/admin/communication/blocks/templates/video/_preview.html.erb b/app/views/admin/communication/blocks/templates/video/_preview.html.erb
index 7adc619bc5554e7f35d6b495df636e679277dee0..90d7d4e4a358338828c1d314c1d7ec0ef5a85357 100644
--- a/app/views/admin/communication/blocks/templates/video/_preview.html.erb
+++ b/app/views/admin/communication/blocks/templates/video/_preview.html.erb
@@ -1,4 +1,11 @@
-<%# TODO iframe video %>
-<%= block_component_preview :url %>
-<%= block_component_preview :video_title %>
+<% if @block.template.video_title %>
+  <div class="top">
+    <h2><%= block_component_preview :video_title %></h2>
+  </div>
+<% end %>
+<% if @block.template.url %>
+  <div class="video">
+    <%= block_component_preview :url %>
+  </div>
+<% end %>
 <%= block_component_preview :transcription %>