From 3beab0ad584e1bcf6fd1347a4aa5c1ff6e4659f4 Mon Sep 17 00:00:00 2001
From: Deepa Padmanabhan <deepa.padmanabhan@bigcommerce.com>
Date: Tue, 3 Oct 2017 10:03:53 -0700
Subject: [PATCH 1/3]  Make cornerstone theme editor menu items to be easier to
 use

---
 schema.json | 1462 ++++++++++++++++++++++++---------------------------
 1 file changed, 700 insertions(+), 762 deletions(-)

diff --git a/schema.json b/schema.json
index 278bd40720..aa506b97d9 100644
--- a/schema.json
+++ b/schema.json
@@ -1,87 +1,44 @@
 [
   {
-    "name": "Global",
+    "name": "Storewide",
     "settings": [
       {
         "type": "color",
-        "label": "Primary color",
+        "label": "Banner background",
         "id": "color-primary"
       },
       {
         "type": "color",
-        "label": "Page background color",
+        "label": "Page background",
         "id": "body-bg"
       },
       {
         "type": "color",
-        "label": "Common light border",
+        "label": "Primary line",
         "id": "container-border-global-color-base"
       },
-      {
-        "type": "color",
-        "label": "Common dark border",
-        "id": "container-border-global-color-dark"
-      },
-      {
-        "type": "color",
-        "label": "Common light background",
-        "id": "container-fill-base"
-      },
       {
         "type": "color",
         "label": "Common dark background",
         "id": "container-fill-dark"
       },
-      {
-        "type": "heading",
-        "content": "Loading indicators"
-      },
-      {
-        "type": "color",
-        "label": "Pace bar color",
-        "id": "pace-progress-backgroundColor"
-      },
-      {
-        "type": "color",
-        "label": "Spinner light half",
-        "id": "spinner-borderColor-light"
-      },
-      {
-        "type": "color",
-        "label": "Spinner dark half",
-        "id": "spinner-borderColor-dark"
-      },
-      {
-        "type": "heading",
-        "content": "Overlays"
-      },
       {
         "type": "color",
-        "label": "Modal overlay background color",
+        "label": "Modal overlay background",
         "id": "overlay-backgroundColor"
       },
-      {
-        "type": "color",
-        "label": "Loading overlay background color",
-        "id": "loadingOverlay-backgroundColor"
-      },
       {
         "type": "color",
         "label": "Alert popup box background color",
         "id": "alert-backgroundColor"
-      }
-    ]
-  },
-  {
-    "name": "Typography & Icons",
-    "settings": [
+      },
       {
         "type": "heading",
-        "content": "Body text"
+        "content": "Text & links"
       },
       {
         "type": "font",
-        "label": "Font family",
+        "label": "Body text font family",
         "id": "body-font",
         "options": [
           {
@@ -103,7 +60,7 @@
       },
       {
         "type": "select",
-        "label": "Font size",
+        "label": "Body text font size",
         "id": "fontSize-root",
         "options": [
           {
@@ -128,6 +85,41 @@
           }
         ]
       },
+      {
+        "type": "color",
+        "label": "Body text color",
+        "id": "color-textBase"
+      },
+      {
+        "type": "color",
+        "label": "Body text hover color",
+        "id": "color-textBase--hover"
+      },
+      {
+        "type": "color",
+        "label": "Secondary text color",
+        "id": "color-textSecondary"
+      },
+      {
+        "type": "color",
+        "label": "Secondary text hover color",
+        "id": "color-textSecondary--hover"
+      },
+      {
+        "type": "color",
+        "label": "Link color",
+        "id": "color-textLink"
+      },
+      {
+        "type": "color",
+        "label": "Link hover color",
+        "id": "color-textLink--hover"
+      },
+      {
+        "type": "color",
+        "label": "Link active color",
+        "id": "color-textLink--active"
+      },
       {
         "type": "heading",
         "content": "Headings"
@@ -166,7 +158,7 @@
       },
       {
         "type": "select",
-        "label": "Font size <h1>",
+        "label": "Heading level 1",
         "id": "fontSize-h1",
         "options": [
           {
@@ -193,7 +185,7 @@
       },
       {
         "type": "select",
-        "label": "Font size <h2>",
+        "label": "Heading level 2",
         "id": "fontSize-h2",
         "options": [
           {
@@ -220,7 +212,7 @@
       },
       {
         "type": "select",
-        "label": "Font size <h3>",
+        "label": "Heading level 3",
         "id": "fontSize-h3",
         "options": [
           {
@@ -247,7 +239,7 @@
       },
       {
         "type": "select",
-        "label": "Font size <h4>",
+        "label": "Heading level 4",
         "id": "fontSize-h4",
         "options": [
           {
@@ -274,7 +266,7 @@
       },
       {
         "type": "select",
-        "label": "Font size <h5>",
+        "label": "Heading level 5",
         "id": "fontSize-h5",
         "options": [
           {
@@ -301,7 +293,7 @@
       },
       {
         "type": "select",
-        "label": "Font size <h6>",
+        "label": "Heading level 6",
         "id": "fontSize-h6",
         "options": [
           {
@@ -326,404 +318,162 @@
           }
         ]
       },
+      {
+        "type": "color",
+        "label": "Headings text color",
+        "id": "color-textHeading"
+      },
       {
         "type": "heading",
-        "content": "Text colors"
+        "content": "Loading indicators"
       },
       {
         "type": "color",
-        "label": "Text color",
-        "id": "color-textBase"
+        "label": "Page loading bar",
+        "id": "pace-progress-backgroundColor"
       },
       {
         "type": "color",
-        "label": "Text hover color",
-        "id": "color-textBase--hover"
+        "label": "Spinner light half",
+        "id": "spinner-borderColor-light"
       },
       {
         "type": "color",
-        "label": "Secondary text color",
-        "id": "color-textSecondary"
+        "label": "Spinner dark half",
+        "id": "spinner-borderColor-dark"
       },
       {
         "type": "color",
-        "label": "Secondary text hover color",
-        "id": "color-textSecondary--hover"
+        "label": "Modal loading background",
+        "id": "loadingOverlay-backgroundColor"
       },
       {
         "type": "color",
-        "label": "Headings text color",
-        "id": "color-textHeading"
+        "label": "Product thumbnail loading background",
+        "id": "container-fill-base"
       },
       {
         "type": "heading",
-        "content": "Link colors"
+        "content": "Displaying products"
       },
       {
-        "type": "color",
-        "label": "Link color",
-        "id": "color-textLink"
+        "type": "select",
+        "id": "product_list_display_mode",
+        "force_reload": true,
+        "label": "Display mode",
+        "options": [
+          {
+            "value": "grid",
+            "label": "Show products in a grid"
+          },
+          {
+            "value": "list",
+            "label": "Show products in a list"
+          }
+        ]
       },
       {
-        "type": "color",
-        "label": "Link hover color",
-        "id": "color-textLink--hover"
+        "type": "heading",
+        "content": "Blog"
       },
       {
-        "type": "color",
-        "label": "Link active color",
-        "id": "color-textLink--active"
+        "type": "imageDimension",
+        "label": "Blog image size",
+        "id": "blog_size",
+        "force_reload": true,
+        "options": [
+          {
+            "value": "190x250",
+            "label": "Optimized for theme"
+          },
+          {
+            "value": "custom",
+            "label": "Specify dimensions"
+          }
+        ]
       },
       {
         "type": "heading",
-        "content": "Icon colors"
+        "content": "Purchase options"
       },
       {
-        "type": "color",
-        "label": "Icon color",
-        "id": "icon-color"
+        "type": "checkbox",
+        "label": "Add 'As low as' text",
+        "force_reload": true,
+        "id": "price_as_low_as"
       },
       {
-        "type": "color",
-        "label": "Icon hover color",
-        "id": "icon-color-hover"
+        "type": "paragraph",
+        "content": "Add 'As low as' pricing text to products with options on layout pages."
       },
       {
-        "type": "color",
-        "label": "Rating empty icon color",
-        "id": "icon-ratingEmpty"
+        "type": "paragraph",
+        "content": "Only recommended if default options are set to lowest price available for each product"
       },
       {
-        "type": "color",
-        "label": "Rating full icon color",
-        "id": "icon-ratingFull"
+        "type": "checkbox",
+        "label": "Restrict purchase to login",
+        "force_reload": true,
+        "id": "restrict_to_login"
       },
       {
-        "type": "color",
-        "label": "Button icon color",
-        "id": "button--icon-svg-color"
+        "type": "paragraph",
+        "content": "Hide prices and add to cart buttons if customers aren't logged in."
       }
     ]
   },
   {
-    "name": "Buttons",
+    "name": "Header & Footer",
     "settings": [
-      {
-        "type": "heading",
-        "content": "Primary button"
-      },
-      {
-        "type": "color",
-        "label": "Text color",
-        "id": "button--primary-color"
-      },
-      {
-        "type": "color",
-        "label": "Text hover color",
-        "id": "button--primary-colorHover"
-      },
-      {
-        "type": "color",
-        "label": "Text active color",
-        "id": "button--primary-colorActive"
-      },
       {
         "type": "color",
-        "label": "Background color",
-        "id": "button--primary-backgroundColor"
+        "label": "Header background color",
+        "id": "header-backgroundColor"
       },
       {
-        "type": "color",
-        "label": "Background hover color",
-        "id": "button--primary-backgroundColorHover"
+        "type": "select",
+        "label": "Logo position",
+        "id": "logo-position",
+        "force_reload": true,
+        "options": [
+          {
+            "value": "right",
+            "label": "Right"
+          },
+          {
+            "value": "center",
+            "label": "Center"
+          },
+          {
+            "value": "left",
+            "label": "Left"
+          }
+        ]
       },
       {
-        "type": "color",
-        "label": "Background active color",
-        "id": "button--primary-backgroundColorActive"
+        "type": "imageDimension",
+        "label": "Image logo size",
+        "id": "logo_size",
+        "description": "Please specify a maximum image size for desktop display. We'll automatically scale down the image for smaller devices.",
+        "force_reload": true,
+        "options": [
+          {
+            "value": "original",
+            "label": "Original (as uploaded)"
+          },
+          {
+            "value": "250x100",
+            "label": "Optimized for theme"
+          },
+          {
+            "value": "custom",
+            "label": "Specify dimensions"
+          }
+        ]
       },
       {
         "type": "heading",
-        "content": "Default button"
-      },
-      {
-        "type": "color",
-        "label": "Text color",
-        "id": "button--default-color"
-      },
-      {
-        "type": "color",
-        "label": "Text hover color",
-        "id": "button--default-colorHover"
-      },
-      {
-        "type": "color",
-        "label": "Text active color",
-        "id": "button--default-colorActive"
-      },
-      {
-        "type": "color",
-        "label": "Border color",
-        "id": "button--default-borderColor"
-      },
-      {
-        "type": "color",
-        "label": "Border hover color",
-        "id": "button--default-borderColorHover"
-      },
-      {
-        "type": "color",
-        "label": "Border active color",
-        "id": "button--default-borderColorActive"
-      },
-      {
-        "type": "heading",
-        "content": "Disabled button"
-      },
-      {
-        "type": "color",
-        "label": "Text color",
-        "id": "button--disabled-color"
-      },
-      {
-        "type": "color",
-        "label": "Background color",
-        "id": "button--disabled-backgroundColor"
-      },
-      {
-        "type": "color",
-        "label": "Border color",
-        "id": "button--disabled-borderColor"
-      },
-      {
-        "type": "heading",
-        "content": "Apple Pay"
-      },
-      {
-        "type": "select",
-        "label": "Button Color",
-        "id": "applePay-button",
-        "options": [
-          {
-            "value": "black",
-            "label": "Black (white text)"
-          },
-          {
-            "value": "white",
-            "label": "White (black text)"
-          },
-          {
-            "value": "white-border",
-            "label": "White (black text with border)"
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name": "Forms",
-    "settings": [
-      {
-        "type": "heading",
-        "content": "Labels"
-      },
-      {
-        "type": "color",
-        "label": "Text color",
-        "id": "form-label-font-color"
-      },
-      {
-        "type": "heading",
-        "content": "Input fields"
-      },
-      {
-        "type": "color",
-        "label": "Text color",
-        "id": "input-font-color"
-      },
-      {
-        "type": "color",
-        "label": "Background color",
-        "id": "input-bg-color"
-      },
-      {
-        "type": "color",
-        "label": "Border color",
-        "id": "input-border-color"
-      },
-      {
-        "type": "color",
-        "label": "Border active color",
-        "id": "input-border-color-active"
-      },
-      {
-        "type": "color",
-        "label": "Disabled background color",
-        "id": "input-disabled-bg"
-      },
-      {
-        "type": "heading",
-        "content": "Select boxes"
-      },
-      {
-        "type": "color",
-        "label": "Background color",
-        "id": "select-bg-color"
-      },
-      {
-        "type": "color",
-        "label": "Arrow icon color",
-        "id": "select-arrow-color"
-      },
-      {
-        "type": "heading",
-        "content": "Checkbox & Radio button"
-      },
-      {
-        "type": "color",
-        "label": "Icon color",
-        "id": "checkRadio-color"
-      },
-      {
-        "type": "color",
-        "label": "Background color",
-        "id": "checkRadio-backgroundColor"
-      },
-      {
-        "type": "color",
-        "label": "Border color",
-        "id": "checkRadio-borderColor"
-      }
-    ]
-  },
-  {
-    "name": "Header",
-    "settings": [
-      {
-        "type": "color",
-        "label": "Background color",
-        "id": "header-backgroundColor"
-      },
-      {
-        "type": "heading",
-        "content": "Category settings"
-      },
-      {
-        "type": "select",
-        "label": "Navigation design",
-        "id": "navigation_design",
-        "force_reload": true,
-        "options": [
-          {
-            "value": "simple",
-            "label": "Simple (Menu display depth of 3)"
-          },
-          {
-            "value": "alternate",
-            "label": "Alternate (Max menu display depth)"
-          }
-        ]
-      },
-      {
-        "type": "paragraph",
-        "content": "*Maximum menu display depth value is set in category settings within Store Settings."
-      },
-      {
-        "type": "heading",
-        "content": "User navigation"
-      },
-      {
-        "type": "color",
-        "label": "Text color",
-        "id": "navUser-color"
-      },
-      {
-        "type": "color",
-        "label": "Text hover color",
-        "id": "navUser-color-hover"
-      },
-      {
-        "type": "color",
-        "label": "Dropdown background color",
-        "id": "navUser-dropdown-backgroundColor"
-      },
-      {
-        "type": "color",
-        "label": "Dropdown border color",
-        "id": "navUser-dropdown-borderColor"
-      },
-      {
-        "type": "color",
-        "label": "Cart counter background color",
-        "id": "navUser-indicator-backgroundColor"
-      },
-      {
-        "type": "heading",
-        "content": "Page navigation"
-      },
-      {
-        "type": "checkbox",
-        "label": "Hide Content Pages in Main Menu",
-        "force_reload": true,
-        "id": "hide_content_navigation"
-      },
-      {
-        "type": "color",
-        "label": "Text color",
-        "id": "navPages-color"
-      },
-      {
-        "type": "color",
-        "label": "Text hover color",
-        "id": "navPages-color-hover"
-      },
-      {
-        "type": "color",
-        "label": "Dropdown background color",
-        "id": "navPages-subMenu-backgroundColor"
-      },
-      {
-        "type": "color",
-        "label": "Dropdown border color",
-        "id": "navPages-subMenu-separatorColor"
-      },
-      {
-        "type": "heading",
-        "content": "Quick search"
-      },
-      {
-        "type": "color",
-        "label": "Background color",
-        "id": "dropdown--quickSearch-backgroundColor"
-      }
-    ]
-  },
-  {
-    "name": "Logo",
-    "settings": [
-      {
-        "type": "select",
-        "label": "Position",
-        "id": "logo-position",
-        "force_reload": true,
-        "options": [
-          {
-            "value": "right",
-            "label": "Right"
-          },
-          {
-            "value": "center",
-            "label": "Center"
-          },
-          {
-            "value": "left",
-            "label": "Left"
-          }
-        ]
-      },
-      {
-        "type": "heading",
-        "content": "Text based logo"
+        "content": "Text based logo"
       },
       {
         "type": "select",
@@ -858,7 +608,7 @@
       },
       {
         "type": "color",
-        "label": "Text Color",
+        "label": "Text color",
         "id": "storeName-color"
       },
       {
@@ -880,96 +630,149 @@
       },
       {
         "type": "heading",
-        "content": "Custom image logo"
+        "content": "User navigation"
       },
       {
-        "type": "imageDimension",
-        "label": "Size",
-        "id": "logo_size",
-        "description": "Please specify a maximum image size for desktop display. We'll automatically scale down the image for smaller devices.",
-        "force_reload": true,
-        "options": [
-          {
-            "value": "original",
-            "label": "Original (as uploaded)"
-          },
-          {
-            "value": "250x100",
-            "label": "Optimized for theme"
-          },
-          {
-            "value": "custom",
-            "label": "Specify dimensions"
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name": "Carousel",
-    "settings": [
-      {
-        "type": "checkbox",
-        "label": "Show Carousel",
-        "force_reload": true,
-        "id": "homepage_show_carousel"
+        "type": "color",
+        "label": "Text color",
+        "id": "navUser-color"
       },
       {
-        "type": "checkbox",
-        "label": "Allows image to stretch on large screens",
-        "force_reload": true,
-        "id": "homepage_stretch_carousel_images"
+        "type": "color",
+        "label": "Text hover color",
+        "id": "navUser-color-hover"
       },
       {
         "type": "color",
-        "label": "Background color",
-        "id": "carousel-bgColor"
+        "label": "Dropdown background color",
+        "id": "navUser-dropdown-backgroundColor"
       },
       {
         "type": "color",
-        "label": "Title color",
-        "id": "carousel-title-color"
+        "label": "Dropdown border color",
+        "id": "navUser-dropdown-borderColor"
       },
       {
         "type": "color",
-        "label": "Description color",
-        "id": "carousel-description-color"
+        "label": "Cart counter background color",
+        "id": "navUser-indicator-backgroundColor"
+      },
+      {
+        "type": "heading",
+        "content": "Main navigation"
+      },
+      {
+        "type": "checkbox",
+        "label": "Hide web pages in main navigation",
+        "force_reload": true,
+        "id": "hide_content_navigation"
       },
       {
         "type": "color",
-        "label": "Indicator color",
-        "id": "carousel-dot-color"
+        "label": "Text color",
+        "id": "navPages-color"
       },
       {
         "type": "color",
-        "label": "Indicator active color",
-        "id": "carousel-dot-color-active"
+        "label": "Text hover color",
+        "id": "navPages-color-hover"
       },
       {
         "type": "color",
-        "label": "Indicator background color",
-        "id": "carousel-dot-bgColor"
+        "label": "Dropdown background color",
+        "id": "navPages-subMenu-backgroundColor"
       },
       {
         "type": "color",
-        "label": "Arrow color",
-        "id": "carousel-arrow-color"
+        "label": "Dropdown border color",
+        "id": "navPages-subMenu-separatorColor"
       },
       {
         "type": "color",
-        "label": "Arrow background color",
-        "id": "carousel-arrow-bgColor"
+        "label": "Quick search background color",
+        "id": "dropdown--quickSearch-backgroundColor"
+      },
+      {
+        "type": "select",
+        "label": "Navigation design",
+        "id": "navigation_design",
+        "force_reload": true,
+        "options": [
+          {
+            "value": "simple",
+            "label": "Simple (Menu display depth of 3)"
+          },
+          {
+            "value": "alternate",
+            "label": "Alternate (Max menu display depth)"
+          }
+        ]
+      },
+      {
+        "type": "heading",
+        "content": "Social media icons"
+      },
+      {
+        "type": "paragraph",
+        "content": "Social accounts must be set up to use this feature."
+      },
+      {
+        "type": "checkbox",
+        "label": "Top Right (Toggle On/Off)",
+        "force_reload": true,
+        "id": "social_icon_placement_top"
+      },
+      {
+        "type": "select",
+        "label": "Footer Placement",
+        "id": "social_icon_placement_bottom",
+        "force_reload": true,
+        "options": [
+          {
+            "value": "bottom_none",
+            "label": "None"
+          },
+          {
+            "value": "bottom_right",
+            "label": "Right"
+          },
+          {
+            "value": "bottom_left",
+            "label": "Left"
+          }
+        ]
+      },
+      {
+        "type": "heading",
+        "content": "Footer"
       },
       {
         "type": "color",
-        "label": "Arrow border color",
-        "id": "carousel-arrow-borderColor"
-      }
-    ]
-  },
-  {
-    "name": "Payment Icons",
-    "settings": [
+        "label": "Background color",
+        "id": "footer-backgroundColor"
+      },
+      {
+        "type": "checkbox",
+        "label": "Show &quot;Powered by BigCommerce&quot;",
+        "force_reload": true,
+        "id": "show_powered_by"
+      },
+      {
+        "type": "checkbox",
+        "label": "Show brands in footer",
+        "force_reload": true,
+        "id": "shop_by_brand_show_footer"
+      },
+      {
+        "type": "checkbox",
+        "label": "Show &quot;&copy;&quot;, current year and store name",
+        "force_reload": true,
+        "id": "show_copyright_footer"
+      },
+      {
+        "type": "heading",
+        "content": "Payment icons"
+      },
       {
         "type": "checkbox",
         "label": "American Express",
@@ -999,60 +802,125 @@
         "label": "Visa",
         "force_reload": true,
         "id": "show_accept_visa"
-      }
-    ]
-  },
-  {
-    "name": "Social Media Icons",
-    "settings": [
+      },
+      {
+        "type": "select",
+        "label": "Apple Pay button color",
+        "id": "applePay-button",
+        "options": [
+          {
+            "value": "black",
+            "label": "Black (white text)"
+          },
+          {
+            "value": "white",
+            "label": "White (black text)"
+          },
+          {
+            "value": "white-border",
+            "label": "White (black text with border)"
+          }
+        ]
+      },
       {
         "type": "heading",
-        "content": "Placement"
+        "content": "GeoTrust SSL"
       },
       {
         "type": "paragraph",
-        "content": "Social accounts must be set up to use this feature."
+        "content": "If you've purchased a GeoTrust SSL from BigCommerce, check your BigCommerce Account Dashboard for the correct Common Name to use here."
       },
       {
-        "type": "checkbox",
-        "label": "Top Right (Toggle On/Off)",
+        "type": "text",
+        "label": "SSL Common Name",
         "force_reload": true,
-        "id": "social_icon_placement_top"
+        "id": "geotrust_ssl_common_name"
       },
       {
         "type": "select",
-        "label": "Bottom Placement",
-        "id": "social_icon_placement_bottom",
-        "force_reload": true,
+        "label": "Seal Size",
+        "id": "geotrust_ssl_seal_size",
         "options": [
           {
-            "value": "bottom_none",
-            "label": "None"
-          },
-          {
-            "value": "bottom_right",
-            "label": "Right"
+            "value": "M",
+            "label": "Medium"
           },
           {
-            "value": "bottom_left",
-            "label": "Left"
+            "value": "S",
+            "label": "Small"
           }
-        ]
+        ],
+        "force_reload": true
       }
     ]
   },
   {
-    "name": "Products",
+    "name": "Home Page",
     "settings": [
+      {
+        "type": "heading",
+        "content": "Carousel"
+      },
       {
         "type": "checkbox",
-        "label": "Show Quickview",
+        "label": "Show Carousel",
         "force_reload": true,
-        "id": "show_product_quick_view"
+        "id": "homepage_show_carousel"
+      },
+      {
+        "type": "color",
+        "label": "Background color",
+        "id": "carousel-bgColor"
+      },
+      {
+        "type": "color",
+        "label": "Title color",
+        "id": "carousel-title-color"
+      },
+      {
+        "type": "color",
+        "label": "Description color",
+        "id": "carousel-description-color"
+      },
+      {
+        "type": "color",
+        "label": "Indicator color",
+        "id": "carousel-dot-color"
+      },
+      {
+        "type": "color",
+        "label": "Indicator active color",
+        "id": "carousel-dot-color-active"
+      },
+      {
+        "type": "color",
+        "label": "Indicator background color",
+        "id": "carousel-dot-bgColor"
+      },
+      {
+        "type": "color",
+        "label": "Arrow color",
+        "id": "carousel-arrow-color"
+      },
+      {
+        "type": "color",
+        "label": "Arrow background color",
+        "id": "carousel-arrow-bgColor"
+      },
+      {
+        "type": "color",
+        "label": "Arrow border color",
+        "id": "carousel-arrow-borderColor"
+      },
+      {
+        "type": "checkbox",
+        "label": "Allow image to stretch on large screens",
+        "force_reload": true,
+        "id": "homepage_stretch_carousel_images"
       },
       {
         "type": "heading",
-        "content": "Home page"
+        "content": "Products"
       },
       {
         "type": "select",
@@ -1233,40 +1101,52 @@
             "label": "12"
           }
         ]
-      },
-      {
-        "type": "heading",
-        "content": "Product display mode"
-      },
-      {
-        "type": "select",
-        "id": "product_list_display_mode",
+      }
+    ]
+  },
+  {
+    "name": "Products",
+    "settings": [
+      {
+        "type": "checkbox",
+        "label": "Show Quickview",
+        "force_reload": true,
+        "id": "show_product_quick_view"
+      },
+      {
+        "type": "heading",
+        "content": "Product pages"
+      },
+      {
+        "label": "Product swatch image sizes",
+        "type": "imageDimension",
+        "id": "swatch_option_size",
         "force_reload": true,
         "options": [
           {
-            "value": "grid",
-            "label": "Show products in a grid"
+            "value": "22x22",
+            "label": "Standard"
           },
           {
-            "value": "list",
-            "label": "Show products in a list"
+            "value": "custom",
+            "label": "Specify dimensions"
           }
         ]
       },
       {
-        "type": "heading",
-        "content": "Product page"
+        "type": "paragraph",
+        "content": "*For texture swatches, max dimensions are 150x150."
       },
       {
-         "type": "checkbox",
-         "label": "Product description tabs",
-         "force_reload": true,
-         "id": "show_product_details_tabs"
+        "type": "checkbox",
+        "label": "Product description tabs",
+        "force_reload": true,
+        "id": "show_product_details_tabs"
       },
       {
         "type": "select",
-        "label": "Number of Product Reviews",
-        "id": "productpage_reviews_count",
+        "label": "Number of Related Products",
+        "id": "productpage_related_products_count",
         "force_reload": true,
         "options": [
           {
@@ -1325,8 +1205,8 @@
       },
       {
         "type": "select",
-        "label": "Number of Related Products",
-        "id": "productpage_related_products_count",
+        "label": "Number of Customers Also Viewed Products",
+        "id": "productpage_similar_by_views_count",
         "force_reload": true,
         "options": [
           {
@@ -1385,8 +1265,8 @@
       },
       {
         "type": "select",
-        "label": "Number of Customers Also Viewed Products",
-        "id": "productpage_similar_by_views_count",
+        "label": "Number of Product Reviews",
+        "id": "productpage_reviews_count",
         "force_reload": true,
         "options": [
           {
@@ -1443,33 +1323,13 @@
           }
         ]
       },
-      {
-        "label": "Product Swatch Image Sizes",
-        "type": "imageDimension",
-        "id": "swatch_option_size",
-        "force_reload": true,
-        "options": [
-          {
-            "value": "22x22",
-            "label": "Standard"
-          },
-          {
-            "value": "custom",
-            "label": "Specify dimensions"
-         }
-        ]
-      },
-      {
-        "type": "paragraph",
-        "content": "*For texture swatches, max dimensions are 150x150."
-      },
       {
         "type": "heading",
-        "content": "Category pages"
+        "content": "Number of products per page"
       },
       {
         "type": "select",
-        "label": "Number of products per page",
+        "label": "Category pages",
         "id": "categorypage_products_per_page",
         "force_reload": true,
         "options": [
@@ -1513,13 +1373,9 @@
         "force_reload": true,
         "id": "shop_by_price_visible"
       },
-      {
-        "type": "heading",
-        "content": "Brand pages"
-      },
       {
         "type": "select",
-        "label": "Number of products per page",
+        "label": "Brand pages",
         "id": "brandpage_products_per_page",
         "force_reload": true,
         "options": [
@@ -1557,13 +1413,9 @@
           }
         ]
       },
-      {
-        "type": "heading",
-        "content": "Search results"
-      },
       {
         "type": "select",
-        "label": "Number of products per page",
+        "label": "Search result pages",
         "id": "searchpage_products_per_page",
         "force_reload": true,
         "options": [
@@ -1626,175 +1478,347 @@
         "id": "card-figcaption-button-background"
       },
       {
-        "type": "heading",
-        "content": "Product Sale Badges"
+        "type": "heading",
+        "content": "Product cards (Quick search)"
+      },
+      {
+        "type": "color",
+        "label": "Background color",
+        "id": "card--alternate-backgroundColor"
+      },
+      {
+        "type": "color",
+        "label": "Border color",
+        "id": "card--alternate-borderColor"
+      },
+      {
+        "type": "color",
+        "label": "Text hover color",
+        "id": "card--alternate-color--hover"
+      },
+      {
+        "type": "heading",
+        "content": "Product sale badges"
+      },
+      {
+        "type": "select",
+        "label": "Display Product sale badges",
+        "id": "product_sale_badges",
+        "force_reload": true,
+        "options": [
+          {
+            "value": "none",
+            "label": "None"
+          },
+          {
+            "value": "topleft",
+            "label": "Top Left"
+          },
+          {
+            "value": "sash",
+            "label": "Diagonal"
+          },
+          {
+            "value": "burst",
+            "label": "Burst"
+          }
+        ]
+      },
+      {
+        "type": "color",
+        "label": "Text color",
+        "id": "color_text_product_sale_badges"
+      },
+      {
+        "type": "color",
+        "label": "Badge color",
+        "id": "color_badge_product_sale_badges"
+      },
+      {
+        "type": "color",
+        "label": "Hover Badge color (Excludes 'Burst')",
+        "id": "color_hover_product_sale_badges"
+      },
+      {
+        "type": "heading",
+        "content": "Image sizes"
+      },
+      {
+        "type": "paragraph",
+        "content": "Please specify a maximum image size for desktop display. We'll automatically scale down the image for smaller devices."
+      },
+      {
+        "type": "imageDimension",
+        "label": "Main product images",
+        "id": "product_size",
+        "force_reload": true,
+        "options": [
+          {
+            "value": "500x659",
+            "label": "Optimized for theme"
+          },
+          {
+            "value": "custom",
+            "label": "Specify dimensions"
+          }
+        ]
+      },
+      {
+        "type": "imageDimension",
+        "label": "Thumbnail image",
+        "id": "productthumb_size",
+        "force_reload": true,
+        "options": [
+          {
+            "value": "100x100",
+            "label": "Optimized for theme"
+          },
+          {
+            "value": "custom",
+            "label": "Specify dimensions"
+          }
+        ]
+      },
+      {
+        "type": "imageDimension",
+        "label": "Zoomed image",
+        "id": "zoom_size",
+        "force_reload": true,
+        "options": [
+          {
+            "value": "1280x1280",
+            "label": "Optimized for theme"
+          },
+          {
+            "value": "custom",
+            "label": "Specify dimensions"
+          }
+        ]
+      },
+      {
+        "type": "imageDimension",
+        "label": "Image in gallery view",
+        "id": "productgallery_size",
+        "force_reload": true,
+        "options": [
+          {
+            "value": "500x659",
+            "label": "Optimized for theme"
+          },
+          {
+            "value": "custom",
+            "label": "Specify dimensions"
+          }
+        ]
+      },
+      {
+        "type": "imageDimension",
+        "label": "Brand image in gallery view",
+        "id": "brand_size",
+        "force_reload": true,
+        "options": [
+          {
+            "value": "190x250",
+            "label": "Optimized for theme"
+          },
+          {
+            "value": "custom",
+            "label": "Specify dimensions"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "name": "Buttons & Icons",
+    "settings": [
+      {
+        "type": "heading",
+        "content": "Primary action button"
+      },
+      {
+        "type": "color",
+        "label": "Text color",
+        "id": "button--primary-color"
+      },
+      {
+        "type": "color",
+        "label": "Text hover color",
+        "id": "button--primary-colorHover"
+      },
+      {
+        "type": "color",
+        "label": "Text active color",
+        "id": "button--primary-colorActive"
+      },
+      {
+        "type": "color",
+        "label": "Background color",
+        "id": "button--primary-backgroundColor"
+      },
+      {
+        "type": "color",
+        "label": "Background hover color",
+        "id": "button--primary-backgroundColorHover"
+      },
+      {
+        "type": "color",
+        "label": "Background active color",
+        "id": "button--primary-backgroundColorActive"
+      },
+      {
+        "type": "heading",
+        "content": "Secondary action button"
+      },
+      {
+        "type": "color",
+        "label": "Text color",
+        "id": "button--default-color"
+      },
+      {
+        "type": "color",
+        "label": "Text hover color",
+        "id": "button--default-colorHover"
+      },
+      {
+        "type": "color",
+        "label": "Text active color",
+        "id": "button--default-colorActive"
+      },
+      {
+        "type": "color",
+        "label": "Border color",
+        "id": "button--default-borderColor"
+      },
+      {
+        "type": "color",
+        "label": "Border hover color",
+        "id": "button--default-borderColorHover"
+      },
+      {
+        "type": "color",
+        "label": "Border active color",
+        "id": "button--default-borderColorActive"
+      },
+      {
+        "type": "heading",
+        "content": "Disabled button"
+      },
+      {
+        "type": "color",
+        "label": "Text color",
+        "id": "button--disabled-color"
+      },
+      {
+        "type": "color",
+        "label": "Background color",
+        "id": "button--disabled-backgroundColor"
+      },
+      {
+        "type": "color",
+        "label": "Border color",
+        "id": "button--disabled-borderColor"
+      },
+      {
+        "type": "heading",
+        "content": "Icon colors"
+      },
+      {
+        "type": "color",
+        "label": "Icon color",
+        "id": "icon-color"
+      },
+      {
+        "type": "color",
+        "label": "Icon hover color",
+        "id": "icon-color-hover"
       },
       {
-        "type": "select",
-        "label": "Display Product Sale Badges",
-        "id": "product_sale_badges",
-        "force_reload": true,
-        "options": [
-          {
-            "value": "none",
-            "label": "None"
-          },
-          {
-            "value": "topleft",
-            "label": "Top Left"
-          },
-          {
-            "value": "sash",
-            "label": "Diagonal"
-          },
-          {
-            "value": "burst",
-            "label": "Burst"
-          }
-        ]
+        "type": "color",
+        "label": "Rating empty icon color",
+        "id": "icon-ratingEmpty"
       },
       {
         "type": "color",
-        "label": "Text Color",
-        "id": "color_text_product_sale_badges"
+        "label": "Rating full icon color",
+        "id": "icon-ratingFull"
       },
       {
         "type": "color",
-        "label": "Badge Color",
-        "id": "color_badge_product_sale_badges"
-      },
+        "label": "Button icon color",
+        "id": "button--icon-svg-color"
+      }
+    ]
+  },
+  {
+    "name": "Forms",
+    "settings": [
       {
         "type": "color",
-        "label": "Hover Badge Color (Excludes 'Burst')",
-        "id": "color_hover_product_sale_badges"
+        "label": "Label text color",
+        "id": "form-label-font-color"
       },
       {
         "type": "heading",
-        "content": "Product cards (Quick search)"
+        "content": "Input fields"
+      },
+      {
+        "type": "color",
+        "label": "Text color",
+        "id": "input-font-color"
       },
       {
         "type": "color",
         "label": "Background color",
-        "id": "card--alternate-backgroundColor"
+        "id": "input-bg-color"
       },
       {
         "type": "color",
         "label": "Border color",
-        "id": "card--alternate-borderColor"
+        "id": "input-border-color"
       },
       {
         "type": "color",
-        "label": "Text hover color",
-        "id": "card--alternate-color--hover"
+        "label": "Border active color",
+        "id": "input-border-color-active"
       },
       {
-        "type": "heading",
-        "content": "Image sizes"
+        "type": "color",
+        "label": "Disabled background color",
+        "id": "input-disabled-bg"
       },
       {
-        "type": "paragraph",
-        "content": "Please specify a maximum image size for desktop display. We'll automatically scale down the image for smaller devices."
+        "type": "heading",
+        "content": "Select boxes"
       },
       {
-        "type": "imageDimension",
-        "label": "Main product images",
-        "id": "product_size",
-        "force_reload": true,
-        "options": [
-          {
-            "value": "500x659",
-            "label": "Optimized for theme"
-          },
-          {
-            "value": "custom",
-            "label": "Specify dimensions"
-          }
-        ]
+        "type": "color",
+        "label": "Background color",
+        "id": "select-bg-color"
       },
       {
-        "type": "imageDimension",
-        "label": "Thumbnail image",
-        "id": "productthumb_size",
-        "force_reload": true,
-        "options": [
-          {
-            "value": "100x100",
-            "label": "Optimized for theme"
-          },
-          {
-            "value": "custom",
-            "label": "Specify dimensions"
-          }
-        ]
+        "type": "color",
+        "label": "Arrow icon color",
+        "id": "select-arrow-color"
       },
       {
-        "type": "imageDimension",
-        "label": "Zoomed image",
-        "id": "zoom_size",
-        "force_reload": true,
-        "options": [
-          {
-            "value": "1280x1280",
-            "label": "Optimized for theme"
-          },
-          {
-            "value": "custom",
-            "label": "Specify dimensions"
-          }
-        ]
+        "type": "heading",
+        "content": "Checkboxes & radio buttons"
       },
       {
-        "type": "imageDimension",
-        "label": "Image in gallery view",
-        "id": "productgallery_size",
-        "force_reload": true,
-        "options": [
-          {
-            "value": "500x659",
-            "label": "Optimized for theme"
-          },
-          {
-            "value": "custom",
-            "label": "Specify dimensions"
-          }
-        ]
+        "type": "color",
+        "label": "Icon color",
+        "id": "checkRadio-color"
       },
       {
-        "type": "imageDimension",
-        "label": "Brand image in gallery view",
-        "id": "brand_size",
-        "force_reload": true,
-        "options": [
-          {
-            "value": "190x250",
-            "label": "Optimized for theme"
-          },
-          {
-            "value": "custom",
-            "label": "Specify dimensions"
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name": "Blog",
-    "settings": [
+        "type": "color",
+        "label": "Background color",
+        "id": "checkRadio-backgroundColor"
+      },
       {
-        "type": "imageDimension",
-        "label": "Blog image size",
-        "id": "blog_size",
-        "force_reload": true,
-        "options": [
-          {
-            "value": "190x250",
-            "label": "Optimized for theme"
-          },
-          {
-            "value": "custom",
-            "label": "Specify dimensions"
-          }
-        ]
+        "type": "color",
+        "label": "Border color",
+        "id": "checkRadio-borderColor"
       }
     ]
   },
@@ -2527,92 +2551,6 @@
       }
     ]
   },
-  {
-    "name": "Footer",
-    "settings": [
-      {
-        "type": "color",
-        "label": "Background color",
-        "id": "footer-backgroundColor"
-      },
-      {
-        "type": "checkbox",
-        "label": "Show &quot;Powered by BigCommerce&quot;",
-        "force_reload": true,
-        "id": "show_powered_by"
-      },
-      {
-        "type": "checkbox",
-        "label": "Show brands in footer",
-        "force_reload": true,
-        "id": "shop_by_brand_show_footer"
-      },
-      {
-        "type": "checkbox",
-        "label": "Show &quot;&copy;&quot;, current year and store name",
-        "force_reload": true,
-        "id": "show_copyright_footer"
-      },
-      {
-        "type": "heading",
-        "content": "GeoTrust SSL"
-      },
-      {
-        "type": "paragraph",
-        "content": "If you've purchased a GeoTrust SSL from BigCommerce, check your BigCommerce Account Dashboard for the correct Common Name to use here."
-      },
-      {
-        "type": "text",
-        "label": "SSL Common Name",
-        "force_reload": true,
-        "id": "geotrust_ssl_common_name"
-      },
-      {
-        "type": "select",
-        "label": "Seal Size",
-        "id": "geotrust_ssl_seal_size",
-        "options": [
-          {
-            "value": "M",
-            "label": "Medium"
-          },
-          {
-            "value": "S",
-            "label": "Small"
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "name": "Purchase Options",
-    "settings": [
-      {
-        "type": "paragraph",
-        "content": "Add 'As low as' pricing text to products with options on layout pages."
-      },
-      {
-        "type": "checkbox",
-        "label": "Add 'As low as' text",
-        "force_reload": true,
-        "id": "price_as_low_as"
-      },
-      {
-        "type": "paragraph",
-        "content": "*only recommended if default options are set to lowest price available for each product"
-      },
-      {
-        "type": "paragraph",
-        "content": "Hide prices and add to cart buttons if customers aren't logged in."
-      },
-      {
-        "type": "checkbox",
-        "label": "Restrict Purchase to Login",
-        "force_reload": true,
-        "id": "restrict_to_login"
-      }
-    ]
-  },
   {
     "name": "Google AMP (beta)",
     "settings": [

From 3d018a2245c9ef7514038cc8b251327ab97fe8fb Mon Sep 17 00:00:00 2001
From: Deepa Padmanabhan <deepa.padmanabhan@bigcommerce.com>
Date: Thu, 5 Oct 2017 15:49:55 -0700
Subject: [PATCH 2/3] Remove references to container-border-global-color-dark
 in cornerstone

---
 assets/scss/settings/global/container/_container.scss | 2 --
 config.json                                           | 3 ---
 2 files changed, 5 deletions(-)

diff --git a/assets/scss/settings/global/container/_container.scss b/assets/scss/settings/global/container/_container.scss
index 230c83f0ca..2faa856892 100644
--- a/assets/scss/settings/global/container/_container.scss
+++ b/assets/scss/settings/global/container/_container.scss
@@ -16,10 +16,8 @@ $container-border-global-size:          1px;
 $container-border-global-style:         solid;
 
 $container-border-global-color-base:    stencilColor("container-border-global-color-base");
-$container-border-global-color-dark:    stencilColor("container-border-global-color-dark");
 
 $container-border-global-base:          $container-border-global-size $container-border-global-style $container-border-global-color-base;
-$container-border-global-dark:          $container-border-global-size $container-border-global-style $container-border-global-color-dark;
 
 
 // Drop shadows
diff --git a/config.json b/config.json
index 2b6583e75d..ab0f8c6b8f 100644
--- a/config.json
+++ b/config.json
@@ -197,7 +197,6 @@
     "dropdown--quickSearch-backgroundColor": "#e5e5e5",
     "blockquote-cite-font-color": "#999999",
     "container-border-global-color-base": "#e5e5e5",
-    "container-border-global-color-dark": "#333333",
     "container-fill-base": "#ffffff",
     "container-fill-dark": "#e5e5e5",
     "label-backgroundColor": "#cccccc",
@@ -510,7 +509,6 @@
         "dropdown--quickSearch-backgroundColor": "#555555",
         "blockquote-cite-font-color": "#999999",
         "container-border-global-color-base": "#666666",
-        "container-border-global-color-dark": "#222222",
         "container-fill-base": "#555555",
         "container-fill-dark": "#333333",
         "label-backgroundColor": "#333333",
@@ -782,7 +780,6 @@
         "dropdown--quickSearch-backgroundColor": "#f2eee9",
         "blockquote-cite-font-color": "#b39c88",
         "container-border-global-color-base": "#ccbdae",
-        "container-border-global-color-dark": "#ccbdae",
         "container-fill-base": "#ffffff",
         "container-fill-dark": "#f2eee9",
         "label-backgroundColor": "#bd5b00",

From 5ac7ab7ca066deb521969fa0623f546dca965b7d Mon Sep 17 00:00:00 2001
From: Deepa Padmanabhan <deepa.padmanabhan@bigcommerce.com>
Date: Fri, 6 Oct 2017 16:53:55 -0700
Subject: [PATCH 3/3] Add details to changelog file

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 064bdaa60f..2b2e3bcc86 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 - Update product UPC when options with different UPC are selected [#1089](https://github.com/bigcommerce/cornerstone/pull/1089)
 - Do not scale product thumbnail images [#1094](https://github.com/bigcommerce/cornerstone/pull/1094)
 - Lazy load carousel images [#1090](https://github.com/bigcommerce/cornerstone/pull/1090)
+- Theme Editor menu item updates for ease of use [#1091] (https://github.com/bigcommerce/cornerstone/pull/1091)
 
 ## 1.9.3 (2017-09-19)
 - Fixes image overlapping details on product page and Quick View on small viewports [#1067](https://github.com/bigcommerce/cornerstone/pull/1067)