diff --git a/assets/css/wc-setup-rtl.css b/assets/css/wc-setup-rtl.css
index adb12a51adf..ae34f8e033b 100644
--- a/assets/css/wc-setup-rtl.css
+++ b/assets/css/wc-setup-rtl.css
@@ -1 +1 @@
-@charset "UTF-8";body{margin:65px auto 24px;-webkit-box-shadow:none;box-shadow:none;background:#f1f1f1;padding:0}#wc-logo{border:0;margin:0 0 24px;padding:0;text-align:center}#wc-logo img{max-width:30%}.wc-setup-content{-webkit-box-shadow:0 1px 3px rgba(0,0,0,.13);box-shadow:0 1px 3px rgba(0,0,0,.13);padding:2em;margin:0 0 20px;background:#fff;overflow:hidden;zoom:1}.wc-setup-content h1,.wc-setup-content h2,.wc-setup-content h3,.wc-setup-content table{margin:0 0 20px;border:0;padding:0;color:#666;clear:none;font-weight:500}.wc-setup-content p{margin:20px 0;font-size:1em;line-height:1.75em;color:#666}.wc-setup-content table{font-size:1em;line-height:1.75em;color:#666}.wc-setup-content a{color:#a16696}.wc-setup-content a:focus,.wc-setup-content a:hover{color:#111}.wc-setup-content .form-table th{width:35%;vertical-align:top;font-weight:400}.wc-setup-content .form-table td{vertical-align:top}.wc-setup-content .form-table td input,.wc-setup-content .form-table td select{width:100%;-webkit-box-sizing:border-box;box-sizing:border-box}.wc-setup-content .form-table td input[size]{width:auto}.wc-setup-content .form-table td .description{line-height:1.5em;display:block;margin-top:.25em;color:#999;font-style:italic}.wc-setup-content .form-table td .input-checkbox,.wc-setup-content .form-table td .input-radio{width:auto;-webkit-box-sizing:inherit;box-sizing:inherit;padding:inherit;margin:0 0 0 .5em;-webkit-box-shadow:none;box-shadow:none}.wc-setup-content .form-table .section_title td{padding:0}.wc-setup-content .form-table .section_title td h2,.wc-setup-content .form-table .section_title td p{margin:12px 0 0}.wc-setup-content .form-table td,.wc-setup-content .form-table th{padding:12px 0;margin:0;border:0}.wc-setup-content .form-table td:first-child,.wc-setup-content .form-table th:first-child{padding-left:1em}.wc-setup-content table.tax-rates{width:100%;font-size:.92em}.wc-setup-content table.tax-rates th{padding:0;text-align:center;width:auto;vertical-align:middle}.wc-setup-content table.tax-rates td{border:1px solid #f5f5f5;padding:6px;text-align:center;vertical-align:middle}.wc-setup-content table.tax-rates td input{outline:0;border:0;padding:0;-webkit-box-shadow:none;box-shadow:none;text-align:center;width:100%}.wc-setup-content table.tax-rates td.sort{cursor:move;color:#ccc}.wc-setup-content table.tax-rates td.sort::before{content:'\f333';font-family:dashicons}.wc-setup-content table.tax-rates td.readonly{background:#f5f5f5}.wc-setup-content table.tax-rates .add{padding:1em 1em 0 0;line-height:1em;font-size:1em;width:0;margin:6px 0 0;height:0;overflow:hidden;position:relative;display:inline-block}.wc-setup-content table.tax-rates .add::before{content:'\f502';font-family:dashicons;position:absolute;right:0;top:0}.wc-setup-content table.tax-rates .remove{padding:1em 1em 0 0;line-height:1em;font-size:1em;width:0;margin:0;height:0;overflow:hidden;position:relative;display:inline-block}.wc-setup-content table.tax-rates .remove::before{content:'\f182';font-family:dashicons;position:absolute;right:0;top:0}.wc-setup-content .wc-setup-pages{width:100%;border-top:1px solid #eee}.wc-setup-content .wc-setup-pages thead th{display:none}.wc-setup-content .wc-setup-pages .page-name{width:30%;font-weight:700}.wc-setup-content .wc-setup-pages td,.wc-setup-content .wc-setup-pages th{padding:14px 0;border-bottom:1px solid #eee}.wc-setup-content .wc-setup-pages td:first-child,.wc-setup-content .wc-setup-pages th:first-child{padding-left:9px}.wc-setup-content .wc-setup-pages th{padding-top:0}.wc-setup-content .wc-setup-pages .page-options p{color:#777;margin:6px 24px 0 0;line-height:1.75em}.wc-setup-content .wc-setup-pages .page-options p input{vertical-align:middle;margin:1px 0 0;height:1.75em;width:1.75em;line-height:1.75em}.wc-setup-content .wc-setup-pages .page-options p label{line-height:1}@media screen and (max-width:782px){.wc-setup-content .form-table tbody th{width:auto}}.wc-setup-content .twitter-share-button{float:left}.wc-setup-content .wc-setup-next-steps{overflow:hidden;margin:0 0 24px;padding-bottom:2px}.wc-setup-content .wc-setup-next-steps h2{margin-bottom:12px}.wc-setup-content .wc-setup-next-steps .wc-setup-next-steps-first{float:right;width:50%;-webkit-box-sizing:border-box;box-sizing:border-box}.wc-setup-content .wc-setup-next-steps .wc-setup-next-steps-last{float:left;width:50%;-webkit-box-sizing:border-box;box-sizing:border-box}.wc-setup-content .wc-setup-next-steps ul{padding:0 0 0 2em;list-style:none outside;margin:0}.wc-setup-content .wc-setup-next-steps ul li a{display:block;padding:0 0 .75em}.wc-setup-content .wc-setup-next-steps ul .setup-product a.button{background-color:#f7f7f7;border-color:#ccc;color:#23282d;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #ccc;box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #ccc;text-shadow:-1px 0 1px #eee,0 1px 1px #eee;font-size:1em;height:auto;line-height:1.75em;margin:0 0 .75em;opacity:1;padding:1em;text-align:center}.wc-setup-content .wc-setup-next-steps ul .setup-product a.button:active,.wc-setup-content .wc-setup-next-steps ul .setup-product a.button:focus,.wc-setup-content .wc-setup-next-steps ul .setup-product a.button:hover{background:#f5f5f5;border-color:#aaa}.wc-setup-content .wc-setup-next-steps ul .setup-product a.button-primary{color:#fff;background-color:#bb77ae;border-color:#a36597;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597;box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597;text-shadow:0 -1px 1px #a36597,-1px 0 1px #a36597,0 1px 1px #a36597,1px 0 1px #a36597}.wc-setup-content .wc-setup-next-steps ul .setup-product a.button-primary:active,.wc-setup-content .wc-setup-next-steps ul .setup-product a.button-primary:focus,.wc-setup-content .wc-setup-next-steps ul .setup-product a.button-primary:hover{color:#fff;background:#a36597;border-color:#a36597;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597;box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597}.wc-setup-content .wc-setup-next-steps ul li a::before{color:#82878c;font:normal 20px/1 dashicons;speak:none;display:inline-block;padding:0 0 0 10px;top:1px;position:relative;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-decoration:none!important;vertical-align:top}.wc-setup-content .wc-setup-next-steps ul .learn-more a::before{content:'\f105'}.wc-setup-content .wc-setup-next-steps ul .video-walkthrough a::before{content:'\f126'}.wc-setup-content .wc-setup-next-steps ul .newsletter a::before{content:'\f465'}.wc-setup-content .updated,.wc-setup-content .woocommerce-newsletter,.wc-setup-content .woocommerce-tracker{padding:24px 24px 0;margin:0 0 24px;overflow:hidden;background:#f5f5f5}.wc-setup-content .updated p,.wc-setup-content .woocommerce-newsletter p,.wc-setup-content .woocommerce-tracker p{padding:0;margin:0 0 12px}.wc-setup-content .updated form,.wc-setup-content .updated p:last-child,.wc-setup-content .woocommerce-newsletter form,.wc-setup-content .woocommerce-newsletter p:last-child,.wc-setup-content .woocommerce-tracker form,.wc-setup-content .woocommerce-tracker p:last-child{margin:0 0 24px}.wc-setup-content .woocommerce-tracker+.woocommerce-newsletter{margin-top:-24px;border-top:2px dashed #ddd}.wc-setup-steps{padding:0 0 24px;margin:0;list-style:none outside;overflow:hidden;color:#ccc;width:100%;display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex}.wc-setup-steps li{width:20%;float:right;padding:0 0 .8em;margin:0;text-align:center;position:relative;border-bottom:4px solid #ccc;line-height:1.4em}.wc-setup-steps li::before{content:'';border:4px solid #ccc;border-radius:100%;width:4px;height:4px;position:absolute;bottom:0;right:50%;margin-right:-6px;margin-bottom:-8px;background:#fff}.wc-setup-steps li.active{border-color:#a16696;color:#a16696}.wc-setup-steps li.active::before{border-color:#a16696}.wc-setup-steps li.done{border-color:#a16696;color:#a16696}.wc-setup-steps li.done::before{border-color:#a16696;background:#a16696}.wc-setup .wc-setup-actions{overflow:hidden;margin:20px 0 0}.wc-setup .wc-setup-actions .button{font-size:1.25em;padding:.5em 1em;line-height:1em;margin-left:.5em;margin-bottom:2px;height:auto;border-radius:4px}.wc-setup .wc-setup-actions .button-primary{background-color:#bb77ae;border-color:#a36597;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597;box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597;text-shadow:0 -1px 1px #a36597,-1px 0 1px #a36597,0 1px 1px #a36597,1px 0 1px #a36597;margin:0;opacity:1}.wc-setup .wc-setup-actions .button-primary:active,.wc-setup .wc-setup-actions .button-primary:focus,.wc-setup .wc-setup-actions .button-primary:hover{background:#a36597;border-color:#a36597;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597;box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597}.wc-setup-content p:last-child{margin-bottom:0}.wc-setup-content p.store-setup{margin-top:0}.wc-return-to-dashboard{font-size:.85em;color:#b5b5b5;margin:1.18em 0;display:block;text-align:center}.wc-wizard-storefront .wc-wizard-storefront-intro{padding:40px 40px 0;background:#f5f5f5;text-align:center}.wc-wizard-storefront .wc-wizard-storefront-intro img{margin:40px 0 0 0;width:100%;display:block}.wc-wizard-storefront .wc-wizard-storefront-features{list-style:none outside;margin:0 0 20px;padding:0 30px 0 0;overflow:hidden}.wc-wizard-storefront .wc-wizard-storefront-feature{margin:0;padding:20px 2em 20px 30px;width:50%;-webkit-box-sizing:border-box;box-sizing:border-box}.wc-wizard-storefront .wc-wizard-storefront-feature::before{margin-right:-2em;position:absolute}.wc-wizard-storefront .wc-wizard-storefront-feature.first{clear:both;float:right}.wc-wizard-storefront .wc-wizard-storefront-feature.last{float:left}.wc-wizard-storefront .wc-wizard-storefront-feature__bulletproof::before{content:'🔒'}.wc-wizard-storefront .wc-wizard-storefront-feature__mobile::before{content:'📱'}.wc-wizard-storefront .wc-wizard-storefront-feature__accessibility::before{content:'👓'}.wc-wizard-storefront .wc-wizard-storefront-feature__search::before{content:'🔍'}.wc-wizard-storefront .wc-wizard-storefront-feature__compatibility::before{content:'🔧'}.wc-wizard-storefront .wc-wizard-storefront-feature__extendable::before{content:'🎨'}.wc-wizard-services{border:1px solid #eee;padding:0;margin:0 0 1em;list-style:none outside;border-radius:4px;overflow:hidden}.wc-wizard-services p{margin:0 0 1em 0;padding:0;font-size:1em;line-height:1.5em}.wc-wizard-service-item,.wc-wizard-services-list-toggle{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-wrap:nowrap;-ms-flex-wrap:nowrap;flex-wrap:nowrap;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between;padding:0;border-bottom:1px solid #eee;color:#666}.wc-wizard-service-item:last-child,.wc-wizard-services-list-toggle:last-child{border-bottom:0}.wc-wizard-service-item .payment-gateway-fee,.wc-wizard-services-list-toggle .payment-gateway-fee{color:#a6a6a6}.wc-wizard-service-item .wc-wizard-service-name,.wc-wizard-services-list-toggle .wc-wizard-service-name{-webkit-flex-basis:0;-ms-flex-preferred-size:0;flex-basis:0;min-width:160px;text-align:center;font-weight:700;padding:2em 0;-webkit-align-self:stretch;-ms-flex-item-align:stretch;align-self:stretch;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center}.wc-wizard-service-item .wc-wizard-service-name img,.wc-wizard-services-list-toggle .wc-wizard-service-name img{max-width:75px}.wc-wizard-service-item.paypal-logo .wc-wizard-service-name img,.wc-wizard-services-list-toggle.paypal-logo .wc-wizard-service-name img{max-width:87px}.wc-wizard-service-item.klarna-logo .wc-wizard-service-name,.wc-wizard-services-list-toggle.klarna-logo .wc-wizard-service-name{background:#000}.wc-wizard-service-item.klarna-logo .wc-wizard-service-name img,.wc-wizard-services-list-toggle.klarna-logo .wc-wizard-service-name img{max-width:87px}.wc-wizard-service-item.square-logo .wc-wizard-service-name,.wc-wizard-services-list-toggle.square-logo .wc-wizard-service-name{background:#000}.wc-wizard-service-item.square-logo .wc-wizard-service-name img,.wc-wizard-services-list-toggle.square-logo .wc-wizard-service-name img{max-width:95px}.wc-wizard-service-item .wc-wizard-service-description,.wc-wizard-services-list-toggle .wc-wizard-service-description{-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;padding:2em 20px}.wc-wizard-service-item .wc-wizard-service-description p,.wc-wizard-services-list-toggle .wc-wizard-service-description p{margin-bottom:0}.wc-wizard-service-item .wc-wizard-service-description .wc-wizard-service-settings,.wc-wizard-services-list-toggle .wc-wizard-service-description .wc-wizard-service-settings{margin-top:1em}.wc-wizard-service-item .wc-wizard-service-description .wc-wizard-service-settings-description,.wc-wizard-services-list-toggle .wc-wizard-service-description .wc-wizard-service-settings-description{display:block;font-style:italic;color:#999}.wc-wizard-service-item .wc-wizard-service-enable,.wc-wizard-services-list-toggle .wc-wizard-service-enable{-webkit-flex-basis:0;-ms-flex-preferred-size:0;flex-basis:0;min-width:75px;text-align:center;cursor:pointer;padding:2em 0}.wc-wizard-service-item .wc-wizard-service-toggle,.wc-wizard-services-list-toggle .wc-wizard-service-toggle{height:16px;width:32px;border:2px solid #935687;background-color:#935687;display:inline-block;text-indent:-9999px;border-radius:10em;position:relative}.wc-wizard-service-item .wc-wizard-service-toggle input[type=checkbox],.wc-wizard-services-list-toggle .wc-wizard-service-toggle input[type=checkbox]{display:none}.wc-wizard-service-item .wc-wizard-service-toggle:before,.wc-wizard-services-list-toggle .wc-wizard-service-toggle:before{content:"";display:block;width:16px;height:16px;background:#fff;position:absolute;top:0;left:0;border-radius:100%}.wc-wizard-service-item .wc-wizard-service-toggle.disabled,.wc-wizard-services-list-toggle .wc-wizard-service-toggle.disabled{border-color:#999;background-color:#999}.wc-wizard-service-item .wc-wizard-service-toggle.disabled:before,.wc-wizard-services-list-toggle .wc-wizard-service-toggle.disabled:before{left:auto;right:0}.wc-wizard-service-item .wc-wizard-service-settings,.wc-wizard-services-list-toggle .wc-wizard-service-settings{display:none;margin-bottom:0;cursor:default}.wc-wizard-service-item .wc-wizard-service-settings.hide,.wc-wizard-services-list-toggle .wc-wizard-service-settings.hide{display:none}.wc-wizard-service-item.checked .wc-wizard-service-settings,.wc-wizard-services-list-toggle.checked .wc-wizard-service-settings{display:inline-block}.wc-wizard-service-item.checked .wc-wizard-service-settings.hide,.wc-wizard-services-list-toggle.checked .wc-wizard-service-settings.hide{display:none}.wc-wizard-service-item.closed,.wc-wizard-services-list-toggle.closed{border-bottom:0}.wc-wizard-service-enable input{visibility:hidden;position:relative;cursor:pointer}.wc-wizard-service-enable input:before{content:"\f347";font-family:dashicons;visibility:initial;color:#666;font-size:25px;margin-right:-5px;top:-6px;position:absolute}.wc-wizard-service-enable input:checked:before{content:"\f343";top:-7px}.wc-wizard-services.manual .wc-wizard-service-item{display:none}.wc-wizard-services.shipping .wc-wizard-service-name{font-weight:400;text-align:right}.wc-wizard-services.shipping .wc-wizard-service-item{padding-right:2em}.wc-wizard-services.shipping .wc-wizard-service-item:first-child{border-bottom:0;padding-bottom:0;font-weight:700}.wc-wizard-services.shipping .wc-wizard-service-item:first-child .wc-wizard-service-name{font-weight:700}.wc-wizard-services.shipping .shipping-method-setting,.wc-wizard-services.shipping .wc-wizard-shipping-method-select{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex}.wc-wizard-services.shipping .shipping-method-setting.hide,.wc-wizard-services.shipping .wc-wizard-shipping-method-select.hide{display:none}.wc-wizard-services.shipping .shipping-method-setting input,.wc-wizard-services.shipping .wc-wizard-shipping-method-dropdown{margin-left:2em;margin-bottom:1em}.wc-wizard-services.shipping .shipping-method-setting input .select2,.wc-wizard-services.shipping .wc-wizard-shipping-method-dropdown .select2{min-width:130px}.wc-wizard-services.shipping .wc-wizard-service-description{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;color:#a6a6a6;font-size:.92em}.wc-wizard-services.shipping .shipping-method-setting input{width:95px;border:1px solid #aaa;border-color:#ddd;border-radius:4px;height:28px;padding-right:8px;padding-left:24px;font-size:14px;color:#444;background-color:#fff;display:inline-block}.wc-wizard-services.shipping .shipping-method-description,.wc-wizard-services.shipping .shipping-method-setting .description{color:#7e7e7e;font-size:.9em}.wc-wizard-services.shipping .shipping-method-setting input::-webkit-input-placeholder{color:#e1e1e1}.wc-wizard-services.shipping .shipping-method-setting input::-moz-placeholder{color:#e1e1e1}.wc-wizard-services.shipping .shipping-method-setting input:-ms-input-placeholder{color:#e1e1e1}.wc-wizard-services.shipping .shipping-method-setting input::-ms-input-placeholder{color:#e1e1e1}.wc-wizard-services.shipping .shipping-method-setting input::placeholder{color:#e1e1e1}.wc-setup-shipping-units p{line-height:1.5em;font-size:13px;margin-bottom:.25em}.wc-setup-shipping-units .wc-setup-shipping-unit{margin-bottom:1.75em}.wc-setup-shipping-units .wc-setup-shipping-unit .select2{min-width:100%}.hide{display:none}.wc-wizard-features{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap;list-style:none;padding:0}.wc-wizard-features .wc-wizard-feature-item{-webkit-flex-basis:calc(50% - 4em - 3px);-ms-flex-preferred-size:calc(50% - 4em - 3px);flex-basis:calc(50% - 4em - 3px);border:1px solid #eee;padding:2em}.wc-wizard-features .wc-wizard-feature-item:nth-child(1){border-radius:0 4px 0 0}.wc-wizard-features .wc-wizard-feature-item:nth-child(2){border-right:0;border-radius:4px 0 0 0}.wc-wizard-features .wc-wizard-feature-item:nth-child(3){border-top:0;border-radius:0 0 4px 0}.wc-wizard-features .wc-wizard-feature-item:nth-child(4){border-top:0;border-right:0;border-radius:0 0 0 4px}.wc-wizard-features p.wc-wizard-feature-description,.wc-wizard-features p.wc-wizard-feature-name{margin:0;line-height:1.5em}h3.jetpack-reasons{text-align:center;margin:3em 0 1em 0;font-size:14px}.jetpack-logo{display:block;margin:1.75em auto 2em auto;max-height:175px}.step{text-align:center}.wc-setup .wc-setup-actions .button{font-weight:300;font-size:16px;padding:1em 2em;-webkit-box-shadow:none;box-shadow:none;min-width:12em;min-width:auto;margin-top:10px}.wc-setup .wc-setup-actions .button:active,.wc-setup .wc-setup-actions .button:focus,.wc-setup .wc-setup-actions .button:hover{-webkit-box-shadow:none;box-shadow:none}.location-prompt{color:#666;font-size:13px;font-weight:500;margin-bottom:.5em;margin-top:1em;display:inline-block}.location-input{border:1px solid #aaa;border-color:#ddd;border-radius:4px;height:30px;width:calc(100% - 8px - 24px - 2px);padding-right:8px;padding-left:24px;font-size:16px;color:#444;background-color:#fff;display:inline-block}.location-input.dropdown{width:100%}.address-step .select2{min-width:100%}.store-address-container{margin-bottom:24px}.store-address-container .city-and-postcode{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex}.store-address-container .city-and-postcode div{-webkit-flex-basis:50%;-ms-flex-preferred-size:50%;flex-basis:50%;margin-left:1em}.store-address-container .city-and-postcode div:last-of-type{margin-left:0}.wc-wizard-service-settings .payment-email-input{border:1px solid #aaa;border-color:#ddd;border-radius:4px;height:30px;padding:0 8px;font-size:14px;color:#444;background-color:#fff;display:inline-block}.newsletter-form-container{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex}.newsletter-form-container .newsletter-form-email{border:1px solid #aaa;border-color:#ddd;border-radius:4px;height:42px;padding:0 8px;font-size:16px;color:#666;background-color:#fff;display:inline-block;margin-left:6px;-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1}.newsletter-form-container .newsletter-form-button-container{-webkit-box-flex:0;-webkit-flex-grow:0;-ms-flex-positive:0;flex-grow:0}.wc-setup .wc-setup-actions .button.newsletter-form-button{height:42px;padding:0 1em;margin:0}.wc-wizard-next-steps{border:1px solid #eee;border-radius:4px;list-style:none;padding:0}.wc-wizard-next-steps li{padding:0}.wc-wizard-next-steps .wc-wizard-next-step-item{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;border-top:1px solid #eee}.wc-wizard-next-steps .wc-wizard-next-step-item:first-child{border-top:0}.wc-wizard-next-steps .wc-wizard-next-step-description{-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;margin:1.5em}.wc-wizard-next-steps .wc-wizard-next-step-action{-webkit-box-flex:0;-webkit-flex-grow:0;-ms-flex-positive:0;flex-grow:0;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center}.wc-wizard-next-steps .wc-wizard-next-step-action .button{margin:1em}.wc-wizard-next-steps p.next-step-heading{margin:0;font-size:.95em;font-weight:400;font-variant:all-petite-caps}.wc-wizard-next-steps p.next-step-extra-info{margin:0}.wc-wizard-next-steps h3.next-step-description{margin:0;font-size:16px;font-weight:600}p.next-steps-help-text{color:#9f9f9f;padding:0 2em;text-align:center;font-size:.9em}p.jetpack-terms{font-size:.8em;text-align:center;max-width:480px;margin:0 auto;line-height:1.5em}.woocommerce-error{background:#ffe6e5;border-color:#ffc5c2;padding:1em;margin-bottom:1em}.woocommerce-error p{margin-top:0;margin-bottom:.5em;color:#444}.woocommerce-error a{color:#ff645c}.woocommerce-error .reconnect-reminder{font-size:.85em}.woocommerce-error .wc-setup-actions .button{font-size:14px}.allow-tracking{color:#9f9f9f;margin-top:1em;text-align:center;font-size:.9em;padding-top:2em;border-top:1px solid #ccc}.wc-wizard-service-setting-ppec_paypal_reroute_requests,.wc-wizard-service-setting-stripe_create_account{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:end;-webkit-align-items:flex-end;-ms-flex-align:end;align-items:flex-end;margin-top:.75em}.wc-wizard-service-setting-ppec_paypal_reroute_requests .payment-checkbox-input,.wc-wizard-service-setting-stripe_create_account .payment-checkbox-input{-webkit-box-ordinal-group:2;-webkit-order:1;-ms-flex-order:1;order:1;margin-right:0;margin-left:0;width:1.5em}.wc-wizard-service-setting-ppec_paypal_reroute_requests .ppec_paypal_reroute_requests,.wc-wizard-service-setting-ppec_paypal_reroute_requests .stripe_create_account,.wc-wizard-service-setting-stripe_create_account .ppec_paypal_reroute_requests,.wc-wizard-service-setting-stripe_create_account .stripe_create_account{-webkit-box-ordinal-group:3;-webkit-order:2;-ms-flex-order:2;order:2;margin-right:.3em}.wc-wizard-service-setting-ppec_paypal_api_subject,.wc-wizard-service-setting-stripe_email{margin-top:.75em}.wc-wizard-service-setting-ppec_paypal_api_subject label.ppec_paypal_api_subject,.wc-wizard-service-setting-ppec_paypal_api_subject label.stripe_email,.wc-wizard-service-setting-stripe_email label.ppec_paypal_api_subject,.wc-wizard-service-setting-stripe_email label.stripe_email{position:absolute;margin:-1px;padding:0;height:1px;width:1px;overflow:hidden;clip:rect(0 0 0 0);border:0}.wc-wizard-service-setting-ppec_paypal_api_subject input.payment-email-input,.wc-wizard-service-setting-stripe_email input.payment-email-input{margin-right:1.5em;margin-bottom:.5em;width:100%}.wc-wizard-service-setting-ppec_paypal_api_subject .wc-wizard-service-settings-description,.wc-wizard-service-setting-stripe_email .wc-wizard-service-settings-description{margin-right:1.5em}
\ No newline at end of file
+@charset "UTF-8";body{margin:65px auto 24px;-webkit-box-shadow:none;box-shadow:none;background:#f1f1f1;padding:0}#wc-logo{border:0;margin:0 0 24px;padding:0;text-align:center}#wc-logo img{max-width:30%}.wc-setup-content{-webkit-box-shadow:0 1px 3px rgba(0,0,0,.13);box-shadow:0 1px 3px rgba(0,0,0,.13);padding:2em;margin:0 0 20px;background:#fff;overflow:hidden;zoom:1}.wc-setup-content h1,.wc-setup-content h2,.wc-setup-content h3,.wc-setup-content table{margin:0 0 20px;border:0;padding:0;color:#666;clear:none;font-weight:500}.wc-setup-content p{margin:20px 0;font-size:1em;line-height:1.75em;color:#666}.wc-setup-content table{font-size:1em;line-height:1.75em;color:#666}.wc-setup-content a{color:#a16696}.wc-setup-content a:focus,.wc-setup-content a:hover{color:#111}.wc-setup-content .form-table th{width:35%;vertical-align:top;font-weight:400}.wc-setup-content .form-table td{vertical-align:top}.wc-setup-content .form-table td input,.wc-setup-content .form-table td select{width:100%;-webkit-box-sizing:border-box;box-sizing:border-box}.wc-setup-content .form-table td input[size]{width:auto}.wc-setup-content .form-table td .description{line-height:1.5em;display:block;margin-top:.25em;color:#999;font-style:italic}.wc-setup-content .form-table td .input-checkbox,.wc-setup-content .form-table td .input-radio{width:auto;-webkit-box-sizing:inherit;box-sizing:inherit;padding:inherit;margin:0 0 0 .5em;-webkit-box-shadow:none;box-shadow:none}.wc-setup-content .form-table .section_title td{padding:0}.wc-setup-content .form-table .section_title td h2,.wc-setup-content .form-table .section_title td p{margin:12px 0 0}.wc-setup-content .form-table td,.wc-setup-content .form-table th{padding:12px 0;margin:0;border:0}.wc-setup-content .form-table td:first-child,.wc-setup-content .form-table th:first-child{padding-left:1em}.wc-setup-content table.tax-rates{width:100%;font-size:.92em}.wc-setup-content table.tax-rates th{padding:0;text-align:center;width:auto;vertical-align:middle}.wc-setup-content table.tax-rates td{border:1px solid #f5f5f5;padding:6px;text-align:center;vertical-align:middle}.wc-setup-content table.tax-rates td input{outline:0;border:0;padding:0;-webkit-box-shadow:none;box-shadow:none;text-align:center;width:100%}.wc-setup-content table.tax-rates td.sort{cursor:move;color:#ccc}.wc-setup-content table.tax-rates td.sort::before{content:'\f333';font-family:dashicons}.wc-setup-content table.tax-rates td.readonly{background:#f5f5f5}.wc-setup-content table.tax-rates .add{padding:1em 1em 0 0;line-height:1em;font-size:1em;width:0;margin:6px 0 0;height:0;overflow:hidden;position:relative;display:inline-block}.wc-setup-content table.tax-rates .add::before{content:'\f502';font-family:dashicons;position:absolute;right:0;top:0}.wc-setup-content table.tax-rates .remove{padding:1em 1em 0 0;line-height:1em;font-size:1em;width:0;margin:0;height:0;overflow:hidden;position:relative;display:inline-block}.wc-setup-content table.tax-rates .remove::before{content:'\f182';font-family:dashicons;position:absolute;right:0;top:0}.wc-setup-content .wc-setup-pages{width:100%;border-top:1px solid #eee}.wc-setup-content .wc-setup-pages thead th{display:none}.wc-setup-content .wc-setup-pages .page-name{width:30%;font-weight:700}.wc-setup-content .wc-setup-pages td,.wc-setup-content .wc-setup-pages th{padding:14px 0;border-bottom:1px solid #eee}.wc-setup-content .wc-setup-pages td:first-child,.wc-setup-content .wc-setup-pages th:first-child{padding-left:9px}.wc-setup-content .wc-setup-pages th{padding-top:0}.wc-setup-content .wc-setup-pages .page-options p{color:#777;margin:6px 24px 0 0;line-height:1.75em}.wc-setup-content .wc-setup-pages .page-options p input{vertical-align:middle;margin:1px 0 0;height:1.75em;width:1.75em;line-height:1.75em}.wc-setup-content .wc-setup-pages .page-options p label{line-height:1}@media screen and (max-width:782px){.wc-setup-content .form-table tbody th{width:auto}}.wc-setup-content .twitter-share-button{float:left}.wc-setup-content .wc-setup-next-steps{overflow:hidden;margin:0 0 24px;padding-bottom:2px}.wc-setup-content .wc-setup-next-steps h2{margin-bottom:12px}.wc-setup-content .wc-setup-next-steps .wc-setup-next-steps-first{float:right;width:50%;-webkit-box-sizing:border-box;box-sizing:border-box}.wc-setup-content .wc-setup-next-steps .wc-setup-next-steps-last{float:left;width:50%;-webkit-box-sizing:border-box;box-sizing:border-box}.wc-setup-content .wc-setup-next-steps ul{padding:0 0 0 2em;list-style:none outside;margin:0}.wc-setup-content .wc-setup-next-steps ul li a{display:block;padding:0 0 .75em}.wc-setup-content .wc-setup-next-steps ul .setup-product a.button{background-color:#f7f7f7;border-color:#ccc;color:#23282d;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #ccc;box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #ccc;text-shadow:-1px 0 1px #eee,0 1px 1px #eee;font-size:1em;height:auto;line-height:1.75em;margin:0 0 .75em;opacity:1;padding:1em;text-align:center}.wc-setup-content .wc-setup-next-steps ul .setup-product a.button:active,.wc-setup-content .wc-setup-next-steps ul .setup-product a.button:focus,.wc-setup-content .wc-setup-next-steps ul .setup-product a.button:hover{background:#f5f5f5;border-color:#aaa}.wc-setup-content .wc-setup-next-steps ul .setup-product a.button-primary{color:#fff;background-color:#bb77ae;border-color:#a36597;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597;box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597;text-shadow:0 -1px 1px #a36597,-1px 0 1px #a36597,0 1px 1px #a36597,1px 0 1px #a36597}.wc-setup-content .wc-setup-next-steps ul .setup-product a.button-primary:active,.wc-setup-content .wc-setup-next-steps ul .setup-product a.button-primary:focus,.wc-setup-content .wc-setup-next-steps ul .setup-product a.button-primary:hover{color:#fff;background:#a36597;border-color:#a36597;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597;box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597}.wc-setup-content .wc-setup-next-steps ul li a::before{color:#82878c;font:normal 20px/1 dashicons;speak:none;display:inline-block;padding:0 0 0 10px;top:1px;position:relative;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-decoration:none!important;vertical-align:top}.wc-setup-content .wc-setup-next-steps ul .learn-more a::before{content:'\f105'}.wc-setup-content .wc-setup-next-steps ul .video-walkthrough a::before{content:'\f126'}.wc-setup-content .wc-setup-next-steps ul .newsletter a::before{content:'\f465'}.wc-setup-content .updated,.wc-setup-content .woocommerce-newsletter,.wc-setup-content .woocommerce-tracker{padding:24px 24px 0;margin:0 0 24px;overflow:hidden;background:#f5f5f5}.wc-setup-content .updated p,.wc-setup-content .woocommerce-newsletter p,.wc-setup-content .woocommerce-tracker p{padding:0;margin:0 0 12px}.wc-setup-content .updated form,.wc-setup-content .updated p:last-child,.wc-setup-content .woocommerce-newsletter form,.wc-setup-content .woocommerce-newsletter p:last-child,.wc-setup-content .woocommerce-tracker form,.wc-setup-content .woocommerce-tracker p:last-child{margin:0 0 24px}.wc-setup-content .woocommerce-tracker+.woocommerce-newsletter{margin-top:-24px;border-top:2px dashed #ddd}.wc-setup-steps{padding:0 0 24px;margin:0;list-style:none outside;overflow:hidden;color:#ccc;width:100%;display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex}.wc-setup-steps li{width:20%;float:right;padding:0 0 .8em;margin:0;text-align:center;position:relative;border-bottom:4px solid #ccc;line-height:1.4em}.wc-setup-steps li::before{content:'';border:4px solid #ccc;border-radius:100%;width:4px;height:4px;position:absolute;bottom:0;right:50%;margin-right:-6px;margin-bottom:-8px;background:#fff}.wc-setup-steps li.active{border-color:#a16696;color:#a16696}.wc-setup-steps li.active::before{border-color:#a16696}.wc-setup-steps li.done{border-color:#a16696;color:#a16696}.wc-setup-steps li.done::before{border-color:#a16696;background:#a16696}.wc-setup .wc-setup-actions{overflow:hidden;margin:20px 0 0}.wc-setup .wc-setup-actions .button{font-size:1.25em;padding:.5em 1em;line-height:1em;margin-left:.5em;margin-bottom:2px;height:auto;border-radius:4px}.wc-setup .wc-setup-actions .button-primary{background-color:#bb77ae;border-color:#a36597;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597;box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597;text-shadow:0 -1px 1px #a36597,-1px 0 1px #a36597,0 1px 1px #a36597,1px 0 1px #a36597;margin:0;opacity:1}.wc-setup .wc-setup-actions .button-primary:active,.wc-setup .wc-setup-actions .button-primary:focus,.wc-setup .wc-setup-actions .button-primary:hover{background:#a36597;border-color:#a36597;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597;box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597}.wc-setup-content p:last-child{margin-bottom:0}.wc-setup-content p.store-setup{margin-top:0}.wc-return-to-dashboard{font-size:.85em;color:#b5b5b5;margin:1.18em 0;display:block;text-align:center}.wc-wizard-storefront .wc-wizard-storefront-intro{padding:40px 40px 0;background:#f5f5f5;text-align:center}.wc-wizard-storefront .wc-wizard-storefront-intro img{margin:40px 0 0 0;width:100%;display:block}.wc-wizard-storefront .wc-wizard-storefront-features{list-style:none outside;margin:0 0 20px;padding:0 30px 0 0;overflow:hidden}.wc-wizard-storefront .wc-wizard-storefront-feature{margin:0;padding:20px 2em 20px 30px;width:50%;-webkit-box-sizing:border-box;box-sizing:border-box}.wc-wizard-storefront .wc-wizard-storefront-feature::before{margin-right:-2em;position:absolute}.wc-wizard-storefront .wc-wizard-storefront-feature.first{clear:both;float:right}.wc-wizard-storefront .wc-wizard-storefront-feature.last{float:left}.wc-wizard-storefront .wc-wizard-storefront-feature__bulletproof::before{content:'🔒'}.wc-wizard-storefront .wc-wizard-storefront-feature__mobile::before{content:'📱'}.wc-wizard-storefront .wc-wizard-storefront-feature__accessibility::before{content:'👓'}.wc-wizard-storefront .wc-wizard-storefront-feature__search::before{content:'🔍'}.wc-wizard-storefront .wc-wizard-storefront-feature__compatibility::before{content:'🔧'}.wc-wizard-storefront .wc-wizard-storefront-feature__extendable::before{content:'🎨'}.wc-wizard-services{border:1px solid #eee;padding:0;margin:0 0 1em;list-style:none outside;border-radius:4px;overflow:hidden}.wc-wizard-services p{margin:0 0 1em 0;padding:0;font-size:1em;line-height:1.5em}.wc-wizard-service-item,.wc-wizard-services-list-toggle{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-wrap:nowrap;-ms-flex-wrap:nowrap;flex-wrap:nowrap;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between;padding:0;border-bottom:1px solid #eee;color:#666}.wc-wizard-service-item:last-child,.wc-wizard-services-list-toggle:last-child{border-bottom:0}.wc-wizard-service-item .payment-gateway-fee,.wc-wizard-services-list-toggle .payment-gateway-fee{color:#a6a6a6}.wc-wizard-service-item .wc-wizard-service-name,.wc-wizard-services-list-toggle .wc-wizard-service-name{-webkit-flex-basis:0;-ms-flex-preferred-size:0;flex-basis:0;min-width:160px;text-align:center;font-weight:700;padding:2em 0;-webkit-align-self:stretch;-ms-flex-item-align:stretch;align-self:stretch;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center}.wc-wizard-service-item .wc-wizard-service-name img,.wc-wizard-services-list-toggle .wc-wizard-service-name img{max-width:75px}.wc-wizard-service-item.paypal-logo .wc-wizard-service-name img,.wc-wizard-services-list-toggle.paypal-logo .wc-wizard-service-name img{max-width:87px}.wc-wizard-service-item.klarna-logo .wc-wizard-service-name,.wc-wizard-services-list-toggle.klarna-logo .wc-wizard-service-name{background:#000}.wc-wizard-service-item.klarna-logo .wc-wizard-service-name img,.wc-wizard-services-list-toggle.klarna-logo .wc-wizard-service-name img{max-width:87px}.wc-wizard-service-item.square-logo .wc-wizard-service-name,.wc-wizard-services-list-toggle.square-logo .wc-wizard-service-name{background:#000}.wc-wizard-service-item.square-logo .wc-wizard-service-name img,.wc-wizard-services-list-toggle.square-logo .wc-wizard-service-name img{max-width:95px}.wc-wizard-service-item .wc-wizard-service-description,.wc-wizard-services-list-toggle .wc-wizard-service-description{-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;padding:2em 20px}.wc-wizard-service-item .wc-wizard-service-description p,.wc-wizard-services-list-toggle .wc-wizard-service-description p{margin-bottom:0}.wc-wizard-service-item .wc-wizard-service-description .wc-wizard-service-settings,.wc-wizard-services-list-toggle .wc-wizard-service-description .wc-wizard-service-settings{margin-top:1em}.wc-wizard-service-item .wc-wizard-service-description .wc-wizard-service-settings-description,.wc-wizard-services-list-toggle .wc-wizard-service-description .wc-wizard-service-settings-description{display:block;font-style:italic;color:#999}.wc-wizard-service-item .wc-wizard-service-enable,.wc-wizard-services-list-toggle .wc-wizard-service-enable{-webkit-flex-basis:0;-ms-flex-preferred-size:0;flex-basis:0;min-width:75px;text-align:center;cursor:pointer;padding:2em 0;position:relative}.wc-wizard-service-item .wc-wizard-service-toggle,.wc-wizard-services-list-toggle .wc-wizard-service-toggle{height:16px;width:32px;border:2px solid #935687;background-color:#935687;display:inline-block;text-indent:-9999px;border-radius:10em;position:relative}.wc-wizard-service-item .wc-wizard-service-toggle input[type=checkbox],.wc-wizard-services-list-toggle .wc-wizard-service-toggle input[type=checkbox]{display:none}.wc-wizard-service-item .wc-wizard-service-toggle:before,.wc-wizard-services-list-toggle .wc-wizard-service-toggle:before{content:"";display:block;width:16px;height:16px;background:#fff;position:absolute;top:0;left:0;border-radius:100%}.wc-wizard-service-item .wc-wizard-service-toggle.disabled,.wc-wizard-services-list-toggle .wc-wizard-service-toggle.disabled{border-color:#999;background-color:#999}.wc-wizard-service-item .wc-wizard-service-toggle.disabled:before,.wc-wizard-services-list-toggle .wc-wizard-service-toggle.disabled:before{left:auto;right:0}.wc-wizard-service-item .wc-wizard-service-settings,.wc-wizard-services-list-toggle .wc-wizard-service-settings{display:none;margin-bottom:0;cursor:default}.wc-wizard-service-item .wc-wizard-service-settings.hide,.wc-wizard-services-list-toggle .wc-wizard-service-settings.hide{display:none}.wc-wizard-service-item.checked .wc-wizard-service-settings,.wc-wizard-services-list-toggle.checked .wc-wizard-service-settings{display:inline-block}.wc-wizard-service-item.checked .wc-wizard-service-settings.hide,.wc-wizard-services-list-toggle.checked .wc-wizard-service-settings.hide{display:none}.wc-wizard-service-item.closed,.wc-wizard-services-list-toggle.closed{border-bottom:0}.wc-wizard-services-list-toggle .wc-wizard-service-enable::before{content:"\f343";font-family:dashicons;visibility:initial;color:#666;font-size:25px;margin-top:-7px;margin-right:-5px;position:absolute;visibility:visible}.wc-wizard-services-list-toggle.closed .wc-wizard-service-enable::before{content:"\f347"}.wc-wizard-services-list-toggle .wc-wizard-service-enable input{visibility:hidden;position:relative;cursor:pointer}.wc-wizard-services.manual .wc-wizard-service-item{display:none}.wc-wizard-services.shipping .wc-wizard-service-name{font-weight:400;text-align:right}.wc-wizard-services.shipping .wc-wizard-service-item{padding-right:2em}.wc-wizard-services.shipping .wc-wizard-service-item:first-child{border-bottom:0;padding-bottom:0;font-weight:700}.wc-wizard-services.shipping .wc-wizard-service-item:first-child .wc-wizard-service-name{font-weight:700}.wc-wizard-services.shipping .shipping-method-setting,.wc-wizard-services.shipping .wc-wizard-shipping-method-select{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex}.wc-wizard-services.shipping .shipping-method-setting.hide,.wc-wizard-services.shipping .wc-wizard-shipping-method-select.hide{display:none}.wc-wizard-services.shipping .shipping-method-setting input,.wc-wizard-services.shipping .wc-wizard-shipping-method-dropdown{margin-left:2em;margin-bottom:1em}.wc-wizard-services.shipping .shipping-method-setting input .select2,.wc-wizard-services.shipping .wc-wizard-shipping-method-dropdown .select2{min-width:130px}.wc-wizard-services.shipping .wc-wizard-service-description{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;color:#a6a6a6;font-size:.92em}.wc-wizard-services.shipping .shipping-method-setting input{width:95px;border:1px solid #aaa;border-color:#ddd;border-radius:4px;height:28px;padding-right:8px;padding-left:24px;font-size:14px;color:#444;background-color:#fff;display:inline-block}.wc-wizard-services.shipping .shipping-method-description,.wc-wizard-services.shipping .shipping-method-setting .description{color:#7e7e7e;font-size:.9em}.wc-wizard-services.shipping .shipping-method-setting input::-webkit-input-placeholder{color:#e1e1e1}.wc-wizard-services.shipping .shipping-method-setting input::-moz-placeholder{color:#e1e1e1}.wc-wizard-services.shipping .shipping-method-setting input:-ms-input-placeholder{color:#e1e1e1}.wc-wizard-services.shipping .shipping-method-setting input::-ms-input-placeholder{color:#e1e1e1}.wc-wizard-services.shipping .shipping-method-setting input::placeholder{color:#e1e1e1}.wc-setup-shipping-units p{line-height:1.5em;font-size:13px;margin-bottom:.25em}.wc-setup-shipping-units .wc-setup-shipping-unit{margin-bottom:1.75em}.wc-setup-shipping-units .wc-setup-shipping-unit .select2{min-width:100%}.hide{display:none}.wc-wizard-features{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap;list-style:none;padding:0}.wc-wizard-features .wc-wizard-feature-item{-webkit-flex-basis:calc(50% - 4em - 3px);-ms-flex-preferred-size:calc(50% - 4em - 3px);flex-basis:calc(50% - 4em - 3px);border:1px solid #eee;padding:2em}.wc-wizard-features .wc-wizard-feature-item:nth-child(1){border-radius:0 4px 0 0}.wc-wizard-features .wc-wizard-feature-item:nth-child(2){border-right:0;border-radius:4px 0 0 0}.wc-wizard-features .wc-wizard-feature-item:nth-child(3){border-top:0;border-radius:0 0 4px 0}.wc-wizard-features .wc-wizard-feature-item:nth-child(4){border-top:0;border-right:0;border-radius:0 0 0 4px}.wc-wizard-features p.wc-wizard-feature-description,.wc-wizard-features p.wc-wizard-feature-name{margin:0;line-height:1.5em}h3.jetpack-reasons{text-align:center;margin:3em 0 1em 0;font-size:14px}.jetpack-logo{display:block;margin:1.75em auto 2em auto;max-height:175px}.step{text-align:center}.wc-setup .wc-setup-actions .button{font-weight:300;font-size:16px;padding:1em 2em;-webkit-box-shadow:none;box-shadow:none;min-width:12em;min-width:auto;margin-top:10px}.wc-setup .wc-setup-actions .button:active,.wc-setup .wc-setup-actions .button:focus,.wc-setup .wc-setup-actions .button:hover{-webkit-box-shadow:none;box-shadow:none}.location-prompt{color:#666;font-size:13px;font-weight:500;margin-bottom:.5em;margin-top:1em;display:inline-block}.location-input{border:1px solid #aaa;border-color:#ddd;border-radius:4px;height:30px;width:calc(100% - 8px - 24px - 2px);padding-right:8px;padding-left:24px;font-size:16px;color:#444;background-color:#fff;display:inline-block}.location-input.dropdown{width:100%}.address-step .select2{min-width:100%}.store-address-container{margin-bottom:24px}.store-address-container .city-and-postcode{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex}.store-address-container .city-and-postcode div{-webkit-flex-basis:50%;-ms-flex-preferred-size:50%;flex-basis:50%;margin-left:1em}.store-address-container .city-and-postcode div:last-of-type{margin-left:0}.wc-wizard-service-settings .payment-email-input{border:1px solid #aaa;border-color:#ddd;border-radius:4px;height:30px;padding:0 8px;font-size:14px;color:#444;background-color:#fff;display:inline-block}.newsletter-form-container{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex}.newsletter-form-container .newsletter-form-email{border:1px solid #aaa;border-color:#ddd;border-radius:4px;height:42px;padding:0 8px;font-size:16px;color:#666;background-color:#fff;display:inline-block;margin-left:6px;-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1}.newsletter-form-container .newsletter-form-button-container{-webkit-box-flex:0;-webkit-flex-grow:0;-ms-flex-positive:0;flex-grow:0}.wc-setup .wc-setup-actions .button.newsletter-form-button{height:42px;padding:0 1em;margin:0}.wc-wizard-next-steps{border:1px solid #eee;border-radius:4px;list-style:none;padding:0}.wc-wizard-next-steps li{padding:0}.wc-wizard-next-steps .wc-wizard-next-step-item{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;border-top:1px solid #eee}.wc-wizard-next-steps .wc-wizard-next-step-item:first-child{border-top:0}.wc-wizard-next-steps .wc-wizard-next-step-description{-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;margin:1.5em}.wc-wizard-next-steps .wc-wizard-next-step-action{-webkit-box-flex:0;-webkit-flex-grow:0;-ms-flex-positive:0;flex-grow:0;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center}.wc-wizard-next-steps .wc-wizard-next-step-action .button{margin:1em}.wc-wizard-next-steps p.next-step-heading{margin:0;font-size:.95em;font-weight:400;font-variant:all-petite-caps}.wc-wizard-next-steps p.next-step-extra-info{margin:0}.wc-wizard-next-steps h3.next-step-description{margin:0;font-size:16px;font-weight:600}p.next-steps-help-text{color:#9f9f9f;padding:0 2em;text-align:center;font-size:.9em}p.jetpack-terms{font-size:.8em;text-align:center;max-width:480px;margin:0 auto;line-height:1.5em}.woocommerce-error{background:#ffe6e5;border-color:#ffc5c2;padding:1em;margin-bottom:1em}.woocommerce-error p{margin-top:0;margin-bottom:.5em;color:#444}.woocommerce-error a{color:#ff645c}.woocommerce-error .reconnect-reminder{font-size:.85em}.woocommerce-error .wc-setup-actions .button{font-size:14px}.allow-tracking{color:#9f9f9f;margin-top:1em;text-align:center;font-size:.9em;padding-top:2em;border-top:1px solid #ccc}.wc-wizard-service-setting-ppec_paypal_reroute_requests,.wc-wizard-service-setting-stripe_create_account{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:end;-webkit-align-items:flex-end;-ms-flex-align:end;align-items:flex-end;margin-top:.75em}.wc-wizard-service-setting-ppec_paypal_reroute_requests .payment-checkbox-input,.wc-wizard-service-setting-stripe_create_account .payment-checkbox-input{-webkit-box-ordinal-group:2;-webkit-order:1;-ms-flex-order:1;order:1;margin-right:0;margin-left:0;width:1.5em}.wc-wizard-service-setting-ppec_paypal_reroute_requests .ppec_paypal_reroute_requests,.wc-wizard-service-setting-ppec_paypal_reroute_requests .stripe_create_account,.wc-wizard-service-setting-stripe_create_account .ppec_paypal_reroute_requests,.wc-wizard-service-setting-stripe_create_account .stripe_create_account{-webkit-box-ordinal-group:3;-webkit-order:2;-ms-flex-order:2;order:2;margin-right:.3em}.wc-wizard-service-setting-ppec_paypal_api_subject,.wc-wizard-service-setting-stripe_email{margin-top:.75em}.wc-wizard-service-setting-ppec_paypal_api_subject label.ppec_paypal_api_subject,.wc-wizard-service-setting-ppec_paypal_api_subject label.stripe_email,.wc-wizard-service-setting-stripe_email label.ppec_paypal_api_subject,.wc-wizard-service-setting-stripe_email label.stripe_email{position:absolute;margin:-1px;padding:0;height:1px;width:1px;overflow:hidden;clip:rect(0 0 0 0);border:0}.wc-wizard-service-setting-ppec_paypal_api_subject input.payment-email-input,.wc-wizard-service-setting-stripe_email input.payment-email-input{margin-right:1.5em;margin-bottom:.5em;width:100%}.wc-wizard-service-setting-ppec_paypal_api_subject .wc-wizard-service-settings-description,.wc-wizard-service-setting-stripe_email .wc-wizard-service-settings-description{margin-right:1.5em}
\ No newline at end of file
diff --git a/assets/css/wc-setup.css b/assets/css/wc-setup.css
index 9ce3b5c8e4e..8506640277c 100644
--- a/assets/css/wc-setup.css
+++ b/assets/css/wc-setup.css
@@ -1 +1 @@
-@charset "UTF-8";body{margin:65px auto 24px;-webkit-box-shadow:none;box-shadow:none;background:#f1f1f1;padding:0}#wc-logo{border:0;margin:0 0 24px;padding:0;text-align:center}#wc-logo img{max-width:30%}.wc-setup-content{-webkit-box-shadow:0 1px 3px rgba(0,0,0,.13);box-shadow:0 1px 3px rgba(0,0,0,.13);padding:2em;margin:0 0 20px;background:#fff;overflow:hidden;zoom:1}.wc-setup-content h1,.wc-setup-content h2,.wc-setup-content h3,.wc-setup-content table{margin:0 0 20px;border:0;padding:0;color:#666;clear:none;font-weight:500}.wc-setup-content p{margin:20px 0;font-size:1em;line-height:1.75em;color:#666}.wc-setup-content table{font-size:1em;line-height:1.75em;color:#666}.wc-setup-content a{color:#a16696}.wc-setup-content a:focus,.wc-setup-content a:hover{color:#111}.wc-setup-content .form-table th{width:35%;vertical-align:top;font-weight:400}.wc-setup-content .form-table td{vertical-align:top}.wc-setup-content .form-table td input,.wc-setup-content .form-table td select{width:100%;-webkit-box-sizing:border-box;box-sizing:border-box}.wc-setup-content .form-table td input[size]{width:auto}.wc-setup-content .form-table td .description{line-height:1.5em;display:block;margin-top:.25em;color:#999;font-style:italic}.wc-setup-content .form-table td .input-checkbox,.wc-setup-content .form-table td .input-radio{width:auto;-webkit-box-sizing:inherit;box-sizing:inherit;padding:inherit;margin:0 .5em 0 0;-webkit-box-shadow:none;box-shadow:none}.wc-setup-content .form-table .section_title td{padding:0}.wc-setup-content .form-table .section_title td h2,.wc-setup-content .form-table .section_title td p{margin:12px 0 0}.wc-setup-content .form-table td,.wc-setup-content .form-table th{padding:12px 0;margin:0;border:0}.wc-setup-content .form-table td:first-child,.wc-setup-content .form-table th:first-child{padding-right:1em}.wc-setup-content table.tax-rates{width:100%;font-size:.92em}.wc-setup-content table.tax-rates th{padding:0;text-align:center;width:auto;vertical-align:middle}.wc-setup-content table.tax-rates td{border:1px solid #f5f5f5;padding:6px;text-align:center;vertical-align:middle}.wc-setup-content table.tax-rates td input{outline:0;border:0;padding:0;-webkit-box-shadow:none;box-shadow:none;text-align:center;width:100%}.wc-setup-content table.tax-rates td.sort{cursor:move;color:#ccc}.wc-setup-content table.tax-rates td.sort::before{content:'\f333';font-family:dashicons}.wc-setup-content table.tax-rates td.readonly{background:#f5f5f5}.wc-setup-content table.tax-rates .add{padding:1em 0 0 1em;line-height:1em;font-size:1em;width:0;margin:6px 0 0;height:0;overflow:hidden;position:relative;display:inline-block}.wc-setup-content table.tax-rates .add::before{content:'\f502';font-family:dashicons;position:absolute;left:0;top:0}.wc-setup-content table.tax-rates .remove{padding:1em 0 0 1em;line-height:1em;font-size:1em;width:0;margin:0;height:0;overflow:hidden;position:relative;display:inline-block}.wc-setup-content table.tax-rates .remove::before{content:'\f182';font-family:dashicons;position:absolute;left:0;top:0}.wc-setup-content .wc-setup-pages{width:100%;border-top:1px solid #eee}.wc-setup-content .wc-setup-pages thead th{display:none}.wc-setup-content .wc-setup-pages .page-name{width:30%;font-weight:700}.wc-setup-content .wc-setup-pages td,.wc-setup-content .wc-setup-pages th{padding:14px 0;border-bottom:1px solid #eee}.wc-setup-content .wc-setup-pages td:first-child,.wc-setup-content .wc-setup-pages th:first-child{padding-right:9px}.wc-setup-content .wc-setup-pages th{padding-top:0}.wc-setup-content .wc-setup-pages .page-options p{color:#777;margin:6px 0 0 24px;line-height:1.75em}.wc-setup-content .wc-setup-pages .page-options p input{vertical-align:middle;margin:1px 0 0;height:1.75em;width:1.75em;line-height:1.75em}.wc-setup-content .wc-setup-pages .page-options p label{line-height:1}@media screen and (max-width:782px){.wc-setup-content .form-table tbody th{width:auto}}.wc-setup-content .twitter-share-button{float:right}.wc-setup-content .wc-setup-next-steps{overflow:hidden;margin:0 0 24px;padding-bottom:2px}.wc-setup-content .wc-setup-next-steps h2{margin-bottom:12px}.wc-setup-content .wc-setup-next-steps .wc-setup-next-steps-first{float:left;width:50%;-webkit-box-sizing:border-box;box-sizing:border-box}.wc-setup-content .wc-setup-next-steps .wc-setup-next-steps-last{float:right;width:50%;-webkit-box-sizing:border-box;box-sizing:border-box}.wc-setup-content .wc-setup-next-steps ul{padding:0 2em 0 0;list-style:none outside;margin:0}.wc-setup-content .wc-setup-next-steps ul li a{display:block;padding:0 0 .75em}.wc-setup-content .wc-setup-next-steps ul .setup-product a.button{background-color:#f7f7f7;border-color:#ccc;color:#23282d;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #ccc;box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #ccc;text-shadow:1px 0 1px #eee,0 1px 1px #eee;font-size:1em;height:auto;line-height:1.75em;margin:0 0 .75em;opacity:1;padding:1em;text-align:center}.wc-setup-content .wc-setup-next-steps ul .setup-product a.button:active,.wc-setup-content .wc-setup-next-steps ul .setup-product a.button:focus,.wc-setup-content .wc-setup-next-steps ul .setup-product a.button:hover{background:#f5f5f5;border-color:#aaa}.wc-setup-content .wc-setup-next-steps ul .setup-product a.button-primary{color:#fff;background-color:#bb77ae;border-color:#a36597;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597;box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597;text-shadow:0 -1px 1px #a36597,1px 0 1px #a36597,0 1px 1px #a36597,-1px 0 1px #a36597}.wc-setup-content .wc-setup-next-steps ul .setup-product a.button-primary:active,.wc-setup-content .wc-setup-next-steps ul .setup-product a.button-primary:focus,.wc-setup-content .wc-setup-next-steps ul .setup-product a.button-primary:hover{color:#fff;background:#a36597;border-color:#a36597;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597;box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597}.wc-setup-content .wc-setup-next-steps ul li a::before{color:#82878c;font:normal 20px/1 dashicons;speak:none;display:inline-block;padding:0 10px 0 0;top:1px;position:relative;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-decoration:none!important;vertical-align:top}.wc-setup-content .wc-setup-next-steps ul .learn-more a::before{content:'\f105'}.wc-setup-content .wc-setup-next-steps ul .video-walkthrough a::before{content:'\f126'}.wc-setup-content .wc-setup-next-steps ul .newsletter a::before{content:'\f465'}.wc-setup-content .updated,.wc-setup-content .woocommerce-newsletter,.wc-setup-content .woocommerce-tracker{padding:24px 24px 0;margin:0 0 24px;overflow:hidden;background:#f5f5f5}.wc-setup-content .updated p,.wc-setup-content .woocommerce-newsletter p,.wc-setup-content .woocommerce-tracker p{padding:0;margin:0 0 12px}.wc-setup-content .updated form,.wc-setup-content .updated p:last-child,.wc-setup-content .woocommerce-newsletter form,.wc-setup-content .woocommerce-newsletter p:last-child,.wc-setup-content .woocommerce-tracker form,.wc-setup-content .woocommerce-tracker p:last-child{margin:0 0 24px}.wc-setup-content .woocommerce-tracker+.woocommerce-newsletter{margin-top:-24px;border-top:2px dashed #ddd}.wc-setup-steps{padding:0 0 24px;margin:0;list-style:none outside;overflow:hidden;color:#ccc;width:100%;display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex}.wc-setup-steps li{width:20%;float:left;padding:0 0 .8em;margin:0;text-align:center;position:relative;border-bottom:4px solid #ccc;line-height:1.4em}.wc-setup-steps li::before{content:'';border:4px solid #ccc;border-radius:100%;width:4px;height:4px;position:absolute;bottom:0;left:50%;margin-left:-6px;margin-bottom:-8px;background:#fff}.wc-setup-steps li.active{border-color:#a16696;color:#a16696}.wc-setup-steps li.active::before{border-color:#a16696}.wc-setup-steps li.done{border-color:#a16696;color:#a16696}.wc-setup-steps li.done::before{border-color:#a16696;background:#a16696}.wc-setup .wc-setup-actions{overflow:hidden;margin:20px 0 0}.wc-setup .wc-setup-actions .button{font-size:1.25em;padding:.5em 1em;line-height:1em;margin-right:.5em;margin-bottom:2px;height:auto;border-radius:4px}.wc-setup .wc-setup-actions .button-primary{background-color:#bb77ae;border-color:#a36597;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597;box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597;text-shadow:0 -1px 1px #a36597,1px 0 1px #a36597,0 1px 1px #a36597,-1px 0 1px #a36597;margin:0;opacity:1}.wc-setup .wc-setup-actions .button-primary:active,.wc-setup .wc-setup-actions .button-primary:focus,.wc-setup .wc-setup-actions .button-primary:hover{background:#a36597;border-color:#a36597;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597;box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597}.wc-setup-content p:last-child{margin-bottom:0}.wc-setup-content p.store-setup{margin-top:0}.wc-return-to-dashboard{font-size:.85em;color:#b5b5b5;margin:1.18em 0;display:block;text-align:center}.wc-wizard-storefront .wc-wizard-storefront-intro{padding:40px 40px 0;background:#f5f5f5;text-align:center}.wc-wizard-storefront .wc-wizard-storefront-intro img{margin:40px 0 0 0;width:100%;display:block}.wc-wizard-storefront .wc-wizard-storefront-features{list-style:none outside;margin:0 0 20px;padding:0 0 0 30px;overflow:hidden}.wc-wizard-storefront .wc-wizard-storefront-feature{margin:0;padding:20px 30px 20px 2em;width:50%;-webkit-box-sizing:border-box;box-sizing:border-box}.wc-wizard-storefront .wc-wizard-storefront-feature::before{margin-left:-2em;position:absolute}.wc-wizard-storefront .wc-wizard-storefront-feature.first{clear:both;float:left}.wc-wizard-storefront .wc-wizard-storefront-feature.last{float:right}.wc-wizard-storefront .wc-wizard-storefront-feature__bulletproof::before{content:'🔒'}.wc-wizard-storefront .wc-wizard-storefront-feature__mobile::before{content:'📱'}.wc-wizard-storefront .wc-wizard-storefront-feature__accessibility::before{content:'👓'}.wc-wizard-storefront .wc-wizard-storefront-feature__search::before{content:'🔍'}.wc-wizard-storefront .wc-wizard-storefront-feature__compatibility::before{content:'🔧'}.wc-wizard-storefront .wc-wizard-storefront-feature__extendable::before{content:'🎨'}.wc-wizard-services{border:1px solid #eee;padding:0;margin:0 0 1em;list-style:none outside;border-radius:4px;overflow:hidden}.wc-wizard-services p{margin:0 0 1em 0;padding:0;font-size:1em;line-height:1.5em}.wc-wizard-service-item,.wc-wizard-services-list-toggle{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-wrap:nowrap;-ms-flex-wrap:nowrap;flex-wrap:nowrap;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between;padding:0;border-bottom:1px solid #eee;color:#666}.wc-wizard-service-item:last-child,.wc-wizard-services-list-toggle:last-child{border-bottom:0}.wc-wizard-service-item .payment-gateway-fee,.wc-wizard-services-list-toggle .payment-gateway-fee{color:#a6a6a6}.wc-wizard-service-item .wc-wizard-service-name,.wc-wizard-services-list-toggle .wc-wizard-service-name{-webkit-flex-basis:0;-ms-flex-preferred-size:0;flex-basis:0;min-width:160px;text-align:center;font-weight:700;padding:2em 0;-webkit-align-self:stretch;-ms-flex-item-align:stretch;align-self:stretch;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center}.wc-wizard-service-item .wc-wizard-service-name img,.wc-wizard-services-list-toggle .wc-wizard-service-name img{max-width:75px}.wc-wizard-service-item.paypal-logo .wc-wizard-service-name img,.wc-wizard-services-list-toggle.paypal-logo .wc-wizard-service-name img{max-width:87px}.wc-wizard-service-item.klarna-logo .wc-wizard-service-name,.wc-wizard-services-list-toggle.klarna-logo .wc-wizard-service-name{background:#000}.wc-wizard-service-item.klarna-logo .wc-wizard-service-name img,.wc-wizard-services-list-toggle.klarna-logo .wc-wizard-service-name img{max-width:87px}.wc-wizard-service-item.square-logo .wc-wizard-service-name,.wc-wizard-services-list-toggle.square-logo .wc-wizard-service-name{background:#000}.wc-wizard-service-item.square-logo .wc-wizard-service-name img,.wc-wizard-services-list-toggle.square-logo .wc-wizard-service-name img{max-width:95px}.wc-wizard-service-item .wc-wizard-service-description,.wc-wizard-services-list-toggle .wc-wizard-service-description{-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;padding:2em 20px}.wc-wizard-service-item .wc-wizard-service-description p,.wc-wizard-services-list-toggle .wc-wizard-service-description p{margin-bottom:0}.wc-wizard-service-item .wc-wizard-service-description .wc-wizard-service-settings,.wc-wizard-services-list-toggle .wc-wizard-service-description .wc-wizard-service-settings{margin-top:1em}.wc-wizard-service-item .wc-wizard-service-description .wc-wizard-service-settings-description,.wc-wizard-services-list-toggle .wc-wizard-service-description .wc-wizard-service-settings-description{display:block;font-style:italic;color:#999}.wc-wizard-service-item .wc-wizard-service-enable,.wc-wizard-services-list-toggle .wc-wizard-service-enable{-webkit-flex-basis:0;-ms-flex-preferred-size:0;flex-basis:0;min-width:75px;text-align:center;cursor:pointer;padding:2em 0}.wc-wizard-service-item .wc-wizard-service-toggle,.wc-wizard-services-list-toggle .wc-wizard-service-toggle{height:16px;width:32px;border:2px solid #935687;background-color:#935687;display:inline-block;text-indent:-9999px;border-radius:10em;position:relative}.wc-wizard-service-item .wc-wizard-service-toggle input[type=checkbox],.wc-wizard-services-list-toggle .wc-wizard-service-toggle input[type=checkbox]{display:none}.wc-wizard-service-item .wc-wizard-service-toggle:before,.wc-wizard-services-list-toggle .wc-wizard-service-toggle:before{content:"";display:block;width:16px;height:16px;background:#fff;position:absolute;top:0;right:0;border-radius:100%}.wc-wizard-service-item .wc-wizard-service-toggle.disabled,.wc-wizard-services-list-toggle .wc-wizard-service-toggle.disabled{border-color:#999;background-color:#999}.wc-wizard-service-item .wc-wizard-service-toggle.disabled:before,.wc-wizard-services-list-toggle .wc-wizard-service-toggle.disabled:before{right:auto;left:0}.wc-wizard-service-item .wc-wizard-service-settings,.wc-wizard-services-list-toggle .wc-wizard-service-settings{display:none;margin-bottom:0;cursor:default}.wc-wizard-service-item .wc-wizard-service-settings.hide,.wc-wizard-services-list-toggle .wc-wizard-service-settings.hide{display:none}.wc-wizard-service-item.checked .wc-wizard-service-settings,.wc-wizard-services-list-toggle.checked .wc-wizard-service-settings{display:inline-block}.wc-wizard-service-item.checked .wc-wizard-service-settings.hide,.wc-wizard-services-list-toggle.checked .wc-wizard-service-settings.hide{display:none}.wc-wizard-service-item.closed,.wc-wizard-services-list-toggle.closed{border-bottom:0}.wc-wizard-service-enable input{visibility:hidden;position:relative;cursor:pointer}.wc-wizard-service-enable input:before{content:"\f347";font-family:dashicons;visibility:initial;color:#666;font-size:25px;margin-left:-5px;top:-6px;position:absolute}.wc-wizard-service-enable input:checked:before{content:"\f343";top:-7px}.wc-wizard-services.manual .wc-wizard-service-item{display:none}.wc-wizard-services.shipping .wc-wizard-service-name{font-weight:400;text-align:left}.wc-wizard-services.shipping .wc-wizard-service-item{padding-left:2em}.wc-wizard-services.shipping .wc-wizard-service-item:first-child{border-bottom:0;padding-bottom:0;font-weight:700}.wc-wizard-services.shipping .wc-wizard-service-item:first-child .wc-wizard-service-name{font-weight:700}.wc-wizard-services.shipping .shipping-method-setting,.wc-wizard-services.shipping .wc-wizard-shipping-method-select{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex}.wc-wizard-services.shipping .shipping-method-setting.hide,.wc-wizard-services.shipping .wc-wizard-shipping-method-select.hide{display:none}.wc-wizard-services.shipping .shipping-method-setting input,.wc-wizard-services.shipping .wc-wizard-shipping-method-dropdown{margin-right:2em;margin-bottom:1em}.wc-wizard-services.shipping .shipping-method-setting input .select2,.wc-wizard-services.shipping .wc-wizard-shipping-method-dropdown .select2{min-width:130px}.wc-wizard-services.shipping .wc-wizard-service-description{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;color:#a6a6a6;font-size:.92em}.wc-wizard-services.shipping .shipping-method-setting input{width:95px;border:1px solid #aaa;border-color:#ddd;border-radius:4px;height:28px;padding-left:8px;padding-right:24px;font-size:14px;color:#444;background-color:#fff;display:inline-block}.wc-wizard-services.shipping .shipping-method-description,.wc-wizard-services.shipping .shipping-method-setting .description{color:#7e7e7e;font-size:.9em}.wc-wizard-services.shipping .shipping-method-setting input::-webkit-input-placeholder{color:#e1e1e1}.wc-wizard-services.shipping .shipping-method-setting input::-moz-placeholder{color:#e1e1e1}.wc-wizard-services.shipping .shipping-method-setting input:-ms-input-placeholder{color:#e1e1e1}.wc-wizard-services.shipping .shipping-method-setting input::-ms-input-placeholder{color:#e1e1e1}.wc-wizard-services.shipping .shipping-method-setting input::placeholder{color:#e1e1e1}.wc-setup-shipping-units p{line-height:1.5em;font-size:13px;margin-bottom:.25em}.wc-setup-shipping-units .wc-setup-shipping-unit{margin-bottom:1.75em}.wc-setup-shipping-units .wc-setup-shipping-unit .select2{min-width:100%}.hide{display:none}.wc-wizard-features{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap;list-style:none;padding:0}.wc-wizard-features .wc-wizard-feature-item{-webkit-flex-basis:calc(50% - 4em - 3px);-ms-flex-preferred-size:calc(50% - 4em - 3px);flex-basis:calc(50% - 4em - 3px);border:1px solid #eee;padding:2em}.wc-wizard-features .wc-wizard-feature-item:nth-child(1){border-radius:4px 0 0 0}.wc-wizard-features .wc-wizard-feature-item:nth-child(2){border-left:0;border-radius:0 4px 0 0}.wc-wizard-features .wc-wizard-feature-item:nth-child(3){border-top:0;border-radius:0 0 0 4px}.wc-wizard-features .wc-wizard-feature-item:nth-child(4){border-top:0;border-left:0;border-radius:0 0 4px 0}.wc-wizard-features p.wc-wizard-feature-description,.wc-wizard-features p.wc-wizard-feature-name{margin:0;line-height:1.5em}h3.jetpack-reasons{text-align:center;margin:3em 0 1em 0;font-size:14px}.jetpack-logo{display:block;margin:1.75em auto 2em auto;max-height:175px}.step{text-align:center}.wc-setup .wc-setup-actions .button{font-weight:300;font-size:16px;padding:1em 2em;-webkit-box-shadow:none;box-shadow:none;min-width:12em;min-width:auto;margin-top:10px}.wc-setup .wc-setup-actions .button:active,.wc-setup .wc-setup-actions .button:focus,.wc-setup .wc-setup-actions .button:hover{-webkit-box-shadow:none;box-shadow:none}.location-prompt{color:#666;font-size:13px;font-weight:500;margin-bottom:.5em;margin-top:1em;display:inline-block}.location-input{border:1px solid #aaa;border-color:#ddd;border-radius:4px;height:30px;width:calc(100% - 8px - 24px - 2px);padding-left:8px;padding-right:24px;font-size:16px;color:#444;background-color:#fff;display:inline-block}.location-input.dropdown{width:100%}.address-step .select2{min-width:100%}.store-address-container{margin-bottom:24px}.store-address-container .city-and-postcode{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex}.store-address-container .city-and-postcode div{-webkit-flex-basis:50%;-ms-flex-preferred-size:50%;flex-basis:50%;margin-right:1em}.store-address-container .city-and-postcode div:last-of-type{margin-right:0}.wc-wizard-service-settings .payment-email-input{border:1px solid #aaa;border-color:#ddd;border-radius:4px;height:30px;padding:0 8px;font-size:14px;color:#444;background-color:#fff;display:inline-block}.newsletter-form-container{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex}.newsletter-form-container .newsletter-form-email{border:1px solid #aaa;border-color:#ddd;border-radius:4px;height:42px;padding:0 8px;font-size:16px;color:#666;background-color:#fff;display:inline-block;margin-right:6px;-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1}.newsletter-form-container .newsletter-form-button-container{-webkit-box-flex:0;-webkit-flex-grow:0;-ms-flex-positive:0;flex-grow:0}.wc-setup .wc-setup-actions .button.newsletter-form-button{height:42px;padding:0 1em;margin:0}.wc-wizard-next-steps{border:1px solid #eee;border-radius:4px;list-style:none;padding:0}.wc-wizard-next-steps li{padding:0}.wc-wizard-next-steps .wc-wizard-next-step-item{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;border-top:1px solid #eee}.wc-wizard-next-steps .wc-wizard-next-step-item:first-child{border-top:0}.wc-wizard-next-steps .wc-wizard-next-step-description{-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;margin:1.5em}.wc-wizard-next-steps .wc-wizard-next-step-action{-webkit-box-flex:0;-webkit-flex-grow:0;-ms-flex-positive:0;flex-grow:0;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center}.wc-wizard-next-steps .wc-wizard-next-step-action .button{margin:1em}.wc-wizard-next-steps p.next-step-heading{margin:0;font-size:.95em;font-weight:400;font-variant:all-petite-caps}.wc-wizard-next-steps p.next-step-extra-info{margin:0}.wc-wizard-next-steps h3.next-step-description{margin:0;font-size:16px;font-weight:600}p.next-steps-help-text{color:#9f9f9f;padding:0 2em;text-align:center;font-size:.9em}p.jetpack-terms{font-size:.8em;text-align:center;max-width:480px;margin:0 auto;line-height:1.5em}.woocommerce-error{background:#ffe6e5;border-color:#ffc5c2;padding:1em;margin-bottom:1em}.woocommerce-error p{margin-top:0;margin-bottom:.5em;color:#444}.woocommerce-error a{color:#ff645c}.woocommerce-error .reconnect-reminder{font-size:.85em}.woocommerce-error .wc-setup-actions .button{font-size:14px}.allow-tracking{color:#9f9f9f;margin-top:1em;text-align:center;font-size:.9em;padding-top:2em;border-top:1px solid #ccc}.wc-wizard-service-setting-ppec_paypal_reroute_requests,.wc-wizard-service-setting-stripe_create_account{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:end;-webkit-align-items:flex-end;-ms-flex-align:end;align-items:flex-end;margin-top:.75em}.wc-wizard-service-setting-ppec_paypal_reroute_requests .payment-checkbox-input,.wc-wizard-service-setting-stripe_create_account .payment-checkbox-input{-webkit-box-ordinal-group:2;-webkit-order:1;-ms-flex-order:1;order:1;margin-left:0;margin-right:0;width:1.5em}.wc-wizard-service-setting-ppec_paypal_reroute_requests .ppec_paypal_reroute_requests,.wc-wizard-service-setting-ppec_paypal_reroute_requests .stripe_create_account,.wc-wizard-service-setting-stripe_create_account .ppec_paypal_reroute_requests,.wc-wizard-service-setting-stripe_create_account .stripe_create_account{-webkit-box-ordinal-group:3;-webkit-order:2;-ms-flex-order:2;order:2;margin-left:.3em}.wc-wizard-service-setting-ppec_paypal_api_subject,.wc-wizard-service-setting-stripe_email{margin-top:.75em}.wc-wizard-service-setting-ppec_paypal_api_subject label.ppec_paypal_api_subject,.wc-wizard-service-setting-ppec_paypal_api_subject label.stripe_email,.wc-wizard-service-setting-stripe_email label.ppec_paypal_api_subject,.wc-wizard-service-setting-stripe_email label.stripe_email{position:absolute;margin:-1px;padding:0;height:1px;width:1px;overflow:hidden;clip:rect(0 0 0 0);border:0}.wc-wizard-service-setting-ppec_paypal_api_subject input.payment-email-input,.wc-wizard-service-setting-stripe_email input.payment-email-input{margin-left:1.5em;margin-bottom:.5em;width:100%}.wc-wizard-service-setting-ppec_paypal_api_subject .wc-wizard-service-settings-description,.wc-wizard-service-setting-stripe_email .wc-wizard-service-settings-description{margin-left:1.5em}
\ No newline at end of file
+@charset "UTF-8";body{margin:65px auto 24px;-webkit-box-shadow:none;box-shadow:none;background:#f1f1f1;padding:0}#wc-logo{border:0;margin:0 0 24px;padding:0;text-align:center}#wc-logo img{max-width:30%}.wc-setup-content{-webkit-box-shadow:0 1px 3px rgba(0,0,0,.13);box-shadow:0 1px 3px rgba(0,0,0,.13);padding:2em;margin:0 0 20px;background:#fff;overflow:hidden;zoom:1}.wc-setup-content h1,.wc-setup-content h2,.wc-setup-content h3,.wc-setup-content table{margin:0 0 20px;border:0;padding:0;color:#666;clear:none;font-weight:500}.wc-setup-content p{margin:20px 0;font-size:1em;line-height:1.75em;color:#666}.wc-setup-content table{font-size:1em;line-height:1.75em;color:#666}.wc-setup-content a{color:#a16696}.wc-setup-content a:focus,.wc-setup-content a:hover{color:#111}.wc-setup-content .form-table th{width:35%;vertical-align:top;font-weight:400}.wc-setup-content .form-table td{vertical-align:top}.wc-setup-content .form-table td input,.wc-setup-content .form-table td select{width:100%;-webkit-box-sizing:border-box;box-sizing:border-box}.wc-setup-content .form-table td input[size]{width:auto}.wc-setup-content .form-table td .description{line-height:1.5em;display:block;margin-top:.25em;color:#999;font-style:italic}.wc-setup-content .form-table td .input-checkbox,.wc-setup-content .form-table td .input-radio{width:auto;-webkit-box-sizing:inherit;box-sizing:inherit;padding:inherit;margin:0 .5em 0 0;-webkit-box-shadow:none;box-shadow:none}.wc-setup-content .form-table .section_title td{padding:0}.wc-setup-content .form-table .section_title td h2,.wc-setup-content .form-table .section_title td p{margin:12px 0 0}.wc-setup-content .form-table td,.wc-setup-content .form-table th{padding:12px 0;margin:0;border:0}.wc-setup-content .form-table td:first-child,.wc-setup-content .form-table th:first-child{padding-right:1em}.wc-setup-content table.tax-rates{width:100%;font-size:.92em}.wc-setup-content table.tax-rates th{padding:0;text-align:center;width:auto;vertical-align:middle}.wc-setup-content table.tax-rates td{border:1px solid #f5f5f5;padding:6px;text-align:center;vertical-align:middle}.wc-setup-content table.tax-rates td input{outline:0;border:0;padding:0;-webkit-box-shadow:none;box-shadow:none;text-align:center;width:100%}.wc-setup-content table.tax-rates td.sort{cursor:move;color:#ccc}.wc-setup-content table.tax-rates td.sort::before{content:'\f333';font-family:dashicons}.wc-setup-content table.tax-rates td.readonly{background:#f5f5f5}.wc-setup-content table.tax-rates .add{padding:1em 0 0 1em;line-height:1em;font-size:1em;width:0;margin:6px 0 0;height:0;overflow:hidden;position:relative;display:inline-block}.wc-setup-content table.tax-rates .add::before{content:'\f502';font-family:dashicons;position:absolute;left:0;top:0}.wc-setup-content table.tax-rates .remove{padding:1em 0 0 1em;line-height:1em;font-size:1em;width:0;margin:0;height:0;overflow:hidden;position:relative;display:inline-block}.wc-setup-content table.tax-rates .remove::before{content:'\f182';font-family:dashicons;position:absolute;left:0;top:0}.wc-setup-content .wc-setup-pages{width:100%;border-top:1px solid #eee}.wc-setup-content .wc-setup-pages thead th{display:none}.wc-setup-content .wc-setup-pages .page-name{width:30%;font-weight:700}.wc-setup-content .wc-setup-pages td,.wc-setup-content .wc-setup-pages th{padding:14px 0;border-bottom:1px solid #eee}.wc-setup-content .wc-setup-pages td:first-child,.wc-setup-content .wc-setup-pages th:first-child{padding-right:9px}.wc-setup-content .wc-setup-pages th{padding-top:0}.wc-setup-content .wc-setup-pages .page-options p{color:#777;margin:6px 0 0 24px;line-height:1.75em}.wc-setup-content .wc-setup-pages .page-options p input{vertical-align:middle;margin:1px 0 0;height:1.75em;width:1.75em;line-height:1.75em}.wc-setup-content .wc-setup-pages .page-options p label{line-height:1}@media screen and (max-width:782px){.wc-setup-content .form-table tbody th{width:auto}}.wc-setup-content .twitter-share-button{float:right}.wc-setup-content .wc-setup-next-steps{overflow:hidden;margin:0 0 24px;padding-bottom:2px}.wc-setup-content .wc-setup-next-steps h2{margin-bottom:12px}.wc-setup-content .wc-setup-next-steps .wc-setup-next-steps-first{float:left;width:50%;-webkit-box-sizing:border-box;box-sizing:border-box}.wc-setup-content .wc-setup-next-steps .wc-setup-next-steps-last{float:right;width:50%;-webkit-box-sizing:border-box;box-sizing:border-box}.wc-setup-content .wc-setup-next-steps ul{padding:0 2em 0 0;list-style:none outside;margin:0}.wc-setup-content .wc-setup-next-steps ul li a{display:block;padding:0 0 .75em}.wc-setup-content .wc-setup-next-steps ul .setup-product a.button{background-color:#f7f7f7;border-color:#ccc;color:#23282d;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #ccc;box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #ccc;text-shadow:1px 0 1px #eee,0 1px 1px #eee;font-size:1em;height:auto;line-height:1.75em;margin:0 0 .75em;opacity:1;padding:1em;text-align:center}.wc-setup-content .wc-setup-next-steps ul .setup-product a.button:active,.wc-setup-content .wc-setup-next-steps ul .setup-product a.button:focus,.wc-setup-content .wc-setup-next-steps ul .setup-product a.button:hover{background:#f5f5f5;border-color:#aaa}.wc-setup-content .wc-setup-next-steps ul .setup-product a.button-primary{color:#fff;background-color:#bb77ae;border-color:#a36597;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597;box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597;text-shadow:0 -1px 1px #a36597,1px 0 1px #a36597,0 1px 1px #a36597,-1px 0 1px #a36597}.wc-setup-content .wc-setup-next-steps ul .setup-product a.button-primary:active,.wc-setup-content .wc-setup-next-steps ul .setup-product a.button-primary:focus,.wc-setup-content .wc-setup-next-steps ul .setup-product a.button-primary:hover{color:#fff;background:#a36597;border-color:#a36597;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597;box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597}.wc-setup-content .wc-setup-next-steps ul li a::before{color:#82878c;font:normal 20px/1 dashicons;speak:none;display:inline-block;padding:0 10px 0 0;top:1px;position:relative;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-decoration:none!important;vertical-align:top}.wc-setup-content .wc-setup-next-steps ul .learn-more a::before{content:'\f105'}.wc-setup-content .wc-setup-next-steps ul .video-walkthrough a::before{content:'\f126'}.wc-setup-content .wc-setup-next-steps ul .newsletter a::before{content:'\f465'}.wc-setup-content .updated,.wc-setup-content .woocommerce-newsletter,.wc-setup-content .woocommerce-tracker{padding:24px 24px 0;margin:0 0 24px;overflow:hidden;background:#f5f5f5}.wc-setup-content .updated p,.wc-setup-content .woocommerce-newsletter p,.wc-setup-content .woocommerce-tracker p{padding:0;margin:0 0 12px}.wc-setup-content .updated form,.wc-setup-content .updated p:last-child,.wc-setup-content .woocommerce-newsletter form,.wc-setup-content .woocommerce-newsletter p:last-child,.wc-setup-content .woocommerce-tracker form,.wc-setup-content .woocommerce-tracker p:last-child{margin:0 0 24px}.wc-setup-content .woocommerce-tracker+.woocommerce-newsletter{margin-top:-24px;border-top:2px dashed #ddd}.wc-setup-steps{padding:0 0 24px;margin:0;list-style:none outside;overflow:hidden;color:#ccc;width:100%;display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex}.wc-setup-steps li{width:20%;float:left;padding:0 0 .8em;margin:0;text-align:center;position:relative;border-bottom:4px solid #ccc;line-height:1.4em}.wc-setup-steps li::before{content:'';border:4px solid #ccc;border-radius:100%;width:4px;height:4px;position:absolute;bottom:0;left:50%;margin-left:-6px;margin-bottom:-8px;background:#fff}.wc-setup-steps li.active{border-color:#a16696;color:#a16696}.wc-setup-steps li.active::before{border-color:#a16696}.wc-setup-steps li.done{border-color:#a16696;color:#a16696}.wc-setup-steps li.done::before{border-color:#a16696;background:#a16696}.wc-setup .wc-setup-actions{overflow:hidden;margin:20px 0 0}.wc-setup .wc-setup-actions .button{font-size:1.25em;padding:.5em 1em;line-height:1em;margin-right:.5em;margin-bottom:2px;height:auto;border-radius:4px}.wc-setup .wc-setup-actions .button-primary{background-color:#bb77ae;border-color:#a36597;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597;box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597;text-shadow:0 -1px 1px #a36597,1px 0 1px #a36597,0 1px 1px #a36597,-1px 0 1px #a36597;margin:0;opacity:1}.wc-setup .wc-setup-actions .button-primary:active,.wc-setup .wc-setup-actions .button-primary:focus,.wc-setup .wc-setup-actions .button-primary:hover{background:#a36597;border-color:#a36597;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597;box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 0 #a36597}.wc-setup-content p:last-child{margin-bottom:0}.wc-setup-content p.store-setup{margin-top:0}.wc-return-to-dashboard{font-size:.85em;color:#b5b5b5;margin:1.18em 0;display:block;text-align:center}.wc-wizard-storefront .wc-wizard-storefront-intro{padding:40px 40px 0;background:#f5f5f5;text-align:center}.wc-wizard-storefront .wc-wizard-storefront-intro img{margin:40px 0 0 0;width:100%;display:block}.wc-wizard-storefront .wc-wizard-storefront-features{list-style:none outside;margin:0 0 20px;padding:0 0 0 30px;overflow:hidden}.wc-wizard-storefront .wc-wizard-storefront-feature{margin:0;padding:20px 30px 20px 2em;width:50%;-webkit-box-sizing:border-box;box-sizing:border-box}.wc-wizard-storefront .wc-wizard-storefront-feature::before{margin-left:-2em;position:absolute}.wc-wizard-storefront .wc-wizard-storefront-feature.first{clear:both;float:left}.wc-wizard-storefront .wc-wizard-storefront-feature.last{float:right}.wc-wizard-storefront .wc-wizard-storefront-feature__bulletproof::before{content:'🔒'}.wc-wizard-storefront .wc-wizard-storefront-feature__mobile::before{content:'📱'}.wc-wizard-storefront .wc-wizard-storefront-feature__accessibility::before{content:'👓'}.wc-wizard-storefront .wc-wizard-storefront-feature__search::before{content:'🔍'}.wc-wizard-storefront .wc-wizard-storefront-feature__compatibility::before{content:'🔧'}.wc-wizard-storefront .wc-wizard-storefront-feature__extendable::before{content:'🎨'}.wc-wizard-services{border:1px solid #eee;padding:0;margin:0 0 1em;list-style:none outside;border-radius:4px;overflow:hidden}.wc-wizard-services p{margin:0 0 1em 0;padding:0;font-size:1em;line-height:1.5em}.wc-wizard-service-item,.wc-wizard-services-list-toggle{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-wrap:nowrap;-ms-flex-wrap:nowrap;flex-wrap:nowrap;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between;padding:0;border-bottom:1px solid #eee;color:#666}.wc-wizard-service-item:last-child,.wc-wizard-services-list-toggle:last-child{border-bottom:0}.wc-wizard-service-item .payment-gateway-fee,.wc-wizard-services-list-toggle .payment-gateway-fee{color:#a6a6a6}.wc-wizard-service-item .wc-wizard-service-name,.wc-wizard-services-list-toggle .wc-wizard-service-name{-webkit-flex-basis:0;-ms-flex-preferred-size:0;flex-basis:0;min-width:160px;text-align:center;font-weight:700;padding:2em 0;-webkit-align-self:stretch;-ms-flex-item-align:stretch;align-self:stretch;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center}.wc-wizard-service-item .wc-wizard-service-name img,.wc-wizard-services-list-toggle .wc-wizard-service-name img{max-width:75px}.wc-wizard-service-item.paypal-logo .wc-wizard-service-name img,.wc-wizard-services-list-toggle.paypal-logo .wc-wizard-service-name img{max-width:87px}.wc-wizard-service-item.klarna-logo .wc-wizard-service-name,.wc-wizard-services-list-toggle.klarna-logo .wc-wizard-service-name{background:#000}.wc-wizard-service-item.klarna-logo .wc-wizard-service-name img,.wc-wizard-services-list-toggle.klarna-logo .wc-wizard-service-name img{max-width:87px}.wc-wizard-service-item.square-logo .wc-wizard-service-name,.wc-wizard-services-list-toggle.square-logo .wc-wizard-service-name{background:#000}.wc-wizard-service-item.square-logo .wc-wizard-service-name img,.wc-wizard-services-list-toggle.square-logo .wc-wizard-service-name img{max-width:95px}.wc-wizard-service-item .wc-wizard-service-description,.wc-wizard-services-list-toggle .wc-wizard-service-description{-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;padding:2em 20px}.wc-wizard-service-item .wc-wizard-service-description p,.wc-wizard-services-list-toggle .wc-wizard-service-description p{margin-bottom:0}.wc-wizard-service-item .wc-wizard-service-description .wc-wizard-service-settings,.wc-wizard-services-list-toggle .wc-wizard-service-description .wc-wizard-service-settings{margin-top:1em}.wc-wizard-service-item .wc-wizard-service-description .wc-wizard-service-settings-description,.wc-wizard-services-list-toggle .wc-wizard-service-description .wc-wizard-service-settings-description{display:block;font-style:italic;color:#999}.wc-wizard-service-item .wc-wizard-service-enable,.wc-wizard-services-list-toggle .wc-wizard-service-enable{-webkit-flex-basis:0;-ms-flex-preferred-size:0;flex-basis:0;min-width:75px;text-align:center;cursor:pointer;padding:2em 0;position:relative}.wc-wizard-service-item .wc-wizard-service-toggle,.wc-wizard-services-list-toggle .wc-wizard-service-toggle{height:16px;width:32px;border:2px solid #935687;background-color:#935687;display:inline-block;text-indent:-9999px;border-radius:10em;position:relative}.wc-wizard-service-item .wc-wizard-service-toggle input[type=checkbox],.wc-wizard-services-list-toggle .wc-wizard-service-toggle input[type=checkbox]{display:none}.wc-wizard-service-item .wc-wizard-service-toggle:before,.wc-wizard-services-list-toggle .wc-wizard-service-toggle:before{content:"";display:block;width:16px;height:16px;background:#fff;position:absolute;top:0;right:0;border-radius:100%}.wc-wizard-service-item .wc-wizard-service-toggle.disabled,.wc-wizard-services-list-toggle .wc-wizard-service-toggle.disabled{border-color:#999;background-color:#999}.wc-wizard-service-item .wc-wizard-service-toggle.disabled:before,.wc-wizard-services-list-toggle .wc-wizard-service-toggle.disabled:before{right:auto;left:0}.wc-wizard-service-item .wc-wizard-service-settings,.wc-wizard-services-list-toggle .wc-wizard-service-settings{display:none;margin-bottom:0;cursor:default}.wc-wizard-service-item .wc-wizard-service-settings.hide,.wc-wizard-services-list-toggle .wc-wizard-service-settings.hide{display:none}.wc-wizard-service-item.checked .wc-wizard-service-settings,.wc-wizard-services-list-toggle.checked .wc-wizard-service-settings{display:inline-block}.wc-wizard-service-item.checked .wc-wizard-service-settings.hide,.wc-wizard-services-list-toggle.checked .wc-wizard-service-settings.hide{display:none}.wc-wizard-service-item.closed,.wc-wizard-services-list-toggle.closed{border-bottom:0}.wc-wizard-services-list-toggle .wc-wizard-service-enable::before{content:"\f343";font-family:dashicons;visibility:initial;color:#666;font-size:25px;margin-top:-7px;margin-left:-5px;position:absolute;visibility:visible}.wc-wizard-services-list-toggle.closed .wc-wizard-service-enable::before{content:"\f347"}.wc-wizard-services-list-toggle .wc-wizard-service-enable input{visibility:hidden;position:relative;cursor:pointer}.wc-wizard-services.manual .wc-wizard-service-item{display:none}.wc-wizard-services.shipping .wc-wizard-service-name{font-weight:400;text-align:left}.wc-wizard-services.shipping .wc-wizard-service-item{padding-left:2em}.wc-wizard-services.shipping .wc-wizard-service-item:first-child{border-bottom:0;padding-bottom:0;font-weight:700}.wc-wizard-services.shipping .wc-wizard-service-item:first-child .wc-wizard-service-name{font-weight:700}.wc-wizard-services.shipping .shipping-method-setting,.wc-wizard-services.shipping .wc-wizard-shipping-method-select{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex}.wc-wizard-services.shipping .shipping-method-setting.hide,.wc-wizard-services.shipping .wc-wizard-shipping-method-select.hide{display:none}.wc-wizard-services.shipping .shipping-method-setting input,.wc-wizard-services.shipping .wc-wizard-shipping-method-dropdown{margin-right:2em;margin-bottom:1em}.wc-wizard-services.shipping .shipping-method-setting input .select2,.wc-wizard-services.shipping .wc-wizard-shipping-method-dropdown .select2{min-width:130px}.wc-wizard-services.shipping .wc-wizard-service-description{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;color:#a6a6a6;font-size:.92em}.wc-wizard-services.shipping .shipping-method-setting input{width:95px;border:1px solid #aaa;border-color:#ddd;border-radius:4px;height:28px;padding-left:8px;padding-right:24px;font-size:14px;color:#444;background-color:#fff;display:inline-block}.wc-wizard-services.shipping .shipping-method-description,.wc-wizard-services.shipping .shipping-method-setting .description{color:#7e7e7e;font-size:.9em}.wc-wizard-services.shipping .shipping-method-setting input::-webkit-input-placeholder{color:#e1e1e1}.wc-wizard-services.shipping .shipping-method-setting input::-moz-placeholder{color:#e1e1e1}.wc-wizard-services.shipping .shipping-method-setting input:-ms-input-placeholder{color:#e1e1e1}.wc-wizard-services.shipping .shipping-method-setting input::-ms-input-placeholder{color:#e1e1e1}.wc-wizard-services.shipping .shipping-method-setting input::placeholder{color:#e1e1e1}.wc-setup-shipping-units p{line-height:1.5em;font-size:13px;margin-bottom:.25em}.wc-setup-shipping-units .wc-setup-shipping-unit{margin-bottom:1.75em}.wc-setup-shipping-units .wc-setup-shipping-unit .select2{min-width:100%}.hide{display:none}.wc-wizard-features{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap;list-style:none;padding:0}.wc-wizard-features .wc-wizard-feature-item{-webkit-flex-basis:calc(50% - 4em - 3px);-ms-flex-preferred-size:calc(50% - 4em - 3px);flex-basis:calc(50% - 4em - 3px);border:1px solid #eee;padding:2em}.wc-wizard-features .wc-wizard-feature-item:nth-child(1){border-radius:4px 0 0 0}.wc-wizard-features .wc-wizard-feature-item:nth-child(2){border-left:0;border-radius:0 4px 0 0}.wc-wizard-features .wc-wizard-feature-item:nth-child(3){border-top:0;border-radius:0 0 0 4px}.wc-wizard-features .wc-wizard-feature-item:nth-child(4){border-top:0;border-left:0;border-radius:0 0 4px 0}.wc-wizard-features p.wc-wizard-feature-description,.wc-wizard-features p.wc-wizard-feature-name{margin:0;line-height:1.5em}h3.jetpack-reasons{text-align:center;margin:3em 0 1em 0;font-size:14px}.jetpack-logo{display:block;margin:1.75em auto 2em auto;max-height:175px}.step{text-align:center}.wc-setup .wc-setup-actions .button{font-weight:300;font-size:16px;padding:1em 2em;-webkit-box-shadow:none;box-shadow:none;min-width:12em;min-width:auto;margin-top:10px}.wc-setup .wc-setup-actions .button:active,.wc-setup .wc-setup-actions .button:focus,.wc-setup .wc-setup-actions .button:hover{-webkit-box-shadow:none;box-shadow:none}.location-prompt{color:#666;font-size:13px;font-weight:500;margin-bottom:.5em;margin-top:1em;display:inline-block}.location-input{border:1px solid #aaa;border-color:#ddd;border-radius:4px;height:30px;width:calc(100% - 8px - 24px - 2px);padding-left:8px;padding-right:24px;font-size:16px;color:#444;background-color:#fff;display:inline-block}.location-input.dropdown{width:100%}.address-step .select2{min-width:100%}.store-address-container{margin-bottom:24px}.store-address-container .city-and-postcode{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex}.store-address-container .city-and-postcode div{-webkit-flex-basis:50%;-ms-flex-preferred-size:50%;flex-basis:50%;margin-right:1em}.store-address-container .city-and-postcode div:last-of-type{margin-right:0}.wc-wizard-service-settings .payment-email-input{border:1px solid #aaa;border-color:#ddd;border-radius:4px;height:30px;padding:0 8px;font-size:14px;color:#444;background-color:#fff;display:inline-block}.newsletter-form-container{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex}.newsletter-form-container .newsletter-form-email{border:1px solid #aaa;border-color:#ddd;border-radius:4px;height:42px;padding:0 8px;font-size:16px;color:#666;background-color:#fff;display:inline-block;margin-right:6px;-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1}.newsletter-form-container .newsletter-form-button-container{-webkit-box-flex:0;-webkit-flex-grow:0;-ms-flex-positive:0;flex-grow:0}.wc-setup .wc-setup-actions .button.newsletter-form-button{height:42px;padding:0 1em;margin:0}.wc-wizard-next-steps{border:1px solid #eee;border-radius:4px;list-style:none;padding:0}.wc-wizard-next-steps li{padding:0}.wc-wizard-next-steps .wc-wizard-next-step-item{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;border-top:1px solid #eee}.wc-wizard-next-steps .wc-wizard-next-step-item:first-child{border-top:0}.wc-wizard-next-steps .wc-wizard-next-step-description{-webkit-box-flex:1;-webkit-flex-grow:1;-ms-flex-positive:1;flex-grow:1;margin:1.5em}.wc-wizard-next-steps .wc-wizard-next-step-action{-webkit-box-flex:0;-webkit-flex-grow:0;-ms-flex-positive:0;flex-grow:0;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center}.wc-wizard-next-steps .wc-wizard-next-step-action .button{margin:1em}.wc-wizard-next-steps p.next-step-heading{margin:0;font-size:.95em;font-weight:400;font-variant:all-petite-caps}.wc-wizard-next-steps p.next-step-extra-info{margin:0}.wc-wizard-next-steps h3.next-step-description{margin:0;font-size:16px;font-weight:600}p.next-steps-help-text{color:#9f9f9f;padding:0 2em;text-align:center;font-size:.9em}p.jetpack-terms{font-size:.8em;text-align:center;max-width:480px;margin:0 auto;line-height:1.5em}.woocommerce-error{background:#ffe6e5;border-color:#ffc5c2;padding:1em;margin-bottom:1em}.woocommerce-error p{margin-top:0;margin-bottom:.5em;color:#444}.woocommerce-error a{color:#ff645c}.woocommerce-error .reconnect-reminder{font-size:.85em}.woocommerce-error .wc-setup-actions .button{font-size:14px}.allow-tracking{color:#9f9f9f;margin-top:1em;text-align:center;font-size:.9em;padding-top:2em;border-top:1px solid #ccc}.wc-wizard-service-setting-ppec_paypal_reroute_requests,.wc-wizard-service-setting-stripe_create_account{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:end;-webkit-align-items:flex-end;-ms-flex-align:end;align-items:flex-end;margin-top:.75em}.wc-wizard-service-setting-ppec_paypal_reroute_requests .payment-checkbox-input,.wc-wizard-service-setting-stripe_create_account .payment-checkbox-input{-webkit-box-ordinal-group:2;-webkit-order:1;-ms-flex-order:1;order:1;margin-left:0;margin-right:0;width:1.5em}.wc-wizard-service-setting-ppec_paypal_reroute_requests .ppec_paypal_reroute_requests,.wc-wizard-service-setting-ppec_paypal_reroute_requests .stripe_create_account,.wc-wizard-service-setting-stripe_create_account .ppec_paypal_reroute_requests,.wc-wizard-service-setting-stripe_create_account .stripe_create_account{-webkit-box-ordinal-group:3;-webkit-order:2;-ms-flex-order:2;order:2;margin-left:.3em}.wc-wizard-service-setting-ppec_paypal_api_subject,.wc-wizard-service-setting-stripe_email{margin-top:.75em}.wc-wizard-service-setting-ppec_paypal_api_subject label.ppec_paypal_api_subject,.wc-wizard-service-setting-ppec_paypal_api_subject label.stripe_email,.wc-wizard-service-setting-stripe_email label.ppec_paypal_api_subject,.wc-wizard-service-setting-stripe_email label.stripe_email{position:absolute;margin:-1px;padding:0;height:1px;width:1px;overflow:hidden;clip:rect(0 0 0 0);border:0}.wc-wizard-service-setting-ppec_paypal_api_subject input.payment-email-input,.wc-wizard-service-setting-stripe_email input.payment-email-input{margin-left:1.5em;margin-bottom:.5em;width:100%}.wc-wizard-service-setting-ppec_paypal_api_subject .wc-wizard-service-settings-description,.wc-wizard-service-setting-stripe_email .wc-wizard-service-settings-description{margin-left:1.5em}
\ No newline at end of file
diff --git a/assets/css/wc-setup.scss b/assets/css/wc-setup.scss
index 7d9db9c4b24..46aec319cb4 100644
--- a/assets/css/wc-setup.scss
+++ b/assets/css/wc-setup.scss
@@ -483,7 +483,8 @@ body {
 	}
 }
 
-.wc-wizard-service-item, .wc-wizard-services-list-toggle {
+.wc-wizard-service-item,
+.wc-wizard-services-list-toggle {
 	display: flex;
 	flex-wrap: nowrap;
 	justify-content: space-between;
@@ -560,6 +561,7 @@ body {
 		text-align: center;
 		cursor: pointer;
 		padding: 2em 0;
+		position: relative;
 	}
 
 	.wc-wizard-service-toggle {
@@ -624,30 +626,31 @@ body {
 	}
 }
 
-// Toggle display a list of services
-.wc-wizard-service-enable input {
-	visibility: hidden;
-	position: relative;
-	cursor: pointer;
-
-	&:before {
-		content: "\f347"; // down chevron
+// Toggle display a list of services.
+.wc-wizard-services-list-toggle {
+	.wc-wizard-service-enable::before {
+		content: "\f343"; // up chevron
 		font-family: "dashicons";
 		visibility: initial;
 		color: #666;
 		font-size: 25px;
-		margin-left: -5px; // center it
-		top: -6px;
+		margin-top: -7px;
+		margin-left: -5px;
 		position: absolute;
+		visibility: visible;
+	}
+	&.closed {
+		.wc-wizard-service-enable::before {
+			content: "\f347"; // down chevron
+		}
+	}
+	.wc-wizard-service-enable input {
+		visibility: hidden;
+		position: relative;
+		cursor: pointer;
 	}
 }
 
-.wc-wizard-service-enable input:checked {
-	&:before {
-		content: "\f343"; // up chevron
-		top: -7px;
-	}
-}
 .wc-wizard-services.manual .wc-wizard-service-item {
 	display: none;
 }
diff --git a/includes/admin/class-wc-admin-setup-wizard.php b/includes/admin/class-wc-admin-setup-wizard.php
index 2a5dfa69e7f..d9b5b4ff66d 100644
--- a/includes/admin/class-wc-admin-setup-wizard.php
+++ b/includes/admin/class-wc-admin-setup-wizard.php
@@ -1153,7 +1153,7 @@ class WC_Admin_Setup_Wizard {
 					'type'        => 'email',
 					'value'       => $user_email,
 					'placeholder' => __( 'Email address to receive payments', 'woocommerce' ),
-					'description' => __( "Enter your email address and we'll authenticate payments for you. To claim a payment, you'll need to have a PayPal Business account or create one later. WooCommerce Services and Jetpack will be installed and activated for you.", 'woocommerce' ),
+					'description' => __( "Enter your email address and we'll authenticate payments for you. WooCommerce Services and Jetpack will be installed and activated for you.", 'woocommerce' ),
 					'required'    => true,
 				),
 			),
@@ -1432,8 +1432,8 @@ class WC_Admin_Setup_Wizard {
 						<?php esc_html_e( 'Collect payments from customers offline.', 'woocommerce' ); ?>
 					</div>
 					<div class="wc-wizard-service-enable">
-							<input class="wc-wizard-service-list-toggle" id="wc-wizard-service-list-toggle" type="checkbox">
-							<label for="wc-wizard-service-list-toggle"></label>
+						<input class="wc-wizard-service-list-toggle" id="wc-wizard-service-list-toggle" type="checkbox">
+						<label for="wc-wizard-service-list-toggle"></label>
 					</div>
 				</li>
 				<?php foreach ( $manual_gateways as $gateway_id => $gateway ) :
diff --git a/includes/admin/helper/class-wc-helper.php b/includes/admin/helper/class-wc-helper.php
index d50c0e4fb5c..e7d092b86cd 100644
--- a/includes/admin/helper/class-wc-helper.php
+++ b/includes/admin/helper/class-wc-helper.php
@@ -1205,12 +1205,18 @@ class WC_Helper {
 	}
 
 	/**
-	 * Add a note about available extension updates if Woo core has an update available.
+	 * Various Helper-related admin notices.
 	 */
 	public static function admin_notices() {
+		if ( apply_filters( 'woocommerce_helper_suppress_admin_notices', false ) ) {
+			return;
+		}
+
 		$screen    = get_current_screen();
 		$screen_id = $screen ? $screen->id : '';
 
+		self::_prompt_helper_connect( $screen_id );
+
 		if ( 'update-core' !== $screen_id ) {
 			return;
 		}
@@ -1220,12 +1226,48 @@ class WC_Helper {
 			return;
 		}
 
+		// Add a note about available extension updates if Woo core has an update available.
 		$notice = self::_get_extensions_update_notice();
 		if ( ! empty( $notice ) ) {
 			echo '<div class="updated woocommerce-message"><p>' . $notice . '</p></div>';
 		}
 	}
 
+	/**
+	 * Prompt a Helper connection if the user has WooCommerce.com extensions.
+	 */
+	private static function _prompt_helper_connect( $screen_id ) {
+		// Don't show the notice on the Helper screens.
+		if ( 'woocommerce_page_wc-addons' == $screen_id && ! empty( $_REQUEST['section'] ) && 'helper' == $_REQUEST['section'] ) {
+			return;
+		}
+
+		// We believe have an active connection.
+		$auth = WC_Helper_Options::get( 'auth' );
+		if ( ! empty( $auth['access_token'] ) ) {
+			return;
+		}
+
+		$active_plugins = apply_filters( 'active_plugins', get_option( 'active_plugins' ) );
+		if ( empty( $active_plugins ) ) {
+			return;
+		}
+
+		$woo_plugins = self::get_local_woo_plugins();
+		if ( empty( $woo_plugins ) ) {
+			return;
+		}
+
+		$active_woo_plugins = array_intersect_key( $woo_plugins, array_flip( $active_plugins ) );
+
+		if ( count( $active_woo_plugins ) > 0 ) {
+			/* translators: %s: helper screen url */
+			$notice = __( '<a href="%s">Connect your store</a> to WooCommerce.com to receive extensions updates and support.', 'woocommerce' );
+			$notice = sprintf( $notice, admin_url( 'admin.php?page=wc-addons&section=helper' ) );
+			echo '<div class="updated woocommerce-message"><p>' . $notice . '</p></div>';
+		}
+	}
+
 	/**
 	 * Get an update notice if one or more Woo extensions has an update available.
 	 *
diff --git a/includes/admin/list-tables/class-wc-admin-list-table-orders.php b/includes/admin/list-tables/class-wc-admin-list-table-orders.php
index 8260bc309f5..18a71083c75 100644
--- a/includes/admin/list-tables/class-wc-admin-list-table-orders.php
+++ b/includes/admin/list-tables/class-wc-admin-list-table-orders.php
@@ -17,7 +17,7 @@ if ( class_exists( 'WC_Admin_List_Table_Orders', false ) ) {
 }
 
 if ( ! class_exists( 'WC_Admin_List_Table', false ) ) {
-	include_once( 'abstract-class-wc-admin-list-table.php' );
+	include_once 'abstract-class-wc-admin-list-table.php';
 }
 
 /**
@@ -57,7 +57,7 @@ class WC_Admin_List_Table_Orders extends WC_Admin_List_Table {
 	/**
 	 * Define primary column.
 	 *
-	 * @return array
+	 * @return string
 	 */
 	protected function get_primary_column() {
 		return 'order_number';
@@ -153,7 +153,8 @@ class WC_Admin_List_Table_Orders extends WC_Admin_List_Table {
 		global $the_order;
 
 		if ( empty( $this->object ) || $this->object->get_id() !== $post_id ) {
-			$this->object = $the_order = wc_get_order( $post_id );
+			$this->object = wc_get_order( $post_id );
+			$the_order    = $this->object;
 		}
 	}
 
@@ -190,11 +191,13 @@ class WC_Admin_List_Table_Orders extends WC_Admin_List_Table {
 		$approved_comments_count = absint( $comment_count['approved'] );
 
 		if ( $approved_comments_count ) {
-			$latest_notes = wc_get_order_notes( array(
-				'order_id' => $this->object->get_id(),
-				'limit'    => 1,
-				'orderby'  => 'date_created_gmt',
-			) );
+			$latest_notes = wc_get_order_notes(
+				array(
+					'order_id' => $this->object->get_id(),
+					'limit'    => 1,
+					'orderby'  => 'date_created_gmt',
+				)
+			);
 
 			$latest_note = current( $latest_notes );
 
@@ -223,7 +226,11 @@ class WC_Admin_List_Table_Orders extends WC_Admin_List_Table {
 		$order_timestamp = $this->object->get_date_created()->getTimestamp();
 
 		if ( $order_timestamp > strtotime( '-1 day', current_time( 'timestamp', true ) ) ) {
-			$show_date = sprintf( _x( '%s ago', '%s = human-readable time difference', 'woocommerce' ), human_time_diff( $this->object->get_date_created()->getTimestamp(), current_time( 'timestamp', true ) ) );
+			$show_date = sprintf(
+				/* translators: %s: human-readable time difference */
+				_x( '%s ago', '%s = human-readable time difference', 'woocommerce' ),
+				human_time_diff( $this->object->get_date_created()->getTimestamp(), current_time( 'timestamp', true ) )
+			);
 		} else {
 			$show_date = $this->object->get_date_created()->date_i18n( apply_filters( 'woocommerce_admin_order_date_format', __( 'M j, Y', 'woocommerce' ) ) );
 		}
@@ -259,17 +266,17 @@ class WC_Admin_List_Table_Orders extends WC_Admin_List_Table {
 
 		if ( $this->object->has_status( array( 'pending', 'on-hold' ) ) ) {
 			$actions['processing'] = array(
-				'url'     => wp_nonce_url( admin_url( 'admin-ajax.php?action=woocommerce_mark_order_status&status=processing&order_id=' . $this->object->get_id() ), 'woocommerce-mark-order-status' ),
-				'name'    => __( 'Processing', 'woocommerce' ),
-				'action'  => 'processing',
+				'url'    => wp_nonce_url( admin_url( 'admin-ajax.php?action=woocommerce_mark_order_status&status=processing&order_id=' . $this->object->get_id() ), 'woocommerce-mark-order-status' ),
+				'name'   => __( 'Processing', 'woocommerce' ),
+				'action' => 'processing',
 			);
 		}
 
 		if ( $this->object->has_status( array( 'pending', 'on-hold', 'processing' ) ) ) {
 			$actions['complete'] = array(
-				'url'     => wp_nonce_url( admin_url( 'admin-ajax.php?action=woocommerce_mark_order_status&status=completed&order_id=' . $this->object->get_id() ), 'woocommerce-mark-order-status' ),
-				'name'    => __( 'Complete', 'woocommerce' ),
-				'action'  => 'complete',
+				'url'    => wp_nonce_url( admin_url( 'admin-ajax.php?action=woocommerce_mark_order_status&status=completed&order_id=' . $this->object->get_id() ), 'woocommerce-mark-order-status' ),
+				'name'   => __( 'Complete', 'woocommerce' ),
+				'action' => 'complete',
 			);
 		}
 
@@ -286,12 +293,14 @@ class WC_Admin_List_Table_Orders extends WC_Admin_List_Table {
 	 * Render columm: billing_address.
 	 */
 	protected function render_billing_address_column() {
-		if ( $address = $this->object->get_formatted_billing_address() ) {
+		$address = $this->object->get_formatted_billing_address();
+
+		if ( $address ) {
 			echo esc_html( preg_replace( '#<br\s*/?>#i', ', ', $address ) );
 
 			if ( $this->object->get_payment_method() ) {
 				/* translators: %s: payment method */
-				echo '<span class="description">' . sprintf( __( 'via %s', 'woocommerce' ), esc_html( $this->object->get_payment_method_title() ) ) . '</span>';
+				echo '<span class="description">' . sprintf( __( 'via %s', 'woocommerce' ), esc_html( $this->object->get_payment_method_title() ) ) . '</span>'; // WPCS: XSS ok.
 			}
 		} else {
 			echo '&ndash;';
@@ -302,11 +311,13 @@ class WC_Admin_List_Table_Orders extends WC_Admin_List_Table {
 	 * Render columm: shipping_address.
 	 */
 	protected function render_shipping_address_column() {
-		if ( $address = $this->object->get_formatted_shipping_address() ) {
+		$address = $this->object->get_formatted_shipping_address();
+
+		if ( $address ) {
 			echo '<a target="_blank" href="' . esc_url( $this->object->get_shipping_address_map_url() ) . '">' . esc_html( preg_replace( '#<br\s*/?>#i', ', ', $address ) ) . '</a>';
 			if ( $this->object->get_shipping_method() ) {
 				/* translators: %s: shipping method */
-				echo '<span class="description">' . sprintf( __( 'via %s', 'woocommerce' ), esc_html( $this->object->get_shipping_method() ) ) . '</span>';
+				echo '<span class="description">' . sprintf( __( 'via %s', 'woocommerce' ), esc_html( $this->object->get_shipping_method() ) ) . '</span>'; // WPCS: XSS ok.
 			}
 		} else {
 			echo '&ndash;';
@@ -326,6 +337,7 @@ class WC_Admin_List_Table_Orders extends WC_Admin_List_Table {
 					<section class="wc-backbone-modal-main" role="main">
 						<header class="wc-backbone-modal-header">
 							<mark class="order-status status-{{ data.status }}"><span>{{ data.status_name }}</span></mark>
+							<?php /* translators: %s: order ID */ ?>
 							<h1><?php echo esc_html( sprintf( __( 'Order #%s', 'woocommerce' ), '{{ data.order_number }}' ) ); ?></h1>
 							<button class="modal-close modal-close-link dashicons dashicons-no-alt">
 								<span class="screen-reader-text"><?php esc_html_e( 'Close modal panel', 'woocommerce' ); ?></span>
@@ -402,26 +414,30 @@ class WC_Admin_List_Table_Orders extends WC_Admin_List_Table {
 	 * @return string
 	 */
 	public static function get_order_preview_item_html( $order ) {
-		$hidden_order_itemmeta = apply_filters( 'woocommerce_hidden_order_itemmeta', array(
-			'_qty',
-			'_tax_class',
-			'_product_id',
-			'_variation_id',
-			'_line_subtotal',
-			'_line_subtotal_tax',
-			'_line_total',
-			'_line_tax',
-			'method_id',
-			'cost',
-		) );
+		$hidden_order_itemmeta = apply_filters(
+			'woocommerce_hidden_order_itemmeta', array(
+				'_qty',
+				'_tax_class',
+				'_product_id',
+				'_variation_id',
+				'_line_subtotal',
+				'_line_subtotal_tax',
+				'_line_total',
+				'_line_tax',
+				'method_id',
+				'cost',
+			)
+		);
 
 		$line_items = apply_filters( 'woocommerce_admin_order_preview_line_items', $order->get_items(), $order );
-		$columns    = apply_filters( 'woocommerce_admin_order_preview_line_item_columns', array(
-			'product'  => __( 'Product', 'woocommerce' ),
-			'quantity' => __( 'Quantity', 'woocommerce' ),
-			'tax'      => __( 'Tax', 'woocommerce' ),
-			'total'    => __( 'Total', 'woocommerce' ),
-		), $order );
+		$columns    = apply_filters(
+			'woocommerce_admin_order_preview_line_item_columns', array(
+				'product'  => __( 'Product', 'woocommerce' ),
+				'quantity' => __( 'Quantity', 'woocommerce' ),
+				'tax'      => __( 'Tax', 'woocommerce' ),
+				'total'    => __( 'Total', 'woocommerce' ),
+			), $order
+		);
 
 		if ( ! wc_tax_enabled() ) {
 			unset( $columns['tax'] );
@@ -457,7 +473,9 @@ class WC_Admin_List_Table_Orders extends WC_Admin_List_Table {
 							$html .= '<div class="wc-order-item-sku">' . esc_html( $product_object->get_sku() ) . '</div>';
 						}
 
-						if ( $meta_data = $item->get_formatted_meta_data( '' ) ) {
+						$meta_data = $item->get_formatted_meta_data( '' );
+
+						if ( $meta_data ) {
 							$html .= '<table cellspacing="0" class="wc-order-item-meta">';
 
 							foreach ( $meta_data as $meta_id => $meta ) {
@@ -478,7 +496,7 @@ class WC_Admin_List_Table_Orders extends WC_Admin_List_Table {
 					case 'total':
 						$html .= wc_price( $item->get_total(), array( 'currency' => $order->get_currency() ) );
 						break;
-					default :
+					default:
 						$html .= apply_filters( 'woocommerce_admin_order_preview_line_item_column_' . sanitize_key( $column ), '', $item, $item_id, $order );
 						break;
 				}
@@ -508,25 +526,25 @@ class WC_Admin_List_Table_Orders extends WC_Admin_List_Table {
 
 		if ( $order->has_status( array( 'pending' ) ) ) {
 			$status_actions['on-hold'] = array(
-				'url'       => wp_nonce_url( admin_url( 'admin-ajax.php?action=woocommerce_mark_order_status&status=on-hold&order_id=' . $order->get_id() ), 'woocommerce-mark-order-status' ),
-				'name'      => __( 'On-hold', 'woocommerce' ),
-				'action'    => 'on-hold',
+				'url'    => wp_nonce_url( admin_url( 'admin-ajax.php?action=woocommerce_mark_order_status&status=on-hold&order_id=' . $order->get_id() ), 'woocommerce-mark-order-status' ),
+				'name'   => __( 'On-hold', 'woocommerce' ),
+				'action' => 'on-hold',
 			);
 		}
 
 		if ( $order->has_status( array( 'pending', 'on-hold' ) ) ) {
 			$status_actions['processing'] = array(
-				'url'       => wp_nonce_url( admin_url( 'admin-ajax.php?action=woocommerce_mark_order_status&status=processing&order_id=' . $order->get_id() ), 'woocommerce-mark-order-status' ),
-				'name'      => __( 'Processing', 'woocommerce' ),
-				'action'    => 'processing',
+				'url'    => wp_nonce_url( admin_url( 'admin-ajax.php?action=woocommerce_mark_order_status&status=processing&order_id=' . $order->get_id() ), 'woocommerce-mark-order-status' ),
+				'name'   => __( 'Processing', 'woocommerce' ),
+				'action' => 'processing',
 			);
 		}
 
 		if ( $order->has_status( array( 'pending', 'on-hold', 'processing' ) ) ) {
 			$status_actions['complete'] = array(
-				'url'       => wp_nonce_url( admin_url( 'admin-ajax.php?action=woocommerce_mark_order_status&status=completed&order_id=' . $order->get_id() ), 'woocommerce-mark-order-status' ),
-				'name'      => __( 'Completed', 'woocommerce' ),
-				'action'    => 'complete',
+				'url'    => wp_nonce_url( admin_url( 'admin-ajax.php?action=woocommerce_mark_order_status&status=completed&order_id=' . $order->get_id() ), 'woocommerce-mark-order-status' ),
+				'name'   => __( 'Completed', 'woocommerce' ),
+				'action' => 'complete',
 			);
 		}
 
@@ -554,30 +572,39 @@ class WC_Admin_List_Table_Orders extends WC_Admin_List_Table {
 		$payment_via      = $order->get_payment_method_title();
 		$payment_method   = $order->get_payment_method();
 		$payment_gateways = WC()->payment_gateways() ? WC()->payment_gateways->payment_gateways() : array();
+		$transaction_id   = $order->get_transaction_id();
 
-		if ( $transaction_id = $order->get_transaction_id() ) {
-			if ( isset( $payment_gateways[ $payment_method ] ) && ( $url = $payment_gateways[ $payment_method ]->get_transaction_url( $order ) ) ) {
+		if ( $transaction_id ) {
+
+			$url = isset( $payment_gateways[ $payment_method ] ) ? $payment_gateways[ $payment_method ]->get_transaction_url( $order ) : false;
+
+			if ( $url ) {
 				$payment_via .= ' (<a href="' . esc_url( $url ) . '" target="_blank">' . esc_html( $transaction_id ) . '</a>)';
 			} else {
 				$payment_via .= ' (' . esc_html( $transaction_id ) . ')';
 			}
 		}
 
-		return apply_filters( 'woocommerce_admin_order_preview_get_order_details', array(
-			'data'                       => $order->get_data(),
-			'order_number'               => $order->get_order_number(),
-			'item_html'                  => WC_Admin_List_Table_Orders::get_order_preview_item_html( $order ),
-			'actions_html'               => WC_Admin_List_Table_Orders::get_order_preview_actions_html( $order ),
-			'ship_to_billing'            => wc_ship_to_billing_address_only(),
-			'needs_shipping'             => $order->needs_shipping_address(),
-			'formatted_billing_address'  => ( $address = $order->get_formatted_billing_address() ) ? $address : __( 'N/A', 'woocommerce' ),
-			'formatted_shipping_address' => ( $address = $order->get_formatted_shipping_address() ) ? $address: __( 'N/A', 'woocommerce' ),
-			'shipping_address_map_url'   => $order->get_shipping_address_map_url(),
-			'payment_via'                => $payment_via,
-			'shipping_via'               => $order->get_shipping_method(),
-			'status'                     => $order->get_status(),
-			'status_name'                => wc_get_order_status_name( $order->get_status() ),
-		), $order );
+		$billing_address  = $order->get_formatted_billing_address();
+		$shipping_address = $order->get_formatted_shipping_address();
+
+		return apply_filters(
+			'woocommerce_admin_order_preview_get_order_details', array(
+				'data'                       => $order->get_data(),
+				'order_number'               => $order->get_order_number(),
+				'item_html'                  => WC_Admin_List_Table_Orders::get_order_preview_item_html( $order ),
+				'actions_html'               => WC_Admin_List_Table_Orders::get_order_preview_actions_html( $order ),
+				'ship_to_billing'            => wc_ship_to_billing_address_only(),
+				'needs_shipping'             => $order->needs_shipping_address(),
+				'formatted_billing_address'  => $billing_address ? $billing_address : __( 'N/A', 'woocommerce' ),
+				'formatted_shipping_address' => $shipping_address ? $shipping_address : __( 'N/A', 'woocommerce' ),
+				'shipping_address_map_url'   => $order->get_shipping_address_map_url(),
+				'payment_via'                => $payment_via,
+				'shipping_via'               => $order->get_shipping_method(),
+				'status'                     => $order->get_status(),
+				'status_name'                => wc_get_order_status_name( $order->get_status() ),
+			), $order
+		);
 	}
 
 	/**
@@ -605,7 +632,7 @@ class WC_Admin_List_Table_Orders extends WC_Admin_List_Table {
 		}
 
 		$changed = 0;
-		$ids = array_map( 'absint', $ids );
+		$ids     = array_map( 'absint', $ids );
 
 		foreach ( $ids as $id ) {
 			$order = wc_get_order( $id );
@@ -614,12 +641,14 @@ class WC_Admin_List_Table_Orders extends WC_Admin_List_Table {
 			$changed++;
 		}
 
-		$redirect_to = add_query_arg( array(
-			'post_type'    => $this->list_table_type,
-			$report_action => true,
-			'changed'      => $changed,
-			'ids'          => join( ',', $ids ),
-		), $redirect_to );
+		$redirect_to = add_query_arg(
+			array(
+				'post_type'    => $this->list_table_type,
+				$report_action => true,
+				'changed'      => $changed,
+				'ids'          => join( ',', $ids ),
+			), $redirect_to
+		);
 
 		return esc_url_raw( $redirect_to );
 	}
@@ -669,10 +698,11 @@ class WC_Admin_List_Table_Orders extends WC_Admin_List_Table {
 		$user_id     = '';
 
 		if ( ! empty( $_GET['_customer_user'] ) ) { // WPCS: input var ok.
-			$user_id     = absint( $_GET['_customer_user'] ); // WPCS: input var ok, sanitization ok.
-			$user        = get_user_by( 'id', $user_id );
-			/* translators: 1: user display name 2: user ID 3: user email */
+			$user_id = absint( $_GET['_customer_user'] ); // WPCS: input var ok, sanitization ok.
+			$user    = get_user_by( 'id', $user_id );
+
 			$user_string = sprintf(
+				/* translators: 1: user display name 2: user ID 3: user email */
 				esc_html__( '%1$s (#%2$s &ndash; %3$s)', 'woocommerce' ),
 				$user->display_name,
 				absint( $user->ID ),
diff --git a/includes/class-wc-background-emailer.php b/includes/class-wc-background-emailer.php
index 332cae0b30a..c5b9412abe8 100644
--- a/includes/class-wc-background-emailer.php
+++ b/includes/class-wc-background-emailer.php
@@ -29,16 +29,17 @@ if ( ! class_exists( 'WP_Background_Process', false ) ) {
 class WC_Background_Emailer extends WP_Background_Process {
 
 	/**
-	 * @var string
-	 */
-	protected $action = 'wc_emailer';
-
-	/**
-	 * Initiate new background process
+	 * Initiate new background process.
 	 */
 	public function __construct() {
+		// Uses unique prefix per blog so each blog has separate queue.
+		$this->prefix = 'wp_' . get_current_blog_id();
+		$this->action = 'wc_emailer';
+
+		// Dispatch queue after shutdown.
+		add_action( 'shutdown', array( $this, 'dispatch_queue' ), 100 );
+
 		parent::__construct();
-		add_action( 'shutdown', array( $this, 'dispatch_queue' ) );
 	}
 
 	/**
@@ -74,11 +75,40 @@ class WC_Background_Emailer extends WP_Background_Process {
 		return false;
 	}
 
+	/**
+	 * Finishes replying to the client, but keeps the process running for further (async) code execution.
+	 *
+	 * @see https://core.trac.wordpress.org/ticket/41358 .
+	 */
+	protected function close_http_connection() {
+		// Only 1 PHP process can access a session object at a time, close this so the next request isn't kept waiting.
+		// @codingStandardsIgnoreStart
+		if ( session_id() ) {
+			session_write_close();
+		}
+		// @codingStandardsIgnoreEnd
+
+		wc_set_time_limit( 0 );
+
+		// fastcgi_finish_request is the cleanest way to send the response and keep the script running, but not every server has it.
+		if ( is_callable( 'fastcgi_finish_request' ) ) {
+			fastcgi_finish_request();
+		} else {
+			// Fallback: send headers and flush buffers.
+			if ( ! headers_sent() ) {
+				header( 'Connection: close' );
+			}
+			@ob_end_flush();
+			flush();
+		}
+	}
+
 	/**
 	 * Save and run queue.
 	 */
 	public function dispatch_queue() {
 		if ( ! empty( $this->data ) ) {
+			$this->close_http_connection();
 			$this->save()->dispatch();
 		}
 	}
diff --git a/includes/class-wc-background-updater.php b/includes/class-wc-background-updater.php
index cb51496368d..87dbf6e3932 100644
--- a/includes/class-wc-background-updater.php
+++ b/includes/class-wc-background-updater.php
@@ -29,9 +29,15 @@ if ( ! class_exists( 'WP_Background_Process', false ) ) {
 class WC_Background_Updater extends WP_Background_Process {
 
 	/**
-	 * @var string
+	 * Initiate new background process.
 	 */
-	protected $action = 'wc_updater';
+	public function __construct() {
+		// Uses unique prefix per blog so each blog has separate queue.
+		$this->prefix = 'wp_' . get_current_blog_id();
+		$this->action = 'wc_updater';
+
+		parent::__construct();
+	}
 
 	/**
 	 * Dispatch updater.
diff --git a/includes/class-wc-install.php b/includes/class-wc-install.php
index 31128d80558..0c39d7e2fa4 100644
--- a/includes/class-wc-install.php
+++ b/includes/class-wc-install.php
@@ -157,7 +157,7 @@ class WC_Install {
 			WC_Admin_Notices::add_notice( 'update' );
 		}
 		if ( ! empty( $_GET['force_update_woocommerce'] ) ) {
-			do_action( 'wp_wc_updater_cron' );
+			do_action( 'wp_' . get_current_blog_id() . '_wc_updater_cron' );
 			wp_safe_redirect( admin_url( 'admin.php?page=wc-settings' ) );
 			exit;
 		}
diff --git a/includes/class-wc-regenerate-images-request.php b/includes/class-wc-regenerate-images-request.php
index fadc8f24491..6bee8a70706 100644
--- a/includes/class-wc-regenerate-images-request.php
+++ b/includes/class-wc-regenerate-images-request.php
@@ -19,11 +19,15 @@ if ( ! defined( 'ABSPATH' ) ) {
 class WC_Regenerate_Images_Request extends WP_Background_Process {
 
 	/**
-	 * Action to hook onto
-	 *
-	 * @var string
+	 * Initiate new background process.
 	 */
-	protected $action = 'woocommerce_regenerate_images';
+	public function __construct() {
+		// Uses unique prefix per blog so each blog has separate queue.
+		$this->prefix = 'wp_' . get_current_blog_id();
+		$this->action = 'wc_regenerate_images';
+
+		parent::__construct();
+	}
 
 	/**
 	 * Fires when the job should start
diff --git a/includes/wc-template-functions.php b/includes/wc-template-functions.php
index 0543361d6bd..8529a0f9a20 100644
--- a/includes/wc-template-functions.php
+++ b/includes/wc-template-functions.php
@@ -1759,7 +1759,52 @@ if ( ! function_exists( 'woocommerce_products_will_display' ) ) {
 	 * @return bool
 	 */
 	function woocommerce_products_will_display() {
-		return 0 < wc_get_loop_prop( 'total', 0 );
+		$display_type = woocommerce_get_loop_display_mode();
+
+		return 0 < wc_get_loop_prop( 'total', 0 ) && $display_type !== 'subcategories';
+	}
+}
+
+if ( ! function_exists( 'woocommerce_get_loop_display_mode' ) ) {
+
+	/**
+	 * See what is going to display in the loop.
+	 *
+	 * @since 3.3.0
+	 * @return string Either products, subcategories, or both, based on current page.
+	 */
+	function woocommerce_get_loop_display_mode() {
+		// Only return products when filtering things.
+		if ( 1 < wc_get_loop_prop( 'current_page' ) || wc_get_loop_prop( 'is_search' ) || wc_get_loop_prop( 'is_filtered' ) ) {
+			return 'products';
+		}
+
+		$parent_id    = 0;
+		$display_type = '';
+
+		if ( is_shop() ) {
+			$display_type = get_option( 'woocommerce_shop_page_display', '' );
+		} elseif ( is_product_category() ) {
+			$parent_id    = get_queried_object_id();
+			$display_type = get_woocommerce_term_meta( $parent_id, 'display_type', true );
+			$display_type = '' === $display_type ? get_option( 'woocommerce_category_archive_display', '' ) : $display_type;
+		}
+
+		// Ensure valid value.
+		if ( '' === $display_type || ! in_array( $display_type, array( 'products', 'subcategories', 'both' ), true ) ) {
+			$display_type = 'products';
+		}
+
+		// If we're showing categories, ensure we actually have something to show.
+		if ( in_array( $display_type, array( 'subcategories', 'both' ), true ) ) {
+			$subcategories = woocommerce_get_product_subcategories( $parent_id );
+
+			if ( empty( $subcategories ) ) {
+				$display_type = 'products';
+			}
+		}
+
+		return $display_type;
 	}
 }
 
@@ -1773,28 +1818,13 @@ if ( ! function_exists( 'woocommerce_maybe_show_product_subcategories' ) ) {
 	 * @return string
 	 */
 	function woocommerce_maybe_show_product_subcategories( $loop_html ) {
-		// Don't show when filtering, searching or when on page > 1.
-		if ( 1 < wc_get_loop_prop( 'current_page' ) || wc_get_loop_prop( 'is_search' ) || wc_get_loop_prop( 'is_filtered' ) ) {
-			return $loop_html;
-		}
-
-		$parent_id    = 0;
-		$display_type = '';
-
-		// Check categories are enabled and see what level to query.
-		if ( is_shop() ) {
-			$display_type = get_option( 'woocommerce_shop_page_display', '' );
-		} elseif ( is_product_category() ) {
-			$parent_id    = get_queried_object_id();
-			$display_type = get_woocommerce_term_meta( $parent_id, 'display_type', true );
-			$display_type = '' === $display_type ? get_option( 'woocommerce_category_archive_display', '' ) : $display_type;
-		}
+		$display_type = woocommerce_get_loop_display_mode();
 
 		// If displaying categories, append to the loop.
-		if ( '' !== $display_type ) {
+		if ( 'subcategories' === $display_type || 'both' === $display_type ) {
 			ob_start();
 			woocommerce_product_subcategories( array(
-				'parent_id'    => $parent_id,
+				'parent_id' => is_product_category() ? get_queried_object_id() : 0,
 			) );
 			$loop_html .= ob_get_clean();
 
@@ -1807,8 +1837,39 @@ if ( ! function_exists( 'woocommerce_maybe_show_product_subcategories' ) ) {
 	}
 }
 
-if ( ! function_exists( 'woocommerce_product_subcategories' ) ) {
+if ( ! function_exists( 'woocommerce_get_product_subcategories' ) ) {
+	/**
+	 * Get (and cache) product subcategories.
+	 *
+	 * @param int $parent_id Get subcategories of this ID.
+	 * @return array
+	 */
+	function woocommerce_get_product_subcategories( $parent_id = 0 ) {
+		$parent_id          = absint( $parent_id );
+		$product_categories = wp_cache_get( 'product-categories-' . $parent_id, 'product_cat' );
 
+		if ( false === $product_categories ) {
+			// NOTE: using child_of instead of parent - this is not ideal but due to a WP bug ( https://core.trac.wordpress.org/ticket/15626 ) pad_counts won't work.
+			$product_categories = get_categories( apply_filters( 'woocommerce_product_subcategories_args', array(
+				'parent'       => $parent_id,
+				'menu_order'   => 'ASC',
+				'hide_empty'   => 0,
+				'hierarchical' => 1,
+				'taxonomy'     => 'product_cat',
+				'pad_counts'   => 1,
+			) ) );
+			wp_cache_set( 'product-categories-' . $parent_id, $product_categories, 'product_cat' );
+		}
+
+		if ( apply_filters( 'woocommerce_product_subcategories_hide_empty', true ) ) {
+			$product_categories = wp_list_filter( $product_categories, array( 'count' => 0 ), 'NOT' );
+		}
+
+		return $product_categories;
+	}
+}
+
+if ( ! function_exists( 'woocommerce_product_subcategories' ) ) {
 	/**
 	 * Display product sub categories as thumbnails.
 	 *
@@ -1822,19 +1883,7 @@ if ( ! function_exists( 'woocommerce_product_subcategories' ) ) {
 			'parent_id'    => 0,
 		) );
 
-		// NOTE: using child_of instead of parent - this is not ideal but due to a WP bug ( https://core.trac.wordpress.org/ticket/15626 ) pad_counts won't work.
-		$product_categories = get_categories( apply_filters( 'woocommerce_product_subcategories_args', array(
-			'parent'       => $args['parent_id'],
-			'menu_order'   => 'ASC',
-			'hide_empty'   => 0,
-			'hierarchical' => 1,
-			'taxonomy'     => 'product_cat',
-			'pad_counts'   => 1,
-		) ) );
-
-		if ( apply_filters( 'woocommerce_product_subcategories_hide_empty', true ) ) {
-			$product_categories = wp_list_filter( $product_categories, array( 'count' => 0 ), 'NOT' );
-		}
+		$product_categories = woocommerce_get_product_subcategories( $args['parent_id'] );
 
 		if ( ! $product_categories ) {
 			return false;
diff --git a/templates/archive-product.php b/templates/archive-product.php
index 87529deec6b..8c21f24f86c 100644
--- a/templates/archive-product.php
+++ b/templates/archive-product.php
@@ -49,7 +49,7 @@ do_action( 'woocommerce_before_main_content' );
 </header>
 <?php
 
-if ( have_posts() ) :
+if ( have_posts() ) {
 
 	/**
 	 * Hook: woocommerce_before_shop_loop.
@@ -62,18 +62,20 @@ if ( have_posts() ) :
 
 	woocommerce_product_loop_start();
 
-	while ( have_posts() ) :
-		the_post();
+	if ( wc_get_loop_prop( 'total' ) ) {
+		while ( have_posts() ) {
+			the_post();
 
-		/**
-		 * Hook: woocommerce_shop_loop.
-		 *
-		 * @hooked WC_Structured_Data::generate_product_data() - 10
-		 */
-		do_action( 'woocommerce_shop_loop' );
+			/**
+			 * Hook: woocommerce_shop_loop.
+			 *
+			 * @hooked WC_Structured_Data::generate_product_data() - 10
+			 */
+			do_action( 'woocommerce_shop_loop' );
 
-		wc_get_template_part( 'content', 'product' );
-	endwhile;
+			wc_get_template_part( 'content', 'product' );
+		}
+	}
 
 	woocommerce_product_loop_end();
 
@@ -83,17 +85,14 @@ if ( have_posts() ) :
 	 * @hooked woocommerce_pagination - 10
 	 */
 	do_action( 'woocommerce_after_shop_loop' );
-
-else :
-
+} else {
 	/**
 	 * Hook: woocommerce_no_products_found.
 	 *
 	 * @hooked wc_no_products_found - 10
 	 */
 	do_action( 'woocommerce_no_products_found' );
-
-endif;
+}
 
 /**
  * Hook: woocommerce_after_main_content.
diff --git a/tests/unit-tests/libraries/class-wc-mock-background-process.php b/tests/unit-tests/libraries/class-wc-mock-background-process.php
new file mode 100644
index 00000000000..faad835c8dd
--- /dev/null
+++ b/tests/unit-tests/libraries/class-wc-mock-background-process.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Test WP_Background_Process functionality
+ *
+ * A mock class for testing the WP_Background_Process functionality.
+ *
+ * @since 3.3
+ */
+class WC_Mock_Background_Process extends WP_Background_Process {
+	/**
+	 * Constructor.
+	 */
+	public function __construct() {
+		// Uses unique prefix per blog so each blog has separate queue.
+		$this->prefix = 'wp_' . get_current_blog_id();
+		$this->action = 'wc_mock_background_process';
+		parent::__construct();
+	}
+
+	/**
+	 * Fires when the job should start.
+	 *
+	 * @return void
+	 */
+	public function dispatch() {
+		parent::dispatch();
+	}
+
+	/**
+	 * Return the identifier string.
+	 *
+	 * @return void
+	 */
+	public function get_identifier() {
+		return $this->identifier;
+	}
+
+	/**
+	 * Returns whether queue is empty or not.
+	 *
+	 * @return boolean
+	 */
+	public function is_queue_empty() {
+		return parent::is_queue_empty();
+	}
+
+	/**
+	 * Rerturns the batch data.
+	 *
+	 * @return void
+	 */
+	public function get_batch() {
+		return parent::get_batch();
+	}
+
+	/**
+	 * Code to execute for each item in the queue
+	 *
+	 * @param mixed $item Queue item to iterate over.
+	 * @return bool
+	 */
+	protected function task( $item ) {
+		// We sleep for 5 seconds to mimic a long running tast to complete some tests.
+		sleep( 5 );
+		update_option( $item['mock_key'], $item['mock_value'] );
+		return false;
+	}
+}
diff --git a/tests/unit-tests/libraries/wp-background-process.php b/tests/unit-tests/libraries/wp-background-process.php
new file mode 100644
index 00000000000..f57e01f6d47
--- /dev/null
+++ b/tests/unit-tests/libraries/wp-background-process.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * WP_Background_Processing Tests.
+ *
+ * @package WooCommerce\Tests\Libraries
+ */
+
+/**
+ * Class Functions.
+ *
+ * @since 3.3
+ */
+class WC_Tests_Libraries_Background_Process extends WC_Unit_Test_Case {
+
+	/**
+	 * Test the is_queue_empty function.
+	 *
+	 * @return void
+	 */
+	public function test_is_queue_empty() {
+		require_once( dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'class-wc-mock-background-process.php' );
+		$queue = new WC_Mock_Background_Process();
+		$this->assertEquals( true, $queue->is_queue_empty() );
+		$queue->push_to_queue( array(
+			'mock_key' => 'mock_value',
+		) );
+		$queue->save();
+		$this->assertEquals( false, $queue->is_queue_empty() );
+	}
+
+	/**
+	 * Make sure the cron works.
+	 *
+	 * @return void
+	 */
+	public function test_schedule_cron_healthcheck() {
+		require_once( dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'class-wc-mock-background-process.php' );
+		$queue = new WC_Mock_Background_Process();
+		$this->assertArrayHasKey( 'wp_' . get_current_blog_id() . '_wc_mock_background_process_cron_interval', $queue->schedule_cron_healthcheck( array() ) );
+	}
+	/**
+	 * Test prefix & action against identifier.
+	 */
+	public function test_identifier() {
+		require_once( dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'class-wc-mock-background-process.php' );
+		$queue = new WC_Mock_Background_Process();
+		$this->assertEquals( 'wp_' . get_current_blog_id() . '_wc_mock_background_process', $queue->get_identifier() );
+	}
+
+	/**
+	 * Test to make sure a batch is returned.
+	 *
+	 * @return void
+	 */
+	public function test_get_batch() {
+		require_once( dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'class-wc-mock-background-process.php' );
+		$queue = new WC_Mock_Background_Process();
+		$queue->push_to_queue( array(
+			'mock_key' => 'mock_value',
+		) );
+		$queue->save();
+		$this->assertNotEmpty( $queue->get_batch() );
+	}
+
+
+}
diff --git a/tests/unit-tests/order/crud.php b/tests/unit-tests/order/class-wc-tests-crud-orders.php
similarity index 74%
rename from tests/unit-tests/order/crud.php
rename to tests/unit-tests/order/class-wc-tests-crud-orders.php
index 1d6627d7d21..85c12198a3d 100644
--- a/tests/unit-tests/order/crud.php
+++ b/tests/unit-tests/order/class-wc-tests-crud-orders.php
@@ -1,7 +1,13 @@
 <?php
+/**
+ * Class WC_Tests_CRUD_Orders file.
+ *
+ * @package WooCommerce\Tests\CRUD
+ */
 
 /**
  * Meta
+ *
  * @package WooCommerce\Tests\CRUD
  */
 class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
@@ -9,7 +15,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_type
 	 */
-	function test_get_type() {
+	public function test_get_type() {
 		$object = new WC_Order();
 		$this->assertEquals( 'shop_order', $object->get_type() );
 	}
@@ -17,7 +23,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_data
 	 */
-	function test_get_data() {
+	public function test_get_data() {
 		$object = new WC_Order();
 		$this->assertInternalType( 'array', $object->get_data() );
 	}
@@ -25,19 +31,19 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_id
 	 */
-	function test_get_id() {
+	public function test_get_id() {
 		$object = new WC_Order();
-		$id = $object->save();
+		$id     = $object->save();
 		$this->assertEquals( $id, $object->get_id() );
 	}
 
 	/**
 	 * Test: get_parent_id
 	 */
-	function test_get_parent_id() {
+	public function test_get_parent_id() {
 		$object1   = new WC_Order();
 		$parent_id = $object1->save();
-		$object = new WC_Order();
+		$object    = new WC_Order();
 		$object->set_parent_id( $parent_id );
 		$this->assertEquals( $parent_id, $object->get_parent_id() );
 	}
@@ -45,7 +51,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_order_number
 	 */
-	function test_get_order_number() {
+	public function test_get_order_number() {
 		$object = new WC_Order();
 		$id     = $object->save();
 		$this->assertEquals( $id, $object->get_order_number() );
@@ -54,7 +60,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_order_key
 	 */
-	function test_get_order_key() {
+	public function test_get_order_key() {
 		$object = new WC_Order();
 		$set_to = 'some_key';
 		$object->set_order_key( $set_to );
@@ -64,7 +70,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_currency
 	 */
-	function test_get_currency() {
+	public function test_get_currency() {
 		$object = new WC_Order();
 		$set_to = 'USD';
 		$object->set_currency( $set_to );
@@ -74,7 +80,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_version
 	 */
-	function test_get_version() {
+	public function test_get_version() {
 		$object = new WC_Order();
 		$set_to = '3.0.0';
 		$object->set_version( $set_to );
@@ -84,7 +90,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_prices_include_tax
 	 */
-	function test_get_prices_include_tax() {
+	public function test_get_prices_include_tax() {
 		$object = new WC_Order();
 		$set_to = 'USD';
 		$object->set_prices_include_tax( 1 );
@@ -94,7 +100,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_date_created
 	 */
-	function test_get_date_created() {
+	public function test_get_date_created() {
 		$object = new WC_Order();
 		$object->set_date_created( '2016-12-12' );
 		$this->assertEquals( '1481500800', $object->get_date_created()->getOffsetTimestamp() );
@@ -106,7 +112,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_date_modified
 	 */
-	function test_get_date_modified() {
+	public function test_get_date_modified() {
 		$object = new WC_Order();
 		$object->set_date_modified( '2016-12-12' );
 		$this->assertEquals( '1481500800', $object->get_date_modified()->getOffsetTimestamp() );
@@ -118,7 +124,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_customer_id
 	 */
-	function test_get_customer_id() {
+	public function test_get_customer_id() {
 		$object = new WC_Order();
 		$set_to = 10;
 		$object->set_customer_id( $set_to );
@@ -128,7 +134,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_user
 	 */
-	function test_get_user() {
+	public function test_get_user() {
 		$object = new WC_Order();
 		$this->assertFalse( $object->get_user() );
 		$set_to = '1';
@@ -139,7 +145,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_discount_total
 	 */
-	function test_get_discount_total() {
+	public function test_get_discount_total() {
 		$object = new WC_Order();
 		$object->set_discount_total( 50 );
 		$this->assertEquals( 50, $object->get_discount_total() );
@@ -148,7 +154,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_discount_tax
 	 */
-	function test_get_discount_tax() {
+	public function test_get_discount_tax() {
 		$object = new WC_Order();
 		$object->set_discount_tax( 5 );
 		$this->assertEquals( 5, $object->get_discount_tax() );
@@ -157,7 +163,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_shipping_total
 	 */
-	function test_get_shipping_total() {
+	public function test_get_shipping_total() {
 		$object = new WC_Order();
 		$object->set_shipping_total( 5 );
 		$this->assertEquals( 5, $object->get_shipping_total() );
@@ -166,7 +172,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_shipping_tax
 	 */
-	function test_get_shipping_tax() {
+	public function test_get_shipping_tax() {
 		$object = new WC_Order();
 		$object->set_shipping_tax( 5 );
 		$this->assertEquals( 5, $object->get_shipping_tax() );
@@ -175,7 +181,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_cart_tax
 	 */
-	function test_get_cart_tax() {
+	public function test_get_cart_tax() {
 		$object = new WC_Order();
 		$object->set_cart_tax( 5 );
 		$this->assertEquals( 5, $object->get_cart_tax() );
@@ -184,7 +190,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_total
 	 */
-	function test_get_total() {
+	public function test_get_total() {
 		$object = new WC_Order();
 		$object->set_total( 5 );
 		$this->assertEquals( 5, $object->get_total() );
@@ -193,7 +199,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_total_tax
 	 */
-	function test_get_total_tax() {
+	public function test_get_total_tax() {
 		$object = new WC_Order();
 		$object->set_cart_tax( 5 );
 		$object->set_shipping_tax( 5 );
@@ -203,7 +209,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_total_discount
 	 */
-	function test_get_total_discount() {
+	public function test_get_total_discount() {
 		$object = new WC_Order();
 		$object->set_discount_total( 50 );
 		$object->set_discount_tax( 5 );
@@ -214,7 +220,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_subtotal
 	 */
-	function test_get_subtotal() {
+	public function test_get_subtotal() {
 		$object = WC_Helper_Order::create_order();
 		$this->assertEquals( 40, $object->get_subtotal() );
 	}
@@ -222,7 +228,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_tax_totals
 	 */
-	function test_get_tax_totals() {
+	public function test_get_tax_totals() {
 		$object = WC_Helper_Order::create_order();
 		$this->assertEquals( array(), $object->get_tax_totals() );
 	}
@@ -230,19 +236,23 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: remove_order_items
 	 */
-	function test_remove_order_items() {
+	public function test_remove_order_items() {
 		$product = WC_Helper_Product::create_simple_product();
 		$object  = new WC_Order();
 		$item_1  = new WC_Order_Item_Product();
-		$item_1->set_props( array(
-			'product'  => $product,
-			'quantity' => 4,
-		) );
-		$item_2  = new WC_Order_Item_Product();
-		$item_2->set_props( array(
-			'product'  => $product,
-			'quantity' => 2,
-		) );
+		$item_1->set_props(
+			array(
+				'product'  => $product,
+				'quantity' => 4,
+			)
+		);
+		$item_2 = new WC_Order_Item_Product();
+		$item_2->set_props(
+			array(
+				'product'  => $product,
+				'quantity' => 2,
+			)
+		);
 		$object->add_item( $item_1 );
 		$object->add_item( $item_2 );
 		$object->save();
@@ -254,18 +264,22 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_items
 	 */
-	function test_get_items() {
-		$object  = new WC_Order();
-		$item_1  = new WC_Order_Item_Product();
-		$item_1->set_props( array(
-			'product'  => WC_Helper_Product::create_simple_product(),
-			'quantity' => 4,
-		) );
-		$item_2  = new WC_Order_Item_Product();
-		$item_2->set_props( array(
-			'product'  => WC_Helper_Product::create_simple_product(),
-			'quantity' => 2,
-		) );
+	public function test_get_items() {
+		$object = new WC_Order();
+		$item_1 = new WC_Order_Item_Product();
+		$item_1->set_props(
+			array(
+				'product'  => WC_Helper_Product::create_simple_product(),
+				'quantity' => 4,
+			)
+		);
+		$item_2 = new WC_Order_Item_Product();
+		$item_2->set_props(
+			array(
+				'product'  => WC_Helper_Product::create_simple_product(),
+				'quantity' => 2,
+			)
+		);
 
 		$object->add_item( $item_1 );
 		$object->add_item( $item_2 );
@@ -276,38 +290,43 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_different_items
 	 */
-	function test_get_different_items() {
-		$object  = new WC_Order();
-		$item_1  = new WC_Order_Item_Product();
-		$item_1->set_props( array(
-			'product'  => WC_Helper_Product::create_simple_product(),
-			'quantity' => 4,
-		) );
-		$item_2  = new WC_Order_Item_Fee();
-		$item_2->set_props( array(
-			'name'       => 'Some Fee',
-			'tax_status' => 'taxable',
-			'total'      => '100',
-			'tax_class'  => '',
-		) );
+	public function test_get_different_items() {
+		$object = new WC_Order();
+		$item_1 = new WC_Order_Item_Product();
+		$item_1->set_props(
+			array(
+				'product'  => WC_Helper_Product::create_simple_product(),
+				'quantity' => 4,
+			)
+		);
+		$item_2 = new WC_Order_Item_Fee();
+		$item_2->set_props(
+			array(
+				'name'       => 'Some Fee',
+				'tax_status' => 'taxable',
+				'total'      => '100',
+				'tax_class'  => '',
+			)
+		);
 		$object->add_item( $item_1 );
 		$object->add_item( $item_2 );
-		// $object->save();
 		$this->assertCount( 2, $object->get_items( array( 'line_item', 'fee' ) ) );
 	}
 
 	/**
 	 * Test: get_fees
 	 */
-	function test_get_fees() {
-		$object  = new WC_Order();
-		$item    = new WC_Order_Item_Fee();
-		$item->set_props( array(
-			'name'       => 'Some Fee',
-			'tax_status' => 'taxable',
-			'total'      => '100',
-			'tax_class'  => '',
-		) );
+	public function test_get_fees() {
+		$object = new WC_Order();
+		$item   = new WC_Order_Item_Fee();
+		$item->set_props(
+			array(
+				'name'       => 'Some Fee',
+				'tax_status' => 'taxable',
+				'total'      => '100',
+				'tax_class'  => '',
+			)
+		);
 		$object->add_item( $item );
 		$this->assertCount( 1, $object->get_fees() );
 	}
@@ -315,7 +334,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_taxes
 	 */
-	function test_get_taxes() {
+	public function test_get_taxes() {
 		global $wpdb;
 
 		update_option( 'woocommerce_calc_taxes', 'yes' );
@@ -332,12 +351,14 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 		);
 		WC_Tax::_insert_tax_rate( $tax_rate );
 
-		$object  = new WC_Order();
-		$item_1  = new WC_Order_Item_Product();
-		$item_1->set_props( array(
-			'product'  => WC_Helper_Product::create_simple_product(),
-			'quantity' => 4,
-		) );
+		$object = new WC_Order();
+		$item_1 = new WC_Order_Item_Product();
+		$item_1->set_props(
+			array(
+				'product'  => WC_Helper_Product::create_simple_product(),
+				'quantity' => 4,
+			)
+		);
 		$object->add_item( $item_1 );
 		$object->calculate_totals();
 		$this->assertCount( 1, $object->get_taxes() );
@@ -351,7 +372,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 
 		$this->assertCount( 2, $object->get_taxes() );
 
-		// Cleanup
+		// Cleanup.
 		$wpdb->query( "DELETE FROM {$wpdb->prefix}woocommerce_tax_rates" );
 		$wpdb->query( "DELETE FROM {$wpdb->prefix}woocommerce_tax_rate_locations" );
 		update_option( 'woocommerce_calc_taxes', 'no' );
@@ -360,7 +381,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test mapping from old tax array keys to CRUD functions.
 	 */
-	function test_tax_legacy_arrayaccess() {
+	public function test_tax_legacy_arrayaccess() {
 		$tax = new WC_Order_item_Tax();
 		$tax->set_rate_id( 5 );
 		$tax->set_compound( true );
@@ -378,16 +399,18 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_shipping_methods
 	 */
-	function test_get_shipping_methods() {
+	public function test_get_shipping_methods() {
 		$object = new WC_Order();
 		$rate   = new WC_Shipping_Rate( 'flat_rate_shipping', 'Flat rate shipping', '10', array(), 'flat_rate' );
 		$item   = new WC_Order_Item_Shipping();
-		$item->set_props( array(
-			'method_title' => $rate->label,
-			'method_id'    => $rate->id,
-			'total'        => wc_format_decimal( $rate->cost ),
-			'taxes'        => $rate->taxes,
-		) );
+		$item->set_props(
+			array(
+				'method_title' => $rate->label,
+				'method_id'    => $rate->id,
+				'total'        => wc_format_decimal( $rate->cost ),
+				'taxes'        => $rate->taxes,
+			)
+		);
 		foreach ( $rate->get_meta_data() as $key => $value ) {
 			$item->add_meta_data( $key, $value, true );
 		}
@@ -399,16 +422,18 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_shipping_method
 	 */
-	function test_get_shipping_method() {
+	public function test_get_shipping_method() {
 		$object = new WC_Order();
 		$rate   = new WC_Shipping_Rate( 'flat_rate_shipping', 'Flat rate shipping', '10', array(), 'flat_rate' );
 		$item   = new WC_Order_Item_Shipping();
-		$item->set_props( array(
-			'method_title' => $rate->label,
-			'method_id'    => $rate->id,
-			'total'        => wc_format_decimal( $rate->cost ),
-			'taxes'        => $rate->taxes,
-		) );
+		$item->set_props(
+			array(
+				'method_title' => $rate->label,
+				'method_id'    => $rate->id,
+				'total'        => wc_format_decimal( $rate->cost ),
+				'taxes'        => $rate->taxes,
+			)
+		);
 		foreach ( $rate->get_meta_data() as $key => $value ) {
 			$item->add_meta_data( $key, $value, true );
 		}
@@ -416,14 +441,16 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 		$object->save();
 		$this->assertEquals( 'Flat rate shipping', $object->get_shipping_method() );
 
-		$rate   = new WC_Shipping_Rate( 'flat_rate_shipping', 'Flat rate shipping 2', '10', array(), 'flat_rate' );
-		$item   = new WC_Order_Item_Shipping();
-		$item->set_props( array(
-			'method_title' => $rate->label,
-			'method_id'    => $rate->id,
-			'total'        => wc_format_decimal( $rate->cost ),
-			'taxes'        => $rate->taxes,
-		) );
+		$rate = new WC_Shipping_Rate( 'flat_rate_shipping', 'Flat rate shipping 2', '10', array(), 'flat_rate' );
+		$item = new WC_Order_Item_Shipping();
+		$item->set_props(
+			array(
+				'method_title' => $rate->label,
+				'method_id'    => $rate->id,
+				'total'        => wc_format_decimal( $rate->cost ),
+				'taxes'        => $rate->taxes,
+			)
+		);
 		foreach ( $rate->get_meta_data() as $key => $value ) {
 			$item->add_meta_data( $key, $value, true );
 		}
@@ -435,14 +462,16 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_used_coupons
 	 */
-	function test_get_used_coupons() {
+	public function test_get_used_coupons() {
 		$object = new WC_Order();
 		$item   = new WC_Order_Item_Coupon();
-		$item->set_props( array(
-			'code'         => '12345',
-			'discount'     => 10,
-			'discount_tax' => 5,
-		) );
+		$item->set_props(
+			array(
+				'code'         => '12345',
+				'discount'     => 10,
+				'discount_tax' => 5,
+			)
+		);
 		$object->add_item( $item );
 		$object->save();
 		$this->assertCount( 1, $object->get_used_coupons() );
@@ -451,18 +480,22 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_item_count
 	 */
-	function test_get_item_count() {
-		$object  = new WC_Order();
-		$item_1  = new WC_Order_Item_Product();
-		$item_1->set_props( array(
-			'product'  => WC_Helper_Product::create_simple_product(),
-			'quantity' => 4,
-		) );
-		$item_2  = new WC_Order_Item_Product();
-		$item_2->set_props( array(
-			'product'  => WC_Helper_Product::create_simple_product(),
-			'quantity' => 2,
-		) );
+	public function test_get_item_count() {
+		$object = new WC_Order();
+		$item_1 = new WC_Order_Item_Product();
+		$item_1->set_props(
+			array(
+				'product'  => WC_Helper_Product::create_simple_product(),
+				'quantity' => 4,
+			)
+		);
+		$item_2 = new WC_Order_Item_Product();
+		$item_2->set_props(
+			array(
+				'product'  => WC_Helper_Product::create_simple_product(),
+				'quantity' => 2,
+			)
+		);
 		$object->add_item( $item_1 );
 		$object->add_item( $item_2 );
 		$object->save();
@@ -472,36 +505,40 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_item
 	 */
-	function test_get_item() {
+	public function test_get_item() {
 		$object = new WC_Order();
 		$item   = new WC_Order_Item_Product();
-		$item->set_props( array(
-			'product'  => WC_Helper_Product::create_simple_product(),
-			'quantity' => 4,
-		) );
+		$item->set_props(
+			array(
+				'product'  => WC_Helper_Product::create_simple_product(),
+				'quantity' => 4,
+			)
+		);
 		$item->save();
 		$object->add_item( $item->get_id() );
 		$object->save();
-		$this->assertTrue( $object->get_item( $item->get_id() ) instanceOf WC_Order_Item_Product );
+		$this->assertTrue( $object->get_item( $item->get_id() ) instanceof WC_Order_Item_Product );
 
 		$object = new WC_Order();
 		$item   = new WC_Order_Item_Coupon();
-		$item->set_props( array(
-			'code'         => '12345',
-			'discount'     => 10,
-			'discount_tax' => 5,
-		) );
+		$item->set_props(
+			array(
+				'code'         => '12345',
+				'discount'     => 10,
+				'discount_tax' => 5,
+			)
+		);
 		$item_id = $item->save();
 		$object->add_item( $item );
 		$object->save();
-		$this->assertTrue( $object->get_item( $item_id ) instanceOf WC_Order_Item_Coupon );
+		$this->assertTrue( $object->get_item( $item_id ) instanceof WC_Order_Item_Coupon );
 	}
 
 	/**
 	 * Test: add_payment_token
 	 */
-	function test_add_payment_token() {
-		$object  = new WC_Order();
+	public function test_add_payment_token() {
+		$object = new WC_Order();
 		$object->save();
 		$this->assertFalse( $object->add_payment_token( 'fish' ) );
 		$token = new WC_Payment_Token_Stub();
@@ -514,8 +551,8 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_payment_tokens
 	 */
-	function test_get_payment_tokens() {
-		$object  = new WC_Order();
+	public function test_get_payment_tokens() {
+		$object = new WC_Order();
 		$object->save();
 		$token = new WC_Payment_Token_Stub();
 		$token->set_extra( __FUNCTION__ );
@@ -528,26 +565,30 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: calculate_shipping
 	 */
-	function test_calculate_shipping() {
+	public function test_calculate_shipping() {
 		$object = new WC_Order();
 		$rate   = new WC_Shipping_Rate( 'flat_rate_shipping', 'Flat rate shipping', '10', array(), 'flat_rate' );
 		$item_1 = new WC_Order_Item_Shipping();
-		$item_1->set_props( array(
-			'method_title' => $rate->label,
-			'method_id'    => $rate->id,
-			'total'        => wc_format_decimal( $rate->cost ),
-			'taxes'        => $rate->taxes,
-		) );
+		$item_1->set_props(
+			array(
+				'method_title' => $rate->label,
+				'method_id'    => $rate->id,
+				'total'        => wc_format_decimal( $rate->cost ),
+				'taxes'        => $rate->taxes,
+			)
+		);
 		foreach ( $rate->get_meta_data() as $key => $value ) {
 			$item_1->add_meta_data( $key, $value, true );
 		}
 		$item_2 = new WC_Order_Item_Shipping();
-		$item_2->set_props( array(
-			'method_title' => $rate->label,
-			'method_id'    => $rate->id,
-			'total'        => wc_format_decimal( $rate->cost ),
-			'taxes'        => $rate->taxes,
-		) );
+		$item_2->set_props(
+			array(
+				'method_title' => $rate->label,
+				'method_id'    => $rate->id,
+				'total'        => wc_format_decimal( $rate->cost ),
+				'taxes'        => $rate->taxes,
+			)
+		);
 		foreach ( $rate->get_meta_data() as $key => $value ) {
 			$item->add_meta_data( $key, $value, true );
 		}
@@ -561,7 +602,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: calculate_taxes
 	 */
-	function test_calculate_taxes() {
+	public function test_calculate_taxes() {
 		global $wpdb;
 		update_option( 'woocommerce_calc_taxes', 'yes' );
 		$tax_rate = array(
@@ -580,14 +621,16 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 		$object = new WC_Order();
 		$object->add_product( WC_Helper_Product::create_simple_product(), 4 );
 
-		$rate   = new WC_Shipping_Rate( 'flat_rate_shipping', 'Flat rate shipping', '10', array(), 'flat_rate' );
-		$item   = new WC_Order_Item_Shipping();
-		$item->set_props( array(
-			'method_title' => $rate->label,
-			'method_id'    => $rate->id,
-			'total'        => wc_format_decimal( $rate->cost ),
-			'taxes'        => $rate->taxes,
-		)  );
+		$rate = new WC_Shipping_Rate( 'flat_rate_shipping', 'Flat rate shipping', '10', array(), 'flat_rate' );
+		$item = new WC_Order_Item_Shipping();
+		$item->set_props(
+			array(
+				'method_title' => $rate->label,
+				'method_id'    => $rate->id,
+				'total'        => wc_format_decimal( $rate->cost ),
+				'taxes'        => $rate->taxes,
+			)
+		);
 		foreach ( $rate->get_meta_data() as $key => $value ) {
 			$item->add_meta_data( $key, $value, true );
 		}
@@ -596,7 +639,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 		$object->calculate_taxes();
 		$this->assertEquals( 5, $object->get_total_tax() );
 
-		// Cleanup
+		// Cleanup.
 		$wpdb->query( "DELETE FROM {$wpdb->prefix}woocommerce_tax_rates" );
 		$wpdb->query( "DELETE FROM {$wpdb->prefix}woocommerce_tax_rate_locations" );
 		update_option( 'woocommerce_calc_taxes', 'no' );
@@ -606,7 +649,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: calculate_taxes_is_vat_excempt
 	 */
-	function test_calculate_taxes_is_vat_excempt() {
+	public function test_calculate_taxes_is_vat_excempt() {
 		global $wpdb;
 		update_option( 'woocommerce_calc_taxes', 'yes' );
 		$tax_rate = array(
@@ -624,14 +667,16 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 
 		$object = new WC_Order();
 		$object->add_product( WC_Helper_Product::create_simple_product(), 4 );
-		$rate   = new WC_Shipping_Rate( 'flat_rate_shipping', 'Flat rate shipping', '10', array(), 'flat_rate' );
-		$item   = new WC_Order_Item_Shipping();
-		$item->set_props( array(
-			'method_title' => $rate->label,
-			'method_id'    => $rate->id,
-			'total'        => wc_format_decimal( $rate->cost ),
-			'taxes'        => $rate->taxes,
-		)  );
+		$rate = new WC_Shipping_Rate( 'flat_rate_shipping', 'Flat rate shipping', '10', array(), 'flat_rate' );
+		$item = new WC_Order_Item_Shipping();
+		$item->set_props(
+			array(
+				'method_title' => $rate->label,
+				'method_id'    => $rate->id,
+				'total'        => wc_format_decimal( $rate->cost ),
+				'taxes'        => $rate->taxes,
+			)
+		);
 		foreach ( $rate->get_meta_data() as $key => $value ) {
 			$item->add_meta_data( $key, $value, true );
 		}
@@ -646,14 +691,17 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 		$object->calculate_taxes();
 		$this->assertEquals( 0, $object->get_total_tax() );
 
-		// Cleanup
+		// Cleanup.
 		$wpdb->query( "DELETE FROM {$wpdb->prefix}woocommerce_tax_rates" );
 		$wpdb->query( "DELETE FROM {$wpdb->prefix}woocommerce_tax_rate_locations" );
 		update_option( 'woocommerce_calc_taxes', 'no' );
 		$object->delete();
 	}
 
-	function test_calculate_taxes_issue_with_addresses() {
+	/**
+	 * Test: calculate_taxes_issue_with_addresses
+	 */
+	public function test_calculate_taxes_issue_with_addresses() {
 		global $wpdb;
 		update_option( 'woocommerce_calc_taxes', 'yes' );
 		$wpdb->query( "DELETE FROM {$wpdb->prefix}woocommerce_tax_rates" );
@@ -661,33 +709,37 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 
 		$taxes = array();
 
-		$taxes[] = WC_Tax::_insert_tax_rate( array(
-			'tax_rate_country'  => 'US',
-			'tax_rate_state'    => '',
-			'tax_rate'          => '20.0000',
-			'tax_rate_name'     => 'TAX',
-			'tax_rate_priority' => '1',
-			'tax_rate_compound' => '0',
-			'tax_rate_shipping' => '1',
-			'tax_rate_order'    => '1',
-			'tax_rate_class'    => '',
-		) );
-		$taxes[] = WC_Tax::_insert_tax_rate( array(
-			'tax_rate_country'  => 'PY',
-			'tax_rate_state'    => '',
-			'tax_rate'          => '10.0000',
-			'tax_rate_name'     => 'TAX',
-			'tax_rate_priority' => '1',
-			'tax_rate_compound' => '0',
-			'tax_rate_shipping' => '1',
-			'tax_rate_order'    => '1',
-			'tax_rate_class'    => '',
-		) );
+		$taxes[] = WC_Tax::_insert_tax_rate(
+			array(
+				'tax_rate_country'  => 'US',
+				'tax_rate_state'    => '',
+				'tax_rate'          => '20.0000',
+				'tax_rate_name'     => 'TAX',
+				'tax_rate_priority' => '1',
+				'tax_rate_compound' => '0',
+				'tax_rate_shipping' => '1',
+				'tax_rate_order'    => '1',
+				'tax_rate_class'    => '',
+			)
+		);
+		$taxes[] = WC_Tax::_insert_tax_rate(
+			array(
+				'tax_rate_country'  => 'PY',
+				'tax_rate_state'    => '',
+				'tax_rate'          => '10.0000',
+				'tax_rate_name'     => 'TAX',
+				'tax_rate_priority' => '1',
+				'tax_rate_compound' => '0',
+				'tax_rate_shipping' => '1',
+				'tax_rate_order'    => '1',
+				'tax_rate_class'    => '',
+			)
+		);
 
 		update_option( 'woocommerce_default_country', 'PY:Central' );
 		update_option( 'woocommerce_tax_based_on', 'shipping' );
 
-		$order = new WC_Order;
+		$order = new WC_Order();
 		$order->set_billing_country( 'US' );
 		$order->set_billing_state( 'CA' );
 		$order->add_product( WC_Helper_Product::create_simple_product(), 4 );
@@ -701,7 +753,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: calculate_totals
 	 */
-	function test_calculate_totals() {
+	public function test_calculate_totals() {
 		global $wpdb;
 		update_option( 'woocommerce_calc_taxes', 'yes' );
 		$tax_rate = array(
@@ -717,17 +769,19 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 		);
 		WC_Tax::_insert_tax_rate( $tax_rate );
 
-		$object  = new WC_Order();
+		$object = new WC_Order();
 		$object->add_product( WC_Helper_Product::create_simple_product(), 4 );
 
-		$rate   = new WC_Shipping_Rate( 'flat_rate_shipping', 'Flat rate shipping', '10', array(), 'flat_rate' );
-		$item   = new WC_Order_Item_Shipping();
-		$item->set_props( array(
-			'method_title' => $rate->label,
-			'method_id'    => $rate->id,
-			'total'        => wc_format_decimal( $rate->cost ),
-			'taxes'        => $rate->taxes,
-		) );
+		$rate = new WC_Shipping_Rate( 'flat_rate_shipping', 'Flat rate shipping', '10', array(), 'flat_rate' );
+		$item = new WC_Order_Item_Shipping();
+		$item->set_props(
+			array(
+				'method_title' => $rate->label,
+				'method_id'    => $rate->id,
+				'total'        => wc_format_decimal( $rate->cost ),
+				'taxes'        => $rate->taxes,
+			)
+		);
 		foreach ( $rate->get_meta_data() as $key => $value ) {
 			$item->add_meta_data( $key, $value, true );
 		}
@@ -736,7 +790,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 		$object->calculate_totals();
 		$this->assertEquals( 55, $object->get_total() );
 
-		// Cleanup
+		// Cleanup.
 		$wpdb->query( "DELETE FROM {$wpdb->prefix}woocommerce_tax_rates" );
 		$wpdb->query( "DELETE FROM {$wpdb->prefix}woocommerce_tax_rate_locations" );
 		update_option( 'woocommerce_calc_taxes', 'no' );
@@ -745,7 +799,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: has_status
 	 */
-	function test_has_status() {
+	public function test_has_status() {
 		$object = new WC_Order();
 		$this->assertFalse( $object->has_status( 'completed' ) );
 		$this->assertFalse( $object->has_status( array( 'processing', 'completed' ) ) );
@@ -756,20 +810,22 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: has_shipping_method
 	 */
-	function test_has_shipping_method() {
+	public function test_has_shipping_method() {
 		$object = new WC_Order();
 		$object->save();
 
 		$this->assertFalse( $object->has_shipping_method( 'flat_rate_shipping' ) );
 
-		$rate   = new WC_Shipping_Rate( 'flat_rate_shipping:1', 'Flat rate shipping', '10', array(), 'flat_rate' );
-		$item   = new WC_Order_Item_Shipping();
-		$item->set_props( array(
-			'method_title' => $rate->label,
-			'method_id'    => $rate->id,
-			'total'        => wc_format_decimal( $rate->cost ),
-			'taxes'        => $rate->taxes,
-		) );
+		$rate = new WC_Shipping_Rate( 'flat_rate_shipping:1', 'Flat rate shipping', '10', array(), 'flat_rate' );
+		$item = new WC_Order_Item_Shipping();
+		$item->set_props(
+			array(
+				'method_title' => $rate->label,
+				'method_id'    => $rate->id,
+				'total'        => wc_format_decimal( $rate->cost ),
+				'taxes'        => $rate->taxes,
+			)
+		);
 		foreach ( $rate->get_meta_data() as $key => $value ) {
 			$item->add_meta_data( $key, $value, true );
 		}
@@ -782,7 +838,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: key_is_valid
 	 */
-	function test_key_is_valid() {
+	public function test_key_is_valid() {
 		$object = new WC_Order();
 		$object->save();
 		$this->assertFalse( $object->key_is_valid( '1234' ) );
@@ -793,7 +849,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: has_free_item
 	 */
-	function test_has_free_item() {
+	public function test_has_free_item() {
 		$object = new WC_Order();
 		$object->add_product( WC_Helper_Product::create_simple_product(), 4 );
 		$this->assertFalse( $object->has_free_item() );
@@ -807,20 +863,20 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: CRUD
 	 */
-	function test_CRUD() {
+	public function test_CRUD() {
 		$object = new WC_Order();
 
-		// Save + create
+		// Save + create.
 		$save_id = $object->save();
 		$post    = get_post( $save_id );
 		$this->assertEquals( 'shop_order', $post->post_type );
 		$this->assertEquals( 'shop_order', $post->post_type );
 
-		// Update
+		// Update.
 		$update_id = $object->save();
 		$this->assertEquals( $update_id, $save_id );
 
-		// Delete
+		// Delete.
 		$object->delete( true );
 		$post = get_post( $save_id );
 		$this->assertNull( $post );
@@ -829,7 +885,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: payment_complete
 	 */
-	function test_payment_complete() {
+	public function test_payment_complete() {
 		$object = new WC_Order();
 		$this->assertFalse( $object->payment_complete() );
 		$object->save();
@@ -841,7 +897,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_formatted_order_total
 	 */
-	function test_get_formatted_order_total() {
+	public function test_get_formatted_order_total() {
 		$object = new WC_Order();
 		$object->set_total( 100 );
 		$object->set_currency( 'USD' );
@@ -851,7 +907,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: set_status
 	 */
-	function test_set_status() {
+	public function test_set_status() {
 		$object = new WC_Order();
 		$object->set_status( 'on-hold' );
 		$this->assertEquals( 'on-hold', $object->get_status() );
@@ -860,7 +916,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: update_status
 	 */
-	function test_update_status() {
+	public function test_update_status() {
 		$object = new WC_Order();
 		$this->assertFalse( $object->update_status( 'on-hold' ) );
 		$object->save();
@@ -871,7 +927,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_billing_first_name
 	 */
-	function test_get_billing_first_name() {
+	public function test_get_billing_first_name() {
 		$object = new WC_Order();
 		$set_to = 'Fred';
 		$object->set_billing_first_name( $set_to );
@@ -881,7 +937,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_billing_last_name
 	 */
-	function test_get_billing_last_name() {
+	public function test_get_billing_last_name() {
 		$object = new WC_Order();
 		$set_to = 'Flintstone';
 		$object->set_billing_last_name( $set_to );
@@ -891,7 +947,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_billing_company
 	 */
-	function test_get_billing_company() {
+	public function test_get_billing_company() {
 		$object = new WC_Order();
 		$set_to = 'Bedrock Ltd.';
 		$object->set_billing_company( $set_to );
@@ -901,7 +957,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_billing_address_1
 	 */
-	function test_get_billing_address_1() {
+	public function test_get_billing_address_1() {
 		$object = new WC_Order();
 		$set_to = '34 Stonepants avenue';
 		$object->set_billing_address_1( $set_to );
@@ -911,7 +967,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_billing_address_2
 	 */
-	function test_get_billing_address_2() {
+	public function test_get_billing_address_2() {
 		$object = new WC_Order();
 		$set_to = 'Rockville';
 		$object->set_billing_address_2( $set_to );
@@ -921,7 +977,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_billing_city
 	 */
-	function test_get_billing_city() {
+	public function test_get_billing_city() {
 		$object = new WC_Order();
 		$set_to = 'Bedrock';
 		$object->set_billing_city( $set_to );
@@ -931,7 +987,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_billing_state
 	 */
-	function test_get_billing_state() {
+	public function test_get_billing_state() {
 		$object = new WC_Order();
 		$set_to = 'Oregon';
 		$object->set_billing_state( $set_to );
@@ -941,7 +997,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_billing_postcode
 	 */
-	function test_get_billing_postcode() {
+	public function test_get_billing_postcode() {
 		$object = new WC_Order();
 		$set_to = '00001';
 		$object->set_billing_postcode( $set_to );
@@ -951,7 +1007,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_billing_country
 	 */
-	function test_get_billing_country() {
+	public function test_get_billing_country() {
 		$object = new WC_Order();
 		$set_to = 'US';
 		$object->set_billing_country( $set_to );
@@ -961,14 +1017,14 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_billing_email
 	 */
-	function test_get_billing_email() {
+	public function test_get_billing_email() {
 		$object = new WC_Order();
 		$set_to = 'test@test.com';
 		$object->set_billing_email( $set_to );
 		$this->assertEquals( $set_to, $object->get_billing_email() );
 
 		$set_to = 'not an email';
-		$this->setExpectedException( 'WC_Data_Exception' );
+		$this->setExpectedException( 'WC_Data_Exception', 'Invalid billing email address' );
 		$object->set_billing_email( $set_to );
 		$this->assertEquals( 'test@test.com', $object->get_billing_email() );
 	}
@@ -976,7 +1032,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_billing_phone
 	 */
-	function test_get_billing_phone() {
+	public function test_get_billing_phone() {
 		$object = new WC_Order();
 		$set_to = '123456678';
 		$object->set_billing_phone( $set_to );
@@ -986,9 +1042,9 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: Setting/getting billing settings after an order is saved
 	 */
-	function test_set_billing_after_save() {
+	public function test_set_billing_after_save() {
 		$object = new WC_Order();
-		$phone = '123456678';
+		$phone  = '123456678';
 		$object->set_billing_phone( $phone );
 		$object->save();
 		$state = 'Oregon';
@@ -1001,7 +1057,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_shipping_first_name
 	 */
-	function test_get_shipping_first_name() {
+	public function test_get_shipping_first_name() {
 		$object = new WC_Order();
 		$set_to = 'Fred';
 		$object->set_shipping_first_name( $set_to );
@@ -1011,7 +1067,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_shipping_last_name
 	 */
-	function test_get_shipping_last_name() {
+	public function test_get_shipping_last_name() {
 		$object = new WC_Order();
 		$set_to = 'Flintstone';
 		$object->set_shipping_last_name( $set_to );
@@ -1021,7 +1077,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_shipping_company
 	 */
-	function test_get_shipping_company() {
+	public function test_get_shipping_company() {
 		$object = new WC_Order();
 		$set_to = 'Bedrock Ltd.';
 		$object->set_shipping_company( $set_to );
@@ -1031,7 +1087,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_shipping_address_1
 	 */
-	function test_get_shipping_address_1() {
+	public function test_get_shipping_address_1() {
 		$object = new WC_Order();
 		$set_to = '34 Stonepants avenue';
 		$object->set_shipping_address_1( $set_to );
@@ -1041,7 +1097,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_shipping_address_2
 	 */
-	function test_get_shipping_address_2() {
+	public function test_get_shipping_address_2() {
 		$object = new WC_Order();
 		$set_to = 'Rockville';
 		$object->set_shipping_address_2( $set_to );
@@ -1051,7 +1107,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_shipping_city
 	 */
-	function test_get_shipping_city() {
+	public function test_get_shipping_city() {
 		$object = new WC_Order();
 		$set_to = 'Bedrock';
 		$object->set_shipping_city( $set_to );
@@ -1061,7 +1117,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_shipping_state
 	 */
-	function test_get_shipping_state() {
+	public function test_get_shipping_state() {
 		$object = new WC_Order();
 		$set_to = 'Oregon';
 		$object->set_shipping_state( $set_to );
@@ -1071,7 +1127,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_shipping_postcode
 	 */
-	function test_get_shipping_postcode() {
+	public function test_get_shipping_postcode() {
 		$object = new WC_Order();
 		$set_to = '00001';
 		$object->set_shipping_postcode( $set_to );
@@ -1081,7 +1137,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_shipping_country
 	 */
-	function test_get_shipping_country() {
+	public function test_get_shipping_country() {
 		$object = new WC_Order();
 		$set_to = 'US';
 		$object->set_shipping_country( $set_to );
@@ -1093,8 +1149,8 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	 *
 	 * @since 3.3
 	 */
-	function test_get_has_formatted_billing_address() {
-		$order = new WC_Order;
+	public function test_get_has_formatted_billing_address() {
+		$order = new WC_Order();
 
 		$this->assertEquals( 'none', $order->get_formatted_billing_address( 'none' ) );
 
@@ -1113,8 +1169,8 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	 *
 	 * @since 3.3
 	 */
-	function test_get_has_formatted_shipping_address() {
-		$order = new WC_Order;
+	public function test_get_has_formatted_shipping_address() {
+		$order = new WC_Order();
 
 		$this->assertEquals( 'none', $order->get_formatted_shipping_address( 'none' ) );
 
@@ -1131,8 +1187,8 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: Setting/getting shipping settings after an order is saved
 	 */
-	function test_set_shipping_after_save() {
-		$object = new WC_Order();
+	public function test_set_shipping_after_save() {
+		$object  = new WC_Order();
 		$country = 'US';
 		$object->set_shipping_country( $country );
 		$object->save();
@@ -1146,7 +1202,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_payment_method
 	 */
-	function test_get_payment_method() {
+	public function test_get_payment_method() {
 		$object = new WC_Order();
 		$set_to = 'paypal';
 		$object->set_payment_method( $set_to );
@@ -1156,7 +1212,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_payment_method_title
 	 */
-	function test_get_payment_method_title() {
+	public function test_get_payment_method_title() {
 		$object = new WC_Order();
 		$set_to = 'PayPal';
 		$object->set_payment_method_title( $set_to );
@@ -1166,7 +1222,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_transaction_id
 	 */
-	function test_get_transaction_id() {
+	public function test_get_transaction_id() {
 		$object = new WC_Order();
 		$set_to = '12345';
 		$object->set_transaction_id( $set_to );
@@ -1176,7 +1232,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_customer_ip_address
 	 */
-	function test_get_customer_ip_address() {
+	public function test_get_customer_ip_address() {
 		$object = new WC_Order();
 		$set_to = '192.168.1.1';
 		$object->set_customer_ip_address( $set_to );
@@ -1186,7 +1242,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_customer_user_agent
 	 */
-	function test_get_customer_user_agent() {
+	public function test_get_customer_user_agent() {
 		$object = new WC_Order();
 		$set_to = 'UAstring';
 		$object->set_customer_user_agent( $set_to );
@@ -1196,7 +1252,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_created_via
 	 */
-	function test_get_created_via() {
+	public function test_get_created_via() {
 		$object = new WC_Order();
 		$set_to = 'WooCommerce';
 		$object->set_created_via( $set_to );
@@ -1206,7 +1262,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_customer_note
 	 */
-	function test_get_customer_note() {
+	public function test_get_customer_note() {
 		$object = new WC_Order();
 		$set_to = 'Leave on porch.';
 		$object->set_customer_note( $set_to );
@@ -1216,7 +1272,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_date_completed
 	 */
-	function test_get_date_completed() {
+	public function test_get_date_completed() {
 		$object = new WC_Order();
 		$object->set_date_completed( '2016-12-12' );
 		$this->assertEquals( '1481500800', $object->get_date_completed()->getOffsetTimestamp() );
@@ -1228,7 +1284,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_date_paid
 	 */
-	function test_get_date_paid() {
+	public function test_get_date_paid() {
 		$object = new WC_Order();
 		$set_to = 'PayPal';
 		$object->set_date_paid( '2016-12-12' );
@@ -1241,7 +1297,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_cart_hash
 	 */
-	function test_get_cart_hash() {
+	public function test_get_cart_hash() {
 		$object = new WC_Order();
 		$set_to = '12345';
 		$object->set_cart_hash( $set_to );
@@ -1251,7 +1307,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_address
 	 */
-	function test_get_address() {
+	public function test_get_address() {
 		$object = new WC_Order();
 
 		$billing = array(
@@ -1307,7 +1363,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_shipping_address_map_url
 	 */
-	function test_get_shipping_address_map_url() {
+	public function test_get_shipping_address_map_url() {
 		$object = new WC_Order();
 		$object->set_shipping_first_name( 'Barney' );
 		$object->set_shipping_last_name( 'Rubble' );
@@ -1324,7 +1380,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_formatted_billing_full_name
 	 */
-	function test_get_formatted_billing_full_name() {
+	public function test_get_formatted_billing_full_name() {
 		$object = new WC_Order();
 		$object->set_billing_first_name( 'Fred' );
 		$object->set_billing_last_name( 'Flintstone' );
@@ -1334,7 +1390,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_formatted_shipping_full_name
 	 */
-	function test_get_formatted_shipping_full_name() {
+	public function test_get_formatted_shipping_full_name() {
 		$object = new WC_Order();
 		$object->set_shipping_first_name( 'Barney' );
 		$object->set_shipping_last_name( 'Rubble' );
@@ -1344,7 +1400,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_formatted_billing_address
 	 */
-	function test_get_formatted_billing_address() {
+	public function test_get_formatted_billing_address() {
 		$object = new WC_Order();
 		$object->set_billing_first_name( 'Fred' );
 		$object->set_billing_last_name( 'Flintstone' );
@@ -1361,7 +1417,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_formatted_shipping_address
 	 */
-	function test_get_formatted_shipping_address() {
+	public function test_get_formatted_shipping_address() {
 		$object = new WC_Order();
 		$object->set_shipping_first_name( 'Barney' );
 		$object->set_shipping_last_name( 'Rubble' );
@@ -1378,7 +1434,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: has_cart_hash
 	 */
-	function test_has_cart_hash() {
+	public function test_has_cart_hash() {
 		$object = new WC_Order();
 		$this->assertFalse( $object->has_cart_hash( '12345' ) );
 		$set_to = '12345';
@@ -1389,7 +1445,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: is_editable
 	 */
-	function test_is_editable() {
+	public function test_is_editable() {
 		$object = new WC_Order();
 		$object->set_status( 'pending' );
 		$this->assertTrue( $object->is_editable() );
@@ -1400,7 +1456,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: is_paid
 	 */
-	function test_is_paid() {
+	public function test_is_paid() {
 		$object = new WC_Order();
 		$object->set_status( 'pending' );
 		$this->assertFalse( $object->is_paid() );
@@ -1411,7 +1467,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: is_download_permitted
 	 */
-	function test_is_download_permitted() {
+	public function test_is_download_permitted() {
 		$object = new WC_Order();
 		$object->set_status( 'pending' );
 		$this->assertFalse( $object->is_download_permitted() );
@@ -1422,7 +1478,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: needs_shipping_address
 	 */
-	function test_needs_shipping_address() {
+	public function test_needs_shipping_address() {
 		$object = new WC_Order();
 		$this->assertFalse( $object->needs_shipping_address() );
 
@@ -1433,7 +1489,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: has_downloadable_item
 	 */
-	function test_has_downloadable_item() {
+	public function test_has_downloadable_item() {
 		$object = new WC_Order();
 		$this->assertFalse( $object->has_downloadable_item() );
 
@@ -1444,7 +1500,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: needs_payment
 	 */
-	function test_needs_payment() {
+	public function test_needs_payment() {
 		$object = new WC_Order();
 
 		$object->set_status( 'pending' );
@@ -1460,7 +1516,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_checkout_payment_url
 	 */
-	function test_get_checkout_payment_url() {
+	public function test_get_checkout_payment_url() {
 		$object = new WC_Order();
 		$id     = $object->save();
 		$this->assertEquals( 'http://example.org?order-pay=' . $id . '&pay_for_order=true&key=' . $object->get_order_key(), $object->get_checkout_payment_url() );
@@ -1469,17 +1525,17 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_checkout_order_received_url
 	 */
-	function test_get_checkout_order_received_url() {
+	public function test_get_checkout_order_received_url() {
 		$object = new WC_Order();
 		$object->set_order_key( 'xxx' );
-		$id     = $object->save();
+		$id = $object->save();
 		$this->assertEquals( 'http://example.org?order-received=' . $id . '&key=' . $object->get_order_key(), $object->get_checkout_order_received_url() );
 	}
 
 	/**
 	 * Test: get_cancel_order_url
 	 */
-	function test_get_cancel_order_url() {
+	public function test_get_cancel_order_url() {
 		$object = new WC_Order();
 		$this->assertInternalType( 'string', $object->get_cancel_order_url() );
 	}
@@ -1487,7 +1543,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_cancel_order_url_raw
 	 */
-	function test_get_cancel_order_url_raw() {
+	public function test_get_cancel_order_url_raw() {
 		$object = new WC_Order();
 		$this->assertInternalType( 'string', $object->get_cancel_order_url_raw() );
 	}
@@ -1495,7 +1551,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_cancel_endpoint
 	 */
-	function test_get_cancel_endpoint() {
+	public function test_get_cancel_endpoint() {
 		$object = new WC_Order();
 		$this->assertEquals( 'http://example.org/', $object->get_cancel_endpoint() );
 	}
@@ -1503,7 +1559,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_view_order_url
 	 */
-	function test_get_view_order_url() {
+	public function test_get_view_order_url() {
 		$object = new WC_Order();
 		$id     = $object->save();
 		$this->assertEquals( 'http://example.org?view-order=' . $id, $object->get_view_order_url() );
@@ -1512,28 +1568,28 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: add_order_note
 	 */
-	function test_add_order_note() {
+	public function test_add_order_note() {
 		$object     = new WC_Order();
 		$id         = $object->save();
-		$comment_id = $object->add_order_note( "Hello, I am a fish" );
+		$comment_id = $object->add_order_note( 'Hello, I am a fish' );
 		$this->assertTrue( $comment_id > 0 );
 
 		$comment = get_comment( $comment_id );
-		$this->assertEquals( "Hello, I am a fish", $comment->comment_content );
+		$this->assertEquals( 'Hello, I am a fish', $comment->comment_content );
 	}
 
 	/**
 	 * Test: get_customer_order_notes
 	 */
-	function test_get_customer_order_notes() {
-		$object     = new WC_Order();
-		$id         = $object->save();
+	public function test_get_customer_order_notes() {
+		$object = new WC_Order();
+		$id     = $object->save();
 
 		$this->assertCount( 0, $object->get_customer_order_notes() );
 
-		$object->add_order_note( "Hello, I am a fish", true );
-		$object->add_order_note( "Hello, I am a fish", false );
-		$object->add_order_note( "Hello, I am a fish", true );
+		$object->add_order_note( 'Hello, I am a fish', true );
+		$object->add_order_note( 'Hello, I am a fish', false );
+		$object->add_order_note( 'Hello, I am a fish', true );
 
 		$this->assertCount( 2, $object->get_customer_order_notes() );
 	}
@@ -1541,18 +1597,20 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_refunds
 	 */
-	function test_get_refunds() {
-		$object     = new WC_Order();
+	public function test_get_refunds() {
+		$object = new WC_Order();
 		$object->set_total( 100 );
-		$id         = $object->save();
+		$id = $object->save();
 
 		$this->assertCount( 0, $object->get_refunds() );
 
-		wc_create_refund( array(
-			'order_id'   => $id,
-			'amount'     => '100',
-			'line_items' => array(),
-		) );
+		wc_create_refund(
+			array(
+				'order_id'   => $id,
+				'amount'     => '100',
+				'line_items' => array(),
+			)
+		);
 
 		$this->assertCount( 1, $object->get_refunds() );
 	}
@@ -1560,27 +1618,31 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_total_refunded
 	 */
-	function test_get_total_refunded() {
+	public function test_get_total_refunded() {
 		$object = new WC_Order();
 		$object->set_total( 400 );
-		$id     = $object->save();
-		wc_create_refund( array(
-			'order_id'   => $id,
-			'amount'     => '100',
-			'line_items' => array(),
-		) );
-		wc_create_refund( array(
-			'order_id'   => $id,
-			'amount'     => '100',
-			'line_items' => array(),
-		) );
+		$id = $object->save();
+		wc_create_refund(
+			array(
+				'order_id'   => $id,
+				'amount'     => '100',
+				'line_items' => array(),
+			)
+		);
+		wc_create_refund(
+			array(
+				'order_id'   => $id,
+				'amount'     => '100',
+				'line_items' => array(),
+			)
+		);
 		$this->assertEquals( 200, $object->get_total_refunded() );
 	}
 
 	/**
 	 * Test: get_total_tax_refunded
 	 */
-	function test_get_total_tax_refunded() {
+	public function test_get_total_tax_refunded() {
 		$object = new WC_Order();
 		$this->assertEquals( 0, $object->get_total_tax_refunded() );
 	}
@@ -1588,7 +1650,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_total_shipping_refunded
 	 */
-	function test_get_total_shipping_refunded() {
+	public function test_get_total_shipping_refunded() {
 		$object = new WC_Order();
 		$this->assertEquals( 0, $object->get_total_shipping_refunded() );
 	}
@@ -1596,7 +1658,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_total_shipping_refunded
 	 */
-	function test_get_total_qty_refunded() {
+	public function test_get_total_qty_refunded() {
 		$object = new WC_Order();
 		$this->assertEquals( 0, $object->get_total_shipping_refunded() );
 	}
@@ -1604,7 +1666,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_qty_refunded_for_item
 	 */
-	function test_get_qty_refunded_for_item() {
+	public function test_get_qty_refunded_for_item() {
 		$object = new WC_Order();
 		$this->assertEquals( 0, $object->get_qty_refunded_for_item( 2 ) );
 	}
@@ -1612,7 +1674,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: test_get_total_refunded_for_item
 	 */
-	function test_get_total_refunded_for_item() {
+	public function test_get_total_refunded_for_item() {
 		$object = new WC_Order();
 		$this->assertEquals( 0, $object->get_total_refunded_for_item( 2 ) );
 	}
@@ -1620,7 +1682,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_tax_refunded_for_item
 	 */
-	function test_get_tax_refunded_for_item() {
+	public function test_get_tax_refunded_for_item() {
 		$object = new WC_Order();
 		$this->assertEquals( 0, $object->get_tax_refunded_for_item( 1, 1 ) );
 	}
@@ -1628,7 +1690,7 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_total_tax_refunded_by_rate_id
 	 */
-	function test_get_total_tax_refunded_by_rate_id() {
+	public function test_get_total_tax_refunded_by_rate_id() {
 		$object = new WC_Order();
 		$this->assertEquals( 0, $object->get_total_tax_refunded_by_rate_id( 2 ) );
 	}
@@ -1636,22 +1698,24 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test: get_remaining_refund_amount
 	 */
-	function test_get_remaining_refund_amount() {
+	public function test_get_remaining_refund_amount() {
 		$object = new WC_Order();
 		$object->set_total( 400 );
-		$id     = $object->save();
-		wc_create_refund( array(
-			'order_id'   => $id,
-			'amount'     => '100',
-			'line_items' => array(),
-		) );
+		$id = $object->save();
+		wc_create_refund(
+			array(
+				'order_id'   => $id,
+				'amount'     => '100',
+				'line_items' => array(),
+			)
+		);
 		$this->assertEquals( 300, $object->get_remaining_refund_amount() );
 	}
 
 	/**
 	 * Test: get_total_tax_refunded_by_rate_id
 	 */
-	function test_get_remaining_refund_items() {
+	public function test_get_remaining_refund_items() {
 		$object = WC_Helper_Order::create_order();
 		$this->assertEquals( 4, $object->get_remaining_refund_items() );
 	}
@@ -1659,26 +1723,29 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	/**
 	 * Test that if an exception is thrown when creating a refund, the refund is deleted from database.
 	 */
-	function test_refund_exception() {
+	public function test_refund_exception() {
 		$order = WC_Helper_Order::create_order();
 		add_action( 'woocommerce_create_refund', array( $this, 'throwAnException' ) );
-		$refund = wc_create_refund( array(
-			'order_id'   => $order->get_id(),
-			'amount'     => $order->get_total(),
-			'line_items' => array(),
-		) );
+		$refund = wc_create_refund(
+			array(
+				'order_id'   => $order->get_id(),
+				'amount'     => $order->get_total(),
+				'line_items' => array(),
+			)
+		);
 		remove_action( 'woocommerce_create_refund', array( $this, 'throwAnException' ) );
 		$this->assertEmpty( $order->get_refunds() );
 	}
 
 	/**
 	 * Test apply_coupon and remove_coupon with a fixed discount coupon.
+	 *
 	 * @since 3.2.0
 	 */
-	function test_add_remove_coupon_fixed() {
+	public function test_add_remove_coupon_fixed() {
 		$order = WC_Helper_Order::create_order();
 
-		$coupon = new WC_Coupon;
+		$coupon = new WC_Coupon();
 		$coupon->set_code( 'test' );
 		$coupon->set_discount_type( 'fixed_cart' );
 		$coupon->set_amount( 10 );
@@ -1696,12 +1763,13 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 
 	/**
 	 * Test apply_coupon and remove_coupon with a percent discount coupon.
+	 *
 	 * @since 3.2.0
 	 */
-	function test_add_remove_coupon_percent() {
+	public function test_add_remove_coupon_percent() {
 		$order = WC_Helper_Order::create_order();
 
-		$coupon = new WC_Coupon;
+		$coupon = new WC_Coupon();
 		$coupon->set_code( 'test' );
 		$coupon->set_discount_type( 'percent' );
 		$coupon->set_amount( 50 );
@@ -1722,22 +1790,26 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 	 *
 	 * @since 3.2.0
 	 */
-	function test_add_remove_items() {
+	public function test_add_remove_items() {
 		$product = WC_Helper_Product::create_simple_product();
 		$object  = new WC_Order();
 		$item_1  = new WC_Order_Item_Product();
-		$item_1->set_props( array(
-			'product'  => $product,
-			'quantity' => 4,
-			'total'    => 100,
-		) );
+		$item_1->set_props(
+			array(
+				'product'  => $product,
+				'quantity' => 4,
+				'total'    => 100,
+			)
+		);
 		$item_1_id = $item_1->save();
-		$item_2  = new WC_Order_Item_Product();
-		$item_2->set_props( array(
-			'product'  => $product,
-			'quantity' => 2,
-			'total'    => 100,
-		) );
+		$item_2    = new WC_Order_Item_Product();
+		$item_2->set_props(
+			array(
+				'product'  => $product,
+				'quantity' => 2,
+				'total'    => 100,
+			)
+		);
 		$item_2_id = $item_2->save();
 		$object->add_item( $item_1 );
 		$object->add_item( $item_2 );
@@ -1748,12 +1820,14 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
 
 		// remove an item and add an item, then compare totals.
 		$object->remove_item( $item_1_id );
-		$item_3  = new WC_Order_Item_Product();
-		$item_3->set_props( array(
-			'product'  => $product,
-			'quantity' => 1,
-			'total'    => 100,
-		) );
+		$item_3 = new WC_Order_Item_Product();
+		$item_3->set_props(
+			array(
+				'product'  => $product,
+				'quantity' => 1,
+				'total'    => 100,
+			)
+		);
 		$object->add_item( $item_3 );
 		$object->save();
 		$object->calculate_totals();