diff --git a/admin/about/page-github.php b/admin/about/page-github.php
index d66ef92..100ab37 100644
--- a/admin/about/page-github.php
+++ b/admin/about/page-github.php
@@ -1,5 +1,5 @@
 <h3><?php esc_html_e( 'Actively Developed on Github', 'polestar' ); ?></h3>
-<img src="<?php echo get_template_directory_uri() ?>/admin/about/github.png" class="about-image-right about-image-no-text-below" />
+<img src="<?php echo esc_url( get_template_directory_uri() ); ?>/admin/about/github.png" class="about-image-right about-image-no-text-below" />
 <p>
 	<?php printf( esc_html__( "Polestar is actively %sdeveloped on Github%s.", 'polestar' ), '<a href="https://github.com/purothemes/polestar" target="_blank">', '</a>' ); ?>
 	<?php esc_html_e( "You can follow commits, open issues and make contributions yourself.", 'polestar' ); ?>
diff --git a/admin/about/page-woocommerce.php b/admin/about/page-woocommerce.php
index ce28919..3c90d9e 100644
--- a/admin/about/page-woocommerce.php
+++ b/admin/about/page-woocommerce.php
@@ -1,5 +1,5 @@
 <h3><?php esc_html_e( 'WooCommerce Integration', 'polestar' ) ?></h3>
-<img src="<?php echo get_template_directory_uri() ?>/admin/about/woocommerce.png" class="about-image-right about-image-no-text-below" />
+<img src="<?php echo esc_url( get_template_directory_uri() ); ?>/admin/about/woocommerce.png" class="about-image-right about-image-no-text-below" />
 <p>
 	<?php esc_html_e( "Polestar is a full-featured WooCommerce theme.", 'polestar' ) ?>
 	<?php esc_html_e( "Featuring premium features like a menu mini-cart and product Quick View. Polestar offers custom WooCommerce styling, keeping your store fast and looking good.", 'polestar' ) ?>
diff --git a/build b/build
index 0f95868..f44c846 160000
--- a/build
+++ b/build
@@ -1 +1 @@
-Subproject commit 0f958680c7dee22820a25ed58c5f22cb85a41163
+Subproject commit f44c84634d37a305d3d77f49cd2abc3351221601
diff --git a/header.php b/header.php
index 196b025..0be0d00 100644
--- a/header.php
+++ b/header.php
@@ -68,7 +68,13 @@
 								<?php endif; ?>
 							
 								<?php if ( get_theme_mod( 'header_menu', true ) ) : ?>
+
+									<?php do_action( 'polestar_menu_before' ); ?>
+
 									<?php wp_nav_menu( array( 'theme_location' => 'menu-1', 'menu_id' => 'primary-menu' ) ); ?>
+
+									<?php do_action( 'polestar_menu_after' ); ?>
+								
 								<?php endif; ?>
 
 								<?php if ( function_exists( 'is_woocommerce' ) && get_theme_mod( 'mini_cart', false ) && ! $mega_menu_active ) polestar_mini_cart(); ?>
@@ -98,7 +104,7 @@
 							<div id="header-search">
 								<div class="polestar-container">
 									<label for='s' class='screen-reader-text'><?php esc_html_e( 'Search for:', 'polestar' ); ?></label>
-									<?php get_search_form() ?>
+									<?php get_search_form(); ?>
 									<a id="close-search">
 										<span class="screen-reader-text"><?php esc_html_e( 'Close search bar', 'polestar' ); ?></span>
 										<?php polestar_display_icon( 'close' ); ?>
diff --git a/inc/extras b/inc/extras
index 40b946e..4b84acd 160000
--- a/inc/extras
+++ b/inc/extras
@@ -1 +1 @@
-Subproject commit 40b946e5d2cf92cc16f1c56c55ac3879b71e3ff4
+Subproject commit 4b84acd0fc4317af11c4e93011c034e43e838dc9
diff --git a/readme.txt b/readme.txt
index 9713b5a..b2284cc 100644
--- a/readme.txt
+++ b/readme.txt
@@ -4,8 +4,9 @@ Contributors: Puro
 
 Tags: one-column, two-columns, left-sidebar, right-sidebar, custom-background, custom-colors, custom-menu, custom-logo, featured-images, footer-widgets, full-width-template, post-formats, sticky-post, theme-options, threaded-comments, translation-ready, blog, e-commerce
 
+Tested up to: 5.5
 Requires at least: 4.7
-Tested up to: 5.3
+Requires PHP: 5.6.20
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -110,7 +111,7 @@ Polestar WordPress Theme is derived from [Underscores WordPress Theme](http://un
 
 == Images ==
 
-Screenshot image "Half Dome Village, Yosemite Valley, United States" sourced from https://unsplash.com by [Billy Chester](https://unsplash.com/@billychester) licensed under [CC0 1.0 Universal (CC0 1.0)](http://creativecommons.org/publicdomain/zero/1.0/).
+Screenshot image "Half Dome Village, Yosemite Valley, United States" sourced from [Stocksnap.io](https://stocksnap.io/photo/mountain-landscape-P1LPBIJDEI) by [Billy Chester](https://stocksnap.io/author/43498) licensed under [CC0 1.0 Universal (CC0 1.0)](http://creativecommons.org/publicdomain/zero/1.0/).
 
 == Fonts and Icons ==
 
@@ -150,6 +151,15 @@ Released under [GPL version 2](https://www.gnu.org/licenses/old-licenses/gpl-2.0
 
 == Changelog ==
 
+= 1.4.1 - 26 July 2020 =
+* WooCommerce: Adjusted spacing for `No Products` notification.
+* Minor code formatting enhancements.
+* WooCommerce: Removed variation price negative margin on single product page.
+* WooCommerce: Minor improvements for Variation Swatches for WooCommerce plugin
+* WooCommerce: Updated `single-product-reviews.php` template to `4.3.0`.
+* Main Menu: Ensured drop-down width handles additional content such as translation flags.
+* Added new menu before and after action hooks. `polestar_menu_before` and `polestar_menu_after`.
+
 = 1.4.0 - 16 February 2020 =
 * Added a page Featured Image setting located at `Customize > Theme Settings > Pages > Featured Image`.
 * Fixed header overlap light mobile menu cart icon color.
diff --git a/sass/navigation/_menus.scss b/sass/navigation/_menus.scss
index dc2e641..a184f86 100644
--- a/sass/navigation/_menus.scss
+++ b/sass/navigation/_menus.scss
@@ -39,6 +39,7 @@
 				margin: 0;
 				padding: 0;
 				min-width: 100%;
+				width: max-content;
 
 				&:hover > ul,
 				&.focus > ul {
diff --git a/sass/style.scss b/sass/style.scss
index 162e52c..c2b2769 100644
--- a/sass/style.scss
+++ b/sass/style.scss
@@ -5,6 +5,9 @@ Author URI: https://purothemes.com/
 Theme URI: https://purothemes.com/themes/polestar/
 Description: Lead the way with Polestar. It's fast loading, responsive, lightweight and flexible design is perfectly suited for building dynamic pages with SiteOrigin's Page Builder and selling with WooCommerce. Ecommerce features include a menu mini-cart and product quick-view. Polestar features a sticky header, beautiful header search, scroll to top and just the right amount of Customizer theme settings. Page level settings let you adjust the theme layout on a page by page basis, perfect for landing pages. If you run a blog, Polestar is ready with awesome features including a full-width posts slider integrated with Jetpack Featured Content, an author box and related posts section. For assistance, check out our <a href="http://purothemes.com/documentation/">theme documentation</a> (http://purothemes.com/documentation/) or ask a question on our <a href="https://purothemes.com/support/">support forum</a> (https://purothemes.com/support/).
 Version: dev
+Tested up to: 5.5
+Requires at least: 4.7
+Requires PHP: 5.6.20
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: polestar
diff --git a/sass/woocommerce/_archive.scss b/sass/woocommerce/_archive.scss
index 951edfe..eec7791 100644
--- a/sass/woocommerce/_archive.scss
+++ b/sass/woocommerce/_archive.scss
@@ -25,6 +25,11 @@
 		}
 	}
 
+	// No products were found matching your selection notification.
+	&.archive .woocommerce-info {
+		margin-top: 30px;
+	}
+
 	// Result count.
 	.woocommerce-result-count {
 		align-items: flex-end;
diff --git a/sass/woocommerce/_quick-view.scss b/sass/woocommerce/_quick-view.scss
index 0f69f82..fd4e5fe 100644
--- a/sass/woocommerce/_quick-view.scss
+++ b/sass/woocommerce/_quick-view.scss
@@ -14,8 +14,8 @@
 	.quick-view {
 		background: #fff;
 		bottom: 0;
-		height: 575px;
 		display: inline-block;
+		height: 575px;
 		left: 0;
 		margin: auto;
 		max-width: 1140px;
@@ -34,8 +34,8 @@
 
 	.quickview-close-icon {
 		color: $color__text-dark;
-		display: block;
 		cursor: pointer;
+		display: block;
 		font-size: 35px;
 		line-height: 1;
 		position: absolute;
@@ -92,7 +92,7 @@
 
 			@media (max-width: 768px) {
 				float: none;
-				padding-top: 0; 
+				padding-top: 0;
 				width: 100%;
 			}
 
@@ -100,6 +100,18 @@
 				line-height: normal;
 				margin: 0; 
 			}
+
+			.variations .value {
+				position: relative;
+			}
+
+			// Variation Swatches for WooCommerce plugin.
+			.variable-items-wrapper ~ .reset_variations {
+				bottom: -10px;
+				left: 0;
+				margin-left: 0;
+				position: absolute;
+			}
 		}
 	}
 }
diff --git a/sass/woocommerce/_single.scss b/sass/woocommerce/_single.scss
index f00231f..9257247 100644
--- a/sass/woocommerce/_single.scss
+++ b/sass/woocommerce/_single.scss
@@ -45,8 +45,8 @@
 					}
 
 					img {
-						display: block;
 						box-shadow: #000 0 0 0;
+						display: block;
 						opacity: .5;
 
 						&.flex-active,
@@ -71,30 +71,30 @@
 				z-index: 9;
 
 				&:before {
+					border: 2px solid #000;
+					border-radius: 100%;
+					box-sizing: content-box;
 					content: "";
 					display: block;
-					width: 10px;
 					height: 10px;
-					border: 2px solid #000;
-					border-radius: 100%;
+					left: 9px;
 					position: absolute;
 					top: 9px;
-					left: 9px;
-					box-sizing: content-box;
+					width: 10px;
 				}
 
 				&:after {
+					background: #000;
 					content: "";
+					border-radius: 6px;
+					box-sizing: content-box;
 					display: block;
-					width: 2px;
 					height: 8px;
-					background: #000;
-					border-radius: 6px;
+					left: 22px;
 					position: absolute;
 					top: 19px;
-					left: 22px;
-					@include transform(rotate(-45deg));
-					box-sizing: content-box;
+					@include transform( rotate(-45deg) );
+					width: 2px;
 				}
 			}
 		}
@@ -188,12 +188,23 @@
 						color: $color__accent;
 					}
 				}
+
+				// Variation Swatches for WooCommerce plugin.
+				.woo-variation-items-wrapper {
+					position: relative;
+
+					.reset_variations {
+						bottom: -10px;
+						left: 0;
+						margin-left: 0;
+						position: absolute;
+					}
+				}
 			}
 
 			.woocommerce-variation .woocommerce-variation-price .price {
 				display: block;
-				margin-top: -25px;
-				width: 100%; 
+				width: 100%;
 			}
 
 			.woocommerce-grouped-product-list {
@@ -212,7 +223,7 @@
 				td {
 					padding: 0;
 				}
-				
+
 				td {
 
 					input {
@@ -312,7 +323,7 @@
 					display: inline-block;
 					font-family: $font__headings;
 					margin: 0 30px 0 0;
-					padding-bottom: 5px; 
+					padding-bottom: 5px;
 					text-transform: uppercase;
 
 					@media (max-width: 768px) {
@@ -322,10 +333,10 @@
 					}
 
 					a {
-						color: $color__text-dark;
-						font-weight: 600; 
 						display: inline-block;
-						outline: 0; 
+						color: $color__text-dark;
+						font-weight: 600;
+						outline: 0;
 					}
 
 					&.active {
@@ -356,9 +367,9 @@
 
 				th.woocommerce-product-attributes-item__label {
 					color: $color__text-dark;
+					padding-left: 0;
 					text-align: left;
 					text-transform: capitalize;
-					padding-left: 0;
 				}
 
 				th,
@@ -370,7 +381,7 @@
 
 					th,
 					td {
-						padding-bottom: 0 
+						padding-bottom: 0;
 					}
 				}
 			}
@@ -388,7 +399,7 @@
 		.woocommerce-Reviews {
 
 			.woocommerce-noreviews {
-				font-size: 14px; 
+				font-size: 14px;
 				margin-bottom: 16px;
 			}
 
@@ -461,28 +472,28 @@
 			.stars {
 
 				a {
-					position: relative;
-					height: 1em;
-					width: 1em;
-					text-indent: -999em;
 					display: inline-block;
+					height: 1em;
+					position: relative;
 					text-decoration: none;
+					text-indent: -999em;
+					width: 1em;
 
 					&:hover {
 						color: $color__accent;
 					}
 
 					&:before {
+						content: "\e021";
 						display: block;
-						position: absolute;
-						top: 0;
-						left: 0;
-						width: 1em;
+						font-family: "WooCommerce";
 						height: 1em;
+						left: 0;
 						line-height: 1;
-						font-family: "WooCommerce";
-						content: "\e021";
+						position: absolute;
 						text-indent: 0;
+						top: 0;
+						width: 1em;
 					}
 
 					&:hover {
@@ -560,7 +571,7 @@
 
 		// Upsells and related products.
 		.woocommerce-tabs ~ .products .product {
-			
+
 			@media (min-width: 769px) {
 				clear: none;
 				margin-right: 3.5%;
diff --git a/searchform.php b/searchform.php
index d94172f..c7a71f5 100644
--- a/searchform.php
+++ b/searchform.php
@@ -1,6 +1,6 @@
 <form method="get" class="search-form" action="<?php echo esc_url( home_url( '/' ) ) ?>">
 	<label for='s' class='screen-reader-text'><?php esc_html_e( 'Search for:', 'polestar' ); ?></label>
-	<input type="search" name="s" placeholder="<?php esc_attr_e( 'Search', 'polestar') ?>" value="<?php echo get_search_query() ?>" />
+	<input type="search" name="s" placeholder="<?php esc_attr_e( 'Search', 'polestar') ?>" value="<?php echo get_search_query(); ?>" />
 	<button type="submit">
 		<label class="screen-reader-text"><?php esc_html_e( 'Search', 'polestar' ); ?></label>
 		<?php polestar_display_icon( 'search' ); ?>
diff --git a/style.css b/style.css
index cce6ec0..b96d2c0 100644
--- a/style.css
+++ b/style.css
@@ -5,6 +5,9 @@ Author URI: https://purothemes.com/
 Theme URI: https://purothemes.com/themes/polestar/
 Description: Lead the way with Polestar. It's fast loading, responsive, lightweight and flexible design is perfectly suited for building dynamic pages with SiteOrigin's Page Builder and selling with WooCommerce. Ecommerce features include a menu mini-cart and product quick-view. Polestar features a sticky header, beautiful header search, scroll to top and just the right amount of Customizer theme settings. Page level settings let you adjust the theme layout on a page by page basis, perfect for landing pages. If you run a blog, Polestar is ready with awesome features including a full-width posts slider integrated with Jetpack Featured Content, an author box and related posts section. For assistance, check out our <a href="http://purothemes.com/documentation/">theme documentation</a> (http://purothemes.com/documentation/) or ask a question on our <a href="https://purothemes.com/support/">support forum</a> (https://purothemes.com/support/).
 Version: dev
+Tested up to: 5.5
+Requires at least: 4.7
+Requires PHP: 5.6.20
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: polestar
@@ -625,7 +628,8 @@ a {
       .main-navigation ul .children li {
         margin: 0;
         padding: 0;
-        min-width: 100%; }
+        min-width: 100%;
+        width: max-content; }
         .main-navigation ul .sub-menu li:hover > ul,
         .main-navigation ul .sub-menu li.focus > ul,
         .main-navigation ul .children li:hover > ul,
diff --git a/woocommerce.css b/woocommerce.css
index fa15f21..d0ca9b0 100644
--- a/woocommerce.css
+++ b/woocommerce.css
@@ -280,6 +280,9 @@ input.button.added:after,
     .woocommerce.archive .page-title {
       font-size: 23px; } }
 
+.woocommerce.archive .woocommerce-info {
+  margin-top: 30px; }
+
 .woocommerce .woocommerce-result-count {
   align-items: flex-end;
   color: #828282;
@@ -598,8 +601,8 @@ input.button.added:after,
         .woocommerce .product .images .flex-control-thumbs li:nth-of-type(4n+4) {
           margin-right: 0; }
         .woocommerce .product .images .flex-control-thumbs li img {
-          display: block;
           box-shadow: #000 0 0 0;
+          display: block;
           opacity: .5; }
           .woocommerce .product .images .flex-control-thumbs li img.flex-active, .woocommerce .product .images .flex-control-thumbs li img:hover {
             opacity: 1; }
@@ -616,32 +619,32 @@ input.button.added:after,
       width: 36px;
       z-index: 9; }
       .woocommerce .product .images .woocommerce-product-gallery__trigger:before {
+        border: 2px solid #000;
+        border-radius: 100%;
+        box-sizing: content-box;
         content: "";
         display: block;
-        width: 10px;
         height: 10px;
-        border: 2px solid #000;
-        border-radius: 100%;
+        left: 9px;
         position: absolute;
         top: 9px;
-        left: 9px;
-        box-sizing: content-box; }
+        width: 10px; }
       .woocommerce .product .images .woocommerce-product-gallery__trigger:after {
+        background: #000;
         content: "";
+        border-radius: 6px;
+        box-sizing: content-box;
         display: block;
-        width: 2px;
         height: 8px;
-        background: #000;
-        border-radius: 6px;
+        left: 22px;
         position: absolute;
         top: 19px;
-        left: 22px;
         -webkit-transform: rotate(-45deg);
         -moz-transform: rotate(-45deg);
         -ms-transform: rotate(-45deg);
         -o-transform: rotate(-45deg);
         transform: rotate(-45deg);
-        box-sizing: content-box; }
+        width: 2px; }
   .woocommerce .product .summary,
   .woocommerce .product .product-info-wrapper {
     float: right;
@@ -716,10 +719,18 @@ input.button.added:after,
         .woocommerce .product .summary .variations .reset_variations:hover,
         .woocommerce .product .product-info-wrapper .variations .reset_variations:hover {
           color: #4d8ffb; }
+      .woocommerce .product .summary .variations .woo-variation-items-wrapper,
+      .woocommerce .product .product-info-wrapper .variations .woo-variation-items-wrapper {
+        position: relative; }
+        .woocommerce .product .summary .variations .woo-variation-items-wrapper .reset_variations,
+        .woocommerce .product .product-info-wrapper .variations .woo-variation-items-wrapper .reset_variations {
+          bottom: -10px;
+          left: 0;
+          margin-left: 0;
+          position: absolute; }
     .woocommerce .product .summary .woocommerce-variation .woocommerce-variation-price .price,
     .woocommerce .product .product-info-wrapper .woocommerce-variation .woocommerce-variation-price .price {
       display: block;
-      margin-top: -25px;
       width: 100%; }
     .woocommerce .product .summary .woocommerce-grouped-product-list,
     .woocommerce .product .product-info-wrapper .woocommerce-grouped-product-list {
@@ -819,9 +830,9 @@ input.button.added:after,
             font-size: 0.9333rem;
             margin-bottom: 10px; } }
         .woocommerce .product .woocommerce-tabs .wc-tabs li a {
+          display: inline-block;
           color: #2d2d2d;
           font-weight: 600;
-          display: inline-block;
           outline: 0; }
         .woocommerce .product .woocommerce-tabs .wc-tabs li.active {
           border-bottom: 2px solid #4d8ffb; }
@@ -839,9 +850,9 @@ input.button.added:after,
       border: none; }
       .woocommerce .product .shop_attributes tr th.woocommerce-product-attributes-item__label {
         color: #2d2d2d;
+        padding-left: 0;
         text-align: left;
-        text-transform: capitalize;
-        padding-left: 0; }
+        text-transform: capitalize; }
       .woocommerce .product .shop_attributes tr th,
       .woocommerce .product .shop_attributes tr td {
         padding: 8px; }
@@ -896,25 +907,25 @@ input.button.added:after,
   .woocommerce .product .woocommerce-Reviews .comment-respond {
     margin-top: 25px; }
   .woocommerce .product .woocommerce-Reviews .stars a {
-    position: relative;
+    display: inline-block;
     height: 1em;
-    width: 1em;
+    position: relative;
+    text-decoration: none;
     text-indent: -999em;
-    display: inline-block;
-    text-decoration: none; }
+    width: 1em; }
     .woocommerce .product .woocommerce-Reviews .stars a:hover {
       color: #4d8ffb; }
     .woocommerce .product .woocommerce-Reviews .stars a:before {
+      content: "\e021";
       display: block;
-      position: absolute;
-      top: 0;
-      left: 0;
-      width: 1em;
+      font-family: "WooCommerce";
       height: 1em;
+      left: 0;
       line-height: 1;
-      font-family: "WooCommerce";
-      content: "\e021";
-      text-indent: 0; }
+      position: absolute;
+      text-indent: 0;
+      top: 0;
+      width: 1em; }
     .woocommerce .product .woocommerce-Reviews .stars a:hover ~ a:before {
       content: "\e021"; }
   .woocommerce .product .woocommerce-Reviews .stars:hover a:before {
@@ -971,8 +982,8 @@ input.button.added:after,
   #quick-view-container .quick-view {
     background: #fff;
     bottom: 0;
-    height: 575px;
     display: inline-block;
+    height: 575px;
     left: 0;
     margin: auto;
     max-width: 1140px;
@@ -988,8 +999,8 @@ input.button.added:after,
         width: 85%; } }
   #quick-view-container .quickview-close-icon {
     color: #2d2d2d;
-    display: block;
     cursor: pointer;
+    display: block;
     font-size: 35px;
     line-height: 1;
     position: absolute;
@@ -1027,6 +1038,13 @@ input.button.added:after,
     #quick-view-container .product-content-wrapper .product-info-wrapper .entry-title {
       line-height: normal;
       margin: 0; }
+    #quick-view-container .product-content-wrapper .product-info-wrapper .variations .value {
+      position: relative; }
+    #quick-view-container .product-content-wrapper .product-info-wrapper .variable-items-wrapper ~ .reset_variations {
+      bottom: -10px;
+      left: 0;
+      margin-left: 0;
+      position: absolute; }
 
 /*--------------------------------------------------------------
 # Widgets
diff --git a/woocommerce/single-product-reviews.php b/woocommerce/single-product-reviews.php
index f1b6d0f..06f6d5e 100644
--- a/woocommerce/single-product-reviews.php
+++ b/woocommerce/single-product-reviews.php
@@ -12,12 +12,10 @@
  *
  * @see     https://docs.woocommerce.com/document/template-structure/
  * @package WooCommerce/Templates
- * @version 3.6.0
+ * @version 4.3.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly.
-}
+defined( 'ABSPATH' ) || exit;
 
 global $product;
 
@@ -59,35 +57,59 @@
 		<div id="review_form_wrapper">
 			<div id="review_form">
 				<?php
-				$commenter = wp_get_current_commenter();
-
+				$commenter    = wp_get_current_commenter();
 				$comment_form = array(
 					/* translators: %s is product title */
-					'title_reply'         => have_comments() ? __( 'Add a review', 'polestar' ) : sprintf( __( 'Be the first to review &ldquo;%s&rdquo;', 'polestar' ), get_the_title() ),
+					'title_reply'         => have_comments() ? esc_html__( 'Add a review', 'polestar' ) : sprintf( esc_html__( 'Be the first to review &ldquo;%s&rdquo;', 'polestar' ), get_the_title() ),
 					/* translators: %s is product title */
-					'title_reply_to'      => __( 'Leave a Reply to %s', 'polestar' ),
+					'title_reply_to'      => esc_html__( 'Leave a Reply to %s', 'polestar' ),
 					'title_reply_before'  => '<span id="reply-title" class="comment-reply-title">',
 					'title_reply_after'   => '</span>',
 					'comment_notes_after' => '',
-					'fields'              => array(
-						'author' => '<p class="comment-form-author"><label for="author">' . esc_html__( 'Name', 'polestar' ) . '&nbsp;<span class="required">*</span></label> ' .
-									'<input id="author" name="author" type="text" value="' . esc_attr( $commenter['comment_author'] ) . '" size="30" required /></p>',
-						'email'  => '<p class="comment-form-email"><label for="email">' . esc_html__( 'Email', 'polestar' ) . '&nbsp;<span class="required">*</span></label> ' .
-									'<input id="email" name="email" type="email" value="' . esc_attr( $commenter['comment_author_email'] ) . '" size="30" required /></p>',
-					),
-					'label_submit'        => __( 'Submit', 'polestar' ),
+					'label_submit'        => esc_html__( 'Submit', 'polestar' ),
 					'logged_in_as'        => '',
 					'comment_field'       => '',
 				);
 
+				$name_email_required = (bool) get_option( 'require_name_email', 1 );
+				$fields              = array(
+					'author' => array(
+						'label'    => __( 'Name', 'polestar' ),
+						'type'     => 'text',
+						'value'    => $commenter['comment_author'],
+						'required' => $name_email_required,
+					),
+					'email'  => array(
+						'label'    => __( 'Email', 'polestar' ),
+						'type'     => 'email',
+						'value'    => $commenter['comment_author_email'],
+						'required' => $name_email_required,
+					),
+				);
+
+				$comment_form['fields'] = array();
+
+				foreach ( $fields as $key => $field ) {
+					$field_html  = '<p class="comment-form-' . esc_attr( $key ) . '">';
+					$field_html .= '<label for="' . esc_attr( $key ) . '">' . esc_html( $field['label'] );
+
+					if ( $field['required'] ) {
+						$field_html .= '&nbsp;<span class="required">*</span>';
+					}
+
+					$field_html .= '</label><input id="' . esc_attr( $key ) . '" name="' . esc_attr( $key ) . '" type="' . esc_attr( $field['type'] ) . '" value="' . esc_attr( $field['value'] ) . '" size="30" ' . ( $field['required'] ? 'required' : '' ) . ' /></p>';
+
+					$comment_form['fields'][ $key ] = $field_html;
+				}
+
 				$account_page_url = wc_get_page_permalink( 'myaccount' );
 				if ( $account_page_url ) {
 					/* translators: %s opening and closing link tags respectively */
-					$comment_form['must_log_in'] = '<p class="must-log-in">' . sprintf( esc_html__( 'You must be %slogged in%S to post a review.', 'polestar' ), '<a href="' . esc_url( $account_page_url ) . '">', '</a>' ) . '</p>';
+					$comment_form['must_log_in'] = '<p class="must-log-in">' . sprintf( esc_html__( 'You must be %1$slogged in%2$s to post a review.', 'polestar' ), '<a href="' . esc_url( $account_page_url ) . '">', '</a>' ) . '</p>';
 				}
 
 				if ( wc_review_ratings_enabled() ) {
-					$comment_form['comment_field'] = '<div class="comment-form-rating"><label for="rating">' . esc_html__( 'Your rating', 'polestar' ) . '</label><select name="rating" id="rating" required>
+					$comment_form['comment_field'] = '<div class="comment-form-rating"><label for="rating">' . esc_html__( 'Your rating', 'polestar' ) . ( wc_review_ratings_required() ? '&nbsp;<span class="required">*</span>' : '' ) . '</label><select name="rating" id="rating" required>
 						<option value="">' . esc_html__( 'Rate&hellip;', 'polestar' ) . '</option>
 						<option value="5">' . esc_html__( 'Perfect', 'polestar' ) . '</option>
 						<option value="4">' . esc_html__( 'Good', 'polestar' ) . '</option>