diff --git a/includes/admin/settings/class-sp-settings-general.php b/includes/admin/settings/class-sp-settings-general.php
index 38940699..56b73024 100644
--- a/includes/admin/settings/class-sp-settings-general.php
+++ b/includes/admin/settings/class-sp-settings-general.php
@@ -320,6 +320,7 @@ class SP_Settings_General extends SP_Settings_Page {
 			    		<?php
 						// Get settings
 						$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() ) );
 
 						// Defaults
 						if ( empty( $colors['primary'] ) ) $colors['primary'] = '#2b353e';
diff --git a/includes/class-sp-frontend-scripts.php b/includes/class-sp-frontend-scripts.php
index 8509fb09..c2413bdd 100644
--- a/includes/class-sp-frontend-scripts.php
+++ b/includes/class-sp-frontend-scripts.php
@@ -148,7 +148,8 @@ class SP_Frontend_Scripts {
 			$offset = ( 'twentyfourteen' == $template ? 48 : 0 );
 		}
 
-		$colors = (array) get_option( 'themeboy', array() );
+		$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() ) );
 
 		// Defaults
 		if ( empty( $colors['primary'] ) ) $colors['primary'] = '#2b353e';