diff --git a/layout/password.liquid b/layout/password.liquid
index c03433ab92f..a6238c03b65 100644
--- a/layout/password.liquid
+++ b/layout/password.liquid
@@ -175,10 +175,14 @@
     {% endstyle %}
 
     {%- unless settings.type_body_font.system? -%}
+      {% comment %}theme-check-disable AssetPreload{% endcomment %}
       <link rel="preload" as="font" href="{{ settings.type_body_font | font_url }}" type="font/woff2" crossorigin>
+      {% comment %}theme-check-enable AssetPreload{% endcomment %}
     {%- endunless -%}
     {%- unless settings.type_header_font.system? -%}
+      {% comment %}theme-check-disable AssetPreload{% endcomment %}
       <link rel="preload" as="font" href="{{ settings.type_header_font | font_url }}" type="font/woff2" crossorigin>
+      {% comment %}theme-check-enable AssetPreload{% endcomment %}
     {%- endunless -%}
 
     {{ 'section-password.css' | asset_url | stylesheet_tag }}
diff --git a/layout/theme.liquid b/layout/theme.liquid
index 786ac69eca2..3da0fb6799c 100644
--- a/layout/theme.liquid
+++ b/layout/theme.liquid
@@ -254,10 +254,14 @@
     {{ 'base.css' | asset_url | stylesheet_tag }}
 
     {%- unless settings.type_body_font.system? -%}
+      {% comment %}theme-check-disable AssetPreload{% endcomment %}
       <link rel="preload" as="font" href="{{ settings.type_body_font | font_url }}" type="font/woff2" crossorigin>
+      {% comment %}theme-check-enable AssetPreload{% endcomment %}
     {%- endunless -%}
     {%- unless settings.type_header_font.system? -%}
+      {% comment %}theme-check-disable AssetPreload{% endcomment %}
       <link rel="preload" as="font" href="{{ settings.type_header_font | font_url }}" type="font/woff2" crossorigin>
+      {% comment %}theme-check-enable AssetPreload{% endcomment %}
     {%- endunless -%}
 
     {%- if localization.available_countries.size > 1 or localization.available_languages.size > 1 -%}
diff --git a/sections/announcement-bar.liquid b/sections/announcement-bar.liquid
index 31db1f58257..ecc45376f50 100644
--- a/sections/announcement-bar.liquid
+++ b/sections/announcement-bar.liquid
@@ -224,7 +224,9 @@
   "max_blocks": 12,
   "class": "announcement-bar-section",
   "enabled_on": {
-    "groups": ["header"]
+    "groups": [
+      "header"
+    ]
   },
   "settings": [
     {
diff --git a/sections/collage.liquid b/sections/collage.liquid
index ae7da8c9b3a..05adc698d6e 100644
--- a/sections/collage.liquid
+++ b/sections/collage.liquid
@@ -250,7 +250,10 @@
   "tag": "section",
   "class": "section",
   "disabled_on": {
-    "groups": ["header", "footer"]
+    "groups": [
+      "header",
+      "footer"
+    ]
   },
   "settings": [
     {
@@ -412,7 +415,10 @@
         {
           "type": "video_url",
           "id": "video_url",
-          "accept": ["youtube", "vimeo"],
+          "accept": [
+            "youtube",
+            "vimeo"
+          ],
           "default": "https://www.youtube.com/watch?v=_9VUPq3SxOc",
           "label": "t:sections.collage.blocks.video.settings.video_url.label",
           "placeholder": "t:sections.collage.blocks.video.settings.video_url.placeholder",
diff --git a/sections/collapsible-content.liquid b/sections/collapsible-content.liquid
index a2d923d2c0c..c5f23f748ba 100644
--- a/sections/collapsible-content.liquid
+++ b/sections/collapsible-content.liquid
@@ -112,7 +112,10 @@
   "tag": "section",
   "class": "section",
   "disabled_on": {
-    "groups": ["header", "footer"]
+    "groups": [
+      "header",
+      "footer"
+    ]
   },
   "settings": [
     {
diff --git a/sections/collection-list.liquid b/sections/collection-list.liquid
index 828f9f7e448..362ab8c2454 100644
--- a/sections/collection-list.liquid
+++ b/sections/collection-list.liquid
@@ -136,7 +136,10 @@
   "class": "section section-collection-list",
   "max_blocks": 15,
   "disabled_on": {
-    "groups": ["header", "footer"]
+    "groups": [
+      "header",
+      "footer"
+    ]
   },
   "settings": [
     {
diff --git a/sections/contact-form.liquid b/sections/contact-form.liquid
index e545933c533..1c04f0c1dfe 100644
--- a/sections/contact-form.liquid
+++ b/sections/contact-form.liquid
@@ -139,7 +139,10 @@
   "tag": "section",
   "class": "section",
   "disabled_on": {
-    "groups": ["header", "footer"]
+    "groups": [
+      "header",
+      "footer"
+    ]
   },
   "settings": [
     {
diff --git a/sections/email-signup-banner.liquid b/sections/email-signup-banner.liquid
index 464637c9ea2..143d08a99be 100644
--- a/sections/email-signup-banner.liquid
+++ b/sections/email-signup-banner.liquid
@@ -385,6 +385,8 @@
       ]
     }
   ],
-  "templates": ["password"]
+  "templates": [
+    "password"
+  ]
 }
 {% endschema %}
diff --git a/sections/featured-blog.liquid b/sections/featured-blog.liquid
index b7aefe7f925..bf93c635cd4 100644
--- a/sections/featured-blog.liquid
+++ b/sections/featured-blog.liquid
@@ -152,7 +152,10 @@
   "name": "t:sections.featured-blog.name",
   "tag": "section",
   "disabled_on": {
-    "groups": ["header", "footer"]
+    "groups": [
+      "header",
+      "footer"
+    ]
   },
   "settings": [
     {
diff --git a/sections/featured-collection.liquid b/sections/featured-collection.liquid
index c582f39b19c..4d1de2ee643 100644
--- a/sections/featured-collection.liquid
+++ b/sections/featured-collection.liquid
@@ -168,7 +168,10 @@
   "tag": "section",
   "class": "section",
   "disabled_on": {
-    "groups": ["header", "footer"]
+    "groups": [
+      "header",
+      "footer"
+    ]
   },
   "settings": [
     {
diff --git a/sections/featured-product.liquid b/sections/featured-product.liquid
index 4c920b73657..a7208069209 100644
--- a/sections/featured-product.liquid
+++ b/sections/featured-product.liquid
@@ -446,8 +446,10 @@
                   {%- endif -%}
                 </div>
               {%- when 'share' -%}
-                {% assign share_url = product.selected_variant.url | default: product.url | prepend: request.origin %}
-                {% render 'share-button', block: block, share_link: share_url %}
+                {% liquid 
+                  assign share_url = product.selected_variant.url | default: product.url | prepend: request.origin 
+                  render 'share-button', block: block, share_link: share_url
+                %}
               {%- when 'variant_picker' -%}
                 {% render 'product-variant-picker',
                   product: product,
@@ -700,7 +702,10 @@
   "tag": "section",
   "class": "section section-featured-product",
   "disabled_on": {
-    "groups": ["header", "footer"]
+    "groups": [
+      "header",
+      "footer"
+    ]
   },
   "blocks": [
     {
diff --git a/sections/header.liquid b/sections/header.liquid
index d5f4cfd81ff..c8ecd2afc5a 100644
--- a/sections/header.liquid
+++ b/sections/header.liquid
@@ -593,7 +593,7 @@
       "label": "t:sections.all.colors.label",
       "default": "scheme-1"
     },
-      {
+    {
       "type": "color_scheme",
       "id": "menu_color_scheme",
       "label": "t:sections.header.settings.menu_color_scheme.label",
diff --git a/sections/image-banner.liquid b/sections/image-banner.liquid
index 44af077d8ec..dbd1eb5dd6d 100644
--- a/sections/image-banner.liquid
+++ b/sections/image-banner.liquid
@@ -168,7 +168,10 @@
   "tag": "section",
   "class": "section",
   "disabled_on": {
-    "groups": ["header", "footer"]
+    "groups": [
+      "header",
+      "footer"
+    ]
   },
   "settings": [
     {
diff --git a/sections/image-with-text.liquid b/sections/image-with-text.liquid
index 62d63a0c7c3..c8abd449687 100644
--- a/sections/image-with-text.liquid
+++ b/sections/image-with-text.liquid
@@ -100,7 +100,10 @@
   "name": "t:sections.image-with-text.name",
   "class": "section",
   "disabled_on": {
-    "groups": ["header", "footer"]
+    "groups": [
+      "header",
+      "footer"
+    ]
   },
   "settings": [
     {
diff --git a/sections/main-product.liquid b/sections/main-product.liquid
index 8b9e9fc9b4c..660a12afec5 100644
--- a/sections/main-product.liquid
+++ b/sections/main-product.liquid
@@ -414,12 +414,10 @@
                 {{- block.settings.text -}}
               </a>
             {%- when 'share' -%}
-              {% assign share_url = product.selected_variant.url | default: product.url | prepend: request.origin %}
-              {% render 'share-button',
-                block: block,
-                share_link: share_url
+              {% liquid 
+                assign share_url = product.selected_variant.url | default: product.url | prepend: request.origin
+                render 'share-button', block: block, share_link: share_url
               %}
-
             {%- when 'variant_picker' -%}
               {% render 'product-variant-picker', product: product, block: block, product_form_id: product_form_id %}
             {%- when 'buy_buttons' -%}
diff --git a/sections/multicolumn.liquid b/sections/multicolumn.liquid
index 633e239d991..9327bafaad3 100644
--- a/sections/multicolumn.liquid
+++ b/sections/multicolumn.liquid
@@ -194,7 +194,10 @@
   "class": "section",
   "tag": "section",
   "disabled_on": {
-    "groups": ["header", "footer"]
+    "groups": [
+      "header",
+      "footer"
+    ]
   },
   "settings": [
     {
diff --git a/sections/multirow.liquid b/sections/multirow.liquid
index 2d242bd05a4..d7053efcd8a 100644
--- a/sections/multirow.liquid
+++ b/sections/multirow.liquid
@@ -112,7 +112,10 @@
   "name": "t:sections.multirow.name",
   "class": "section",
   "disabled_on": {
-    "groups": ["header", "footer"]
+    "groups": [
+      "header",
+      "footer"
+    ]
   },
   "settings": [
     {
diff --git a/sections/newsletter.liquid b/sections/newsletter.liquid
index d9e510dc6e1..90013a57d62 100644
--- a/sections/newsletter.liquid
+++ b/sections/newsletter.liquid
@@ -120,7 +120,9 @@
   "tag": "section",
   "class": "section",
   "disabled_on": {
-    "groups": ["header"]
+    "groups": [
+      "header"
+    ]
   },
   "settings": [
     {
diff --git a/sections/page.liquid b/sections/page.liquid
index 24eccbc68b0..5bdddaa6095 100644
--- a/sections/page.liquid
+++ b/sections/page.liquid
@@ -41,7 +41,10 @@
   "tag": "section",
   "class": "section",
   "disabled_on": {
-    "groups": ["header", "footer"]
+    "groups": [
+      "header",
+      "footer"
+    ]
   },
   "settings": [
     {
diff --git a/sections/quick-order-list.liquid b/sections/quick-order-list.liquid
index e089e933d66..85c885a9597 100644
--- a/sections/quick-order-list.liquid
+++ b/sections/quick-order-list.liquid
@@ -276,7 +276,9 @@
   "name": "t:sections.quick-order-list.name",
   "limit": 1,
   "enabled_on": {
-    "templates": ["product"]
+    "templates": [
+      "product"
+    ]
   },
   "settings": [
     {
diff --git a/sections/rich-text.liquid b/sections/rich-text.liquid
index 4a2914ce57b..60fc6fc5775 100644
--- a/sections/rich-text.liquid
+++ b/sections/rich-text.liquid
@@ -100,7 +100,10 @@
   "tag": "section",
   "class": "section",
   "disabled_on": {
-    "groups": ["header", "footer"]
+    "groups": [
+      "header",
+      "footer"
+    ]
   },
   "settings": [
     {
diff --git a/sections/slideshow.liquid b/sections/slideshow.liquid
index eba91e849b7..eca076ff320 100644
--- a/sections/slideshow.liquid
+++ b/sections/slideshow.liquid
@@ -269,7 +269,10 @@
   "tag": "section",
   "class": "section",
   "disabled_on": {
-    "groups": ["header", "footer"]
+    "groups": [
+      "header",
+      "footer"
+    ]
   },
   "settings": [
     {
diff --git a/sections/video.liquid b/sections/video.liquid
index 17b14532c9c..3df8f7c3527 100644
--- a/sections/video.liquid
+++ b/sections/video.liquid
@@ -154,7 +154,10 @@
   "tag": "section",
   "class": "section",
   "disabled_on": {
-    "groups": ["header", "footer"]
+    "groups": [
+      "header",
+      "footer"
+    ]
   },
   "settings": [
     {
@@ -209,7 +212,10 @@
     {
       "type": "video_url",
       "id": "video_url",
-      "accept": ["youtube", "vimeo"],
+      "accept": [
+        "youtube",
+        "vimeo"
+      ],
       "default": "https://www.youtube.com/watch?v=_9VUPq3SxOc",
       "label": "t:sections.video.settings.video_url.label",
       "info": "t:sections.video.settings.video_url.info"
diff --git a/snippets/product-variant-options.liquid b/snippets/product-variant-options.liquid
index 3af179ac13b..453a4a386cc 100644
--- a/snippets/product-variant-options.liquid
+++ b/snippets/product-variant-options.liquid
@@ -67,21 +67,35 @@
   {%- endcapture %}
 
   {%- if picker_type == 'swatch' -%}
-    {% assign checked = false %}
-    {% if option.selected_value == value %}
-      {% assign checked = true %}
-    {% endif %}
-    {%
-      render 'swatch-input',
-      id: input_id,
-      name: option.name,
-      value: value | escape,
-      product_form_id: product_form_id,
-      checked: checked,
-      disabled: option_disabled,
-      shape: block.settings.swatch_shape,
-      help_text: label_unavailable
+    {% liquid
+      assign checked = false
+
+      if option.selected_value == value
+        assign checked = true
+      endif
+
+      assign value_text = value | escape
     %}
+    <input
+      type="radio"
+      id="{{ input_id }}"
+      name="{{ option.name }}"
+      value="{{ value_text }}"
+      form="{{ product_form_id }}"
+      class="swatch-input__input{% if option_disabled %} disabled{% endif %}"
+      {% if checked %}
+        checked
+      {% endif %}
+    >
+    <label
+      for="{{ input_id }}"
+      title="{{ value_text }}"
+      class="swatch-input__label{% if block.settings.swatch_shape == 'square' %} swatch-input__label--square{% endif %}"
+    >
+      {% render 'swatch', swatch: value.swatch, shape: block.settings.swatch_shape %}
+      <span class="visually-hidden">{{ value_text }}</span>
+      {{ label_unavailable }}
+    </label>
   {%- elsif picker_type == 'button' -%}
     <input
       type="radio"
diff --git a/snippets/swatch-input.liquid b/snippets/swatch-input.liquid
deleted file mode 100644
index c1d6907fdb3..00000000000
--- a/snippets/swatch-input.liquid
+++ /dev/null
@@ -1,45 +0,0 @@
-{% comment %}
-  Renders a swatch input component.
-  Accepts:
-  - id: {String} unique input id
-  - name: {String} input name,
-  - value: {ProductOptionValueDrop} input value,
-  - product_form_id: {String} id of the form associted with the input
-  - checked: {Boolean} default checked status
-  - disabled: {Boolean} default disabled status
-  - shape: {String} swatch shape. Accepts 'square', defaults to circle.
-  - help_text: {String} additional content to render inside the label
-
-  Usage:
-   {% render 'swatch-input',
-      id: input_id,
-      name: input_name,
-      value: input_value,
-      product_form_id: product_form_id,
-      checked: checked,
-      disabled: disabled,
-      shape: 'square'
-      help_text: 'help text'
-    %}
-{% endcomment %}
-
-<input
-  type="radio"
-  id="{{ id }}"
-  name="{{ name }}"
-  value="{{ value }}"
-  form="{{ product_form_id }}"
-  class="swatch-input__input{% if disabled %} disabled{% endif %}"
-  {% if checked %}
-    checked
-  {% endif %}
->
-<label
-  for="{{ id }}"
-  title="{{ value }}"
-  class="swatch-input__label{% if shape == 'square' %} swatch-input__label--square{% endif %}"
->
-  {% render 'swatch', swatch: value.swatch, shape: shape %}
-  <span class="visually-hidden">{{ value }}</span>
-  {{ help_text }}
-</label>
diff --git a/templates/gift_card.liquid b/templates/gift_card.liquid
index 4a2838a1069..652f4ac8fcf 100644
--- a/templates/gift_card.liquid
+++ b/templates/gift_card.liquid
@@ -92,10 +92,14 @@
     {% endstyle %}
 
     {%- unless settings.type_body_font.system? -%}
+      {% comment %}theme-check-disable AssetPreload{% endcomment %}
       <link rel="preload" as="font" href="{{ settings.type_body_font | font_url }}" type="font/woff2" crossorigin>
+      {% comment %}theme-check-enable AssetPreload{% endcomment %}
     {%- endunless -%}
     {%- unless settings.type_header_font.system? -%}
+      {% comment %}theme-check-disable AssetPreload{% endcomment %}
       <link rel="preload" as="font" href="{{ settings.type_header_font | font_url }}" type="font/woff2" crossorigin>
+      {% comment %}theme-check-enable AssetPreload{% endcomment %}
     {%- endunless -%}
 
     {{ 'template-giftcard.css' | asset_url | stylesheet_tag }}
@@ -135,6 +139,7 @@
             alt=""
             height="{{ 570 | divided_by: 1.5 }}"
             width="570"
+            loading="eager"
           >
         {%- endif %}
       </div>