diff --git a/src/assets/js/customizer/customizer.js b/src/assets/js/customizer/customizer.js
index d68485a50..6528171cc 100644
--- a/src/assets/js/customizer/customizer.js
+++ b/src/assets/js/customizer/customizer.js
@@ -498,6 +498,51 @@ BOLDGRID.Customizer.Util.getInitialPalettes = function( option ) {
 			$( '.site-description' ).toggleClass( 'screen-reader-text', 'show' !== to );
 		} ) );
 
+		/*
+		 * Automatically update palette selector controls whenever the
+		 * color palette is changed.
+		 */
+		controlApi( 'boldgrid_color_palette', function( value ) {
+			value.bind( function( to ) {
+				var colors,
+					neutral,
+					paletteSelectorControls = [];
+
+				colors = BOLDGRID.Customizer.Util.getInitialPalettes( to );
+				controlApi.control.each( function( control ) {
+					if ( 'bgtfw-palette-selector' === control.params.type ) {
+						paletteSelectorControls.push( control );
+					}
+				} );
+
+				if ( colors ) {
+					neutral = colors.pop();
+					_.each( paletteSelectorControls, function( control ) {
+						var $labels       = control.container.find( 'label' ),
+							value         = control.setting.get(),
+							valuePosition = value.split( ':' )[0].split( '-' )[1];
+
+						if ( 'neutral' === valuePosition ) {
+							control.setting.set( 'color-neutral:' + neutral );
+						} else {
+							control.setting.set( 'color-' + valuePosition + ':' + colors[ valuePosition - 1 ] );
+						}
+
+						$labels.each( function() {
+							var $label      = $( this ),
+								colorNumber = $label.attr( 'for' ).split( '-' )[1];
+
+								if ( 'neutral' === colorNumber ) {
+									$label.find( 'span' ).attr( 'style', 'background-color: ' + neutral );
+								} else {
+									$label.find( 'span' ).attr( 'style', 'background-color: ' + colors[ parseInt( colorNumber ) - 1 ] );
+								}
+						} );
+					} );
+				}
+			} );
+		} );
+
 		api( 'boldgrid_color_palette', function( value ) {
 			value.bind( function( to ) {
 				var colors,
diff --git a/src/boldgrid-theme-framework.php b/src/boldgrid-theme-framework.php
index dcf275d00..a25896cfc 100644
--- a/src/boldgrid-theme-framework.php
+++ b/src/boldgrid-theme-framework.php
@@ -3,7 +3,7 @@
  * Plugin Name: BoldGrid Theme Framework
  * Plugin URI: https://www.boldgrid.com/docs/configuration-file
  * Description: BoldGrid Theme Framework is a library that allows you to easily make BoldGrid themes. Please see our reference guide for more information: https://www.boldgrid.com/docs/configuration-file
- * Version: 2.17.1
+ * Version: 2.17.2-rc0
  * Author: BoldGrid.com <wpb@boldgrid.com>
  * Author URI: https://www.boldgrid.com/
  * Text Domain: bgtfw