diff --git a/includes/admin/settings/class-sp-settings-general.php b/includes/admin/settings/class-sp-settings-general.php
index 39389691..ebdd62c8 100644
--- a/includes/admin/settings/class-sp-settings-general.php
+++ b/includes/admin/settings/class-sp-settings-general.php
@@ -213,8 +213,6 @@ class SP_Settings_General extends SP_Settings_Page {
 		if ( isset( $_POST['gmt_offset'] ) )
 			update_option( 'gmt_offset', $_POST['gmt_offset'] );
 
-	    update_option( 'sportspress_enable_frontend_css', isset( $_POST['sportspress_enable_frontend_css'] ) ? 'yes' : 'no' );
-
 		if ( isset( $_POST['sportspress_frontend_css_primary'] ) ) {
 
 			// Save settings
@@ -223,6 +221,7 @@ class SP_Settings_General extends SP_Settings_Page {
 			$text 			= ( ! empty( $_POST['sportspress_frontend_css_text'] ) ) ? sp_format_hex( $_POST['sportspress_frontend_css_text'] ) : '';
 			$heading 		= ( ! empty( $_POST['sportspress_frontend_css_heading'] ) ) ? sp_format_hex( $_POST['sportspress_frontend_css_heading'] ) : '';
 			$link 			= ( ! empty( $_POST['sportspress_frontend_css_link'] ) ) ? sp_format_hex( $_POST['sportspress_frontend_css_link'] ) : '';
+			$customize 		= ( ! empty( $_POST['sportspress_frontend_css_customize'] ) ) ? 1 : '';
 
 			$colors = array(
 				'primary' 		=> $primary,
@@ -230,6 +229,7 @@ class SP_Settings_General extends SP_Settings_Page {
 				'text' 			=> $text,
 				'heading' 		=> $heading,
 				'link' 			=> $link,
+				'customize' 	=> $customize,
 			);
 
 			// Merge with existing options if available
@@ -330,6 +330,11 @@ class SP_Settings_General extends SP_Settings_Page {
 						$colors = array_map( 'esc_attr', (array) get_option( 'themeboy', array() ) );
 						if ( empty( $colors ) ) $colors = array_map( 'esc_attr', (array) get_option( 'sportspress_frontend_css_colors', array() ) );
 
+						// Fallback
+						if ( ! isset( $colors['customize'] ) ) {
+							$colors['customize'] = ( 'yes' == get_option( 'sportspress_enable_frontend_css', 'no' ) );
+						}
+
 						// Defaults
 						if ( empty( $colors['primary'] ) ) $colors['primary'] = '#2b353e';
 						if ( empty( $colors['background'] ) ) $colors['background'] = '#f4f4f4';
@@ -346,8 +351,8 @@ class SP_Settings_General extends SP_Settings_Page {
 
 						if ( ( $styles = SP_Frontend_Scripts::get_styles() ) && array_key_exists( 'sportspress-general', $styles ) ):
 						    ?><br>
-						    <label for="sportspress_enable_frontend_css">
-								<input name="sportspress_enable_frontend_css" id="sportspress_enable_frontend_css" type="checkbox" value="1" <?php checked( get_option( 'sportspress_enable_frontend_css', 'no' ), 'yes' ); ?>>
+						    <label for="sportspress_frontend_css_customize">
+								<input name="sportspress_frontend_css_customize" id="sportspress_frontend_css_customize" type="checkbox" value="1" <?php checked( $colors['customize'] ); ?>>
 								<?php _e( 'Enable', 'sportspress' ); ?>
 							</label>
 						<?php endif; ?>
diff --git a/includes/class-sp-frontend-scripts.php b/includes/class-sp-frontend-scripts.php
index 4169ead6..5651c97b 100644
--- a/includes/class-sp-frontend-scripts.php
+++ b/includes/class-sp-frontend-scripts.php
@@ -136,9 +136,9 @@ class SP_Frontend_Scripts {
 	 * @return void
 	 */
 	public function custom_css() {
-		$enabled = get_option( 'sportspress_enable_frontend_css', 'no' );
-		$custom = get_option( 'sportspress_custom_css', null );
+		$colors = array_map( 'esc_attr', (array) get_option( 'themeboy', array() ) );
 
+		$custom = get_option( 'sportspress_custom_css', null );
 		$align = get_option( 'sportspress_table_text_align', 'default' );
 		$padding = get_option( 'sportspress_table_padding', null );
 
@@ -148,9 +148,13 @@ class SP_Frontend_Scripts {
 			$offset = ( 'twentyfourteen' == $template ? 48 : 0 );
 		}
 
-		$colors = array_map( 'esc_attr', (array) get_option( 'themeboy', array() ) );
 		if ( empty( $colors ) ) $colors = array_map( 'esc_attr', (array) get_option( 'sportspress_frontend_css_colors', array() ) );
 
+		// Fallback
+		if ( ! isset( $colors['customize'] ) ) {
+			$colors['customize'] = ( 'yes' == get_option( 'sportspress_enable_frontend_css', 'no' ) );
+		}
+
 		// Defaults
 		if ( empty( $colors['primary'] ) ) $colors['primary'] = '#2b353e';
 		if ( empty( $colors['background'] ) ) $colors['background'] = '#f4f4f4';
@@ -163,7 +167,7 @@ class SP_Frontend_Scripts {
 		
 		echo '<style type="text/css">';
 
-		if ( $enabled == 'yes' && ! current_theme_supports( 'sportspress' ) && sizeof( $colors ) > 0 ) {
+		if ( $colors['customize'] && ! current_theme_supports( 'sportspress' ) && sizeof( $colors ) > 0 ) {
 			echo ' /* SportsPress Frontend CSS */ ';
 
 			echo '.sp-event-calendar tbody td a,.sp-event-calendar tbody td a:hover{background: none;}';