diff --git a/assets/base.css b/assets/base.css
index 05e086a3403..7a00a2b35cb 100644
--- a/assets/base.css
+++ b/assets/base.css
@@ -387,6 +387,16 @@ h5,
   word-break: break-word;
 }
 
+.hxl {
+  font-size: calc(var(--font-heading-scale) * 5rem);
+}
+
+@media only screen and (min-width: 750px) {
+  .hxl {
+    font-size: calc(var(--font-heading-scale) * 6.2rem);
+  }
+}
+
 .h0 {
   font-size: calc(var(--font-heading-scale) * 4rem);
 }
@@ -553,6 +563,10 @@ table:not([class]) th {
   }
 }
 
+.left {
+  text-align: left;
+}
+
 .center {
   text-align: center;
 }
diff --git a/assets/section-rich-text.css b/assets/section-rich-text.css
index a414be2605f..e2ac8c942d2 100644
--- a/assets/section-rich-text.css
+++ b/assets/section-rich-text.css
@@ -1,38 +1,37 @@
 .rich-text {
-  margin-left: auto;
-  margin-right: auto;
-  text-align: center;
   z-index: 1;
 }
 
-.rich-text.rich-text--full-width {
-  max-width: initial;
-  width: 100%;
+.rich-text__wrapper {
+  display: flex;
+  justify-content: center;
+  width: calc(100% - 4rem / var(--font-body-scale));
 }
 
-.rich-text__blocks {
+.rich-text:not(.rich-text--full-width) .rich-text__wrapper {
   margin: auto;
-  /* 2.5rem margin on left & right */
-  width: calc(100% - 5rem / var(--font-body-scale));
-}
-
-.rich-text__blocks * {
-  overflow-wrap: break-word;
+  width: calc(100% - 8rem / var(--font-body-scale));
 }
 
-.rich-text--full-width .rich-text__blocks {
-  /* 4rem (1.5rem + 2.5rem) margin on left & right */
-  width: calc(100% - 8rem / var(--font-body-scale));
+.rich-text__blocks {
+  width: 100%;
 }
 
 @media screen and (min-width: 750px) {
-  .rich-text__blocks {
-    max-width: 50rem;
+  .rich-text__wrapper {
+    width: 100%;
+  }
+
+  .rich-text__wrapper--left {
+    justify-content: flex-start;
+  }
+
+  .rich-text__wrapper--right {
+    justify-content: flex-end;
   }
 
-  .rich-text--full-width .rich-text__blocks {
-    /* 7.5rem (5rem + 2.5rem) margin on left & right */
-    width: calc(100% - 15rem);
+  .rich-text__blocks {
+    max-width: 50rem;
   }
 }
 
@@ -42,7 +41,9 @@
   }
 }
 
-/* Blocks */
+.rich-text__blocks * {
+  overflow-wrap: break-word;
+}
 
 .rich-text__blocks > * {
   margin-top: 0;
@@ -56,3 +57,30 @@
 .rich-text__blocks > * + a {
   margin-top: 3rem;
 }
+
+.rich-text__buttons {
+  display: inline-flex;
+  justify-content: center;
+  flex-wrap: wrap;
+  gap: 1rem;
+  width: 100%;
+  max-width: 45rem;
+  word-break: break-word;
+}
+
+.rich-text__buttons--multiple > * {
+  flex-grow: 1;
+  min-width: 22rem;
+}
+
+.rich-text__buttons + .rich-text__buttons {
+  margin-top: 1rem;
+}
+
+.rich-text__blocks.left .rich-text__buttons {
+  justify-content: flex-start;
+}
+
+.rich-text__blocks.right .rich-text__buttons {
+  justify-content: flex-end;
+}
diff --git a/locales/cs.schema.json b/locales/cs.schema.json
index 6373a4638b8..09dc5cd1aa9 100644
--- a/locales/cs.schema.json
+++ b/locales/cs.schema.json
@@ -338,6 +338,9 @@
         },
         "options__3": {
           "label": "Velký"
+        },
+        "options__4": {
+          "label": "Extra velká"
         }
       }
     },
@@ -1950,6 +1953,31 @@
       "settings": {
         "full_width": {
           "label": "Nastavit plnou šířku sekce"
+        },
+        "desktop_content_position": {
+          "options__1": {
+            "label": "Vlevo"
+          },
+          "options__2": {
+            "label": "Uprostřed"
+          },
+          "options__3": {
+            "label": "Vpravo"
+          },
+          "label": "Pozice obsahu v počítači",
+          "info": "Pozice se automaticky optimalizuje pro mobilní prostředí."
+        },
+        "content_alignment": {
+          "options__1": {
+            "label": "Doleva"
+          },
+          "options__2": {
+            "label": "Na střed"
+          },
+          "options__3": {
+            "label": "Doprava"
+          },
+          "label": "Zarovnání obsahu"
         }
       },
       "blocks": {
@@ -1969,17 +1997,57 @@
             }
           }
         },
-        "button": {
-          "name": "Tlačítko",
+        "buttons": {
+          "name": "Tlačítka",
           "settings": {
-            "button_label": {
-              "label": "Text tlačítka"
+            "button_label_1": {
+              "label": "První text tlačítka",
+              "info": "Pokud chcete tlačítko skrýt, nezadávejte žádný text."
             },
-            "button_link": {
-              "label": "Tlačítkový odkaz"
+            "button_link_1": {
+              "label": "První tlačítkový odkaz"
             },
-            "button_style_secondary": {
+            "button_style_secondary_1": {
               "label": "Použít styl tlačítka s obrysem"
+            },
+            "button_label_2": {
+              "label": "Druhý text tlačítka",
+              "info": "Pokud chcete tlačítko skrýt, nezadávejte žádný text."
+            },
+            "button_link_2": {
+              "label": "Druhý tlačítkový odkaz"
+            },
+            "button_style_secondary_2": {
+              "label": "Použít styl tlačítka s obrysem"
+            }
+          }
+        },
+        "caption": {
+          "name": "Titulek",
+          "settings": {
+            "text": {
+              "label": "Text"
+            },
+            "text_style": {
+              "label": "Textový styl",
+              "options__1": {
+                "label": "Podtitul"
+              },
+              "options__2": {
+                "label": "Velká písmena"
+              }
+            },
+            "caption_size": {
+              "label": "Velikost textu",
+              "options__1": {
+                "label": "Malý"
+              },
+              "options__2": {
+                "label": "Střední"
+              },
+              "options__3": {
+                "label": "Velký"
+              }
             }
           }
         }
diff --git a/locales/da.schema.json b/locales/da.schema.json
index 7964f38ae44..c1b02a6af6a 100644
--- a/locales/da.schema.json
+++ b/locales/da.schema.json
@@ -338,6 +338,9 @@
         },
         "options__3": {
           "label": "Stor"
+        },
+        "options__4": {
+          "label": "Ekstra stor"
         }
       }
     },
@@ -1950,6 +1953,31 @@
       "settings": {
         "full_width": {
           "label": "Gør afsnittet til fuld bredde"
+        },
+        "desktop_content_position": {
+          "options__1": {
+            "label": "Venstre"
+          },
+          "options__2": {
+            "label": "Centreret"
+          },
+          "options__3": {
+            "label": "Højre"
+          },
+          "label": "Placering af indhold på computer",
+          "info": "Placeringen optimeres automatisk til mobil."
+        },
+        "content_alignment": {
+          "options__1": {
+            "label": "Venstre"
+          },
+          "options__2": {
+            "label": "Centreret"
+          },
+          "options__3": {
+            "label": "Højre"
+          },
+          "label": "Indholdsjustering"
         }
       },
       "blocks": {
@@ -1969,17 +1997,57 @@
             }
           }
         },
-        "button": {
-          "name": "Knap",
+        "buttons": {
+          "name": "Knapper",
           "settings": {
-            "button_label": {
-              "label": "Knaptekst"
+            "button_label_1": {
+              "label": "Første knaptekst",
+              "info": "Lad feltet være tomt for at skjule knappen."
             },
-            "button_link": {
-              "label": "Knaplink"
+            "button_link_1": {
+              "label": "Første knaplink"
             },
-            "button_style_secondary": {
+            "button_style_secondary_1": {
               "label": "Brug rammeknaptypografi"
+            },
+            "button_label_2": {
+              "label": "Anden knaptekst",
+              "info": "Lad feltet være tomt for at skjule knappen."
+            },
+            "button_link_2": {
+              "label": "Andet knaplink"
+            },
+            "button_style_secondary_2": {
+              "label": "Brug rammeknaptypografi"
+            }
+          }
+        },
+        "caption": {
+          "name": "Billedtekst",
+          "settings": {
+            "text": {
+              "label": "Tekst"
+            },
+            "text_style": {
+              "label": "Teksttypografi",
+              "options__1": {
+                "label": "Underoverskrift"
+              },
+              "options__2": {
+                "label": "Store bogstaver"
+              }
+            },
+            "caption_size": {
+              "label": "Tekststørrelse",
+              "options__1": {
+                "label": "Lille"
+              },
+              "options__2": {
+                "label": "Medium"
+              },
+              "options__3": {
+                "label": "Stor"
+              }
             }
           }
         }
diff --git a/locales/de.schema.json b/locales/de.schema.json
index cc43b18a059..95fa2337fcc 100644
--- a/locales/de.schema.json
+++ b/locales/de.schema.json
@@ -338,6 +338,9 @@
         },
         "options__3": {
           "label": "Groß"
+        },
+        "options__4": {
+          "label": "Extra groß"
         }
       }
     },
@@ -1950,6 +1953,31 @@
       "settings": {
         "full_width": {
           "label": "Abschnitt über die gesamte Breite"
+        },
+        "desktop_content_position": {
+          "options__1": {
+            "label": "Links"
+          },
+          "options__2": {
+            "label": "Zentriert"
+          },
+          "options__3": {
+            "label": "Rechts"
+          },
+          "label": "Desktop-Inhaltsposition",
+          "info": "Positionen werden automatisch für die mobile Nutzung optimiert."
+        },
+        "content_alignment": {
+          "options__1": {
+            "label": "Links"
+          },
+          "options__2": {
+            "label": "Zentriert"
+          },
+          "options__3": {
+            "label": "Rechts"
+          },
+          "label": "Inhaltsausrichtung"
         }
       },
       "blocks": {
@@ -1969,17 +1997,57 @@
             }
           }
         },
-        "button": {
-          "name": "Schaltfläche",
+        "buttons": {
+          "name": "Schaltflächen",
           "settings": {
-            "button_label": {
-              "label": "Schaltflächenbeschriftung"
+            "button_label_1": {
+              "label": "Erste Beschriftung der Schaltfläche",
+              "info": "Lasse die Beschriftung leer, um die Schaltfläche auszublenden."
             },
-            "button_link": {
-              "label": "Schaltflächenlink"
+            "button_link_1": {
+              "label": "Erster Link der Schaltfläche"
             },
-            "button_style_secondary": {
+            "button_style_secondary_1": {
               "label": "Umriss-Stil für Schaltfläche verwenden"
+            },
+            "button_label_2": {
+              "label": "Zweite Beschriftung der Schaltfläche",
+              "info": "Lasse die Beschriftung leer, um die Schaltfläche auszublenden."
+            },
+            "button_link_2": {
+              "label": "Zweiter Link der Schaltfläche"
+            },
+            "button_style_secondary_2": {
+              "label": "Umriss-Stil für Schaltfläche verwenden"
+            }
+          }
+        },
+        "caption": {
+          "name": "Bildtext",
+          "settings": {
+            "text": {
+              "label": "Text"
+            },
+            "text_style": {
+              "label": "Textstil",
+              "options__1": {
+                "label": "Untertitel"
+              },
+              "options__2": {
+                "label": "Großbuchstaben"
+              }
+            },
+            "caption_size": {
+              "label": "Textgröße",
+              "options__1": {
+                "label": "Klein"
+              },
+              "options__2": {
+                "label": "Mittel"
+              },
+              "options__3": {
+                "label": "Groß"
+              }
             }
           }
         }
diff --git a/locales/en.default.schema.json b/locales/en.default.schema.json
index aeabbdf54e9..42c8123fcb6 100644
--- a/locales/en.default.schema.json
+++ b/locales/en.default.schema.json
@@ -338,6 +338,9 @@
         },
         "options__3": {
           "label": "Large"
+        },
+        "options__4": {
+          "label": "Extra large"
         }
       }
     },
@@ -2203,6 +2206,31 @@
     "rich-text": {
       "name": "Rich text",
       "settings": {
+        "desktop_content_position": {
+          "options__1": {
+            "label": "Left"
+          },
+          "options__2": {
+            "label": "Center"
+          },
+          "options__3": {
+            "label": "Right"
+          },
+          "label": "Desktop content position",
+          "info": "Position is automatically optimized for mobile."
+        },
+        "content_alignment": {
+          "options__1": {
+            "label": "Left"
+          },
+          "options__2": {
+            "label": "Center"
+          },
+          "options__3": {
+            "label": "Right"
+          },
+          "label": "Content alignment"
+        },
         "full_width": {
           "label": "Make section full width"
         }
@@ -2216,6 +2244,35 @@
             }
           }
         },
+        "caption": {
+          "name": "Caption",
+          "settings": {
+            "text": {
+              "label": "Text"
+            },
+            "text_style": {
+              "label": "Text style",
+              "options__1": {
+                "label": "Subtitle"
+              },
+              "options__2": {
+                "label": "Uppercase"
+              }
+            },
+            "caption_size": {
+              "label": "Text size",
+              "options__1": {
+                "label": "Small"
+              },
+              "options__2": {
+                "label": "Medium"
+              },
+              "options__3": {
+                "label": "Large"
+              }
+            }
+          }
+        },
         "text": {
           "name": "Text",
           "settings": {
@@ -2224,16 +2281,27 @@
             }
           }
         },
-        "button": {
-          "name": "Button",
+        "buttons": {
+          "name": "Buttons",
           "settings": {
-            "button_label": {
-              "label": "Button label"
+            "button_label_1": {
+              "label": "First button label",
+              "info": "Leave the label blank to hide the button."
             },
-            "button_link": {
-              "label": "Button link"
+            "button_link_1": {
+              "label": "First button link"
+            },
+            "button_style_secondary_1": {
+              "label": "Use outline button style"
+            },
+            "button_label_2": {
+              "label": "Second button label",
+              "info": "Leave the label blank to hide the button."
             },
-            "button_style_secondary": {
+            "button_link_2": {
+              "label": "Second button link"
+            },
+            "button_style_secondary_2": {
               "label": "Use outline button style"
             }
           }
@@ -2650,4 +2718,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/locales/es.schema.json b/locales/es.schema.json
index c989f604a4d..75eaf2eba17 100644
--- a/locales/es.schema.json
+++ b/locales/es.schema.json
@@ -338,6 +338,9 @@
         },
         "options__3": {
           "label": "Grande"
+        },
+        "options__4": {
+          "label": "Extra grande"
         }
       }
     },
@@ -1950,6 +1953,31 @@
       "settings": {
         "full_width": {
           "label": "Definir ancho completo en sección"
+        },
+        "desktop_content_position": {
+          "options__1": {
+            "label": "Izquierda"
+          },
+          "options__2": {
+            "label": "Centrado"
+          },
+          "options__3": {
+            "label": "Derecha"
+          },
+          "label": "Posición del contenido en el escritorio",
+          "info": "La posición se optimizó automáticamente para dispositivos móviles."
+        },
+        "content_alignment": {
+          "options__1": {
+            "label": "Izquierda"
+          },
+          "options__2": {
+            "label": "Centrado"
+          },
+          "options__3": {
+            "label": "Derecha"
+          },
+          "label": "Alineación de contenido"
         }
       },
       "blocks": {
@@ -1969,17 +1997,57 @@
             }
           }
         },
-        "button": {
-          "name": "Botón",
+        "buttons": {
+          "name": "Botones",
           "settings": {
-            "button_label": {
-              "label": "Etiqueta de botón"
+            "button_label_1": {
+              "label": "Primera etiqueta de botón",
+              "info": "Deja la etiqueta en blanco para ocultar el botón."
             },
-            "button_link": {
-              "label": "Enlace de botón"
+            "button_link_1": {
+              "label": "Primer enlace de botón"
             },
-            "button_style_secondary": {
+            "button_style_secondary_1": {
               "label": "Usar estilo de botón con contorno"
+            },
+            "button_label_2": {
+              "label": "Primera etiqueta de botón",
+              "info": "Deja la etiqueta en blanco para ocultar el botón."
+            },
+            "button_link_2": {
+              "label": "Segundo enlace de botón"
+            },
+            "button_style_secondary_2": {
+              "label": "Usar estilo de botón con contorno"
+            }
+          }
+        },
+        "caption": {
+          "name": "Leyenda",
+          "settings": {
+            "text": {
+              "label": "Texto"
+            },
+            "text_style": {
+              "label": "Estilo de texto",
+              "options__1": {
+                "label": "Subtítulo"
+              },
+              "options__2": {
+                "label": "Mayúscula"
+              }
+            },
+            "caption_size": {
+              "label": "Tamaño del texto",
+              "options__1": {
+                "label": "Pequeño"
+              },
+              "options__2": {
+                "label": "Mediano"
+              },
+              "options__3": {
+                "label": "Grande"
+              }
             }
           }
         }
diff --git a/locales/fi.schema.json b/locales/fi.schema.json
index b48cfdc068e..7269e1f2807 100644
--- a/locales/fi.schema.json
+++ b/locales/fi.schema.json
@@ -338,6 +338,9 @@
         },
         "options__3": {
           "label": "Suuri"
+        },
+        "options__4": {
+          "label": "Erittäin suuri"
         }
       }
     },
@@ -1950,6 +1953,31 @@
       "settings": {
         "full_width": {
           "label": "Tee osiosta täysleveä"
+        },
+        "desktop_content_position": {
+          "options__1": {
+            "label": "Vasen"
+          },
+          "options__2": {
+            "label": "Keskitetty"
+          },
+          "options__3": {
+            "label": "Oikea"
+          },
+          "label": "Työpöytäsisällön sijainti",
+          "info": "Sijainti optimoidaan automaattisesti mobiililaitteille."
+        },
+        "content_alignment": {
+          "options__1": {
+            "label": "Vasen"
+          },
+          "options__2": {
+            "label": "Keskitetty"
+          },
+          "options__3": {
+            "label": "Oikea"
+          },
+          "label": "Sisällön kohdistus"
         }
       },
       "blocks": {
@@ -1969,17 +1997,57 @@
             }
           }
         },
-        "button": {
-          "name": "Painike",
+        "buttons": {
+          "name": "Painikkeet",
           "settings": {
-            "button_label": {
-              "label": "Tekstipainike"
+            "button_label_1": {
+              "label": "Ensimmäinen tekstipainike",
+              "info": "Jos haluat piilottaa painikkeen, jätä painikkeen teksti tyhjäksi."
             },
-            "button_link": {
-              "label": "Painikelinkki"
+            "button_link_1": {
+              "label": "Ensimmäinen painikelinkki"
             },
-            "button_style_secondary": {
+            "button_style_secondary_1": {
               "label": "Käytä ääriviivallista painiketyyliä"
+            },
+            "button_label_2": {
+              "label": "Toinen tekstipainike",
+              "info": "Jos haluat piilottaa painikkeen, jätä painikkeen teksti tyhjäksi."
+            },
+            "button_link_2": {
+              "label": "Toinen painikelinkki"
+            },
+            "button_style_secondary_2": {
+              "label": "Käytä ääriviivallista painiketyyliä"
+            }
+          }
+        },
+        "caption": {
+          "name": "Kuvateksti",
+          "settings": {
+            "text": {
+              "label": "Teksti"
+            },
+            "text_style": {
+              "label": "Tekstityyli",
+              "options__1": {
+                "label": "Alaotsikko"
+              },
+              "options__2": {
+                "label": "Isot kirjaimet"
+              }
+            },
+            "caption_size": {
+              "label": "Tekstin koko",
+              "options__1": {
+                "label": "Pieni"
+              },
+              "options__2": {
+                "label": "Keskisuuri"
+              },
+              "options__3": {
+                "label": "Suuri"
+              }
             }
           }
         }
diff --git a/locales/fr.schema.json b/locales/fr.schema.json
index 7289fd2bc83..c2163e152df 100644
--- a/locales/fr.schema.json
+++ b/locales/fr.schema.json
@@ -338,6 +338,9 @@
         },
         "options__3": {
           "label": "Grand"
+        },
+        "options__4": {
+          "label": "Très grand"
         }
       }
     },
@@ -1950,6 +1953,31 @@
       "settings": {
         "full_width": {
           "label": "Rendre la section pleine largeur"
+        },
+        "desktop_content_position": {
+          "options__1": {
+            "label": "Gauche"
+          },
+          "options__2": {
+            "label": "Centre"
+          },
+          "options__3": {
+            "label": "Droite"
+          },
+          "label": "Position du contenu sur ordinateur",
+          "info": "La position est automatiquement optimisée pour les mobiles."
+        },
+        "content_alignment": {
+          "options__1": {
+            "label": "Gauche"
+          },
+          "options__2": {
+            "label": "Centre"
+          },
+          "options__3": {
+            "label": "Droite"
+          },
+          "label": "Alignement du contenu"
         }
       },
       "blocks": {
@@ -1969,17 +1997,57 @@
             }
           }
         },
-        "button": {
-          "name": "Bouton",
+        "buttons": {
+          "name": "Boutons",
           "settings": {
-            "button_label": {
-              "label": "Texte du bouton"
+            "button_label_1": {
+              "label": "Texte du premier bouton",
+              "info": "Laisser le texte vide pour masquer le bouton."
             },
-            "button_link": {
-              "label": "Lien du bouton"
+            "button_link_1": {
+              "label": "Lien du premier bouton"
             },
-            "button_style_secondary": {
+            "button_style_secondary_1": {
               "label": "Utiliser le style du bouton en relief"
+            },
+            "button_label_2": {
+              "label": "Texte du deuxième bouton",
+              "info": "Laisser le texte vide pour masquer le bouton."
+            },
+            "button_link_2": {
+              "label": "Lien du deuxième bouton"
+            },
+            "button_style_secondary_2": {
+              "label": "Utiliser le style du bouton en relief"
+            }
+          }
+        },
+        "caption": {
+          "name": "Légende",
+          "settings": {
+            "text": {
+              "label": "Texte"
+            },
+            "text_style": {
+              "label": "Style de texte",
+              "options__1": {
+                "label": "Sous‑titre"
+              },
+              "options__2": {
+                "label": "Majuscule"
+              }
+            },
+            "caption_size": {
+              "label": "Taille du texte",
+              "options__1": {
+                "label": "Petit"
+              },
+              "options__2": {
+                "label": "Moyen"
+              },
+              "options__3": {
+                "label": "Grand"
+              }
             }
           }
         }
diff --git a/locales/it.schema.json b/locales/it.schema.json
index 5a020184f20..7fe8e62b2d5 100644
--- a/locales/it.schema.json
+++ b/locales/it.schema.json
@@ -338,6 +338,9 @@
         },
         "options__3": {
           "label": "Grande"
+        },
+        "options__4": {
+          "label": "Extra large"
         }
       }
     },
@@ -1950,6 +1953,31 @@
       "settings": {
         "full_width": {
           "label": "Crea sezione a larghezza intera"
+        },
+        "desktop_content_position": {
+          "options__1": {
+            "label": "A sinistra"
+          },
+          "options__2": {
+            "label": "Al centro"
+          },
+          "options__3": {
+            "label": "A destra"
+          },
+          "label": "Posizione contenuto su desktop",
+          "info": "Posizione automaticamente ottimizzata per dispositivi mobili."
+        },
+        "content_alignment": {
+          "options__1": {
+            "label": "A sinistra"
+          },
+          "options__2": {
+            "label": "Al centro"
+          },
+          "options__3": {
+            "label": "A destra"
+          },
+          "label": "Allineamento contenuto"
         }
       },
       "blocks": {
@@ -1969,17 +1997,57 @@
             }
           }
         },
-        "button": {
-          "name": "Pulsante",
+        "buttons": {
+          "name": "Pulsanti",
           "settings": {
-            "button_label": {
-              "label": "Etichetta pulsante"
+            "button_label_1": {
+              "label": "Prima etichetta pulsante",
+              "info": "Lascia vuota l'etichetta per nascondere il pulsante."
             },
-            "button_link": {
-              "label": "Link pulsante"
+            "button_link_1": {
+              "label": "Primo link pulsante"
             },
-            "button_style_secondary": {
+            "button_style_secondary_1": {
               "label": "Utilizza stile contorno pulsante"
+            },
+            "button_label_2": {
+              "label": "Seconda etichetta pulsante",
+              "info": "Lascia vuota l'etichetta per nascondere il pulsante."
+            },
+            "button_link_2": {
+              "label": "Secondo link pulsante"
+            },
+            "button_style_secondary_2": {
+              "label": "Utilizza stile contorno pulsante"
+            }
+          }
+        },
+        "caption": {
+          "name": "Didascalia",
+          "settings": {
+            "text": {
+              "label": "Testo"
+            },
+            "text_style": {
+              "label": "Stile testo",
+              "options__1": {
+                "label": "Sottotitolo"
+              },
+              "options__2": {
+                "label": "Maiuscolo"
+              }
+            },
+            "caption_size": {
+              "label": "Dimensione del testo",
+              "options__1": {
+                "label": "Piccola"
+              },
+              "options__2": {
+                "label": "Media"
+              },
+              "options__3": {
+                "label": "Grande"
+              }
             }
           }
         }
diff --git a/locales/ja.schema.json b/locales/ja.schema.json
index 7bd5fdaa7f3..1847aeb0fa0 100644
--- a/locales/ja.schema.json
+++ b/locales/ja.schema.json
@@ -338,6 +338,9 @@
         },
         "options__3": {
           "label": "大"
+        },
+        "options__4": {
+          "label": "特大"
         }
       }
     },
@@ -1950,6 +1953,31 @@
       "settings": {
         "full_width": {
           "label": "セクションを全幅にする"
+        },
+        "desktop_content_position": {
+          "options__1": {
+            "label": "左"
+          },
+          "options__2": {
+            "label": "中央"
+          },
+          "options__3": {
+            "label": "右"
+          },
+          "label": "デスクトップのコンテンツ位置",
+          "info": "位置はモバイル用に自動で最適化されます。"
+        },
+        "content_alignment": {
+          "options__1": {
+            "label": "左"
+          },
+          "options__2": {
+            "label": "中央"
+          },
+          "options__3": {
+            "label": "右"
+          },
+          "label": "コンテンツアラインメント"
         }
       },
       "blocks": {
@@ -1969,19 +1997,59 @@
           },
           "name": "テキスト"
         },
-        "button": {
+        "buttons": {
           "settings": {
-            "button_label": {
-              "label": "ボタンのラベル"
+            "button_label_1": {
+              "label": "最初のボタンのラベル",
+              "info": "ボタンを非表示にするには、ラベルを空白にします。"
             },
-            "button_link": {
-              "label": "ボタンのリンク"
+            "button_link_1": {
+              "label": "最初のボタンのリンク"
             },
-            "button_style_secondary": {
+            "button_style_secondary_1": {
+              "label": "アウトラインボタンのスタイルを使用する"
+            },
+            "button_label_2": {
+              "label": "2番目のボタンのラベル",
+              "info": "ボタンを非表示にするには、ラベルを空白にします。"
+            },
+            "button_link_2": {
+              "label": "2番目のボタンのリンク"
+            },
+            "button_style_secondary_2": {
               "label": "アウトラインボタンのスタイルを使用する"
             }
           },
           "name": "ボタン"
+        },
+        "caption": {
+          "name": "キャプション",
+          "settings": {
+            "text": {
+              "label": "テキスト"
+            },
+            "text_style": {
+              "label": "テキストスタイル",
+              "options__1": {
+                "label": "サブタイトル"
+              },
+              "options__2": {
+                "label": "大文字"
+              }
+            },
+            "caption_size": {
+              "label": "テキストサイズ",
+              "options__1": {
+                "label": "小"
+              },
+              "options__2": {
+                "label": "中"
+              },
+              "options__3": {
+                "label": "大"
+              }
+            }
+          }
         }
       },
       "presets": {
diff --git a/locales/ko.schema.json b/locales/ko.schema.json
index 2ed225b4423..96080d9e412 100644
--- a/locales/ko.schema.json
+++ b/locales/ko.schema.json
@@ -338,6 +338,9 @@
         },
         "options__3": {
           "label": "크게"
+        },
+        "options__4": {
+          "label": "특대"
         }
       }
     },
@@ -1950,6 +1953,31 @@
       "settings": {
         "full_width": {
           "label": "섹션을 전체 폭 사용"
+        },
+        "desktop_content_position": {
+          "options__1": {
+            "label": "왼쪽"
+          },
+          "options__2": {
+            "label": "가운데"
+          },
+          "options__3": {
+            "label": "오른쪽"
+          },
+          "label": "데스크톱 콘텐츠 위치",
+          "info": "위치는 자동으로 모바일에 최적화됩니다."
+        },
+        "content_alignment": {
+          "options__1": {
+            "label": "왼쪽"
+          },
+          "options__2": {
+            "label": "가운데"
+          },
+          "options__3": {
+            "label": "오른쪽"
+          },
+          "label": "콘텐츠 정렬"
         }
       },
       "blocks": {
@@ -1969,19 +1997,59 @@
           },
           "name": "텍스트"
         },
-        "button": {
+        "buttons": {
           "settings": {
-            "button_label": {
-              "label": "버튼 레이블"
+            "button_label_1": {
+              "label": "첫 번째 버튼 레이블",
+              "info": "버튼을 숨기려면 레이블을 비워둡니다."
             },
-            "button_link": {
-              "label": "버튼 링크"
+            "button_link_1": {
+              "label": "첫 번째 버튼 링크"
             },
-            "button_style_secondary": {
+            "button_style_secondary_1": {
+              "label": "윤곽 버튼 스타일 사용"
+            },
+            "button_label_2": {
+              "label": "두 번째 버튼 레이블",
+              "info": "버튼을 숨기려면 레이블을 비워둡니다."
+            },
+            "button_link_2": {
+              "label": "두 번째 버튼 링크"
+            },
+            "button_style_secondary_2": {
               "label": "윤곽 버튼 스타일 사용"
             }
           },
           "name": "버튼"
+        },
+        "caption": {
+          "name": "캡션",
+          "settings": {
+            "text": {
+              "label": "텍스트"
+            },
+            "text_style": {
+              "label": "텍스트 스타일",
+              "options__1": {
+                "label": "소제목"
+              },
+              "options__2": {
+                "label": "대문자"
+              }
+            },
+            "caption_size": {
+              "label": "텍스트 사이즈",
+              "options__1": {
+                "label": "작게"
+              },
+              "options__2": {
+                "label": "보통"
+              },
+              "options__3": {
+                "label": "크게"
+              }
+            }
+          }
         }
       },
       "presets": {
diff --git a/locales/nb.schema.json b/locales/nb.schema.json
index c0cd4c760ee..4056adc143e 100644
--- a/locales/nb.schema.json
+++ b/locales/nb.schema.json
@@ -338,6 +338,9 @@
         },
         "options__3": {
           "label": "Stor"
+        },
+        "options__4": {
+          "label": "Ekstra stort"
         }
       }
     },
@@ -1950,6 +1953,31 @@
       "settings": {
         "full_width": {
           "label": "Gjør seksjonen til full bredde"
+        },
+        "desktop_content_position": {
+          "options__1": {
+            "label": "Venstre"
+          },
+          "options__2": {
+            "label": "Sentrert"
+          },
+          "options__3": {
+            "label": "Høyre"
+          },
+          "label": "Innholdsplassering på datamaskin",
+          "info": "Posisjonen optimaliseres automatisk for mobil."
+        },
+        "content_alignment": {
+          "options__1": {
+            "label": "Venstre"
+          },
+          "options__2": {
+            "label": "Sentrert"
+          },
+          "options__3": {
+            "label": "Høyre"
+          },
+          "label": "Innholdsjustering"
         }
       },
       "blocks": {
@@ -1969,17 +1997,57 @@
             }
           }
         },
-        "button": {
-          "name": "Knapp",
+        "buttons": {
+          "name": "Knapper",
           "settings": {
-            "button_label": {
-              "label": "Knappetikett"
+            "button_label_1": {
+              "label": "Første knappetikett",
+              "info": "La etiketten stå tom for å skjule knappen."
             },
-            "button_link": {
-              "label": "Knappekobling"
+            "button_link_1": {
+              "label": "Første knappekobling"
             },
-            "button_style_secondary": {
+            "button_style_secondary_1": {
               "label": "Bruk knappestil med omriss"
+            },
+            "button_label_2": {
+              "label": "Andre knappetikett",
+              "info": "La etiketten stå tom for å skjule knappen."
+            },
+            "button_link_2": {
+              "label": "Andre knappekobling"
+            },
+            "button_style_secondary_2": {
+              "label": "Bruk knappestil med omriss"
+            }
+          }
+        },
+        "caption": {
+          "name": "Bildetekst",
+          "settings": {
+            "text": {
+              "label": "Tekst"
+            },
+            "text_style": {
+              "label": "Tekststil",
+              "options__1": {
+                "label": "Undertekst"
+              },
+              "options__2": {
+                "label": "Store bokstaver"
+              }
+            },
+            "caption_size": {
+              "label": "Tekststørrelse",
+              "options__1": {
+                "label": "Liten"
+              },
+              "options__2": {
+                "label": "Middels"
+              },
+              "options__3": {
+                "label": "Stor"
+              }
             }
           }
         }
diff --git a/locales/nl.schema.json b/locales/nl.schema.json
index 3dd318cf604..f12c14fe6f1 100644
--- a/locales/nl.schema.json
+++ b/locales/nl.schema.json
@@ -338,6 +338,9 @@
         },
         "options__3": {
           "label": "Groot"
+        },
+        "options__4": {
+          "label": "Extra groot"
         }
       }
     },
@@ -1950,6 +1953,31 @@
       "settings": {
         "full_width": {
           "label": "Volledige breedte voor sectie gebruiken"
+        },
+        "desktop_content_position": {
+          "options__1": {
+            "label": "Links"
+          },
+          "options__2": {
+            "label": "Midden"
+          },
+          "options__3": {
+            "label": "Rechts"
+          },
+          "label": "Positie van content op desktop",
+          "info": "De positie wordt automatisch geoptimaliseerd voor mobiel."
+        },
+        "content_alignment": {
+          "options__1": {
+            "label": "Links"
+          },
+          "options__2": {
+            "label": "Midden"
+          },
+          "options__3": {
+            "label": "Rechts"
+          },
+          "label": "Content uitlijnen"
         }
       },
       "blocks": {
@@ -1969,19 +1997,59 @@
             }
           }
         },
-        "button": {
-          "name": "Knop",
+        "buttons": {
+          "name": "Knoppen",
           "settings": {
-            "button_label": {
-              "label": "Knop met tekstlabel"
+            "button_label_1": {
+              "label": "Eerste knoplabel",
+              "info": "Laat het label leeg om de knop te verbergen."
             },
-            "button_link": {
-              "label": "Knop met link"
+            "button_link_1": {
+              "label": "Eerste knoplink"
+            },
+            "button_style_secondary_1": {
+              "label": "Gebruik de knopstijl Omlijnen"
+            },
+            "button_label_2": {
+              "label": "Tweede knoplabel",
+              "info": "Laat het label leeg om de knop te verbergen."
             },
-            "button_style_secondary": {
+            "button_link_2": {
+              "label": "Tweede knoplink"
+            },
+            "button_style_secondary_2": {
               "label": "Gebruik de knopstijl Omlijnen"
             }
           }
+        },
+        "caption": {
+          "name": "Bijschrift",
+          "settings": {
+            "text": {
+              "label": "Tekst"
+            },
+            "text_style": {
+              "label": "Tekststijl",
+              "options__1": {
+                "label": "Ondertitel"
+              },
+              "options__2": {
+                "label": "Hoofdletters"
+              }
+            },
+            "caption_size": {
+              "label": "Tekstgrootte",
+              "options__1": {
+                "label": "Klein"
+              },
+              "options__2": {
+                "label": "Gemiddeld"
+              },
+              "options__3": {
+                "label": "Groot"
+              }
+            }
+          }
         }
       },
       "presets": {
diff --git a/locales/pl.schema.json b/locales/pl.schema.json
index 0acbd243615..7f2aab4fda5 100644
--- a/locales/pl.schema.json
+++ b/locales/pl.schema.json
@@ -338,6 +338,9 @@
         },
         "options__3": {
           "label": "Duży"
+        },
+        "options__4": {
+          "label": "Bardzo duży"
         }
       }
     },
@@ -1950,6 +1953,31 @@
       "settings": {
         "full_width": {
           "label": "Zrób sekcję na całą szerokość"
+        },
+        "desktop_content_position": {
+          "options__1": {
+            "label": "Lewa strona"
+          },
+          "options__2": {
+            "label": "Środek"
+          },
+          "options__3": {
+            "label": "Prawa strona"
+          },
+          "label": "Pozycja treści na komputerze",
+          "info": "Pozycja jest automatycznie optymalizowana dla urządzeń mobilnych."
+        },
+        "content_alignment": {
+          "options__1": {
+            "label": "Lewa strona"
+          },
+          "options__2": {
+            "label": "Środek"
+          },
+          "options__3": {
+            "label": "Prawa strona"
+          },
+          "label": "Wyrównanie zawartości"
         }
       },
       "blocks": {
@@ -1969,17 +1997,57 @@
             }
           }
         },
-        "button": {
-          "name": "Przycisk",
+        "buttons": {
+          "name": "Przyciski",
           "settings": {
-            "button_label": {
-              "label": "Przycisk z etykietą"
+            "button_label_1": {
+              "label": "Pierwszy przycisk z etykietą",
+              "info": "Pozostaw etykietę pustą, aby ukryć przycisk."
             },
-            "button_link": {
-              "label": "Link przycisku"
+            "button_link_1": {
+              "label": "Pierwszy link przycisku"
             },
-            "button_style_secondary": {
+            "button_style_secondary_1": {
               "label": "Użyj stylu przycisku konspektu"
+            },
+            "button_label_2": {
+              "label": "Drugi przycisk z etykietą",
+              "info": "Pozostaw etykietę pustą, aby ukryć przycisk."
+            },
+            "button_link_2": {
+              "label": "Drugi link przycisku"
+            },
+            "button_style_secondary_2": {
+              "label": "Użyj stylu przycisku konspektu"
+            }
+          }
+        },
+        "caption": {
+          "name": "Napisy",
+          "settings": {
+            "text": {
+              "label": "Tekst"
+            },
+            "text_style": {
+              "label": "Styl tekstu",
+              "options__1": {
+                "label": "Podtytuł"
+              },
+              "options__2": {
+                "label": "Duże litery"
+              }
+            },
+            "caption_size": {
+              "label": "Rozmiar tekstu",
+              "options__1": {
+                "label": "Mały"
+              },
+              "options__2": {
+                "label": "Średni"
+              },
+              "options__3": {
+                "label": "Duży"
+              }
             }
           }
         }
diff --git a/locales/pt-BR.schema.json b/locales/pt-BR.schema.json
index 040b8f9ccb5..cf3f5d5f070 100644
--- a/locales/pt-BR.schema.json
+++ b/locales/pt-BR.schema.json
@@ -338,6 +338,9 @@
         },
         "options__3": {
           "label": "Grande"
+        },
+        "options__4": {
+          "label": "Extra grande"
         }
       }
     },
@@ -1950,6 +1953,31 @@
       "settings": {
         "full_width": {
           "label": "Definir seção com largura total"
+        },
+        "desktop_content_position": {
+          "options__1": {
+            "label": "Esquerda"
+          },
+          "options__2": {
+            "label": "Centro"
+          },
+          "options__3": {
+            "label": "Direita"
+          },
+          "label": "Posição do conteúdo no desktop",
+          "info": "A posição é otimizada automaticamente para dispositivos móveis."
+        },
+        "content_alignment": {
+          "options__1": {
+            "label": "Esquerda"
+          },
+          "options__2": {
+            "label": "Centro"
+          },
+          "options__3": {
+            "label": "Direita"
+          },
+          "label": "Alinhamento de conteúdo"
         }
       },
       "blocks": {
@@ -1969,17 +1997,57 @@
             }
           }
         },
-        "button": {
-          "name": "Botão",
+        "buttons": {
+          "name": "Botões",
           "settings": {
-            "button_label": {
-              "label": "Etiqueta de botão"
+            "button_label_1": {
+              "label": "Primeira etiqueta de botão",
+              "info": "Deixe a etiqueta em branco para ocultar o botão."
             },
-            "button_link": {
-              "label": "Link de botão"
+            "button_link_1": {
+              "label": "Primeiro link de botão"
             },
-            "button_style_secondary": {
+            "button_style_secondary_1": {
               "label": "Usar estilo de botão com contorno"
+            },
+            "button_label_2": {
+              "label": "Segunda etiqueta de botão",
+              "info": "Deixe a etiqueta em branco para ocultar o botão."
+            },
+            "button_link_2": {
+              "label": "Segundo link de botão"
+            },
+            "button_style_secondary_2": {
+              "label": "Usar estilo de botão com contorno"
+            }
+          }
+        },
+        "caption": {
+          "name": "Legenda",
+          "settings": {
+            "text": {
+              "label": "Texto"
+            },
+            "text_style": {
+              "label": "Estilo de texto",
+              "options__1": {
+                "label": "Legenda"
+              },
+              "options__2": {
+                "label": "Letras maiúsculas"
+              }
+            },
+            "caption_size": {
+              "label": "Tamanho do texto",
+              "options__1": {
+                "label": "Pequeno"
+              },
+              "options__2": {
+                "label": "Médio"
+              },
+              "options__3": {
+                "label": "Grande"
+              }
             }
           }
         }
diff --git a/locales/pt-PT.schema.json b/locales/pt-PT.schema.json
index 60fd373f2d8..018e5285b36 100644
--- a/locales/pt-PT.schema.json
+++ b/locales/pt-PT.schema.json
@@ -338,6 +338,9 @@
         },
         "options__3": {
           "label": "Grande"
+        },
+        "options__4": {
+          "label": "Extra grande"
         }
       }
     },
@@ -1950,6 +1953,31 @@
       "settings": {
         "full_width": {
           "label": "Tornar a secção em largura total"
+        },
+        "desktop_content_position": {
+          "options__1": {
+            "label": "Esquerda"
+          },
+          "options__2": {
+            "label": "Ao centro"
+          },
+          "options__3": {
+            "label": "Direita"
+          },
+          "label": "Posição do conteúdo para computador",
+          "info": "A posição é automaticamente otimizada para dispositivos móveis."
+        },
+        "content_alignment": {
+          "options__1": {
+            "label": "Esquerda"
+          },
+          "options__2": {
+            "label": "Ao centro"
+          },
+          "options__3": {
+            "label": "Direita"
+          },
+          "label": "Alinhamento de conteúdo"
         }
       },
       "blocks": {
@@ -1969,19 +1997,59 @@
           },
           "name": "Texto"
         },
-        "button": {
+        "buttons": {
           "settings": {
-            "button_label": {
-              "label": "Etiqueta do botão"
+            "button_label_1": {
+              "label": "Primeira etiqueta do botão",
+              "info": "Deixe a etiqueta em branco para ocultar o botão."
             },
-            "button_link": {
-              "label": "Ligação do botão"
+            "button_link_1": {
+              "label": "Primeira ligação do botão"
+            },
+            "button_style_secondary_1": {
+              "label": "Utilizar estilo de botão de contorno"
+            },
+            "button_label_2": {
+              "label": "Segunda etiqueta do botão",
+              "info": "Deixe a etiqueta em branco para ocultar o botão."
+            },
+            "button_link_2": {
+              "label": "Segunda ligação do botão"
             },
-            "button_style_secondary": {
+            "button_style_secondary_2": {
               "label": "Utilizar estilo de botão de contorno"
             }
           },
-          "name": "Botão"
+          "name": "Botões"
+        },
+        "caption": {
+          "name": "Legenda",
+          "settings": {
+            "text": {
+              "label": "Texto"
+            },
+            "text_style": {
+              "label": "Estilo de texto",
+              "options__1": {
+                "label": "Legenda"
+              },
+              "options__2": {
+                "label": "Maiúsculas"
+              }
+            },
+            "caption_size": {
+              "label": "Tamanho do texto",
+              "options__1": {
+                "label": "Pequeno"
+              },
+              "options__2": {
+                "label": "Médio"
+              },
+              "options__3": {
+                "label": "Grande"
+              }
+            }
+          }
         }
       },
       "presets": {
diff --git a/locales/sv.schema.json b/locales/sv.schema.json
index d0f44f46738..db4d8bc62f8 100644
--- a/locales/sv.schema.json
+++ b/locales/sv.schema.json
@@ -338,6 +338,9 @@
         },
         "options__3": {
           "label": "Stor"
+        },
+        "options__4": {
+          "label": "Extra stor"
         }
       }
     },
@@ -1950,6 +1953,31 @@
       "settings": {
         "full_width": {
           "label": "Ge avsnittet full bredd"
+        },
+        "desktop_content_position": {
+          "options__1": {
+            "label": "Vänster"
+          },
+          "options__2": {
+            "label": "Centrera"
+          },
+          "options__3": {
+            "label": "Höger"
+          },
+          "label": "Innehållsposition på skrivbord",
+          "info": "Positionen optimeras automatiskt för mobilen."
+        },
+        "content_alignment": {
+          "options__1": {
+            "label": "Vänster"
+          },
+          "options__2": {
+            "label": "Centrera"
+          },
+          "options__3": {
+            "label": "Höger"
+          },
+          "label": "Innehållsjustering"
         }
       },
       "blocks": {
@@ -1969,19 +1997,59 @@
           },
           "name": "Text"
         },
-        "button": {
+        "buttons": {
           "settings": {
-            "button_label": {
-              "label": "Knappetikett"
+            "button_label_1": {
+              "label": "Första knappetikett",
+              "info": "Lämna etiketten tom eller dölj knappen."
             },
-            "button_link": {
-              "label": "Knapplänk"
+            "button_link_1": {
+              "label": "Första knapplänk"
             },
-            "button_style_secondary": {
+            "button_style_secondary_1": {
+              "label": "Använd stil för knappkontur"
+            },
+            "button_label_2": {
+              "label": "Andra knappetikett",
+              "info": "Lämna etiketten tom eller dölj knappen."
+            },
+            "button_link_2": {
+              "label": "Andra knapplänk"
+            },
+            "button_style_secondary_2": {
               "label": "Använd stil för knappkontur"
             }
           },
-          "name": "Knapp"
+          "name": "Knappar"
+        },
+        "caption": {
+          "name": "Rubrik",
+          "settings": {
+            "text": {
+              "label": "Text"
+            },
+            "text_style": {
+              "label": "Textstil",
+              "options__1": {
+                "label": "Underrubrik"
+              },
+              "options__2": {
+                "label": "Stora bokstäver"
+              }
+            },
+            "caption_size": {
+              "label": "Textstorlek",
+              "options__1": {
+                "label": "Liten"
+              },
+              "options__2": {
+                "label": "Medel"
+              },
+              "options__3": {
+                "label": "Stor"
+              }
+            }
+          }
         }
       },
       "presets": {
diff --git a/locales/th.schema.json b/locales/th.schema.json
index e19cd439a3f..9fffed29b91 100644
--- a/locales/th.schema.json
+++ b/locales/th.schema.json
@@ -338,6 +338,9 @@
         },
         "options__3": {
           "label": "ใหญ่"
+        },
+        "options__4": {
+          "label": "ขนาดใหญ่พิเศษ"
         }
       }
     },
@@ -1950,6 +1953,31 @@
       "settings": {
         "full_width": {
           "label": "ทำส่วนให้เต็มความกว้าง"
+        },
+        "desktop_content_position": {
+          "options__1": {
+            "label": "ซ้าย"
+          },
+          "options__2": {
+            "label": "กึ่งกลาง"
+          },
+          "options__3": {
+            "label": "ขวา"
+          },
+          "label": "ตำแหน่งเนื้อหาบนเดสก์ท็อป",
+          "info": "ระบบจะปรับตำแหน่งให้เหมาะสมกับมือถือโดยอัตโนมัติ"
+        },
+        "content_alignment": {
+          "options__1": {
+            "label": "ซ้าย"
+          },
+          "options__2": {
+            "label": "กึ่งกลาง"
+          },
+          "options__3": {
+            "label": "ขวา"
+          },
+          "label": "การจัดวางเนื้อหา"
         }
       },
       "blocks": {
@@ -1969,19 +1997,59 @@
           },
           "name": "ข้อความ"
         },
-        "button": {
+        "buttons": {
           "settings": {
-            "button_label": {
-              "label": "ป้ายกำกับปุ่ม"
+            "button_label_1": {
+              "label": "ป้ายกำกับปุ่มแรก",
+              "info": "เว้นป้ายให้ว่างไว้เพื่อซ่อนปุ่ม"
             },
-            "button_link": {
-              "label": "ลิงก์ปุ่ม"
+            "button_link_1": {
+              "label": "ลิงก์ปุ่มแรก"
+            },
+            "button_style_secondary_1": {
+              "label": "ใช้รูปแบบปุ่มแบบเค้าโครง"
             },
-            "button_style_secondary": {
+            "button_label_2": {
+              "label": "ป้ายกำกับปุ่มที่สอง",
+              "info": "เว้นป้ายให้ว่างไว้เพื่อซ่อนปุ่ม"
+            },
+            "button_link_2": {
+              "label": "ลิงก์ปุ่มที่สอง"
+            },
+            "button_style_secondary_2": {
               "label": "ใช้รูปแบบปุ่มแบบเค้าโครง"
             }
           },
           "name": "ปุ่ม"
+        },
+        "caption": {
+          "name": "คำบรรยาย",
+          "settings": {
+            "text": {
+              "label": "ข้อความ"
+            },
+            "text_style": {
+              "label": "รูปแบบข้อความ",
+              "options__1": {
+                "label": "หัวเรื่องย่อย"
+              },
+              "options__2": {
+                "label": "ตัวพิมพ์ใหญ่"
+              }
+            },
+            "caption_size": {
+              "label": "ขนาดตัวอักษร",
+              "options__1": {
+                "label": "เล็ก"
+              },
+              "options__2": {
+                "label": "ปานกลาง"
+              },
+              "options__3": {
+                "label": "ใหญ่"
+              }
+            }
+          }
         }
       },
       "presets": {
diff --git a/locales/tr.schema.json b/locales/tr.schema.json
index e0e0bf09e62..a059eaafbfb 100644
--- a/locales/tr.schema.json
+++ b/locales/tr.schema.json
@@ -338,6 +338,9 @@
         },
         "options__3": {
           "label": "Büyük"
+        },
+        "options__4": {
+          "label": "Çok büyük"
         }
       }
     },
@@ -1950,6 +1953,31 @@
       "settings": {
         "full_width": {
           "label": "Bölümü tam genişlikli yap"
+        },
+        "desktop_content_position": {
+          "options__1": {
+            "label": "Sol"
+          },
+          "options__2": {
+            "label": "Orta"
+          },
+          "options__3": {
+            "label": "Sağ"
+          },
+          "label": "Masaüstü içerik konumu",
+          "info": "Konum, mobil cihazlar için otomatik olarak optimize edilir."
+        },
+        "content_alignment": {
+          "options__1": {
+            "label": "Sol"
+          },
+          "options__2": {
+            "label": "Orta"
+          },
+          "options__3": {
+            "label": "Sağ"
+          },
+          "label": "İçerik hizalaması"
         }
       },
       "blocks": {
@@ -1969,17 +1997,57 @@
             }
           }
         },
-        "button": {
-          "name": "Düğme",
+        "buttons": {
+          "name": "Düğmeler",
           "settings": {
-            "button_label": {
-              "label": "Düğme etiketi"
+            "button_label_1": {
+              "label": "İlk düğme etiketi",
+              "info": "Düğmeyi gizlemek için etiketi boş bırakın."
             },
-            "button_link": {
-              "label": "Düğme bağlantısı"
+            "button_link_1": {
+              "label": "İlk düğme bağlantısı"
             },
-            "button_style_secondary": {
+            "button_style_secondary_1": {
               "label": "Dış çizgi düğme stilini kullan"
+            },
+            "button_label_2": {
+              "label": "İkinci düğme etiketi",
+              "info": "Düğmeyi gizlemek için etiketi boş bırakın."
+            },
+            "button_link_2": {
+              "label": "İkinci düğme bağlantısı"
+            },
+            "button_style_secondary_2": {
+              "label": "Dış çizgi düğme stilini kullan"
+            }
+          }
+        },
+        "caption": {
+          "name": "Alt yazı",
+          "settings": {
+            "text": {
+              "label": "Metin rengi"
+            },
+            "text_style": {
+              "label": "Metin stili",
+              "options__1": {
+                "label": "Alt yazı"
+              },
+              "options__2": {
+                "label": "Büyük harf"
+              }
+            },
+            "caption_size": {
+              "label": "Metin boyutu",
+              "options__1": {
+                "label": "Küçük"
+              },
+              "options__2": {
+                "label": "Orta"
+              },
+              "options__3": {
+                "label": "Büyük"
+              }
             }
           }
         }
diff --git a/locales/vi.schema.json b/locales/vi.schema.json
index 30cdee25b8b..8641db200f4 100644
--- a/locales/vi.schema.json
+++ b/locales/vi.schema.json
@@ -338,6 +338,9 @@
         },
         "options__3": {
           "label": "Lớn"
+        },
+        "options__4": {
+          "label": "Cực lớn"
         }
       }
     },
@@ -1950,6 +1953,31 @@
       "settings": {
         "full_width": {
           "label": "Làm cho mục có chiều rộng đầy đủ"
+        },
+        "desktop_content_position": {
+          "options__1": {
+            "label": "Bên trái"
+          },
+          "options__2": {
+            "label": "Ở giữa"
+          },
+          "options__3": {
+            "label": "Bên phải"
+          },
+          "label": "Vị trí nội dung trên màn hình máy tính",
+          "info": "Vị trí được tự động tối ưu hóa cho thiết bị di động."
+        },
+        "content_alignment": {
+          "options__1": {
+            "label": "Bên trái"
+          },
+          "options__2": {
+            "label": "Ở giữa"
+          },
+          "options__3": {
+            "label": "Bên phải"
+          },
+          "label": "Căn chỉnh nội dung"
         }
       },
       "blocks": {
@@ -1969,17 +1997,57 @@
             }
           }
         },
-        "button": {
+        "buttons": {
           "name": "Nút",
           "settings": {
-            "button_label": {
-              "label": "Nhãn nút"
+            "button_label_1": {
+              "label": "Nhãn nút thứ nhất",
+              "info": "Để nhãn trống để ẩn nút."
             },
-            "button_link": {
-              "label": "Liên kết trên nút"
+            "button_link_1": {
+              "label": "Liên kết trên nút thứ nhất"
             },
-            "button_style_secondary": {
+            "button_style_secondary_1": {
               "label": "Sử dụng kiểu nút viền ngoài"
+            },
+            "button_label_2": {
+              "label": "Nhãn nút thứ hai",
+              "info": "Để nhãn trống để ẩn nút."
+            },
+            "button_link_2": {
+              "label": "Liên kết trên nút thứ hai"
+            },
+            "button_style_secondary_2": {
+              "label": "Sử dụng kiểu nút viền ngoài"
+            }
+          }
+        },
+        "caption": {
+          "name": "Phụ đề",
+          "settings": {
+            "text": {
+              "label": "Văn bản"
+            },
+            "text_style": {
+              "label": "Kiểu văn bản",
+              "options__1": {
+                "label": "Tiêu đề phụ"
+              },
+              "options__2": {
+                "label": "Chữ viết hoa"
+              }
+            },
+            "caption_size": {
+              "label": "Cỡ chữ",
+              "options__1": {
+                "label": "Nhỏ"
+              },
+              "options__2": {
+                "label": "Trung bình"
+              },
+              "options__3": {
+                "label": "Lớn"
+              }
             }
           }
         }
diff --git a/locales/zh-CN.schema.json b/locales/zh-CN.schema.json
index 2d61684704e..48e34f85aae 100644
--- a/locales/zh-CN.schema.json
+++ b/locales/zh-CN.schema.json
@@ -338,6 +338,9 @@
         },
         "options__3": {
           "label": "大"
+        },
+        "options__4": {
+          "label": "特大"
         }
       }
     },
@@ -1950,6 +1953,31 @@
       "settings": {
         "full_width": {
           "label": "使分区展示全宽"
+        },
+        "desktop_content_position": {
+          "options__1": {
+            "label": "左"
+          },
+          "options__2": {
+            "label": "居中"
+          },
+          "options__3": {
+            "label": "右"
+          },
+          "label": "台式设备内容位置",
+          "info": "位置会针对移动设备进行自动优化。"
+        },
+        "content_alignment": {
+          "options__1": {
+            "label": "左"
+          },
+          "options__2": {
+            "label": "居中"
+          },
+          "options__3": {
+            "label": "右"
+          },
+          "label": "内容对齐方式"
         }
       },
       "blocks": {
@@ -1969,19 +1997,59 @@
           },
           "name": "文本"
         },
-        "button": {
+        "buttons": {
           "settings": {
-            "button_label": {
-              "label": "按钮标签"
+            "button_label_1": {
+              "label": "第一个按钮标签",
+              "info": "将标签留空以隐藏按钮。"
             },
-            "button_link": {
-              "label": "按钮链接"
+            "button_link_1": {
+              "label": "第一个按钮链接"
             },
-            "button_style_secondary": {
+            "button_style_secondary_1": {
+              "label": "使用轮廓按钮样式"
+            },
+            "button_label_2": {
+              "label": "第二个按钮标签",
+              "info": "将标签留空以隐藏按钮。"
+            },
+            "button_link_2": {
+              "label": "第二个按钮链接"
+            },
+            "button_style_secondary_2": {
               "label": "使用轮廓按钮样式"
             }
           },
           "name": "按钮"
+        },
+        "caption": {
+          "name": "字幕",
+          "settings": {
+            "text": {
+              "label": "文本"
+            },
+            "text_style": {
+              "label": "文本样式",
+              "options__1": {
+                "label": "副标题"
+              },
+              "options__2": {
+                "label": "大写"
+              }
+            },
+            "caption_size": {
+              "label": "文本大小",
+              "options__1": {
+                "label": "小"
+              },
+              "options__2": {
+                "label": "中"
+              },
+              "options__3": {
+                "label": "大"
+              }
+            }
+          }
         }
       },
       "presets": {
diff --git a/locales/zh-TW.schema.json b/locales/zh-TW.schema.json
index ef15082cf74..b5abd3ee95c 100644
--- a/locales/zh-TW.schema.json
+++ b/locales/zh-TW.schema.json
@@ -338,6 +338,9 @@
         },
         "options__3": {
           "label": "大"
+        },
+        "options__4": {
+          "label": "超大型"
         }
       }
     },
@@ -1950,6 +1953,31 @@
       "settings": {
         "full_width": {
           "label": "讓區段呈現全寬度"
+        },
+        "desktop_content_position": {
+          "options__1": {
+            "label": "靠左"
+          },
+          "options__2": {
+            "label": "置中"
+          },
+          "options__3": {
+            "label": "靠右"
+          },
+          "label": "桌面版內容位置",
+          "info": "行動版會自動調整為最佳位置。"
+        },
+        "content_alignment": {
+          "options__1": {
+            "label": "靠左"
+          },
+          "options__2": {
+            "label": "置中"
+          },
+          "options__3": {
+            "label": "靠右"
+          },
+          "label": "內容對齊"
         }
       },
       "blocks": {
@@ -1969,19 +1997,59 @@
           },
           "name": "文字"
         },
-        "button": {
+        "buttons": {
           "settings": {
-            "button_label": {
-              "label": "按鈕標籤"
+            "button_label_1": {
+              "label": "第一個按鈕標籤",
+              "info": "將標籤保留空白以隱藏按鈕。"
             },
-            "button_link": {
-              "label": "按鈕連結"
+            "button_link_1": {
+              "label": "第一個按鈕連結"
             },
-            "button_style_secondary": {
+            "button_style_secondary_1": {
+              "label": "使用外框按鈕樣式"
+            },
+            "button_label_2": {
+              "label": "第二個按鈕標籤",
+              "info": "將標籤保留空白以隱藏按鈕。"
+            },
+            "button_link_2": {
+              "label": "第二個按鈕連結"
+            },
+            "button_style_secondary_2": {
               "label": "使用外框按鈕樣式"
             }
           },
           "name": "按鈕"
+        },
+        "caption": {
+          "name": "說明",
+          "settings": {
+            "text": {
+              "label": "文字"
+            },
+            "text_style": {
+              "label": "文字樣式",
+              "options__1": {
+                "label": "副標題"
+              },
+              "options__2": {
+                "label": "大寫"
+              }
+            },
+            "caption_size": {
+              "label": "文字大小",
+              "options__1": {
+                "label": "小"
+              },
+              "options__2": {
+                "label": "中"
+              },
+              "options__3": {
+                "label": "大"
+              }
+            }
+          }
         }
       },
       "presets": {
diff --git a/sections/rich-text.liquid b/sections/rich-text.liquid
index 91097df2ab5..e50d4211da2 100644
--- a/sections/rich-text.liquid
+++ b/sections/rich-text.liquid
@@ -20,19 +20,34 @@
 
 <div class="isolate{% unless section.settings.full_width %} page-width{% endunless %}">
   <div class="rich-text content-container color-{{ section.settings.color_scheme }} gradient{% if section.settings.full_width %} rich-text--full-width content-container--full-width{% endif %} section-{{ section.id }}-padding">
-    <div class="rich-text__blocks">
-      {%- for block in section.blocks -%}
-        {%- case block.type -%}
-          {%- when 'heading' -%}
-            <h2 class="{{ block.settings.heading_size }}" {{ block.shopify_attributes }}>{{ block.settings.heading | escape }}</h2>
-          {%- when 'text' -%}
-            <div class="rich-text__text rte" {{ block.shopify_attributes }}>{{ block.settings.text }}</div>
-          {%- when 'button' -%}
-            <a{% if block.settings.button_link == blank %} role="link" aria-disabled="true"{% else %} href="{{ block.settings.button_link }}"{% endif %} class="button{% if block.settings.button_style_secondary %} button--secondary{% else %} button--primary{% endif %}" {{ block.shopify_attributes }}>
-              {{ block.settings.button_label | escape }}
-            </a>
-        {%- endcase -%}
-      {%- endfor -%}
+    <div class="rich-text__wrapper rich-text__wrapper--{{ section.settings.desktop_content_position }}{% if section.settings.full_width %} page-width{% endif %}">
+      <div class="rich-text__blocks {{ section.settings.content_alignment }}">
+        {%- for block in section.blocks -%}
+          {%- case block.type -%}
+            {%- when 'heading' -%}
+              <h2 class="rich-text__heading rte {{ block.settings.heading_size }}" {{ block.shopify_attributes }}>
+                {{ block.settings.heading | replace: 'p>', 'span>' }}
+              </h2>
+            {%- when 'caption' -%}
+              <p class="rich-text__caption {{ block.settings.text_style }} {{ block.settings.text_style }}--{{ block.settings.text_size }}" {{ block.shopify_attributes }}>
+                {{ block.settings.caption | escape }}
+              </p>
+            {%- when 'text' -%}
+              <div class="rich-text__text rte" {{ block.shopify_attributes }}>
+                {{ block.settings.text }}
+              </div>
+            {%- when 'buttons' -%}
+              <div class="rich-text__buttons{% if block.settings.button_label_1 != blank and block.settings.button_label_2 != blank %} rich-text__buttons--multiple{% endif %}" {{ block.shopify_attributes }}>
+                {%- if block.settings.button_label_1 != blank -%}
+                  <a{% if block.settings.button_link_1 == blank %} role="link" aria-disabled="true"{% else %} href="{{ block.settings.button_link_1 }}"{% endif %} class="button{% if block.settings.button_style_secondary_1 %} button--secondary{% else %} button--primary{% endif %}">{{ block.settings.button_label_1 | escape }}</a>
+                {%- endif -%}
+                {%- if block.settings.button_label_2 != blank -%}
+                  <a{% if block.settings.button_link_2 == blank %} role="link" aria-disabled="true"{% else %} href="{{ block.settings.button_link_2 }}"{% endif %} class="button{% if block.settings.button_style_secondary_2 %} button--secondary{% else %} button--primary{% endif %}">{{ block.settings.button_label_2 | escape }}</a>
+                {%- endif -%}
+              </div>
+          {%- endcase -%}
+        {%- endfor -%}
+      </div>
     </div>
   </div>
 </div>
@@ -43,6 +58,47 @@
   "tag": "section",
   "class": "section",
   "settings": [
+    {
+      "type": "select",
+      "id": "desktop_content_position",
+      "options": [
+        {
+          "value": "left",
+          "label": "t:sections.rich-text.settings.desktop_content_position.options__1.label"
+        },
+        {
+          "value": "center",
+          "label": "t:sections.rich-text.settings.desktop_content_position.options__2.label"
+        },
+        {
+          "value": "right",
+          "label": "t:sections.rich-text.settings.desktop_content_position.options__3.label"
+        }
+      ],
+      "default": "center",
+      "label": "t:sections.rich-text.settings.desktop_content_position.label",
+      "info": "t:sections.rich-text.settings.desktop_content_position.info"
+    },
+    {
+      "type": "select",
+      "id": "content_alignment",
+      "options": [
+        {
+          "value": "left",
+          "label": "t:sections.rich-text.settings.content_alignment.options__1.label"
+        },
+        {
+          "value": "center",
+          "label": "t:sections.rich-text.settings.content_alignment.options__2.label"
+        },
+        {
+          "value": "right",
+          "label": "t:sections.rich-text.settings.content_alignment.options__3.label"
+        }
+      ],
+      "default": "center",
+      "label": "t:sections.rich-text.settings.content_alignment.label"
+    },
     {
       "type": "select",
       "id": "color_scheme",
@@ -106,12 +162,12 @@
     {
       "type": "heading",
       "name": "t:sections.rich-text.blocks.heading.name",
-      "limit": 1,
+      "limit": 3,
       "settings": [
         {
-          "type": "text",
+          "type": "richtext",
           "id": "heading",
-          "default": "Talk about your brand",
+          "default": "<p>Talk about your brand</p>",
           "label": "t:sections.rich-text.blocks.heading.settings.heading.label"
         },
         {
@@ -129,6 +185,10 @@
             {
               "value": "h0",
               "label": "t:sections.all.heading_size.options__3.label"
+            },
+            {
+              "value": "hxl",
+              "label": "t:sections.all.heading_size.options__4.label"
             }
           ],
           "default": "h1",
@@ -136,10 +196,59 @@
         }
       ]
     },
+    {
+      "type": "caption",
+      "name": "t:sections.rich-text.blocks.caption.name",
+      "limit": 3,
+      "settings": [
+        {
+          "type": "text",
+          "id": "caption",
+          "default": "Add a tagline",
+          "label": "t:sections.rich-text.blocks.caption.settings.text.label"
+        },
+        {
+          "type": "select",
+          "id": "text_style",
+          "options": [
+            {
+              "value": "subtitle",
+              "label": "t:sections.rich-text.blocks.caption.settings.text_style.options__1.label"
+            },
+            {
+              "value": "caption-with-letter-spacing",
+              "label": "t:sections.rich-text.blocks.caption.settings.text_style.options__2.label"
+            }
+          ],
+          "default": "caption-with-letter-spacing",
+          "label": "t:sections.rich-text.blocks.caption.settings.text_style.label"
+        },
+        {
+          "type": "select",
+          "id": "text_size",
+          "options": [
+            {
+              "value": "small",
+              "label": "t:sections.rich-text.blocks.caption.settings.caption_size.options__1.label"
+            },
+            {
+              "value": "medium",
+              "label": "t:sections.rich-text.blocks.caption.settings.caption_size.options__2.label"
+            },
+            {
+              "value": "large",
+              "label": "t:sections.rich-text.blocks.caption.settings.caption_size.options__3.label"
+            }
+          ],
+          "default": "medium",
+          "label": "t:sections.rich-text.blocks.caption.settings.caption_size.label"
+        }
+      ]
+    },
     {
       "type": "text",
       "name": "t:sections.rich-text.blocks.text.name",
-      "limit": 1,
+      "limit": 3,
       "settings": [
         {
           "type": "richtext",
@@ -150,26 +259,45 @@
       ]
     },
     {
-      "type": "button",
-      "name": "t:sections.rich-text.blocks.button.name",
-      "limit": 1,
+      "type": "buttons",
+      "name": "t:sections.rich-text.blocks.buttons.name",
+      "limit": 2,
       "settings": [
         {
           "type": "text",
-          "id": "button_label",
+          "id": "button_label_1",
+          "default": "Button label",
+          "label": "t:sections.rich-text.blocks.buttons.settings.button_label_1.label",
+          "info": "t:sections.rich-text.blocks.buttons.settings.button_label_1.info"
+        },
+        {
+          "type": "url",
+          "id": "button_link_1",
+          "label": "t:sections.rich-text.blocks.buttons.settings.button_link_1.label"
+        },
+        {
+          "type": "checkbox",
+          "id": "button_style_secondary_1",
+          "default": false,
+          "label": "t:sections.rich-text.blocks.buttons.settings.button_style_secondary_1.label"
+        },
+        {
+          "type": "text",
+          "id": "button_label_2",
           "default": "Button label",
-          "label": "t:sections.rich-text.blocks.button.settings.button_label.label"
+          "label": "t:sections.rich-text.blocks.buttons.settings.button_label_2.label",
+          "info": "t:sections.rich-text.blocks.buttons.settings.button_label_2.info"
         },
         {
           "type": "url",
-          "id": "button_link",
-          "label": "t:sections.rich-text.blocks.button.settings.button_link.label"
+          "id": "button_link_2",
+          "label": "t:sections.rich-text.blocks.buttons.settings.button_link_2.label"
         },
         {
           "type": "checkbox",
-          "id": "button_style_secondary",
+          "id": "button_style_secondary_2",
           "default": false,
-          "label": "t:sections.rich-text.blocks.button.settings.button_style_secondary.label"
+          "label": "t:sections.rich-text.blocks.buttons.settings.button_style_secondary_2.label"
         }
       ]
     }
@@ -185,7 +313,7 @@
           "type": "text"
         },
         {
-          "type": "button"
+          "type": "buttons"
         }
       ]
     }
diff --git a/templates/index.json b/templates/index.json
index a3d80351e09..14ea5d442d6 100644
--- a/templates/index.json
+++ b/templates/index.json
@@ -53,7 +53,7 @@
         "heading": {
           "type": "heading",
           "settings": {
-            "heading": "Talk about your brand",
+            "heading": "<p>Talk about your brand</p>",
             "heading_size": "h1"
           }
         },