diff --git a/core/default_settings/default_setting_edit.php b/core/default_settings/default_setting_edit.php
index 892ab08088..af2cf34bf7 100644
--- a/core/default_settings/default_setting_edit.php
+++ b/core/default_settings/default_setting_edit.php
@@ -417,9 +417,6 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		$category == "theme" && $subcategory == "background_color" && $name == "array" ||
 		$category == "theme" && $subcategory == "login_color" && $name == "text"
 		) {
-		// source: http://rightjs.org
-		echo "	<script src='".PROJECT_PATH."/resources/rightjs/right.js'></script>";
-		echo "	<script src='".PROJECT_PATH."/resources/rightjs/right-colorpicker-src.js' type='text/javascript'></script>";
 		echo "	<style>";
 		echo "		DIV.rui-colorpicker  { width: 253px; }";
 		echo "		DIV.rui-colorpicker DIV.controls { width: 61px; }";
diff --git a/themes/enhanced/template.php b/themes/enhanced/template.php
index 233020164b..25518e1207 100644
--- a/themes/enhanced/template.php
+++ b/themes/enhanced/template.php
@@ -933,9 +933,10 @@ legend {
 	//-->
 </SCRIPT>
 
-<!-- // javascript calendar (source: http://rightjs.org) - keep before jquery load -->
+<!-- // javascript calendar and color picker (source: http://rightjs.org) - keep before jquery load -->
 <script language="JavaScript" type='text/javascript' src='<?php echo PROJECT_PATH; ?>/resources/rightjs/right.js'></script>
 <script language="JavaScript" type='text/javascript' src='<?php echo PROJECT_PATH; ?>/resources/rightjs/right-calendar-src.js'></script>
+<script language="JavaScript" type='text/javascript' src='<?php echo PROJECT_PATH; ?>/resources/rightjs/right-colorpicker-src.js'></script>
 
 <script language="JavaScript" type="text/javascript" src="<?php echo PROJECT_PATH; ?>/resources/jquery/jquery-1.8.3.js"></script>
 <script language="JavaScript" type="text/javascript" src="<?php echo PROJECT_PATH; ?>/resources/jquery/jquery.autosize.input.js"></script>