diff --git a/sections/product-page.liquid b/sections/product-page.liquid
index f0e6583..42114a5 100644
--- a/sections/product-page.liquid
+++ b/sections/product-page.liquid
@@ -7,26 +7,26 @@
 {%- assign color_palette                 = section.settings.color_palette -%}
 {%- assign description                   = product.description -%}
 {%- assign description_placement         = section.settings.description_placement -%}
-{%- assign enable_controls_desktop       = section.settings.show_controls -%}
-{%- assign enable_controls_mobile        = section.settings.enable_controls_mobile -%}
-{%- assign enable_thumbnails_desktop     = section.settings.show_thumbnails -%}
-{%- assign enable_thumbnails_mobile      = section.settings.enable_thumbnails_mobile -%}
+{%- assign image_fit_desktop             = section.settings.image_fit_desktop -%}
+{%- assign image_fit_mobile              = section.settings.image_fit_mobile -%}
 {%- assign infinite_scroll_desktop       = section.settings.infinity_scroll -%}
 {%- assign infinite_scroll_mobile        = section.settings.infinite_scroll_mobile -%}
 {%- assign message_label                 = section.settings.message_label -%}
-{%- assign object_fit_desktop            = section.settings.object_fit_desktop -%}
-{%- assign object_fit_mobile             = section.settings.object_fit_mobile -%}
-{%- assign padding_top                   = section.settings.padding_top -%}
 {%- assign padding_bottom                = section.settings.padding_bottom -%}
-{%- assign padding_top_mobile            = section.settings.padding_top_mobile -%}
 {%- assign padding_bottom_mobile         = section.settings.padding_bottom_mobile -%}
+{%- assign padding_top                   = section.settings.padding_top -%}
+{%- assign padding_top_mobile            = section.settings.padding_top_mobile -%}
 {%- assign period                        = product | product_price_label -%}
 {%- assign price                         = product | product_price -%}
 {%- assign quantity                      = product | product_button -%}
 {%- assign show_breadcrumbs              = section.settings.show_breadcrumbs -%}
+{%- assign show_controls_desktop         = section.settings.show_controls -%}
+{%- assign show_controls_mobile          = section.settings.show_controls_mobile -%}
+{%- assign show_thumbnails_desktop       = section.settings.show_thumbnails -%}
+{%- assign show_thumbnails_mobile        = section.settings.show_thumbnails_mobile -%}
 {%- assign title                         = product.name -%}
-{%- assign variants                      = product.variants -%}
 {%- assign variant_selector              = product | product_variations_select -%}
+{%- assign variants                      = product.variants -%}
 {%- assign variation_label               = 'store.variant' | user_t -%}
 
 
@@ -96,14 +96,14 @@
     <div class="product-main__wrapper">
       <div class="product-main__gallery">
         {{ product | product_gallery:
-          image_fit_desktop: object_fit_desktop,
-          enable_thumbnails_desktop: enable_thumbnails_desktop,
+          enable_controls_desktop: show_controls_desktop,
+          enable_controls_mobile: show_controls_mobile,
+          enable_thumbnails_desktop: show_thumbnails_desktop,
+          enable_thumbnails_mobile: show_thumbnails_mobile,
+          image_fit_desktop: image_fit_desktop,
+          image_fit_mobile: image_fit_mobile,
           infinite_scroll_desktop: infinite_scroll_desktop,
-          enable_controls_desktop: enable_controls_desktop,
-          image_fit_mobile: object_fit_mobile,
-          enable_thumbnails_mobile: enable_thumbnails_mobile,
           infinite_scroll_mobile: infinite_scroll_mobile,
-          enable_controls_mobile: enable_controls_mobile
         }}
       </div>
 
@@ -321,13 +321,13 @@
       },
       {
         "type": "checkbox",
-        "id": "enable_controls_mobile",
+        "id": "show_controls_mobile",
         "label": "Show navigation buttons",
         "default": true
       },
       {
         "type": "checkbox",
-        "id": "enable_thumbnails_mobile",
+        "id": "show_thumbnails_mobile",
         "label": "Show thumbnails",
         "default": true
       },
diff --git a/templates/construct/product.json b/templates/construct/product.json
index 4bacf78..755847d 100644
--- a/templates/construct/product.json
+++ b/templates/construct/product.json
@@ -22,7 +22,10 @@
         "breadcrumbs_root_url": "collections",
         "color_palette": "one",
         "description_placement": "top",
+        "image_fit_desktop": "cover",
+        "image_fit_mobile": "cover",
         "infinity_scroll": true,
+        "infinity_scroll_mobile": true,
         "message_label": "Free shipping over $50",
         "padding_bottom": "small",
         "padding_bottom_mobile": "small",
@@ -30,7 +33,9 @@
         "padding_top_mobile": "small",
         "show_breadcrumbs": true,
         "show_controls": true,
-        "show_thumbnails": true
+        "show_controls_mobile": true,
+        "show_thumbnails": true,
+        "show_thumbnails_mobile": true
       },
       "disabled": null
     },
diff --git a/templates/product.json b/templates/product.json
index 4bacf78..755847d 100644
--- a/templates/product.json
+++ b/templates/product.json
@@ -22,7 +22,10 @@
         "breadcrumbs_root_url": "collections",
         "color_palette": "one",
         "description_placement": "top",
+        "image_fit_desktop": "cover",
+        "image_fit_mobile": "cover",
         "infinity_scroll": true,
+        "infinity_scroll_mobile": true,
         "message_label": "Free shipping over $50",
         "padding_bottom": "small",
         "padding_bottom_mobile": "small",
@@ -30,7 +33,9 @@
         "padding_top_mobile": "small",
         "show_breadcrumbs": true,
         "show_controls": true,
-        "show_thumbnails": true
+        "show_controls_mobile": true,
+        "show_thumbnails": true,
+        "show_thumbnails_mobile": true
       },
       "disabled": null
     },
diff --git a/templates/romance/product.json b/templates/romance/product.json
index 60562ca..365bcc8 100644
--- a/templates/romance/product.json
+++ b/templates/romance/product.json
@@ -22,7 +22,10 @@
         "breadcrumbs_root_url": "collections",
         "color_palette": "one",
         "description_placement": "top",
+        "image_fit_desktop": "cover",
+        "image_fit_mobile": "cover",
         "infinity_scroll": true,
+        "infinity_scroll_mobile": true,
         "message_label": "Free shipping over $50",
         "padding_bottom": "small",
         "padding_bottom_mobile": "small",
@@ -30,7 +33,9 @@
         "padding_top_mobile": "small",
         "show_breadcrumbs": true,
         "show_controls": true,
-        "show_thumbnails": true
+        "show_controls_mobile": true,
+        "show_thumbnails": true,
+        "show_thumbnails_mobile": true
       },
       "disabled": null
     },
diff --git a/templates/vogue/product.json b/templates/vogue/product.json
index 60562ca..365bcc8 100644
--- a/templates/vogue/product.json
+++ b/templates/vogue/product.json
@@ -22,7 +22,10 @@
         "breadcrumbs_root_url": "collections",
         "color_palette": "one",
         "description_placement": "top",
+        "image_fit_desktop": "cover",
+        "image_fit_mobile": "cover",
         "infinity_scroll": true,
+        "infinity_scroll_mobile": true,
         "message_label": "Free shipping over $50",
         "padding_bottom": "small",
         "padding_bottom_mobile": "small",
@@ -30,7 +33,9 @@
         "padding_top_mobile": "small",
         "show_breadcrumbs": true,
         "show_controls": true,
-        "show_thumbnails": true
+        "show_controls_mobile": true,
+        "show_thumbnails": true,
+        "show_thumbnails_mobile": true
       },
       "disabled": null
     },