diff --git a/inc/woocommerce.php b/inc/woocommerce.php
index 29d3de0..a0e0cf1 100644
--- a/inc/woocommerce.php
+++ b/inc/woocommerce.php
@@ -15,7 +15,7 @@ if ( ! function_exists( 'understrap_woocommerce_support' ) ) {
 	 * Declares WooCommerce theme support.
 	 */
 	function understrap_woocommerce_support() {
-		add_theme_support( 'woocommerce' );
+		add_theme_support( 'understrap' );
 
 		// Add New Woocommerce 3.0.0 Product Gallery support.
 		add_theme_support( 'wc-product-gallery-lightbox' );
diff --git a/woocommerce/cart/cart-empty.php b/woocommerce/cart/cart-empty.php
index fd2a9cb..ca6c9c5 100644
--- a/woocommerce/cart/cart-empty.php
+++ b/woocommerce/cart/cart-empty.php
@@ -12,7 +12,7 @@
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
  * @package WooCommerce/Templates
- * @version 3.5.1
+ * @version 3.6.1
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/woocommerce/cart/cart.php b/woocommerce/cart/cart.php
index 581f2c1..eeb677c 100644
--- a/woocommerce/cart/cart.php
+++ b/woocommerce/cart/cart.php
@@ -12,7 +12,7 @@
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
  * @package WooCommerce/Templates
- * @version 3.5.1
+ * @version 3.6.1
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/woocommerce/cart/mini-cart.php b/woocommerce/cart/mini-cart.php
index b8abe1f..9c973b9 100644
--- a/woocommerce/cart/mini-cart.php
+++ b/woocommerce/cart/mini-cart.php
@@ -15,7 +15,7 @@
  * @see     https://docs.woocommerce.com/document/template-structure/
  * @author  WooThemes
  * @package WooCommerce/Templates
- * @version 3.5.1
+ * @version 3.6.1
  */
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
diff --git a/woocommerce/cart/proceed-to-checkout-button.php b/woocommerce/cart/proceed-to-checkout-button.php
index 344bf7d..110c6ab 100644
--- a/woocommerce/cart/proceed-to-checkout-button.php
+++ b/woocommerce/cart/proceed-to-checkout-button.php
@@ -15,7 +15,7 @@
  * @see     https://docs.woocommerce.com/document/template-structure/
  * @author  WooThemes
  * @package WooCommerce/Templates
- * @version 2.4.0
+ * @version 3.6.1
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/woocommerce/checkout/form-checkout.php b/woocommerce/checkout/form-checkout.php
index 5146a4b..50d78b5 100644
--- a/woocommerce/checkout/form-checkout.php
+++ b/woocommerce/checkout/form-checkout.php
@@ -12,7 +12,7 @@
  *
  * @see https://docs.woocommerce.com/document/template-structure/
  * @package WooCommerce/Templates
- * @version 3.5.1
+ * @version 3.6.1
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/woocommerce/checkout/form-coupon.php b/woocommerce/checkout/form-coupon.php
index 364c7b2..aac6617 100644
--- a/woocommerce/checkout/form-coupon.php
+++ b/woocommerce/checkout/form-coupon.php
@@ -12,7 +12,7 @@
  *
  * @see https://docs.woocommerce.com/document/template-structure/
  * @package WooCommerce/Templates
- * @version 3.4.4
+ * @version 3.6.1
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/woocommerce/checkout/form-pay.php b/woocommerce/checkout/form-pay.php
index fa098c0..63dc14b 100644
--- a/woocommerce/checkout/form-pay.php
+++ b/woocommerce/checkout/form-pay.php
@@ -12,7 +12,7 @@
  *
  * @see https://docs.woocommerce.com/document/template-structure/
  * @package WooCommerce/Templates
- * @version 3.4.0
+ * @version 3.6.1
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/woocommerce/checkout/payment.php b/woocommerce/checkout/payment.php
index a83c966..9b8ff17 100644
--- a/woocommerce/checkout/payment.php
+++ b/woocommerce/checkout/payment.php
@@ -12,7 +12,7 @@
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
  * @package WooCommerce/Templates
- * @version 3.5.3
+ * @version 3.6.1
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/woocommerce/global/form-login.php b/woocommerce/global/form-login.php
index e9f6bee..b0a03ee 100644
--- a/woocommerce/global/form-login.php
+++ b/woocommerce/global/form-login.php
@@ -12,7 +12,8 @@
  *
  * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @package 	WooCommerce/Templates
- * @version     3.6.0
+
+ * @version     3.6.1
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/woocommerce/global/quantity-input.php b/woocommerce/global/quantity-input.php
index a3ec3fc..f5dcf22 100644
--- a/woocommerce/global/quantity-input.php
+++ b/woocommerce/global/quantity-input.php
@@ -12,7 +12,7 @@
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
  * @package WooCommerce/Templates
- * @version 3.6.0
+ * @version 3.6.1
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/woocommerce/loop/add-to-cart.php b/woocommerce/loop/add-to-cart.php
index ccd35c1..ecd9133 100644
--- a/woocommerce/loop/add-to-cart.php
+++ b/woocommerce/loop/add-to-cart.php
@@ -13,7 +13,7 @@
  * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @author 		WooThemes
  * @package 	WooCommerce/Templates
- * @version     3.3.0
+ * @version     3.6.1
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/woocommerce/loop/orderby.php b/woocommerce/loop/orderby.php
index bd4c825..b31a8b6 100644
--- a/woocommerce/loop/orderby.php
+++ b/woocommerce/loop/orderby.php
@@ -12,7 +12,7 @@
  *
  * @see 	    https://docs.woocommerce.com/document/template-structure/
  * @package 	WooCommerce/Templates
- * @version     3.6.0
+ * @version     3.6.1
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/woocommerce/myaccount/downloads.php b/woocommerce/myaccount/downloads.php
index 7904946..add3e2a 100644
--- a/woocommerce/myaccount/downloads.php
+++ b/woocommerce/myaccount/downloads.php
@@ -15,7 +15,7 @@
  * @see 	https://docs.woocommerce.com/document/template-structure/
  * @author  WooThemes
  * @package WooCommerce/Templates
- * @version 3.2.0
+ * @version 3.6.1
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/woocommerce/myaccount/form-edit-account.php b/woocommerce/myaccount/form-edit-account.php
index faf003b..1f326b0 100644
--- a/woocommerce/myaccount/form-edit-account.php
+++ b/woocommerce/myaccount/form-edit-account.php
@@ -12,7 +12,7 @@
  *
  * @see https://docs.woocommerce.com/document/template-structure/
  * @package WooCommerce/Templates
- * @version 3.5.1
+ * @version 3.6.1
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/woocommerce/myaccount/form-edit-address.php b/woocommerce/myaccount/form-edit-address.php
index c2225b7..30f0f2e 100644
--- a/woocommerce/myaccount/form-edit-address.php
+++ b/woocommerce/myaccount/form-edit-address.php
@@ -12,7 +12,7 @@
  *
  * @see https://docs.woocommerce.com/document/template-structure/
  * @package WooCommerce/Templates
- * @version 3.6.0
+ * @version 3.6.1
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/woocommerce/myaccount/form-login.php b/woocommerce/myaccount/form-login.php
index 14f5f05..44d13b8 100644
--- a/woocommerce/myaccount/form-login.php
+++ b/woocommerce/myaccount/form-login.php
@@ -12,7 +12,7 @@
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
  * @package WooCommerce/Templates
- * @version 3.6.0
+ * @version 3.6.1
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/woocommerce/myaccount/form-lost-password.php b/woocommerce/myaccount/form-lost-password.php
index a683089..f6fcaf6 100644
--- a/woocommerce/myaccount/form-lost-password.php
+++ b/woocommerce/myaccount/form-lost-password.php
@@ -12,7 +12,7 @@
  *
  * @see https://docs.woocommerce.com/document/template-structure/
  * @package WooCommerce/Templates
- * @version 3.5.2
+ * @version 3.6.1
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/woocommerce/myaccount/form-reset-password.php b/woocommerce/myaccount/form-reset-password.php
index 4316ad4..529c39b 100644
--- a/woocommerce/myaccount/form-reset-password.php
+++ b/woocommerce/myaccount/form-reset-password.php
@@ -12,7 +12,7 @@
  *
  * @see https://docs.woocommerce.com/document/template-structure/
  * @package WooCommerce/Templates
- * @version 3.5.5
+ * @version 3.6.1
  */
 
 defined( 'ABSPATH' ) || exit;
@@ -50,4 +50,3 @@ do_action( 'woocommerce_before_reset_password_form' );
 </form>
 <?php
 do_action( 'woocommerce_after_reset_password_form' );
-
diff --git a/woocommerce/myaccount/my-address.php b/woocommerce/myaccount/my-address.php
index e511eb4..7b9d2f3 100644
--- a/woocommerce/myaccount/my-address.php
+++ b/woocommerce/myaccount/my-address.php
@@ -13,7 +13,7 @@
  * @see     https://docs.woocommerce.com/document/template-structure/
  * @author  WooThemes
  * @package WooCommerce/Templates
- * @version 2.6.0
+ * @version 3.6.1
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/woocommerce/myaccount/navigation.php b/woocommerce/myaccount/navigation.php
index edb1a7d..b71f633 100644
--- a/woocommerce/myaccount/navigation.php
+++ b/woocommerce/myaccount/navigation.php
@@ -13,7 +13,7 @@
  * @see     https://docs.woocommerce.com/document/template-structure/
  * @author  WooThemes
  * @package WooCommerce/Templates
- * @version 2.6.0
+ * @version 3.6.1
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/woocommerce/myaccount/orders.php b/woocommerce/myaccount/orders.php
index 56c4ae9..d22db40 100644
--- a/woocommerce/myaccount/orders.php
+++ b/woocommerce/myaccount/orders.php
@@ -15,7 +15,7 @@
  * @see 	https://docs.woocommerce.com/document/template-structure/
  * @author  WooThemes
  * @package WooCommerce/Templates
- * @version 3.2.0
+ * @version 3.6.1
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -66,7 +66,7 @@ do_action( 'woocommerce_before_account_orders', $has_orders ); ?>
 							<?php elseif ( 'order-actions' === $column_id ) : ?>
 								<?php
 								$actions = wc_get_account_orders_actions( $order );
-								
+
 								if ( ! empty( $actions ) ) {
 									foreach ( $actions as $key => $action ) {
 										echo '<a href="' . esc_url( $action['url'] ) . '" class="woocommerce-button button ' . sanitize_html_class( $key ) . '">' . esc_html( $action['name'] ) . '</a>';
diff --git a/woocommerce/product-searchform.php b/woocommerce/product-searchform.php
index c0b9b5e..b8fb487 100644
--- a/woocommerce/product-searchform.php
+++ b/woocommerce/product-searchform.php
@@ -13,7 +13,7 @@
  * @see     https://docs.woocommerce.com/document/template-structure/
  * @author  WooThemes
  * @package WooCommerce/Templates
- * @version 3.3.0
+ * @version 3.6.1
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/woocommerce/single-product/add-to-cart/simple.php b/woocommerce/single-product/add-to-cart/simple.php
index 733843e..6964e99 100644
--- a/woocommerce/single-product/add-to-cart/simple.php
+++ b/woocommerce/single-product/add-to-cart/simple.php
@@ -12,7 +12,7 @@
  *
  * @see https://docs.woocommerce.com/document/template-structure/
  * @package WooCommerce/Templates
- * @version 3.4.0
+ * @version 3.6.1
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/woocommerce/single-product/add-to-cart/variation-add-to-cart-button.php b/woocommerce/single-product/add-to-cart/variation-add-to-cart-button.php
index ec3c6ac..c99506b 100644
--- a/woocommerce/single-product/add-to-cart/variation-add-to-cart-button.php
+++ b/woocommerce/single-product/add-to-cart/variation-add-to-cart-button.php
@@ -4,7 +4,7 @@
  *
  * @see https://docs.woocommerce.com/document/template-structure/
  * @package WooCommerce/Templates
- * @version 3.4.0
+ * @version 3.6.1
  */
 
 defined( 'ABSPATH' ) || exit;
diff --git a/woocommerce/single-product/rating.php b/woocommerce/single-product/rating.php
index b1be13d..1f65e8c 100644
--- a/woocommerce/single-product/rating.php
+++ b/woocommerce/single-product/rating.php
@@ -12,7 +12,7 @@
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
  * @package WooCommerce/Templates
- * @version 3.6.0
+ * @version 3.6.1
  */
 
 if ( ! defined( 'ABSPATH' ) ) {