diff --git a/config/settings_schema.json b/config/settings_schema.json
index cecb89755b5..66cfcab1db9 100644
--- a/config/settings_schema.json
+++ b/config/settings_schema.json
@@ -112,8 +112,7 @@
         "type": "font_picker",
         "id": "type_header_font",
         "default": "assistant_n4",
-        "label": "t:settings_schema.typography.settings.type_header_font.label",
-        "info": "t:settings_schema.typography.settings.type_header_font.info"
+        "label": "t:settings_schema.typography.settings.type_header_font.label"
       },
       {
         "type": "range",
@@ -133,8 +132,7 @@
         "type": "font_picker",
         "id": "type_body_font",
         "default": "assistant_n4",
-        "label": "t:settings_schema.typography.settings.type_body_font.label",
-        "info": "t:settings_schema.typography.settings.type_body_font.info"
+        "label": "t:settings_schema.typography.settings.type_body_font.label"
       },
       {
         "type": "range",
@@ -1305,10 +1303,6 @@
   {
     "name": "t:settings_schema.social-media.name",
     "settings": [
-      {
-        "type": "header",
-        "content": "t:settings_schema.social-media.settings.header.content"
-      },
       {
         "type": "text",
         "id": "social_facebook_link",
@@ -1368,10 +1362,6 @@
   {
     "name": "t:settings_schema.search_input.name",
     "settings": [
-      {
-        "type": "header",
-        "content": "t:settings_schema.search_input.settings.header.content"
-      },
       {
         "type": "checkbox",
         "id": "predictive_search_enabled",
@@ -1397,10 +1387,6 @@
   {
     "name": "t:settings_schema.currency_format.name",
     "settings": [
-      {
-        "type": "header",
-        "content": "t:settings_schema.currency_format.settings.content"
-      },
       {
         "type": "paragraph",
         "content": "t:settings_schema.currency_format.settings.paragraph"
diff --git a/locales/en.default.schema.json b/locales/en.default.schema.json
index 87fccb56934..6dfc8cbee88 100644
--- a/locales/en.default.schema.json
+++ b/locales/en.default.schema.json
@@ -145,12 +145,11 @@
           "label": "Logo"
         },
         "logo_width": {
-          "label": "Desktop logo width",
-          "info": "Logo width is automatically optimized for mobile."
+          "label": "Width"
         },
         "favicon": {
-          "label": "Favicon image",
-          "info": "Will be scaled down to 32 x 32px"
+          "label": "Favicon",
+          "info": "Displayed at 32 x 32px"
         }
       }
     },
@@ -158,7 +157,7 @@
       "name": "Brand information",
       "settings": {
         "paragraph": {
-          "content": "Add a brand description to your store's footer."
+          "content": "Displays in the footer's brand information block"
         },
         "brand_headline": {
           "label": "Headline"
@@ -178,11 +177,10 @@
       "name": "Typography",
       "settings": {
         "type_header_font": {
-          "label": "Font",
-          "info": "Selecting a different font can affect the speed of your store. [Learn more about system fonts.](https://help.shopify.com/manual/online-store/os/store-speed/improving-speed#fonts)"
+          "label": "Font"
         },
         "heading_scale": {
-          "label": "Font size scale"
+          "label": "Size scale"
         },
         "header__1": {
           "content": "Headings"
@@ -191,11 +189,10 @@
           "content": "Body"
         },
         "type_body_font": {
-          "label": "Font",
-          "info": "Selecting a different font can affect the speed of your store. [Learn more about system fonts.](https://help.shopify.com/manual/online-store/os/store-speed/improving-speed#fonts)"
+          "label": "Font"
         },
         "body_scale": {
-          "label": "Font size scale"
+          "label": "Size scale"
         }
       }
     },
@@ -204,7 +201,7 @@
     },
     "variant_pills": {
       "name": "Variant pills",
-      "paragraph": "Variant pills are one way of displaying your product variants. [Learn more](https://help.shopify.com/en/manual/online-store/themes/theme-structure/page-types#variant-picker-block)"
+      "paragraph": "Variant pills are one way of displaying your [product variants](https://help.shopify.com/manual/online-store/themes/theme-structure/page-types/product-pages#variant-picker-block)"
     },
     "inputs": {
       "name": "Inputs"
@@ -214,7 +211,7 @@
     },
     "popups": {
       "name": "Dropdowns and pop-ups",
-      "paragraph": "Affects areas like navigation dropdowns, pop-up modals, and cart pop-ups."
+      "paragraph": "Affects areas like navigation dropdowns and pop-up modals and carts"
     },
     "media": {
       "name": "Media"
@@ -239,7 +236,7 @@
             "label": "3D lift"
           },
           "label": "Hover effect",
-          "info": "Affects cards and buttons."
+          "info": "Affects cards and buttons"
         }
       }
     },
@@ -290,29 +287,25 @@
     "search_input": {
       "name": "Search behavior",
       "settings": {
-        "header": {
-          "content": "Search suggestions"
-        },
         "predictive_search_enabled": {
-          "label": "Enable search suggestions"
+          "label": "Search suggestions"
         },
         "predictive_search_show_vendor": {
-          "label": "Show product vendor",
-          "info": "Visible when search suggestions enabled."
+          "label": "Product vendor",
+          "info": "Shown when search suggestions enabled"
         },
         "predictive_search_show_price": {
-          "label": "Show product price",
-          "info": "Visible when search suggestions enabled."
+          "label": "Product price",
+          "info": "Shown when search suggestions enabled"
         }
       }
     },
     "currency_format": {
       "name": "Currency format",
       "settings": {
-        "content": "Currency codes",
-        "paragraph": "Cart and checkout prices always show currency codes. Example: $1.00 USD.",
+        "paragraph": "Cart and checkout prices always show currency codes",
         "currency_code_enabled": {
-          "label": "Show currency codes"
+          "label": "Currency codes"
         }
       }
     },
@@ -320,7 +313,7 @@
       "name": "Cart",
       "settings": {
         "cart_type": {
-          "label": "Cart type",
+          "label": "Type",
           "drawer": {
             "label": "Drawer"
           },
@@ -328,20 +321,20 @@
             "label": "Page"
           },
           "notification": {
-            "label": "Popup notification"
+            "label": "Popup"
           }
         },
         "show_vendor": {
-          "label": "Show vendor"
+          "label": "Vendor"
         },
         "show_cart_note": {
-          "label": "Enable cart note"
+          "label": "Cart note"
         },
         "cart_drawer": {
           "header": "Cart drawer",
           "collection": {
             "label": "Collection",
-            "info": "Visible when cart drawer is empty."
+            "info": "Shown when cart is empty"
           }
         }
       }
@@ -359,7 +352,7 @@
           "content": "Grid"
         },
         "paragraph__grid": {
-          "content": "Affects areas with multiple columns or rows."
+          "content": "Affects areas with multiple columns or rows"
         },
         "spacing_grid_horizontal": {
           "label": "Horizontal space"
@@ -387,13 +380,13 @@
           "options__4": {
             "label": "Zoom in on scroll"
           },
-          "label": "Image behavior"
+          "label": "Animation"
         }
       },
       "padding": {
-        "section_padding_heading": "Section padding",
-        "padding_top": "Top padding",
-        "padding_bottom": "Bottom padding"
+        "section_padding_heading": "Padding",
+        "padding_top": "Top",
+        "padding_bottom": "Bottom"
       },
       "spacing": "Spacing",
       "colors": {
@@ -443,42 +436,41 @@
         "options__8": {
           "label": "Round"
         },
-        "label": "Image shape",
-        "info": "Standard-styled cards have no borders when an image shape is active."
+        "label": "Image shape"
       }
     },
     "announcement-bar": {
       "name": "Announcement bar",
       "settings": {
         "auto_rotate": {
-          "label": "Auto-rotate announcements"
+          "label": "Auto rotate"
         },
         "change_slides_speed": {
           "label": "Change every"
         },
         "header__1": {
-          "content": "Social media icons",
-          "info": "To display your social media accounts, link them in your [theme settings](/editor?context=theme&category=social%20media)."
+          "content": "Social media",
+          "info": "Manage social accounts in [theme settings](/editor?context=theme&category=social%20media)"
         },
         "header__2": {
           "content": "Announcements"
         },
         "show_social": {
-          "label": "Show icons on desktop"
+          "label": "Icons"
         },
         "header__3": {
           "content": "Country/region selector",
-          "info": "To add a country/region, go to your [market settings.](/admin/settings/markets)"
+          "info": "Manage counties/regions in your [market settings](/admin/settings/markets)"
         },
         "enable_country_selector": {
-          "label": "Enable country/region selector"
+          "label": "Country/region selector"
         },
         "header__4": {
           "content": "Language selector",
-          "info": "To add a language, go to your [language settings.](/admin/settings/languages)"
+          "info": "Manage languages in [language settings](/admin/settings/languages)"
         },
         "enable_language_selector": {
-          "label": "Enable language selector"
+          "label": "Language selector"
         }
       },
       "blocks": {
@@ -530,7 +522,7 @@
           "label": "Heading"
         },
         "desktop_layout": {
-          "label": "Desktop layout",
+          "label": "Layout",
           "options__1": {
             "label": "Left large block"
           },
@@ -549,7 +541,7 @@
         },
         "card_styles": {
           "label": "Card style",
-          "info": "Product, collection, and blog card styles can be updated in theme settings.",
+          "info": "Individual card styles are controlled in theme settings",
           "options__1": {
             "label": "Use individual card styles"
           },
@@ -577,7 +569,7 @@
               "label": "Show secondary background"
             },
             "second_image": {
-              "label": "Show second image on hover"
+              "label": "Second image on hover"
             }
           }
         },
@@ -629,29 +621,29 @@
           },
           "options__3": {
             "label": "Square"
-          },
-          "info": "Add images by editing your collections. [Learn more](https://help.shopify.com/manual/products/collections)"
+          }
         },
         "columns_desktop": {
-          "label": "Number of columns on desktop"
+          "label": "Columns"
         },
         "show_view_all": {
-          "label": "Enable \"View all\" button if list includes more collections than shown"
-        },
+          "label": "\"View all\" button",
+          "info": "Visible if list has more collections than shown"
+            },
         "header_mobile": {
           "content": "Mobile Layout"
         },
         "columns_mobile": {
-          "label": "Number of columns on mobile",
+          "label": "Columns",
           "options__1": {
-            "label": "1 column"
+            "label": "1"
           },
           "options__2": {
-            "label": "2 columns"
+            "label": "2"
           }
         },
         "swipe_on_mobile": {
-          "label": "Enable swipe on mobile"
+          "label": "Carousel"
         }
       },
       "blocks": {
@@ -703,23 +695,23 @@
           "label": "Blog"
         },
         "post_limit": {
-          "label": "Number of blog posts to show"
-        },
+          "label": "Posts"
+        }, 
         "columns_desktop": {
-          "label": "Number of columns on desktop"
+          "label": "Columns"
         },
         "show_view_all": {
-          "label": "Enable \"View all\" button if blog includes more blog posts than shown"
+          "label": "\"View all\" button",
+          "info": "Visible if blog has more posts than shown"
         },
         "show_image": {
-          "label": "Show featured image",
-          "info": "For best results, use an image with a 3:2 aspect ratio. [Learn more](https://help.shopify.com/manual/shopify-admin/productivity-tools/image-editor#understanding-image-aspect-ratio)"
+          "label": "Featured image"
         },
         "show_date": {
-          "label": "Show date"
+          "label": "Date"
         },
         "show_author": {
-          "label": "Show author"
+          "label": "Author"
         }
       },
       "presets": {
@@ -729,6 +721,9 @@
     "featured-collection": {
       "name": "Featured collection",
       "settings": {
+        "header_text": {
+        "content": "Text"
+        },
         "title": {
           "label": "Heading",
           "default": "Featured collection"
@@ -737,7 +732,7 @@
           "label": "Description"
         },
         "show_description": {
-          "label": "Show collection description from the admin"
+          "label": "Collection description"
         },
         "description_style": {
           "label": "Description style",
@@ -751,17 +746,21 @@
             "label": "Uppercase"
           }
         },
+        "header_collection": {
+          "content": "Collection layout"
+        },        
         "collection": {
           "label": "Collection"
         },
         "products_to_show": {
-          "label": "Maximum products to show"
+          "label": "Products"
         },
         "columns_desktop": {
-          "label": "Number of columns on desktop"
+          "label": "Columns"
         },
         "show_view_all": {
-          "label": "Enable \"View all\" if collection has more products than shown"
+          "label": "\"View all\" button",
+          "info": "Visible if collection has more products than shown"
         },
         "view_all_style": {
           "label": "\"View all\" style",
@@ -776,10 +775,10 @@
           }
         },
         "enable_desktop_slider": {
-          "label": "Enable carousel on desktop"
+          "label": "Carousel"
         },
         "full_width": {
-          "label": "Make products full width"
+          "label": "Full width products"
         },
         "header": {
           "content": "Product card"
@@ -797,33 +796,29 @@
           }
         },
         "show_secondary_image": {
-          "label": "Show second image on hover"
+          "label": "Second image on hover"
         },
         "show_vendor": {
-          "label": "Show vendor"
+          "label": "Vendor"
         },
         "show_rating": {
-          "label": "Show product rating",
-          "info": "To display a rating, add a product rating app. [Learn more](https://help.shopify.com/manual/online-store/themes/theme-structure/theme-features#featured-collection-show-product-rating)"
+          "label": "Product rating",
+          "info": "An app is required for ratings. [Learn more](https://help.shopify.com/manual/online-store/themes/theme-structure/theme-features#featured-collection-show-product-rating)"
         },
         "enable_quick_buy": {
-          "label": "Enable quick add button",
-          "info": "Optimal with popup or drawer cart type."
-        },
-        "header_mobile": {
-          "content": "Mobile Layout"
+          "label": "Quick add"
         },
         "columns_mobile": {
-          "label": "Number of columns on mobile",
+          "label": "Mobile columns",
           "options__1": {
-            "label": "1 column"
+            "label": "1"
           },
           "options__2": {
-            "label": "2 columns"
+            "label": "2"
           }
         },
         "swipe_on_mobile": {
-          "label": "Enable swipe on mobile"
+          "label": "Mobile carousel"
         }
       },
       "presets": {
@@ -841,7 +836,7 @@
               "label": "Text"
             },
             "text_style": {
-              "label": "Text style",
+              "label": "Style",
               "options__1": {
                 "label": "Body"
               },
@@ -894,8 +889,8 @@
           "name": "Buy buttons",
           "settings": {
             "show_dynamic_checkout": {
-              "label": "Show dynamic checkout buttons",
-              "info": "Using the payment methods available on your store, customers see their preferred option, like PayPal or Apple Pay. [Learn more](https://help.shopify.com/manual/using-themes/change-the-layout/dynamic-checkout)"
+              "label": "Dynamic checkout buttons",
+              "info": "Customers will see their preferred payment option. [Learn more](https://help.shopify.com/manual/using-themes/change-the-layout/dynamic-checkout)"
             }
           }
         },
@@ -938,7 +933,7 @@
           "name": "Product rating",
           "settings": {
             "paragraph": {
-              "content": "To display a rating, add a product rating app. [Learn more](https://help.shopify.com/manual/online-store/themes/theme-structure/theme-features#featured-product-rating)"
+              "content": "An app is required for product ratings. [Learn more](https://help.shopify.com/manual/online-store/themes/theme-structure/theme-features#featured-product-rating)"
             }
           }
         }
@@ -948,14 +943,13 @@
           "label": "Product"
         },
         "secondary_background": {
-          "label": "Show secondary background"
+          "label": "Secondary background"
         },
         "header": {
-          "content": "Media",
-          "info": "Learn more about [media types](https://help.shopify.com/manual/products/product-media)"
+          "content": "Media"
         },
         "media_position": {
-          "label": "Desktop media position",
+          "label": "Position",
           "info": "Position is automatically optimized for mobile.",
           "options__1": {
             "label": "Left"
@@ -968,7 +962,7 @@
           "label": "Hide unselected variants’ media on desktop"
         },
         "enable_video_looping": {
-          "label": "Enable video looping"
+          "label": "Loop video"
         }
       },
       "presets": {
@@ -986,8 +980,7 @@
               "default": "Quick links"
             },
             "menu": {
-              "label": "Menu",
-              "info": "Displays only top-level menu items."
+              "label": "Menu"
             }
           }
         },
@@ -995,14 +988,14 @@
           "name": "Brand information",
           "settings": {
             "paragraph": {
-              "content": "This block will display your brand information. [Edit brand information.](/editor?context=theme&category=brand%20information)"
+              "content": "Manage in your [theme settings](/editor?context=theme&category=brand%20information)"
             },
             "header__1": {
-              "content": "Social media icons"
+              "content": "Social Media"
             },
             "show_social": {
-              "label": "Show social media icons",
-              "info": "To display your social media accounts, link them in your [theme settings](/editor?context=theme&category=social%20media)."
+              "label": "Icons",
+              "info": "Manage social accounts in [theme settings](/editor?context=theme&category=social%20media)"
             }
           }
         },
@@ -1022,7 +1015,7 @@
       },
       "settings": {
         "newsletter_enable": {
-          "label": "Show email signup"
+          "label": "Email signup"
         },
         "newsletter_heading": {
           "label": "Heading",
@@ -1030,55 +1023,55 @@
         },
         "header__1": {
           "content": "Email Signup",
-          "info": "Subscribers added automatically to your “accepted marketing” customer list. [Learn more](https://help.shopify.com/manual/customers/manage-customers)"
+          "info": "Signups add [customer profiles](https://help.shopify.com/manual/customers/manage-customers)"
         },
         "header__2": {
-          "content": "Social media icons",
-          "info": "To display your social media accounts, link them in your [theme settings](/editor?context=theme&category=social%20media)."
+          "content": "Social media",
+          "info": "Manage social accounts in [theme settings](/editor?context=theme&category=social%20media)"
         },
         "show_social": {
-          "label": "Show social media icons"
+          "label": "Icons"
         },
         "header__3": {
           "content": "Country/region selector"
         },
         "header__4": {
-          "info": "To add a country/region, go to your [market settings.](/admin/settings/markets)"
+          "info": "Manage countries/regions in [market settings](/admin/settings/markets)"
         },
         "enable_country_selector": {
-          "label": "Enable country/region selector"
+          "label": "Country/region selector"
         },
         "header__5": {
           "content": "Language selector"
         },
         "header__6": {
-          "info": "To add a language, go to your [language settings.](/admin/settings/languages)"
+          "info": "Manage languages in [language settings](/admin/settings/languages)"
         },
         "enable_language_selector": {
-          "label": "Enable language selector"
+          "label": "Language selector"
         },
         "header__7": {
           "content": "Payment methods"
         },
         "payment_enable": {
-          "label": "Show payment icons"
+          "label": "Icons"
         },
         "header__8": {
-          "content": "Policy links",
-          "info": "To add store policies, go to your [policy settings](/admin/settings/legal)."
+          "content": "Policies",
+          "info": "Manage in your [policy settings](/admin/settings/legal)"
         },
         "show_policy": {
-          "label": "Show policy links"
+          "label": "Policy links"
         },
         "margin_top": {
           "label": "Top margin"
         },
         "header__9": {
           "content": "Follow on Shop",
-          "info": "To allow customers to follow your store on the Shop app from your storefront, Shop Pay must be enabled. [Learn more](https://help.shopify.com/manual/online-store/themes/customizing-themes/follow-on-shop)"
+          "info": "Shop Pay must be enabled. [Learn more](https://help.shopify.com/manual/online-store/themes/customizing-themes/follow-on-shop)"
         },
         "enable_follow_on_shop": {
-          "label": "Enable Follow on Shop"
+          "label": "Follow on Shop"
         }
       }
     },
@@ -1086,10 +1079,10 @@
       "name": "Header",
       "settings": {
         "logo_help": {
-          "content": "Edit your logo in [theme settings](/editor?context=theme&category=logo)."
+          "content": "Edit your logo in [theme settings](/editor?context=theme&category=logo)"
         },
         "logo_position": {
-          "label": "Desktop logo position",
+          "label": "Logo position",
           "options__1": {
             "label": "Middle left"
           },
@@ -1107,8 +1100,7 @@
           "label": "Menu"
         },
         "menu_type_desktop": {
-          "label": "Desktop menu type",
-          "info": "Menu type is automatically optimized for mobile.",
+          "label": "Menu type",
           "options__1": {
             "label": "Dropdown"
           },
@@ -1120,7 +1112,7 @@
           }
         },
         "show_line_separator": {
-          "label": "Show separator line"
+          "label": "Separator line"
         },
         "header__1": {
           "content": "Color"
@@ -1147,19 +1139,19 @@
           "content": "Country/region selector"
         },
         "header__4": {
-          "info": "To add a country/region, go to your [market settings.](/admin/settings/markets)"
+          "info": "Manage countries/regions in [market settings](/admin/settings/markets)"
         },
         "enable_country_selector": {
-          "label": "Enable country/region selector"
+          "label": "Country/region selector"
         },
         "header__5": {
           "content": "Language selector"
         },
         "header__6": {
-          "info": "To add a language, go to your [language settings.](/admin/settings/languages)"
+          "info": "Manage languages in [language settings](/admin/settings/languages)"
         },
         "enable_language_selector": {
-          "label": "Enable language selector"
+          "label": "Language selector"
         },
         "margin_bottom": {
           "label": "Bottom margin"
@@ -1168,7 +1160,7 @@
           "content": "Mobile layout"
         },
         "mobile_logo_position": {
-          "label": "Mobile logo position",
+          "label": "Logo position",
           "options__1": {
             "label": "Center"
           },
@@ -1178,11 +1170,11 @@
         },
         "header__7": {
           "content": "Customer accounts log in",
-          "info": "To manage customer accounts, go to your [customer accounts settings](/admin/settings/customer_accounts)."
+          "info": "Manage customer accounts in your [customer accounts settings](/admin/settings/customer_accounts)"
         },
         "enable_customer_avatar": {
-          "label": "Show avatar",
-          "info": "Customers will only see their avatar when they're signed in with Shop"
+          "label": "Avatar",
+          "info": "Only visible when customers are signed in with Shop"
         }
       }
     },
@@ -1190,13 +1182,13 @@
       "name": "Image banner",
       "settings": {
         "image": {
-          "label": "First image"
+          "label": "Image 1"
         },
         "image_2": {
-          "label": "Second image"
+          "label": "Image 2"
         },
         "image_overlay_opacity": {
-          "label": "Image overlay opacity"
+          "label": "Overlay opacity"
         },
         "image_height": {
           "label": "Banner height",
@@ -1211,8 +1203,10 @@
           },
           "options__4": {
             "label": "Large"
+          }
           },
-          "info": "For best results, use an image with a 3:2 aspect ratio. [Learn more](https://help.shopify.com/manual/shopify-admin/productivity-tools/image-editor#understanding-image-aspect-ratio)"
+        "content": {
+          "content": "Content"
         },
         "desktop_content_position": {
           "options__1": {
@@ -1242,10 +1236,10 @@
           "options__9": {
             "label": "Bottom Right"
           },
-          "label": "Desktop content position"
+          "label": "Position"
         },
         "show_text_box": {
-          "label": "Show container on desktop"
+          "label": "Container"
         },
         "desktop_content_alignment": {
           "options__1": {
@@ -1257,7 +1251,7 @@
           "options__3": {
             "label": "Right"
           },
-          "label": "Desktop content alignment"
+          "label": "Alignment"
         },
         "mobile": {
           "content": "Mobile Layout"
@@ -1272,13 +1266,13 @@
           "options__3": {
             "label": "Right"
           },
-          "label": "Mobile content alignment"
+          "label": "Content alignment"
         },
         "stack_images_on_mobile": {
-          "label": "Stack images on mobile"
+          "label": "Stack images"
         },
         "show_text_below": {
-          "label": "Show container on mobile"
+          "label": "Container"
         }
       },
       "blocks": {
@@ -1295,7 +1289,7 @@
           "name": "Text",
           "settings": {
             "text": {
-              "label": "Description",
+              "label": "Text",
               "default": "Give customers details about the banner image(s) or content on the template."
             },
             "text_style": {
@@ -1308,34 +1302,40 @@
               "options__3": {
                 "label": "Uppercase"
               },
-              "label": "Text style"
+              "label": "Style"
             }
           }
         },
         "buttons": {
           "name": "Buttons",
           "settings": {
+          "header_1":{
+          "content": "Button 1"
+          },
             "button_label_1": {
-              "label": "First button label",
-              "info": "Leave the label blank to hide the button.",
+              "label": "Label",
+              "info": "Leave blank to hide",
               "default": "Button label"
             },
             "button_link_1": {
-              "label": "First button link"
+              "label": "Link"
             },
             "button_style_secondary_1": {
-              "label": "Use outline button style"
+              "label": "Outline style"
+            },
+            "header_2":{
+              "content": "Button 2"
             },
             "button_label_2": {
-              "label": "Second button label",
-              "info": "Leave the label blank to hide the button.",
+              "label": "Label",
+              "info": "Leave blank to hide",
               "default": "Button label"
             },
             "button_link_2": {
-              "label": "Second button link"
+              "label": "Link"
             },
             "button_style_secondary_2": {
-              "label": "Use outline button style"
+              "label": "Outline style"
             }
           }
         }
@@ -1347,6 +1347,12 @@
     "image-with-text": {
       "name": "Image with text",
       "settings": {
+      "header": {
+      "content": "Content"
+      },
+      "header_colors": {
+      "content": "Colors" 
+      },
         "image": {
           "label": "Image"
         },
@@ -1363,7 +1369,7 @@
           "options__4": {
             "label": "Large"
           },
-          "label": "Image height"
+          "label": "Height"
         },
         "desktop_image_width": {
           "options__1": {
@@ -1375,8 +1381,7 @@
           "options__3": {
             "label": "Large"
           },
-          "label": "Desktop image width",
-          "info": "Image is automatically optimized for mobile."
+          "label": "Width"
         },
         "layout": {
           "options__1": {
@@ -1385,8 +1390,7 @@
           "options__2": {
             "label": "Image second"
           },
-          "label": "Desktop image placement",
-          "info": "Image first is the default mobile layout."
+          "label": "Placement"
         },
         "desktop_content_alignment": {
           "options__1": {
@@ -1398,7 +1402,7 @@
           "options__3": {
             "label": "Right"
           },
-          "label": "Desktop content alignment"
+          "label": "Alignment"
         },
         "desktop_content_position": {
           "options__1": {
@@ -1410,7 +1414,7 @@
           "options__3": {
             "label": "Bottom"
           },
-          "label": "Desktop content position"
+          "label": "Position"
         },
         "content_layout": {
           "options__1": {
@@ -1419,7 +1423,7 @@
           "options__2": {
             "label": "Overlap"
           },
-          "label": "Content layout"
+          "label": "Layout"
         },
         "mobile_content_alignment": {
           "options__1": {
@@ -1431,7 +1435,7 @@
           "options__3": {
             "label": "Right"
           },
-          "label": "Mobile content alignment"
+          "label": "Mobile alignment"
         }
       },
       "blocks": {
@@ -1478,11 +1482,11 @@
           "name": "Text",
           "settings": {
             "text": {
-              "label": "Content",
+              "label": "Text",
               "default": "<p>Pair text with an image to focus on your chosen product, collection, or blog post. Add details on availability, style, or even provide a review.</p>"
             },
             "text_style": {
-              "label": "Text style",
+              "label": "Style",
               "options__1": {
                 "label": "Body"
               },
@@ -1496,15 +1500,15 @@
           "name": "Button",
           "settings": {
             "button_label": {
-              "label": "Button label",
-              "info": "Leave the label blank to hide the button.",
+              "label": "Label",
+              "info": "Leave blank to hide",
               "default": "Button label"
             },
             "button_link": {
-              "label": "Button link"
+              "label": "Link"
             },
             "outline_button": {
-              "label": "Use outline button style"
+              "label": "Outline style"
             }
           }
         }
@@ -1519,6 +1523,15 @@
         "image": {
           "label": "Image"
         },
+        "header":{
+        "content": "Image"
+        },
+        "header_2":{
+        "content": "Content"
+        },
+        "header_3":{
+        "content": "Colors"
+        },        
         "image_height": {
           "options__1": {
             "label": "Adapt to image"
@@ -1532,7 +1545,7 @@
           "options__4": {
             "label": "Large"
           },
-          "label": "Image height"
+          "label": "Height"
         },
         "desktop_image_width": {
           "options__1": {
@@ -1544,8 +1557,7 @@
           "options__3": {
             "label": "Large"
           },
-          "label": "Desktop image width",
-          "info": "Image is automatically optimized for mobile."
+          "label": "Width"
         },
         "text_style": {
           "options__1": {
@@ -1575,7 +1587,7 @@
           "options__3": {
             "label": "Right"
           },
-          "label": "Desktop content alignment"
+          "label": "Desktop alignment"
         },
         "desktop_content_position": {
           "options__1": {
@@ -1587,8 +1599,7 @@
           "options__3": {
             "label": "Bottom"
           },
-          "label": "Desktop content position",
-          "info": "Position is automatically optimized for mobile."
+          "label": "Position"
         },
         "image_layout": {
           "options__1": {
@@ -1603,8 +1614,7 @@
           "options__4": {
             "label": "Aligned right"
           },
-          "label": "Desktop image placement",
-          "info": "Placement is automatically optimized for mobile."
+          "label": "Placement"
         },
         "container_color_scheme": {
           "label": "Container color scheme"
@@ -1619,10 +1629,7 @@
           "options__3": {
             "label": "Right"
           },
-          "label": "Mobile content alignment"
-        },
-        "header_mobile": {
-          "content": "Mobile Layout"
+          "label": "Mobile alignment"
         }
       },
       "blocks": {
@@ -1674,7 +1681,7 @@
           "name": "Featured image",
           "settings": {
             "image_height": {
-              "label": "Featured image height",
+              "label": "Image height",
               "options__1": {
                 "label": "Adapt to image"
               },
@@ -1686,8 +1693,7 @@
               },
               "options__4": {
                 "label": "Large"
-              },
-              "info": "For best results, use an image with a 16:9 aspect ratio. [Learn more](https://help.shopify.com/manual/shopify-admin/productivity-tools/image-editor#understanding-image-aspect-ratio)"
+              }
             }
           }
         },
@@ -1695,10 +1701,10 @@
           "name": "Title",
           "settings": {
             "blog_show_date": {
-              "label": "Show date"
+              "label": "Date"
             },
             "blog_show_author": {
-              "label": "Show author"
+              "label": "Author"
             }
           }
         },
@@ -1711,12 +1717,6 @@
             "text": {
               "label": "Text",
               "default": "Share"
-            },
-            "featured_image_info": {
-              "content": "If you include a link in social media posts, the page’s featured image will be shown as the preview image. [Learn more](https://help.shopify.com/manual/online-store/images/showing-social-media-thumbnail-images)."
-            },
-            "title_info": {
-              "content": "A store title and description are included with the preview image. [Learn more](https://help.shopify.com/manual/promoting-marketing/seo/adding-keywords#set-a-title-and-description-for-your-online-store)."
             }
           }
         }
@@ -1725,33 +1725,26 @@
     "main-blog": {
       "name": "Blog posts",
       "settings": {
-        "header": {
-          "content": "Blog post card"
-        },
         "show_image": {
-          "label": "Show featured image"
+          "label": "Featured image"
         },
         "show_date": {
-          "label": "Show date"
+          "label": "Date"
         },
         "show_author": {
-          "label": "Show author"
-        },
-        "paragraph": {
-          "content": "Change excerpts by editing your blog posts. [Learn more](https://help.shopify.com/manual/online-store/blogs/writing-blogs#display-an-excerpt-from-a-blog-post)"
+          "label": "Author"
         },
         "layout": {
-          "label": "Desktop layout",
+          "label": "Layout",
           "options__1": {
             "label": "Grid"
           },
           "options__2": {
             "label": "Collage"
-          },
-          "info": "Posts are stacked on mobile."
+          }
         },
         "image_height": {
-          "label": "Featured image height",
+          "label": "Image height",
           "options__1": {
             "label": "Adapt to image"
           },
@@ -1763,8 +1756,7 @@
           },
           "options__4": {
             "label": "Large"
-          },
-          "info": "For best results, use an image with a 3:2 aspect ratio. [Learn more](https://help.shopify.com/manual/shopify-admin/productivity-tools/image-editor#understanding-image-aspect-ratio)"
+          }
         }
       }
     },
@@ -1786,14 +1778,13 @@
       "name": "Collection banner",
       "settings": {
         "paragraph": {
-          "content": "Add a description or image by editing your collection. [Learn more](https://help.shopify.com/manual/products/collections/collection-layout)"
+          "content": "Collection details are [managed in your admin](https://help.shopify.com/manual/products/collections/collection-layout)"
         },
         "show_collection_description": {
-          "label": "Show collection description"
+          "label": "Description"
         },
         "show_collection_image": {
-          "label": "Show collection image",
-          "info": "For best results, use an image with a 16:9 aspect ratio. [Learn more](https://help.shopify.com/manual/shopify-admin/productivity-tools/image-editor#understanding-image-aspect-ratio)"
+          "label": "Image"
         }
       }
     },
@@ -1804,14 +1795,14 @@
           "label": "Products per page"
         },
         "columns_desktop": {
-          "label": "Number of columns on desktop"
+          "label": "Columns"
         },
         "enable_filtering": {
-          "label": "Enable filtering",
-          "info": "Customize filters with the Search & Discovery app. [Learn more](https://help.shopify.com/manual/online-store/search-and-discovery/filters)"
+          "label": "Filters",
+          "info": "Customize filters with the [Search & Discovery app](https://help.shopify.com/manual/online-store/search-and-discovery/filters)"
         },
         "filter_type": {
-          "label": "Desktop filter layout",
+          "label": "Filter layout",
           "options__1": {
             "label": "Horizontal"
           },
@@ -1820,11 +1811,10 @@
           },
           "options__3": {
             "label": "Drawer"
-          },
-          "info": "Drawer is the default mobile layout."
+          }
         },
         "enable_sorting": {
-          "label": "Enable sorting"
+          "label": "Sorting"
         },
         "image_ratio": {
           "label": "Image ratio",
@@ -1839,14 +1829,14 @@
           }
         },
         "show_secondary_image": {
-          "label": "Show second image on hover"
+          "label": "Second image on hover"
         },
         "show_vendor": {
-          "label": "Show vendor"
+          "label": "Vendor"
         },
         "show_rating": {
-          "label": "Show product rating",
-          "info": "To display a rating, add a product rating app. [Learn more](https://help.shopify.com/manual/online-store/themes/theme-structure/page-types#product-grid-section-settings)"
+          "label": "Product rating",
+          "info": "An app is required for product ratings. [Learn more](https://help.shopify.com/manual/online-store/themes/theme-structure/page-types#product-grid-section-settings)"
         },
         "header__1": {
           "content": "Filtering and sorting"
@@ -1855,28 +1845,24 @@
           "content": "Product card"
         },
         "enable_tags": {
-          "label": "Enable filtering",
-          "info": "Customize filters with the Search & Discovery app. [Learn more](https://help.shopify.com/manual/online-store/search-and-discovery/filters)"
+          "label": "Filters",
+          "info": "Customize filters with the [Search & Discovery app](https://help.shopify.com/manual/online-store/search-and-discovery/filters)"
         },
         "quick_add": {
           "label": "Quick add",
-          "info": "Bulk is optimized for items purchased in higher quantities.",
           "options": {
             "option_1": "None",
             "option_2": "Standard",
             "option_3": "Bulk"
           }
         },
-        "header_mobile": {
-          "content": "Mobile Layout"
-        },
         "columns_mobile": {
-          "label": "Number of columns on mobile",
+          "label": "Mobile columns",
           "options__1": {
-            "label": "1 column"
+            "label": "1"
           },
           "options__2": {
-            "label": "2 columns"
+            "label": "2"
           }
         }
       }
@@ -1889,7 +1875,7 @@
           "default": "Collections"
         },
         "sort": {
-          "label": "Sort collections by:",
+          "label": "Sort collections",
           "options__1": {
             "label": "Alphabetically, A-Z"
           },
@@ -1919,22 +1905,21 @@
           },
           "options__3": {
             "label": "Square"
-          },
-          "info": "Add images by editing your collections. [Learn more](https://help.shopify.com/manual/products/collections)"
+          }
         },
         "columns_desktop": {
-          "label": "Number of columns on desktop"
+          "label": "Columns"
         },
         "header_mobile": {
           "content": "Mobile Layout"
         },
         "columns_mobile": {
-          "label": "Number of columns on mobile",
+          "label": "Mobile columns",
           "options__1": {
-            "label": "1 column"
+            "label": "1"
           },
           "options__2": {
-            "label": "2 columns"
+            "label": "2"
           }
         }
       }
@@ -1957,11 +1942,8 @@
     "main-password-header": {
       "name": "Password header",
       "settings": {
-        "logo_header": {
-          "content": "Logo"
-        },
         "logo_help": {
-          "content": "Edit your logo in theme settings."
+          "content": "Edit your logo in [theme settings](/editor?context=theme&category=logo)"
         }
       }
     },
@@ -1976,7 +1958,7 @@
               "default": "Text block"
             },
             "text_style": {
-              "label": "Text style",
+              "label": "Style",
               "options__1": {
                 "label": "Body"
               },
@@ -2011,11 +1993,10 @@
               }
             },
             "inventory_threshold": {
-              "label": "Low inventory threshold",
-              "info": "Choose 0 to always show in stock if available."
+              "label": "Low inventory threshold"
             },
             "show_inventory_quantity": {
-              "label": "Show inventory count"
+              "label": "Inventory count"
             }
           }
         },
@@ -2053,12 +2034,12 @@
           "name": "Buy buttons",
           "settings": {
             "show_dynamic_checkout": {
-              "label": "Show dynamic checkout buttons",
-              "info": "Using the payment methods available on your store, customers see their preferred option, like PayPal or Apple Pay. [Learn more](https://help.shopify.com/manual/using-themes/change-the-layout/dynamic-checkout)"
+              "label": "Dynamic checkout buttons",
+              "info": "Customers will see their preferred payment option. [Learn more](https://help.shopify.com/manual/using-themes/change-the-layout/dynamic-checkout)"
             },
             "show_gift_card_recipient": {
-              "label": "Show recipient information form for gift cards",
-              "info": "Allows buyers to send gift cards on a scheduled date along with a personal message. [Learn more](https://help.shopify.com/manual/online-store/themes/customizing-themes/add-gift-card-recipient-fields)"
+              "label": "Recipient info form for gift cards",
+              "info": "Customers can add a personal message and schedule the send date. [Learn more](https://help.shopify.com/manual/online-store/themes/customizing-themes/add-gift-card-recipient-fields)"
             }
           }
         },
@@ -2091,12 +2072,6 @@
             "text": {
               "label": "Text",
               "default": "Share"
-            },
-            "featured_image_info": {
-              "content": "If you include a link in social media posts, the page’s featured image will be shown as the preview image. [Learn more](https://help.shopify.com/manual/online-store/images/showing-social-media-thumbnail-images)."
-            },
-            "title_info": {
-              "content": "A store title and description are included with the preview image. [Learn more](https://help.shopify.com/manual/promoting-marketing/seo/adding-keywords#set-a-title-and-description-for-your-online-store)."
             }
           }
         },
@@ -2104,7 +2079,6 @@
           "name": "Collapsible row",
           "settings": {
             "heading": {
-              "info": "Include a heading that explains the content.",
               "label": "Heading",
               "default": "Collapsible row"
             },
@@ -2267,7 +2241,7 @@
           "name": "Product rating",
           "settings": {
             "paragraph": {
-              "content": "To display a rating, add a product rating app. [Learn more](https://help.shopify.com/manual/online-store/themes/theme-structure/page-types#product-rating-block)"
+              "content": "An app is required for product ratings. [Learn more](https://help.shopify.com/manual/online-store/themes/theme-structure/page-types#product-rating-block)"
             }
           }
         },
@@ -2275,23 +2249,23 @@
           "name": "Complementary products",
           "settings": {
             "paragraph": {
-              "content": "To select complementary products, add the Search & Discovery app. [Learn more](https://help.shopify.com/manual/online-store/search-and-discovery/product-recommendations)"
+              "content": "Manage complementary products in the [Search & Discovery app](https://help.shopify.com/manual/online-store/search-and-discovery/product-recommendations)"
             },
             "heading": {
               "label": "Heading",
               "default": "Pairs well with"
             },
             "make_collapsible_row": {
-              "label": "Show as collapsible row"
+              "label": "Collapsible row"
             },
             "icon": {
-              "info": "Visible when collapsible row is displayed."
+              "info": "Shown when collapsible row is selected"
             },
             "product_list_limit": {
-              "label": "Maximum products to show"
+              "label": "Products"
             },
             "products_per_page": {
-              "label": "Number of products per page"
+              "label": "Products per page"
             },
             "pagination_style": {
               "label": "Pagination style",
@@ -2312,7 +2286,7 @@
               }
             },
             "enable_quick_add": {
-              "label": "Enable quick add button"
+              "label": "Quick add"
             }
           }
         },
@@ -2328,41 +2302,47 @@
                 "label": "Vertical"
               }
             },
-            "content": {
-              "label": "Content",
-              "info": "Choose an icon or add an image for each column or row."
+            "pairing_1": {
+              "label": "Pairing 1",
+              "info": "Choose an icon or add an image for each pairing"
             },
             "heading": {
-              "info": "Leave the heading label blank to hide the icon column."
+              "info": "Leave blank to hide this pairing"
             },
             "icon_1": {
-              "label": "First icon"
+              "label": "Icon"
             },
             "image_1": {
-              "label": "First image"
+              "label": "Image"
             },
             "heading_1": {
-              "label": "First heading",
+              "label": "Heading",
               "default": "Heading"
             },
+            "pairing_2": {
+              "label": "Pairing 2"
+            },            
             "icon_2": {
-              "label": "Second icon"
+              "label": "Icon"
             },
             "image_2": {
-              "label": "Second image"
+              "label": "Image"
             },
             "heading_2": {
-              "label": "Second heading",
+              "label": "Heading",
               "default": "Heading"
             },
+            "pairing_3": {
+            "label": "Pairing 3"
+            },             
             "icon_3": {
-              "label": "Third icon"
+              "label": "Icon"
             },
             "image_3": {
-              "label": "Third image"
+              "label": "Image"
             },
             "heading_3": {
-              "label": "Third heading",
+              "label": "Heading",
               "default": "Heading"
             }
           }
@@ -2370,14 +2350,13 @@
       },
       "settings": {
         "header": {
-          "content": "Media",
-          "info": "Learn more about [media types.](https://help.shopify.com/manual/products/product-media)"
+          "content": "Media"
         },
         "enable_sticky_info": {
-          "label": "Enable sticky content on desktop"
+          "label": "Sticky content"
         },
         "gallery_layout": {
-          "label": "Desktop layout",
+          "label": "Layout",
           "options__1": {
             "label": "Stacked"
           },
@@ -2392,11 +2371,10 @@
           }
         },
         "constrain_to_viewport": {
-          "label": "Constrain media to screen height"
+          "label": "Constrain to screen height"
         },
         "media_size": {
-          "label": "Desktop media width",
-          "info": "Media is automatically optimized for mobile.",
+          "label": "Width",
           "options__1": {
             "label": "Small"
           },
@@ -2409,7 +2387,6 @@
         },
         "image_zoom": {
           "label": "Image zoom",
-          "info": "Click and hover defaults to open lightbox on mobile.",
           "options__1": {
             "label": "Open lightbox"
           },
@@ -2421,8 +2398,7 @@
           }
         },
         "media_position": {
-          "label": "Desktop media position",
-          "info": "Position is automatically optimized for mobile.",
+          "label": "Position",
           "options__1": {
             "label": "Left"
           },
@@ -2431,7 +2407,7 @@
           }
         },
         "media_fit": {
-          "label": "Media fit",
+          "label": "Fit",
           "options__1": {
             "label": "Original"
           },
@@ -2452,10 +2428,10 @@
           }
         },
         "hide_variants": {
-          "label": "Hide other variants’ media after selecting a variant"
+          "label": "Hide unselected variant media"
         },
         "enable_video_looping": {
-          "label": "Enable video looping"
+          "label": "Loop video"
         }
       }
     },
@@ -2469,8 +2445,17 @@
       "name": "Search results",
       "settings": {
         "columns_desktop": {
-          "label": "Number of columns on desktop"
+          "label": "Columns"
         },
+        "columns_mobile": {
+          "label": "Mobile columns",
+          "options__1": {
+            "label": "1 column"
+          },
+          "options__2": {
+            "label": "2 columns"
+          }
+        },        
         "image_ratio": {
           "label": "Image ratio",
           "options__1": {
@@ -2484,39 +2469,26 @@
           }
         },
         "show_secondary_image": {
-          "label": "Show second image on hover"
+          "label": "Second image on hover"
         },
         "show_vendor": {
-          "label": "Show vendor"
+          "label": "Vendor"
         },
         "show_rating": {
-          "label": "Show product rating",
-          "info": "To display a rating, add a product rating app. [Learn more](https://help.shopify.com/manual/online-store/themes/theme-structure/page-types#search-results-section-settings)"
+          "label": "Product rating",
+          "info": "An app is required for product ratings. [Learn more](https://help.shopify.com/manual/online-store/themes/theme-structure/page-types#search-results-section-settings)"
         },
         "header__1": {
           "content": "Product card"
         },
         "header__2": {
-          "content": "Blog card",
-          "info": "Blog card styles also apply to page cards in search results. To change card styles update your theme settings."
+          "content": "Blog card"
         },
         "article_show_date": {
-          "label": "Show date"
+          "label": "Date"
         },
         "article_show_author": {
-          "label": "Show author"
-        },
-        "header_mobile": {
-          "content": "Mobile Layout"
-        },
-        "columns_mobile": {
-          "label": "Number of columns on mobile",
-          "options__1": {
-            "label": "1 column"
-          },
-          "options__2": {
-            "label": "2 columns"
-          }
+          "label": "Author"
         }
       }
     },
@@ -2555,7 +2527,7 @@
           }
         },
         "columns_desktop": {
-          "label": "Number of columns on desktop"
+          "label": "Columns"
         },
         "column_alignment": {
           "label": "Column alignment",
@@ -2586,16 +2558,16 @@
           "content": "Mobile Layout"
         },
         "columns_mobile": {
-          "label": "Number of columns on mobile",
+          "label": "Columns",
           "options__1": {
-            "label": "1 column"
+            "label": "1"
           },
           "options__2": {
-            "label": "2 columns"
+            "label": "2"
           }
         },
         "swipe_on_mobile": {
-          "label": "Enable swipe on mobile"
+          "label": "Carousel"
         }
       },
       "blocks": {
@@ -2630,10 +2602,10 @@
       "name": "Email signup",
       "settings": {
         "full_width": {
-          "label": "Make section full width"
+          "label": "Full width"
         },
         "paragraph": {
-          "content": "Each email subscription creates a customer account. [Learn more](https://help.shopify.com/manual/customers)"
+          "content": "Signups add [customer profiles](https://help.shopify.com/manual/customers/manage-customers)"
         }
       },
       "blocks": {
@@ -2647,10 +2619,10 @@
           }
         },
         "paragraph": {
-          "name": "Subheading",
+          "name": "Text",
           "settings": {
             "paragraph": {
-              "label": "Description",
+              "label": "Text",
               "default": "<p>Be the first to know about new collections and exclusive offers.</p>"
             }
           }
@@ -2667,19 +2639,19 @@
       "name": "Email signup banner",
       "settings": {
         "paragraph": {
-          "content": "Each email subscription creates a customer account. [Learn more](https://help.shopify.com/manual/customers)"
+          "content": "Signups add [customer profiles](https://help.shopify.com/manual/customers/manage-customers)"
         },
         "image": {
           "label": "Background image"
         },
         "image_overlay_opacity": {
-          "label": "Image overlay opacity"
+          "label": "Overlay opacity"
         },
         "show_background_image": {
           "label": "Show background image"
         },
         "show_text_box": {
-          "label": "Show container on desktop"
+          "label": "Container"
         },
         "desktop_content_position": {
           "options__1": {
@@ -2709,13 +2681,13 @@
           "options__9": {
             "label": "Bottom Right"
           },
-          "label": "Desktop content position"
+          "label": "Content position"
         },
         "color_scheme": {
           "info": "Visible when container displayed."
         },
         "image_height": {
-          "label": "Banner height",
+          "label": "Height",
           "options__1": {
             "label": "Adapt to image"
           },
@@ -2727,8 +2699,7 @@
           },
           "options__4": {
             "label": "Large"
-          },
-          "info": "For best results, use an image with a 16:9 aspect ratio. [Learn more](https://help.shopify.com/manual/shopify-admin/productivity-tools/image-editor#understanding-image-aspect-ratio)"
+          }
         },
         "desktop_content_alignment": {
           "options__1": {
@@ -2740,7 +2711,7 @@
           "options__3": {
             "label": "Right"
           },
-          "label": "Desktop content alignment"
+          "label": "Content alignment"
         },
         "header": {
           "content": "Mobile Layout"
@@ -2755,11 +2726,10 @@
           "options__3": {
             "label": "Right"
           },
-          "label": "Mobile content alignment"
+          "label": "Content alignment"
         },
         "show_text_below": {
-          "label": "Show content below image on mobile",
-          "info": "For best results, use an image with a 16:9 aspect ratio. [Learn more](https://help.shopify.com/manual/shopify-admin/productivity-tools/image-editor#understanding-image-aspect-ratio)"
+          "label": "Stacked layout"
         }
       },
       "blocks": {
@@ -2773,10 +2743,10 @@
           }
         },
         "paragraph": {
-          "name": "Paragraph",
+          "name": "Text",
           "settings": {
             "paragraph": {
-              "label": "Description",
+              "label": "Text",
               "default": "<p>Be the first to know when we launch.</p>"
             },
             "text_style": {
@@ -2786,7 +2756,7 @@
               "options__2": {
                 "label": "Subtitle"
               },
-              "label": "Text style"
+              "label": "Style"
             }
           }
         },
@@ -2813,10 +2783,10 @@
       "name": "Quick order list",
       "settings": {
         "show_image": {
-          "label": "Show images"
+          "label": "Images"
         },
         "show_sku": {
-          "label": "Show SKUs"
+          "label": "SKUs"
         }
       },
       "presets": {
@@ -2830,13 +2800,13 @@
           "label": "Heading"
         },
         "products_to_show": {
-          "label": "Maximum products to show"
+          "label": "Products"
         },
         "columns_desktop": {
-          "label": "Number of columns on desktop"
+          "label": "Columns"
         },
         "paragraph__1": {
-          "content": "Dynamic recommendations use order and product information to change and improve over time. [Learn more](https://help.shopify.com/themes/development/recommended-products)",
+          "content": "Related products can be managed in the [Search & Discovery app](https://help.shopify.com/manual/online-store/search-and-discovery/product-recommendations)",
           "default": "You may also like"
         },
         "header__2": {
@@ -2855,25 +2825,22 @@
           }
         },
         "show_secondary_image": {
-          "label": "Show second image on hover"
+          "label": "Second image on hover"
         },
         "show_vendor": {
-          "label": "Show vendor"
+          "label": "Vendor"
         },
         "show_rating": {
-          "label": "Show product rating",
-          "info": "To display a rating, add a product rating app. [Learn more](https://help.shopify.com/manual/online-store/themes/theme-structure/page-types#product-recommendations-section-settings)"
-        },
-        "header_mobile": {
-          "content": "Mobile Layout"
+          "label": "Product rating",
+          "info": "An app is required for product ratings. [Learn more](https://help.shopify.com/manual/online-store/themes/theme-structure/page-types#product-recommendations-section-settings)"
         },
         "columns_mobile": {
-          "label": "Number of columns on mobile",
+          "label": "Mobile columns",
           "options__1": {
-            "label": "1 column"
+            "label": "1"
           },
           "options__2": {
-            "label": "2 columns"
+            "label": "2"
           }
         }
       }
@@ -2891,8 +2858,7 @@
           "options__3": {
             "label": "Right"
           },
-          "label": "Desktop content position",
-          "info": "Position is automatically optimized for mobile."
+          "label": "Content position"
         },
         "content_alignment": {
           "options__1": {
@@ -2907,7 +2873,7 @@
           "label": "Content alignment"
         },
         "full_width": {
-          "label": "Make section full width"
+          "label": "Full width"
         }
       },
       "blocks": {
@@ -2954,7 +2920,7 @@
           "name": "Text",
           "settings": {
             "text": {
-              "label": "Description",
+              "label": "Text",
               "default": "<p>Share information about your brand with your customers. Describe a product, make announcements, or welcome customers to your store.</p>"
             }
           }
@@ -2962,26 +2928,32 @@
         "buttons": {
           "name": "Buttons",
           "settings": {
+            "header_button1": {
+            "content": "Button 1"
+            }, 
             "button_label_1": {
-              "label": "First button label",
-              "info": "Leave the label blank to hide the button.",
+              "label": "Label",
+              "info": "Leave blank to hide",
               "default": "Button label"
             },
             "button_link_1": {
-              "label": "First button link"
+              "label": "Link"
             },
             "button_style_secondary_1": {
-              "label": "Use outline button style"
+              "label": "Outline style"
             },
+            "header_button2": {
+              "content": "Button 2"
+            },             
             "button_label_2": {
-              "label": "Second button label",
-              "info": "Leave the label blank to hide the button."
+              "label": "Label",
+              "info": "Leave label blank to hide"
             },
             "button_link_2": {
-              "label": "Second button link"
+              "label": "Link"
             },
             "button_style_secondary_2": {
-              "label": "Use outline button style"
+              "label": "Outline style"
             }
           }
         }
@@ -3004,7 +2976,7 @@
           "label": "Video"
         },
         "enable_video_looping": {
-          "label": "Play video on loop"
+          "label": "Loop video"
         },
         "header__1": {
           "content": "Shopify-hosted video"
@@ -3016,7 +2988,7 @@
           "content": "Style"
         },
         "paragraph": {
-          "content": "Shows when no Shopify-hosted video is selected."
+          "content": "Shows when no Shopify-hosted video is selected"
         },
         "video_url": {
           "label": "URL",
@@ -3024,14 +2996,14 @@
         },
         "description": {
           "label": "Video alt text",
-          "info": "Describe the video for customers using screen readers. [Learn more](https://help.shopify.com/manual/online-store/themes/theme-structure/theme-features#video)"
+          "info": "Describe the video for those using screen readers"
         },
         "image_padding": {
           "label": "Add image padding",
           "info": "Select image padding if you don't want your cover image to be cropped."
         },
         "full_width": {
-          "label": "Make section full width"
+          "label": "Full width"
         }
       },
       "presets": {
@@ -3051,7 +3023,7 @@
           }
         },
         "slide_height": {
-          "label": "Slide height",
+          "label": "Height",
           "options__1": {
             "label": "Adapt to first image"
           },
@@ -3084,15 +3056,15 @@
           "label": "Change slides every"
         },
         "mobile": {
-          "content": "Mobile layout"
+          "content": "Mobile Layout"
         },
         "show_text_below": {
-          "label": "Show content below images on mobile"
+          "label": "Stacked layout"
         },
         "accessibility": {
           "content": "Accessibility",
           "label": "Slideshow description",
-          "info": "Describe the slideshow for customers using screen readers.",
+          "info": "Describe the slideshow for those using screen readers",
           "default": "Slideshow about our brand"
         }
       },
@@ -3111,20 +3083,21 @@
               "label": "Subheading",
               "default": "Tell your brand's story through images"
             },
+            "header_button": {
+            "content": "Button"      
+            },
             "button_label": {
-              "label": "Button label",
-              "info": "Leave the label blank to hide the button.",
+              "label": "Label",
               "default": "Button label"
             },
             "link": {
-              "label": "Button link"
+              "label": "Link"
             },
             "secondary_style": {
-              "label": "Use outline button style"
+              "label": "Outline style"
             },
             "box_align": {
-              "label": "Desktop content position",
-              "info": "Position is automatically optimized for mobile.",
+              "label": "Content position",              
               "options__1": {
                 "label": "Top left"
               },
@@ -3153,11 +3126,14 @@
                 "label": "Bottom right"
               }
             },
+            "header_layout": {
+            "content": "Layout"                 
+            },
             "show_text_box": {
-              "label": "Show container on desktop"
+              "label": "Container"
             },
             "text_alignment": {
-              "label": "Desktop content alignment",
+              "label": "Content alignment",
               "option_1": {
                 "label": "Left"
               },
@@ -3169,8 +3145,14 @@
               }
             },
             "image_overlay_opacity": {
-              "label": "Image overlay opacity"
+              "label": "Overlay opacity"
             },
+            "header_text": {
+            "content": "Text"      
+            },
+            "header_colors": {
+            "content": "Colors"                 
+            },            
             "text_alignment_mobile": {
               "label": "Mobile content alignment",
               "options__1": {
@@ -3229,10 +3211,10 @@
           "info": "Visible when Layout is set to Row or Section container."
         },
         "open_first_collapsible_row": {
-          "label": "Open first collapsible row"
+          "label": "Open first row"
         },
         "header": {
-          "content": "Image layout"
+          "content": "Image"
         },
         "image": {
           "label": "Image"
@@ -3250,14 +3232,13 @@
           }
         },
         "desktop_layout": {
-          "label": "Desktop layout",
+          "label": "Layout",
           "options__1": {
             "label": "Image first"
           },
           "options__2": {
             "label": "Image second"
-          },
-          "info": "Image is always first on mobile."
+          }
         }
       },
       "blocks": {
@@ -3266,7 +3247,6 @@
           "settings": {
             "heading": {
               "default": "Collapsible row",
-              "info": "Include a heading that explains the content.",
               "label": "Heading"
             },
             "row_content": {
diff --git a/sections/collapsible-content.liquid b/sections/collapsible-content.liquid
index bf31768ab8a..e9b8932eba3 100644
--- a/sections/collapsible-content.liquid
+++ b/sections/collapsible-content.liquid
@@ -256,8 +256,7 @@
         }
       ],
       "default": "image_second",
-      "label": "t:sections.collapsible_content.settings.desktop_layout.label",
-      "info": "t:sections.collapsible_content.settings.desktop_layout.info"
+      "label": "t:sections.collapsible_content.settings.desktop_layout.label"
     },
     {
       "type": "header",
@@ -293,8 +292,7 @@
           "type": "text",
           "id": "heading",
           "default": "t:sections.collapsible_content.blocks.collapsible_row.settings.heading.default",
-          "label": "t:sections.collapsible_content.blocks.collapsible_row.settings.heading.label",
-          "info": "t:sections.collapsible_content.blocks.collapsible_row.settings.heading.info"
+          "label": "t:sections.collapsible_content.blocks.collapsible_row.settings.heading.label"
         },
         {
           "type": "select",
diff --git a/sections/collection-list.liquid b/sections/collection-list.liquid
index 01b4b28fa63..99c899b0f57 100644
--- a/sections/collection-list.liquid
+++ b/sections/collection-list.liquid
@@ -195,8 +195,7 @@
         }
       ],
       "default": "square",
-      "label": "t:sections.collection-list.settings.image_ratio.label",
-      "info": "t:sections.collection-list.settings.image_ratio.info"
+      "label": "t:sections.collection-list.settings.image_ratio.label"
     },
     {
       "type": "range",
@@ -218,7 +217,8 @@
       "type": "checkbox",
       "id": "show_view_all",
       "default": false,
-      "label": "t:sections.collection-list.settings.show_view_all.label"
+      "label": "t:sections.collection-list.settings.show_view_all.label",
+      "info": "t:sections.collection-list.settings.show_view_all.info"   
     },
     {
       "type": "header",
diff --git a/sections/email-signup-banner.liquid b/sections/email-signup-banner.liquid
index 38e89c38426..9a08aa9b928 100644
--- a/sections/email-signup-banner.liquid
+++ b/sections/email-signup-banner.liquid
@@ -155,6 +155,12 @@
       "type": "paragraph",
       "content": "t:sections.email-signup-banner.settings.paragraph.content"
     },
+    {
+      "type": "checkbox",
+      "id": "show_background_image",
+      "label": "t:sections.email-signup-banner.settings.show_background_image.label",
+      "default": true
+    },    
     {
       "type": "image_picker",
       "id": "image",
@@ -170,12 +176,6 @@
       "label": "t:sections.email-signup-banner.settings.image_overlay_opacity.label",
       "default": 0
     },
-    {
-      "type": "checkbox",
-      "id": "show_background_image",
-      "label": "t:sections.email-signup-banner.settings.show_background_image.label",
-      "default": true
-    },
     {
       "type": "select",
       "id": "image_height",
@@ -198,8 +198,7 @@
         }
       ],
       "default": "medium",
-      "label": "t:sections.email-signup-banner.settings.image_height.label",
-      "info": "t:sections.email-signup-banner.settings.image_height.info"
+      "label": "t:sections.email-signup-banner.settings.image_height.label"
     },
     {
       "type": "select",
diff --git a/sections/featured-blog.liquid b/sections/featured-blog.liquid
index fc2eeeea09d..3ab29e20ebf 100644
--- a/sections/featured-blog.liquid
+++ b/sections/featured-blog.liquid
@@ -266,8 +266,7 @@
       "type": "checkbox",
       "id": "show_image",
       "default": true,
-      "label": "t:sections.featured-blog.settings.show_image.label",
-      "info": "t:sections.featured-blog.settings.show_image.info"
+      "label": "t:sections.featured-blog.settings.show_image.label"
     },
     {
       "type": "checkbox",
@@ -285,7 +284,8 @@
       "type": "checkbox",
       "id": "show_view_all",
       "default": true,
-      "label": "t:sections.featured-blog.settings.show_view_all.label"
+      "label": "t:sections.featured-blog.settings.show_view_all.label",
+      "info": "t:sections.featured-blog.settings.show_view_all.info"
     },
     {
       "type": "header",
diff --git a/sections/featured-collection.liquid b/sections/featured-collection.liquid
index b5261870c0a..c4ebcfc9fff 100644
--- a/sections/featured-collection.liquid
+++ b/sections/featured-collection.liquid
@@ -206,6 +206,10 @@
     "groups": ["header", "footer"]
   },
   "settings": [
+    {
+      "type": "header",
+      "content": "t:sections.featured-collection.settings.header_text.content"
+    },
     {
       "type": "inline_richtext",
       "id": "title",
@@ -271,6 +275,10 @@
       ],
       "default": "body"
     },
+    {
+      "type": "header",
+      "content": "t:sections.featured-collection.settings.header_collection.content"
+    },    
     {
       "type": "collection",
       "id": "collection",
@@ -294,6 +302,22 @@
       "default": 4,
       "label": "t:sections.featured-collection.settings.columns_desktop.label"
     },
+    {
+      "type": "select",
+      "id": "columns_mobile",
+      "default": "2",
+      "label": "t:sections.featured-collection.settings.columns_mobile.label",
+      "options": [
+        {
+          "value": "1",
+          "label": "t:sections.featured-collection.settings.columns_mobile.options__1.label"
+        },
+        {
+          "value": "2",
+          "label": "t:sections.featured-collection.settings.columns_mobile.options__2.label"
+        }
+      ]
+    },
     {
       "type": "checkbox",
       "id": "full_width",
@@ -304,7 +328,8 @@
       "type": "checkbox",
       "id": "show_view_all",
       "default": true,
-      "label": "t:sections.featured-collection.settings.show_view_all.label"
+      "label": "t:sections.featured-collection.settings.show_view_all.label",
+      "info": "t:sections.featured-collection.settings.show_view_all.info"
     },
     {
       "type": "select",
@@ -332,6 +357,12 @@
       "label": "t:sections.featured-collection.settings.enable_desktop_slider.label",
       "default": false
     },
+    {
+      "type": "checkbox",
+      "id": "swipe_on_mobile",
+      "default": false,
+      "label": "t:sections.featured-collection.settings.swipe_on_mobile.label"
+    },    
     {
       "type": "color_scheme",
       "id": "color_scheme",
@@ -401,8 +432,7 @@
         }
       ],
       "default": "default",
-      "label": "t:sections.all.image_shape.label",
-      "info": "t:sections.all.image_shape.info"
+      "label": "t:sections.all.image_shape.label"
     },
     {
       "type": "checkbox",
@@ -428,7 +458,6 @@
       "id": "quick_add",
       "default": "none",
       "label": "t:sections.main-collection-product-grid.settings.quick_add.label",
-      "info": "t:sections.main-collection-product-grid.settings.quick_add.info",
       "options": [
         {
           "value": "none",
@@ -444,32 +473,6 @@
         }
       ]
     },
-    {
-      "type": "header",
-      "content": "t:sections.featured-collection.settings.header_mobile.content"
-    },
-    {
-      "type": "select",
-      "id": "columns_mobile",
-      "default": "2",
-      "label": "t:sections.featured-collection.settings.columns_mobile.label",
-      "options": [
-        {
-          "value": "1",
-          "label": "t:sections.featured-collection.settings.columns_mobile.options__1.label"
-        },
-        {
-          "value": "2",
-          "label": "t:sections.featured-collection.settings.columns_mobile.options__2.label"
-        }
-      ]
-    },
-    {
-      "type": "checkbox",
-      "id": "swipe_on_mobile",
-      "default": false,
-      "label": "t:sections.featured-collection.settings.swipe_on_mobile.label"
-    },
     {
       "type": "header",
       "content": "t:sections.all.padding.section_padding_heading"
diff --git a/sections/featured-product.liquid b/sections/featured-product.liquid
index 8eb489d6c3b..f1c94259c26 100644
--- a/sections/featured-product.liquid
+++ b/sections/featured-product.liquid
@@ -678,14 +678,6 @@
           "id": "share_label",
           "label": "t:sections.featured-product.blocks.share.settings.text.label",
           "default": "t:sections.featured-product.blocks.share.settings.text.default"
-        },
-        {
-          "type": "paragraph",
-          "content": "t:sections.featured-product.blocks.share.settings.featured_image_info.content"
-        },
-        {
-          "type": "paragraph",
-          "content": "t:sections.featured-product.blocks.share.settings.title_info.content"
         }
       ]
     },
@@ -1348,8 +1340,7 @@
     },
     {
       "type": "header",
-      "content": "t:sections.featured-product.settings.header.content",
-      "info": "t:sections.featured-product.settings.header.info"
+      "content": "t:sections.featured-product.settings.header.content"
     },
     {
       "type": "select",
@@ -1369,8 +1360,7 @@
         }
       ],
       "default": "medium",
-      "label": "t:sections.main-product.settings.media_size.label",
-      "info": "t:sections.main-product.settings.media_size.info"
+      "label": "t:sections.main-product.settings.media_size.label"
     },
     {
       "type": "checkbox",
@@ -1408,8 +1398,7 @@
         }
       ],
       "default": "left",
-      "label": "t:sections.featured-product.settings.media_position.label",
-      "info": "t:sections.featured-product.settings.media_position.info"
+      "label": "t:sections.featured-product.settings.media_position.label"
     },
     {
       "type": "select",
@@ -1429,8 +1418,7 @@
         }
       ],
       "default": "lightbox",
-      "label": "t:sections.main-product.settings.image_zoom.label",
-      "info": "t:sections.main-product.settings.image_zoom.info"
+      "label": "t:sections.main-product.settings.image_zoom.label"
     },
     {
       "type": "checkbox",
diff --git a/sections/footer.liquid b/sections/footer.liquid
index 868a66a8f09..5ac766a837a 100644
--- a/sections/footer.liquid
+++ b/sections/footer.liquid
@@ -342,8 +342,7 @@
           "type": "link_list",
           "id": "menu",
           "default": "footer",
-          "label": "t:sections.footer.blocks.link_list.settings.menu.label",
-          "info": "t:sections.footer.blocks.link_list.settings.menu.info"
+          "label": "t:sections.footer.blocks.link_list.settings.menu.label"
         }
       ]
     },
@@ -402,13 +401,13 @@
           "max": 550,
           "step": 5,
           "unit": "px",
-          "label": "Image width",
+          "label": "Width",
           "default": 100
         },
         {
           "type": "select",
           "id": "alignment",
-          "label": "Image alignment on large screen",
+          "label": "Alignment",
           "options": [
             {
               "value": "",
diff --git a/sections/header.liquid b/sections/header.liquid
index bd2cc4cee94..26746696a7b 100644
--- a/sections/header.liquid
+++ b/sections/header.liquid
@@ -493,8 +493,7 @@
         }
       ],
       "default": "dropdown",
-      "label": "t:sections.header.settings.menu_type_desktop.label",
-      "info": "t:sections.header.settings.menu_type_desktop.info"
+      "label": "t:sections.header.settings.menu_type_desktop.label"
     },
     {
       "type": "select",
diff --git a/sections/image-banner.liquid b/sections/image-banner.liquid
index 465f292e854..8648f1150b0 100644
--- a/sections/image-banner.liquid
+++ b/sections/image-banner.liquid
@@ -217,8 +217,35 @@
         }
       ],
       "default": "medium",
-      "label": "t:sections.image-banner.settings.image_height.label",
-      "info": "t:sections.image-banner.settings.image_height.info"
+      "label": "t:sections.image-banner.settings.image_height.label"
+    },
+    {
+      "type": "select",
+      "id": "image_behavior",
+      "options": [
+        {
+          "value": "none",
+          "label": "t:sections.all.animation.image_behavior.options__1.label"
+        },
+        {
+          "value": "ambient",
+          "label": "t:sections.all.animation.image_behavior.options__2.label"
+        },
+        {
+          "value": "fixed",
+          "label": "t:sections.all.animation.image_behavior.options__3.label"
+        },
+        {
+          "value": "zoom-in",
+          "label": "t:sections.all.animation.image_behavior.options__4.label"
+        }
+      ],
+      "default": "none",
+      "label": "t:sections.all.animation.image_behavior.label"
+    },
+    {
+      "type": "header",
+      "content": "t:sections.image-banner.settings.content.content"
     },
     {
       "type": "select",
@@ -264,12 +291,6 @@
       "default": "middle-center",
       "label": "t:sections.image-banner.settings.desktop_content_position.label"
     },
-    {
-      "type": "checkbox",
-      "id": "show_text_box",
-      "default": true,
-      "label": "t:sections.image-banner.settings.show_text_box.label"
-    },
     {
       "type": "select",
       "id": "desktop_content_alignment",
@@ -290,40 +311,18 @@
       "default": "center",
       "label": "t:sections.image-banner.settings.desktop_content_alignment.label"
     },
+    {
+      "type": "checkbox",
+      "id": "show_text_box",
+      "default": true,
+      "label": "t:sections.image-banner.settings.show_text_box.label"
+    },
     {
       "type": "color_scheme",
       "id": "color_scheme",
       "label": "t:sections.all.colors.label",
       "default": "scheme-1"
     },
-    {
-      "type": "header",
-      "content": "t:sections.all.animation.content"
-    },
-    {
-      "type": "select",
-      "id": "image_behavior",
-      "options": [
-        {
-          "value": "none",
-          "label": "t:sections.all.animation.image_behavior.options__1.label"
-        },
-        {
-          "value": "ambient",
-          "label": "t:sections.all.animation.image_behavior.options__2.label"
-        },
-        {
-          "value": "fixed",
-          "label": "t:sections.all.animation.image_behavior.options__3.label"
-        },
-        {
-          "value": "zoom-in",
-          "label": "t:sections.all.animation.image_behavior.options__4.label"
-        }
-      ],
-      "default": "none",
-      "label": "t:sections.all.animation.image_behavior.label"
-    },
     {
       "type": "header",
       "content": "t:sections.image-banner.settings.mobile.content"
@@ -441,6 +440,10 @@
       "name": "t:sections.image-banner.blocks.buttons.name",
       "limit": 1,
       "settings": [
+        {
+        "type": "header",
+        "content": "t:sections.image-banner.blocks.buttons.settings.header_1.content"
+        },
         {
           "type": "text",
           "id": "button_label_1",
@@ -459,6 +462,10 @@
           "default": false,
           "label": "t:sections.image-banner.blocks.buttons.settings.button_style_secondary_1.label"
         },
+        {
+        "type": "header",
+        "content": "t:sections.image-banner.blocks.buttons.settings.header_2.content"
+        },
         {
           "type": "text",
           "id": "button_label_2",
diff --git a/sections/image-with-text.liquid b/sections/image-with-text.liquid
index 29448fdce03..346afc32a45 100644
--- a/sections/image-with-text.liquid
+++ b/sections/image-with-text.liquid
@@ -162,8 +162,7 @@
         }
       ],
       "default": "medium",
-      "label": "t:sections.image-with-text.settings.desktop_image_width.label",
-      "info": "t:sections.image-with-text.settings.desktop_image_width.info"
+      "label": "t:sections.image-with-text.settings.desktop_image_width.label"
     },
     {
       "type": "select",
@@ -179,9 +178,48 @@
         }
       ],
       "default": "image_first",
-      "label": "t:sections.image-with-text.settings.layout.label",
-      "info": "t:sections.image-with-text.settings.layout.info"
+      "label": "t:sections.image-with-text.settings.layout.label"
     },
+    {
+      "type": "select",
+      "id": "image_behavior",
+      "options": [
+        {
+          "value": "none",
+          "label": "t:sections.all.animation.image_behavior.options__1.label"
+        },
+        {
+          "value": "ambient",
+          "label": "t:sections.all.animation.image_behavior.options__2.label"
+        },
+        {
+          "value": "zoom-in",
+          "label": "t:sections.all.animation.image_behavior.options__4.label"
+        }
+      ],
+      "default": "none",
+      "label": "t:sections.all.animation.image_behavior.label"
+    },
+    {
+      "type": "header",
+      "content": "t:sections.image-with-text.settings.header.content"
+    }, 
+    {
+      "type": "select",
+      "id": "content_layout",
+      "options": [
+        {
+          "value": "no-overlap",
+          "label": "t:sections.image-with-text.settings.content_layout.options__1.label"
+        },
+        {
+          "value": "overlap",
+          "label": "t:sections.image-with-text.settings.content_layout.options__2.label"
+        }
+      ],
+      "default": "no-overlap",
+      "label": "t:sections.image-with-text.settings.content_layout.label"
+    },       
     {
       "type": "select",
       "id": "desktop_content_position",
@@ -224,20 +262,28 @@
     },
     {
       "type": "select",
-      "id": "content_layout",
+      "id": "mobile_content_alignment",
       "options": [
         {
-          "value": "no-overlap",
-          "label": "t:sections.image-with-text.settings.content_layout.options__1.label"
+          "value": "left",
+          "label": "t:sections.image-with-text.settings.mobile_content_alignment.options__1.label"
         },
         {
-          "value": "overlap",
-          "label": "t:sections.image-with-text.settings.content_layout.options__2.label"
+          "value": "center",
+          "label": "t:sections.image-with-text.settings.mobile_content_alignment.options__2.label"
+        },
+        {
+          "value": "right",
+          "label": "t:sections.image-with-text.settings.mobile_content_alignment.options__3.label"
         }
       ],
-      "default": "no-overlap",
-      "label": "t:sections.image-with-text.settings.content_layout.label"
+      "default": "left",
+      "label": "t:sections.image-with-text.settings.mobile_content_alignment.label"
     },
+    {
+      "type": "header",
+      "content": "t:sections.image-with-text.settings.header_colors.content"
+    },        
     {
       "type": "color_scheme",
       "id": "section_color_scheme",
@@ -250,54 +296,6 @@
       "label": "t:sections.multirow.settings.container_color_scheme.label",
       "default": "scheme-1"
     },
-    {
-      "type": "header",
-      "content": "t:sections.all.animation.content"
-    },
-    {
-      "type": "select",
-      "id": "image_behavior",
-      "options": [
-        {
-          "value": "none",
-          "label": "t:sections.all.animation.image_behavior.options__1.label"
-        },
-        {
-          "value": "ambient",
-          "label": "t:sections.all.animation.image_behavior.options__2.label"
-        },
-        {
-          "value": "zoom-in",
-          "label": "t:sections.all.animation.image_behavior.options__4.label"
-        }
-      ],
-      "default": "none",
-      "label": "t:sections.all.animation.image_behavior.label"
-    },
-    {
-      "type": "header",
-      "content": "Mobile layout"
-    },
-    {
-      "type": "select",
-      "id": "mobile_content_alignment",
-      "options": [
-        {
-          "value": "left",
-          "label": "t:sections.image-with-text.settings.mobile_content_alignment.options__1.label"
-        },
-        {
-          "value": "center",
-          "label": "t:sections.image-with-text.settings.mobile_content_alignment.options__2.label"
-        },
-        {
-          "value": "right",
-          "label": "t:sections.image-with-text.settings.mobile_content_alignment.options__3.label"
-        }
-      ],
-      "default": "left",
-      "label": "t:sections.image-with-text.settings.mobile_content_alignment.label"
-    },
     {
       "type": "header",
       "content": "t:sections.all.padding.section_padding_heading"
diff --git a/sections/main-article.liquid b/sections/main-article.liquid
index 2f4f8490597..936ed9f1631 100644
--- a/sections/main-article.liquid
+++ b/sections/main-article.liquid
@@ -328,8 +328,7 @@
             }
           ],
           "default": "adapt",
-          "label": "t:sections.main-article.blocks.featured_image.settings.image_height.label",
-          "info": "t:sections.main-article.blocks.featured_image.settings.image_height.info"
+          "label": "t:sections.main-article.blocks.featured_image.settings.image_height.label"
         }
       ]
     },
@@ -367,14 +366,6 @@
           "id": "share_label",
           "label": "t:sections.main-article.blocks.share.settings.text.label",
           "default": "t:sections.main-article.blocks.share.settings.text.default"
-        },
-        {
-          "type": "paragraph",
-          "content": "t:sections.main-article.blocks.share.settings.featured_image_info.content"
-        },
-        {
-          "type": "paragraph",
-          "content": "t:sections.main-article.blocks.share.settings.title_info.content"
         }
       ]
     }
diff --git a/sections/main-blog.liquid b/sections/main-blog.liquid
index 6a89251ca7c..adc207dcf6f 100644
--- a/sections/main-blog.liquid
+++ b/sections/main-blog.liquid
@@ -56,10 +56,6 @@
   "tag": "section",
   "class": "section",
   "settings": [
-    {
-      "type": "header",
-      "content": "t:sections.main-blog.settings.header.content"
-    },
     {
       "type": "select",
       "id": "layout",
@@ -74,8 +70,7 @@
         }
       ],
       "default": "collage",
-      "label": "t:sections.main-blog.settings.layout.label",
-      "info": "t:sections.main-blog.settings.layout.info"
+      "label": "t:sections.main-blog.settings.layout.label"
     },
     {
       "type": "checkbox",
@@ -105,8 +100,7 @@
         }
       ],
       "default": "medium",
-      "label": "t:sections.main-blog.settings.image_height.label",
-      "info": "t:sections.main-blog.settings.image_height.info"
+      "label": "t:sections.main-blog.settings.image_height.label"
     },
     {
       "type": "checkbox",
@@ -120,10 +114,6 @@
       "default": false,
       "label": "t:sections.main-blog.settings.show_author.label"
     },
-    {
-      "type": "paragraph",
-      "content": "t:sections.main-blog.settings.paragraph.content"
-    },
     {
       "type": "header",
       "content": "t:sections.all.padding.section_padding_heading"
diff --git a/sections/main-cart-footer.liquid b/sections/main-cart-footer.liquid
index 8057853e8b0..47b35364b86 100644
--- a/sections/main-cart-footer.liquid
+++ b/sections/main-cart-footer.liquid
@@ -144,6 +144,10 @@
       "label": "t:sections.all.colors.label",
       "default": "scheme-1"
     },
+    {
+      "type": "header",
+      "content": "t:sections.all.padding.section_padding_heading"
+    },    
     {
       "type": "range",
       "id": "padding_top",
diff --git a/sections/main-collection-banner.liquid b/sections/main-collection-banner.liquid
index 3c944f41564..ed84128be08 100644
--- a/sections/main-collection-banner.liquid
+++ b/sections/main-collection-banner.liquid
@@ -64,8 +64,7 @@
       "type": "checkbox",
       "id": "show_collection_image",
       "default": false,
-      "label": "t:sections.main-collection-banner.settings.show_collection_image.label",
-      "info": "t:sections.main-collection-banner.settings.show_collection_image.info"
+      "label": "t:sections.main-collection-banner.settings.show_collection_image.label"
     },
     {
       "type": "color_scheme",
diff --git a/sections/main-collection-product-grid.liquid b/sections/main-collection-product-grid.liquid
index d2eb1f78393..eb8607c7708 100644
--- a/sections/main-collection-product-grid.liquid
+++ b/sections/main-collection-product-grid.liquid
@@ -218,6 +218,22 @@
       "default": 4,
       "label": "t:sections.main-collection-product-grid.settings.columns_desktop.label"
     },
+    {
+      "type": "select",
+      "id": "columns_mobile",
+      "default": "2",
+      "label": "t:sections.main-collection-product-grid.settings.columns_mobile.label",
+      "options": [
+        {
+          "value": "1",
+          "label": "t:sections.main-collection-product-grid.settings.columns_mobile.options__1.label"
+        },
+        {
+          "value": "2",
+          "label": "t:sections.main-collection-product-grid.settings.columns_mobile.options__2.label"
+        }
+      ]
+    },    
     {
       "type": "color_scheme",
       "id": "color_scheme",
@@ -287,8 +303,7 @@
         }
       ],
       "default": "default",
-      "label": "t:sections.all.image_shape.label",
-      "info": "t:sections.all.image_shape.info"
+      "label": "t:sections.all.image_shape.label"
     },
     {
       "type": "checkbox",
@@ -314,7 +329,6 @@
       "id": "quick_add",
       "default": "none",
       "label": "t:sections.main-collection-product-grid.settings.quick_add.label",
-      "info": "t:sections.main-collection-product-grid.settings.quick_add.info",
       "options": [
         {
           "value": "none",
@@ -359,8 +373,7 @@
         }
       ],
       "default": "horizontal",
-      "label": "t:sections.main-collection-product-grid.settings.filter_type.label",
-      "info": "t:sections.main-collection-product-grid.settings.filter_type.info"
+      "label": "t:sections.main-collection-product-grid.settings.filter_type.label"
     },
     {
       "type": "checkbox",
@@ -368,26 +381,6 @@
       "default": true,
       "label": "t:sections.main-collection-product-grid.settings.enable_sorting.label"
     },
-    {
-      "type": "header",
-      "content": "t:sections.main-collection-product-grid.settings.header_mobile.content"
-    },
-    {
-      "type": "select",
-      "id": "columns_mobile",
-      "default": "2",
-      "label": "t:sections.main-collection-product-grid.settings.columns_mobile.label",
-      "options": [
-        {
-          "value": "1",
-          "label": "t:sections.main-collection-product-grid.settings.columns_mobile.options__1.label"
-        },
-        {
-          "value": "2",
-          "label": "t:sections.main-collection-product-grid.settings.columns_mobile.options__2.label"
-        }
-      ]
-    },
     {
       "type": "header",
       "content": "t:sections.all.padding.section_padding_heading"
diff --git a/sections/main-list-collections.liquid b/sections/main-list-collections.liquid
index 2c949588d63..944a7285e60 100644
--- a/sections/main-list-collections.liquid
+++ b/sections/main-list-collections.liquid
@@ -108,8 +108,7 @@
         }
       ],
       "default": "adapt",
-      "label": "t:sections.main-list-collections.settings.image_ratio.label",
-      "info": "t:sections.main-list-collections.settings.image_ratio.info"
+      "label": "t:sections.main-list-collections.settings.image_ratio.label"
     },
     {
       "type": "range",
@@ -120,10 +119,6 @@
       "default": 3,
       "label": "t:sections.main-list-collections.settings.columns_desktop.label"
     },
-    {
-      "type": "header",
-      "content": "t:sections.main-list-collections.settings.header_mobile.content"
-    },
     {
       "type": "select",
       "id": "columns_mobile",
diff --git a/sections/main-password-header.liquid b/sections/main-password-header.liquid
index 74dcaa3a418..352ddf9ce5b 100644
--- a/sections/main-password-header.liquid
+++ b/sections/main-password-header.liquid
@@ -106,10 +106,6 @@
 {
   "name": "t:sections.main-password-header.name",
   "settings": [
-    {
-      "type": "header",
-      "content": "t:sections.main-password-header.settings.logo_header.content"
-    },
     {
       "type": "paragraph",
       "content": "t:sections.main-password-header.settings.logo_help.content"
diff --git a/sections/main-product.liquid b/sections/main-product.liquid
index 30890e47acf..2fc44b3087c 100644
--- a/sections/main-product.liquid
+++ b/sections/main-product.liquid
@@ -834,7 +834,6 @@
           "min": 0,
           "max": 100,
           "step": 1,
-          "info": "t:sections.main-product.blocks.inventory.settings.inventory_threshold.info",
           "default": 10
         },
         {
@@ -930,14 +929,6 @@
           "id": "share_label",
           "label": "t:sections.main-product.blocks.share.settings.text.label",
           "default": "t:sections.main-product.blocks.share.settings.text.default"
-        },
-        {
-          "type": "paragraph",
-          "content": "t:sections.main-product.blocks.share.settings.featured_image_info.content"
-        },
-        {
-          "type": "paragraph",
-          "content": "t:sections.main-product.blocks.share.settings.title_info.content"
         }
       ]
     },
@@ -961,7 +952,6 @@
           "type": "text",
           "id": "heading",
           "default": "t:sections.main-product.blocks.collapsible_tab.settings.heading.default",
-          "info": "t:sections.main-product.blocks.collapsible_tab.settings.heading.info",
           "label": "t:sections.main-product.blocks.collapsible_tab.settings.heading.label"
         },
         {
@@ -1482,8 +1472,8 @@
         },
         {
           "type": "header",
-          "content": "t:sections.main-product.blocks.icon_with_text.settings.content.label",
-          "info": "t:sections.main-product.blocks.icon_with_text.settings.content.info"
+          "content": "t:sections.main-product.blocks.icon_with_text.settings.pairing_1.label",
+          "info": "t:sections.main-product.blocks.icon_with_text.settings.pairing_1.info"
         },
         {
           "type": "select",
@@ -1681,6 +1671,10 @@
           "label": "t:sections.main-product.blocks.icon_with_text.settings.heading_1.label",
           "info": "t:sections.main-product.blocks.icon_with_text.settings.heading.info"
         },
+        {
+          "type": "header",
+          "content": "t:sections.main-product.blocks.icon_with_text.settings.pairing_2.label"
+        },        
         {
           "type": "select",
           "id": "icon_2",
@@ -1877,6 +1871,10 @@
           "label": "t:sections.main-product.blocks.icon_with_text.settings.heading_2.label",
           "info": "t:sections.main-product.blocks.icon_with_text.settings.heading.info"
         },
+        {
+          "type": "header",
+          "content": "t:sections.main-product.blocks.icon_with_text.settings.pairing_3.label"
+        },        
         {
           "type": "select",
           "id": "icon_3",
@@ -2091,8 +2089,7 @@
     },
     {
       "type": "header",
-      "content": "t:sections.main-product.settings.header.content",
-      "info": "t:sections.main-product.settings.header.info"
+      "content": "t:sections.main-product.settings.header.content"
     },
     {
       "type": "select",
@@ -2112,8 +2109,7 @@
         }
       ],
       "default": "large",
-      "label": "t:sections.main-product.settings.media_size.label",
-      "info": "t:sections.main-product.settings.media_size.info"
+      "label": "t:sections.main-product.settings.media_size.label"
     },
     {
       "type": "checkbox",
@@ -2161,6 +2157,26 @@
       "default": "stacked",
       "label": "t:sections.main-product.settings.gallery_layout.label"
     },
+    {
+      "type": "select",
+      "id": "mobile_thumbnails",
+      "options": [
+        {
+          "value": "columns",
+          "label": "t:sections.main-product.settings.mobile_thumbnails.options__1.label"
+        },
+        {
+          "value": "show",
+          "label": "t:sections.main-product.settings.mobile_thumbnails.options__2.label"
+        },
+        {
+          "value": "hide",
+          "label": "t:sections.main-product.settings.mobile_thumbnails.options__3.label"
+        }
+      ],
+      "default": "hide",
+      "label": "t:sections.main-product.settings.mobile_thumbnails.label"
+    },    
     {
       "type": "select",
       "id": "media_position",
@@ -2175,8 +2191,7 @@
         }
       ],
       "default": "left",
-      "label": "t:sections.main-product.settings.media_position.label",
-      "info": "t:sections.main-product.settings.media_position.info"
+      "label": "t:sections.main-product.settings.media_position.label"
     },
     {
       "type": "select",
@@ -2196,28 +2211,7 @@
         }
       ],
       "default": "lightbox",
-      "label": "t:sections.main-product.settings.image_zoom.label",
-      "info": "t:sections.main-product.settings.image_zoom.info"
-    },
-    {
-      "type": "select",
-      "id": "mobile_thumbnails",
-      "options": [
-        {
-          "value": "columns",
-          "label": "t:sections.main-product.settings.mobile_thumbnails.options__1.label"
-        },
-        {
-          "value": "show",
-          "label": "t:sections.main-product.settings.mobile_thumbnails.options__2.label"
-        },
-        {
-          "value": "hide",
-          "label": "t:sections.main-product.settings.mobile_thumbnails.options__3.label"
-        }
-      ],
-      "default": "hide",
-      "label": "t:sections.main-product.settings.mobile_thumbnails.label"
+      "label": "t:sections.main-product.settings.image_zoom.label"
     },
     {
       "type": "checkbox",
diff --git a/sections/main-search.liquid b/sections/main-search.liquid
index 6ce6ab498a1..7ad54da0a97 100644
--- a/sections/main-search.liquid
+++ b/sections/main-search.liquid
@@ -348,6 +348,22 @@
       "default": 4,
       "label": "t:sections.main-search.settings.columns_desktop.label"
     },
+    {
+      "type": "select",
+      "id": "columns_mobile",
+      "default": "2",
+      "label": "t:sections.main-search.settings.columns_mobile.label",
+      "options": [
+        {
+          "value": "1",
+          "label": "t:sections.main-search.settings.columns_mobile.options__1.label"
+        },
+        {
+          "value": "2",
+          "label": "t:sections.main-search.settings.columns_mobile.options__2.label"
+        }
+      ]
+    },    
     {
       "type": "header",
       "content": "t:sections.main-search.settings.header__1.content"
@@ -410,8 +426,7 @@
         }
       ],
       "default": "default",
-      "label": "t:sections.all.image_shape.label",
-      "info": "t:sections.all.image_shape.info"
+      "label": "t:sections.all.image_shape.label"
     },
     {
       "type": "checkbox",
@@ -461,8 +476,7 @@
         }
       ],
       "default": "horizontal",
-      "label": "t:sections.main-collection-product-grid.settings.filter_type.label",
-      "info": "t:sections.main-collection-product-grid.settings.filter_type.info"
+      "label": "t:sections.main-collection-product-grid.settings.filter_type.label"
     },
     {
       "type": "checkbox",
@@ -472,8 +486,7 @@
     },
     {
       "type": "header",
-      "content": "t:sections.main-search.settings.header__2.content",
-      "info": "t:sections.main-search.settings.header__2.info"
+      "content": "t:sections.main-search.settings.header__2.content"
     },
     {
       "type": "checkbox",
@@ -487,26 +500,6 @@
       "default": false,
       "label": "t:sections.main-search.settings.article_show_author.label"
     },
-    {
-      "type": "header",
-      "content": "t:sections.main-search.settings.header_mobile.content"
-    },
-    {
-      "type": "select",
-      "id": "columns_mobile",
-      "default": "2",
-      "label": "t:sections.main-search.settings.columns_mobile.label",
-      "options": [
-        {
-          "value": "1",
-          "label": "t:sections.main-search.settings.columns_mobile.options__1.label"
-        },
-        {
-          "value": "2",
-          "label": "t:sections.main-search.settings.columns_mobile.options__2.label"
-        }
-      ]
-    },
     {
       "type": "header",
       "content": "t:sections.all.padding.section_padding_heading"
diff --git a/sections/multirow.liquid b/sections/multirow.liquid
index f5b2a8935b8..2fc52734a0b 100644
--- a/sections/multirow.liquid
+++ b/sections/multirow.liquid
@@ -115,6 +115,10 @@
     "groups": ["header", "footer"]
   },
   "settings": [
+    {
+      "type": "header",
+      "content": "t:sections.multirow.settings.header.content"
+    },
     {
       "type": "select",
       "id": "image_height",
@@ -157,8 +161,35 @@
         }
       ],
       "default": "medium",
-      "label": "t:sections.multirow.settings.desktop_image_width.label",
-      "info": "t:sections.multirow.settings.desktop_image_width.info"
+      "label": "t:sections.multirow.settings.desktop_image_width.label"
+    },
+    {
+      "type": "select",
+      "id": "image_layout",
+      "options": [
+        {
+          "value": "alternate-left",
+          "label": "t:sections.multirow.settings.image_layout.options__1.label"
+        },
+        {
+          "value": "alternate-right",
+          "label": "t:sections.multirow.settings.image_layout.options__2.label"
+        },
+        {
+          "value": "align-left",
+          "label": "t:sections.multirow.settings.image_layout.options__3.label"
+        },
+        {
+          "value": "align-right",
+          "label": "t:sections.multirow.settings.image_layout.options__4.label"
+        }
+      ],
+      "default": "alternate-left",
+      "label": "t:sections.multirow.settings.image_layout.label"
+    },
+    {
+      "type": "header",
+      "content": "t:sections.multirow.settings.header_2.content"
     },
     {
       "type": "select",
@@ -238,8 +269,7 @@
         }
       ],
       "default": "middle",
-      "label": "t:sections.multirow.settings.desktop_content_position.label",
-      "info": "t:sections.multirow.settings.desktop_content_position.info"
+      "label": "t:sections.multirow.settings.desktop_content_position.label"
     },
     {
       "type": "select",
@@ -263,28 +293,27 @@
     },
     {
       "type": "select",
-      "id": "image_layout",
+      "id": "mobile_content_alignment",
       "options": [
         {
-          "value": "alternate-left",
-          "label": "t:sections.multirow.settings.image_layout.options__1.label"
-        },
-        {
-          "value": "alternate-right",
-          "label": "t:sections.multirow.settings.image_layout.options__2.label"
+          "value": "left",
+          "label": "t:sections.multirow.settings.mobile_content_alignment.options__1.label"
         },
         {
-          "value": "align-left",
-          "label": "t:sections.multirow.settings.image_layout.options__3.label"
+          "value": "center",
+          "label": "t:sections.multirow.settings.mobile_content_alignment.options__2.label"
         },
         {
-          "value": "align-right",
-          "label": "t:sections.multirow.settings.image_layout.options__4.label"
+          "value": "right",
+          "label": "t:sections.multirow.settings.mobile_content_alignment.options__3.label"
         }
       ],
-      "default": "alternate-left",
-      "label": "t:sections.multirow.settings.image_layout.label",
-      "info": "t:sections.multirow.settings.image_layout.info"
+      "default": "left",
+      "label": "t:sections.multirow.settings.mobile_content_alignment.label"
+    },
+    {
+      "type": "header",
+      "content": "t:sections.multirow.settings.header_3.content"
     },
     {
       "type": "color_scheme",
@@ -298,30 +327,6 @@
       "label": "t:sections.multirow.settings.container_color_scheme.label",
       "default": "scheme-1"
     },
-    {
-      "type": "header",
-      "content": "t:sections.multirow.settings.header_mobile.content"
-    },
-    {
-      "type": "select",
-      "id": "mobile_content_alignment",
-      "options": [
-        {
-          "value": "left",
-          "label": "t:sections.multirow.settings.mobile_content_alignment.options__1.label"
-        },
-        {
-          "value": "center",
-          "label": "t:sections.multirow.settings.mobile_content_alignment.options__2.label"
-        },
-        {
-          "value": "right",
-          "label": "t:sections.multirow.settings.mobile_content_alignment.options__3.label"
-        }
-      ],
-      "default": "left",
-      "label": "t:sections.multirow.settings.mobile_content_alignment.label"
-    },
     {
       "type": "header",
       "content": "t:sections.all.padding.section_padding_heading"
diff --git a/sections/newsletter.liquid b/sections/newsletter.liquid
index a3d19f1dfaa..4c14b8b8209 100644
--- a/sections/newsletter.liquid
+++ b/sections/newsletter.liquid
@@ -129,6 +129,10 @@
     "groups": ["header"]
   },
   "settings": [
+    {
+      "type": "paragraph",
+      "content": "t:sections.newsletter.settings.paragraph.content"
+    },
     {
       "type": "color_scheme",
       "id": "color_scheme",
@@ -141,10 +145,6 @@
       "default": true,
       "label": "t:sections.newsletter.settings.full_width.label"
     },
-    {
-      "type": "paragraph",
-      "content": "t:sections.newsletter.settings.paragraph.content"
-    },
     {
       "type": "header",
       "content": "t:sections.all.padding.section_padding_heading"
diff --git a/sections/related-products.liquid b/sections/related-products.liquid
index 0f85128f18e..5617046f891 100644
--- a/sections/related-products.liquid
+++ b/sections/related-products.liquid
@@ -120,6 +120,22 @@
       "default": 4,
       "label": "t:sections.related-products.settings.columns_desktop.label"
     },
+    {
+      "type": "select",
+      "id": "columns_mobile",
+      "default": "2",
+      "label": "t:sections.related-products.settings.columns_mobile.label",
+      "options": [
+        {
+          "value": "1",
+          "label": "t:sections.related-products.settings.columns_mobile.options__1.label"
+        },
+        {
+          "value": "2",
+          "label": "t:sections.related-products.settings.columns_mobile.options__2.label"
+        }
+      ]    
+    },
     {
       "type": "color_scheme",
       "id": "color_scheme",
@@ -189,8 +205,7 @@
         }
       ],
       "default": "default",
-      "label": "t:sections.all.image_shape.label",
-      "info": "t:sections.all.image_shape.info"
+      "label": "t:sections.all.image_shape.label"
     },
     {
       "type": "checkbox",
@@ -211,26 +226,6 @@
       "label": "t:sections.related-products.settings.show_rating.label",
       "info": "t:sections.related-products.settings.show_rating.info"
     },
-    {
-      "type": "header",
-      "content": "t:sections.related-products.settings.header_mobile.content"
-    },
-    {
-      "type": "select",
-      "id": "columns_mobile",
-      "default": "2",
-      "label": "t:sections.related-products.settings.columns_mobile.label",
-      "options": [
-        {
-          "value": "1",
-          "label": "t:sections.related-products.settings.columns_mobile.options__1.label"
-        },
-        {
-          "value": "2",
-          "label": "t:sections.related-products.settings.columns_mobile.options__2.label"
-        }
-      ]
-    },
     {
       "type": "header",
       "content": "t:sections.all.padding.section_padding_heading"
diff --git a/sections/rich-text.liquid b/sections/rich-text.liquid
index 32bb308bbaf..e687d950270 100644
--- a/sections/rich-text.liquid
+++ b/sections/rich-text.liquid
@@ -121,8 +121,7 @@
         }
       ],
       "default": "center",
-      "label": "t:sections.rich-text.settings.desktop_content_position.label",
-      "info": "t:sections.rich-text.settings.desktop_content_position.info"
+      "label": "t:sections.rich-text.settings.desktop_content_position.label"
     },
     {
       "type": "select",
@@ -290,6 +289,10 @@
       "name": "t:sections.rich-text.blocks.buttons.name",
       "limit": 2,
       "settings": [
+        {
+         "type": "header",
+         "content": "t:sections.rich-text.blocks.buttons.settings.header_button1.content"
+        },        
         {
           "type": "text",
           "id": "button_label",
@@ -308,6 +311,10 @@
           "default": false,
           "label": "t:sections.rich-text.blocks.buttons.settings.button_style_secondary_1.label"
         },
+        {
+         "type": "header",
+         "content": "t:sections.rich-text.blocks.buttons.settings.header_button2.content"
+        },          
         {
           "type": "text",
           "id": "button_label_2",
diff --git a/sections/slideshow.liquid b/sections/slideshow.liquid
index 3f415df50e3..f3d98114230 100644
--- a/sections/slideshow.liquid
+++ b/sections/slideshow.liquid
@@ -346,10 +346,6 @@
       "label": "t:sections.slideshow.settings.change_slides_speed.label",
       "default": 5
     },
-    {
-      "type": "header",
-      "content": "t:sections.all.animation.content"
-    },
     {
       "type": "select",
       "id": "image_behavior",
@@ -399,6 +395,20 @@
           "id": "image",
           "label": "t:sections.slideshow.blocks.slide.settings.image.label"
         },
+        {
+          "type": "range",
+          "id": "image_overlay_opacity",
+          "min": 0,
+          "max": 100,
+          "step": 10,
+          "unit": "%",
+          "label": "t:sections.slideshow.blocks.slide.settings.image_overlay_opacity.label",
+          "default": 0
+        },
+        {
+          "type": "header",
+          "content": "t:sections.slideshow.blocks.slide.settings.header_text.content"
+        },
         {
           "type": "inline_richtext",
           "id": "heading",
@@ -439,12 +449,15 @@
           "default": "t:sections.slideshow.blocks.slide.settings.subheading.default",
           "label": "t:sections.slideshow.blocks.slide.settings.subheading.label"
         },
+        {
+          "type": "header",
+          "content": "t:sections.slideshow.blocks.slide.settings.header_button.content"
+        },        
         {
           "type": "text",
           "id": "button_label",
           "default": "t:sections.slideshow.blocks.slide.settings.button_label.default",
-          "label": "t:sections.slideshow.blocks.slide.settings.button_label.label",
-          "info": "t:sections.slideshow.blocks.slide.settings.button_label.info"
+          "label": "t:sections.slideshow.blocks.slide.settings.button_label.label"
         },
         {
           "type": "url",
@@ -457,6 +470,16 @@
           "label": "t:sections.slideshow.blocks.slide.settings.secondary_style.label",
           "default": false
         },
+        {
+          "type": "header",
+          "content": "t:sections.slideshow.blocks.slide.settings.header_layout.content"
+        },         
+        {
+          "type": "checkbox",
+          "id": "show_text_box",
+          "label": "t:sections.slideshow.blocks.slide.settings.show_text_box.label",
+          "default": true
+        },
         {
           "type": "select",
           "id": "box_align",
@@ -499,14 +522,7 @@
             }
           ],
           "default": "middle-center",
-          "label": "t:sections.slideshow.blocks.slide.settings.box_align.label",
-          "info": "t:sections.slideshow.blocks.slide.settings.box_align.info"
-        },
-        {
-          "type": "checkbox",
-          "id": "show_text_box",
-          "label": "t:sections.slideshow.blocks.slide.settings.show_text_box.label",
-          "default": true
+          "label": "t:sections.slideshow.blocks.slide.settings.box_align.label"
         },
         {
           "type": "select",
@@ -528,26 +544,6 @@
           "default": "center",
           "label": "t:sections.slideshow.blocks.slide.settings.text_alignment.label"
         },
-        {
-          "type": "range",
-          "id": "image_overlay_opacity",
-          "min": 0,
-          "max": 100,
-          "step": 10,
-          "unit": "%",
-          "label": "t:sections.slideshow.blocks.slide.settings.image_overlay_opacity.label",
-          "default": 0
-        },
-        {
-          "type": "color_scheme",
-          "id": "color_scheme",
-          "label": "t:sections.all.colors.label",
-          "default": "scheme-1"
-        },
-        {
-          "type": "header",
-          "content": "t:sections.slideshow.settings.mobile.content"
-        },
         {
           "type": "select",
           "id": "text_alignment_mobile",
@@ -567,6 +563,16 @@
           ],
           "default": "center",
           "label": "t:sections.slideshow.blocks.slide.settings.text_alignment_mobile.label"
+        },
+        {
+          "type": "header",
+          "content": "t:sections.slideshow.blocks.slide.settings.header_colors.content"
+        },         
+        {
+          "type": "color_scheme",
+          "id": "color_scheme",
+          "label": "t:sections.all.colors.label",
+          "default": "scheme-1"
         }
       ]
     }