diff --git a/src/assets/js/customizer/search.js b/src/assets/js/customizer/search.js
index ba67e6568..71a0b7fe1 100644
--- a/src/assets/js/customizer/search.js
+++ b/src/assets/js/customizer/search.js
@@ -67,7 +67,7 @@ BOLDGRID.CUSTOMIZER.Search = BOLDGRID.CUSTOMIZER.Search || {};
 				if ( 'sidebar' === section.type ) {
 					sidebar = wp.customize.section( section.id );
 					panel = wp.customize.panel( sidebar.params.panel );
-					_.each( sidebar.sidebarMeta.controls, function( v ) {
+					_.each( sidebar.controls(), function( v ) {
 						var c;
 						c = v.params;
 						c.label = c.label.replace( /:/g, '' );
diff --git a/src/assets/scss/customizer/controls.scss b/src/assets/scss/customizer/controls.scss
index f7176464b..2da93dcee 100644
--- a/src/assets/scss/customizer/controls.scss
+++ b/src/assets/scss/customizer/controls.scss
@@ -895,6 +895,11 @@
 	color: #23282d;
 }
 
+/* General Customizer Styles */
+h1, h2, h3, h4, h5, h6 {
+	font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;
+}
+
 /*--------------------------------------------------------------
 # Customizer Sidebar Controls
 --------------------------------------------------------------*/
diff --git a/src/assets/scss/customizer/controls/_dropdown-menus.scss b/src/assets/scss/customizer/controls/_dropdown-menus.scss
index cc411a8a6..dd308be22 100644
--- a/src/assets/scss/customizer/controls/_dropdown-menus.scss
+++ b/src/assets/scss/customizer/controls/_dropdown-menus.scss
@@ -63,8 +63,11 @@ li.customize-control-bgtfw-dropdown-menu {
 					vertical-align: top;
 					font-size: 1.6em;
 					padding: 0.4em;
+					color: #50575e;
+					box-sizing: content-box;
 				}
 				.text {
+					color: #50575e;
 					vertical-align: middle;
     				padding: 0.4em;
 				}
@@ -89,6 +92,10 @@ li.customize-control-bgtfw-dropdown-menu {
 				font-weight: inherit;
 				padding-bottom: 10px;
 				border-bottom: solid 1px #dcdcde;
+				font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;
+				a {
+					text-decoration: underline;
+				}
 			}
 			&.bgtfw-dropdown-menu-help-label {
 				padding-left: 10px;
diff --git a/src/assets/scss/customizer/controls/_presets.scss b/src/assets/scss/customizer/controls/_presets.scss
index e38ec0f11..cb0ad4ceb 100644
--- a/src/assets/scss/customizer/controls/_presets.scss
+++ b/src/assets/scss/customizer/controls/_presets.scss
@@ -4,6 +4,8 @@
 		width: 125px;
 		height: 125px;
 		margin: 10px;
+		position: relative;
+		display: inline-block;
 		img {
 			border-radius: 15px;
 		}
@@ -12,6 +14,11 @@
 		box-shadow: 0 0 5px 5px #2271B1;
 		border: 1px solid #fff;
 	}
+
+	input {
+		display: none;
+	}
+
 }
 
 #customize-control-bgtfw_header_preset_branding,
diff --git a/src/includes/class-boldgrid-framework-styles.php b/src/includes/class-boldgrid-framework-styles.php
index edca67233..35373fa35 100644
--- a/src/includes/class-boldgrid-framework-styles.php
+++ b/src/includes/class-boldgrid-framework-styles.php
@@ -582,10 +582,15 @@ public static function convert_array_to_css( $css_rules, $id ) {
 	 * @since     1.0.0
 	 */
 	public function add_editor_styling() {
-		$local_files = $this->get_local_editor_styles();
+		global $wp_customize;
 
-		apply_filters( 'boldgrid_theme_framework_editor_styles', $local_files );
-		add_editor_style( $local_files );
+		$is_editor = false !== strpos( $_SERVER['REQUEST_URI'], '/post-new' ) || false !== strpos( $_SERVER['REQUEST_URI'], 'action=edit' );
+
+		if ( $is_editor ) {
+			$local_files = $this->get_local_editor_styles();
+			apply_filters( 'boldgrid_theme_framework_editor_styles', $local_files );
+			add_editor_style( $local_files );
+		}
 	}
 
 	/**
diff --git a/src/includes/customizer/class-boldgrid-framework-customizer.php b/src/includes/customizer/class-boldgrid-framework-customizer.php
index f3d11d222..9a63f6b94 100644
--- a/src/includes/customizer/class-boldgrid-framework-customizer.php
+++ b/src/includes/customizer/class-boldgrid-framework-customizer.php
@@ -420,6 +420,13 @@ public function enqueue_styles() {
 			array(),
 			$this->configs['version']
 		);
+
+		wp_enqueue_style(
+			'kirki-control-styles',
+			$this->configs['framework']['root_uri'] . '/includes/kirki/controls/css/styles.css',
+			array(),
+			$this->configs['version']
+		);
 	}
 
 	/**