From 5b97091e27a252f5c356b6873d5e7870856cdbdc Mon Sep 17 00:00:00 2001
From: reliberate <git@reliberate.com>
Date: Mon, 28 Mar 2016 22:29:15 -0600
Subject: [PATCH] Theme: Add additional Settings to control the style of
 various elements, remove old css classes. Default/Domain/User Settings: Add
 color previews in list view.

---
 app/call_broadcast/call_broadcast_send.php    |   2 +-
 app/edit/footer.php                           |  12 -
 app/music_on_hold/music_on_hold.php           |   5 +-
 app/recordings/recordings.php                 |   3 +-
 .../voicemail_greetings.php                   |   3 +-
 app/voicemails/voicemail_messages.php         |   3 +-
 app/xml_cdr/xml_cdr.php                       |   2 +-
 app/xml_cdr/xml_cdr_inc.php                   |   1 -
 .../default_settings/default_setting_edit.php |  31 +-
 core/default_settings/default_settings.php    |   8 +
 core/domain_settings/domain_setting_edit.php  |  31 +-
 core/domain_settings/domain_settings.php      |  10 +-
 core/users/user_setting_edit.php              |  31 +-
 core/users/user_settings.php                  |  10 +-
 themes/default/app_defaults.php               | 141 ++++++++
 themes/default/config.php                     |  14 +-
 themes/default/template.php                   | 304 ++++++------------
 17 files changed, 281 insertions(+), 330 deletions(-)

diff --git a/app/call_broadcast/call_broadcast_send.php b/app/call_broadcast/call_broadcast_send.php
index 3041391e16..68cd87ad37 100644
--- a/app/call_broadcast/call_broadcast_send.php
+++ b/app/call_broadcast/call_broadcast_send.php
@@ -242,7 +242,7 @@ require_once "resources/header.php";
 	echo "<div align='center'>";
 	echo "<table width='100%' border='0' cellpadding='0' cellspacing='2'>\n";
 
-	echo "<tr class='border'>\n";
+	echo "<tr>\n";
 	echo "	<td align=\"center\">\n";
 	echo "		<br>";
 
diff --git a/app/edit/footer.php b/app/edit/footer.php
index b11f46e5d4..45fff9c89f 100644
--- a/app/edit/footer.php
+++ b/app/edit/footer.php
@@ -23,19 +23,7 @@
 	Contributor(s):
 	Mark J Crane <markjcrane@fusionpbx.com>
 */
-/*
-echo "<br><br>";
-echo "</td></tr></table>";
 
-echo "<span class='smalltext'>";
-echo "fusionpbx ";
-echo "&nbsp; &nbsp;  &nbsp; &nbsp; ";
-echo "<a href='http://fusionpbx.com'>http://fusionpbx.com</a>";
-echo "&nbsp; &nbsp;  &nbsp; &nbsp; ";
-echo "Author: Mark J. Crane ";
-
-echo "</span>";
-*/
 echo "<div>";
 echo "</body>";
 echo "</html>";
diff --git a/app/music_on_hold/music_on_hold.php b/app/music_on_hold/music_on_hold.php
index 8cbe4788e3..d060fcc214 100644
--- a/app/music_on_hold/music_on_hold.php
+++ b/app/music_on_hold/music_on_hold.php
@@ -376,7 +376,6 @@ else {
 	$c = 0;
 	$row_style["0"] = "row_style0";
 	$row_style["1"] = "row_style1";
-	$row_style["2"] = "row_style2";
 
 //show the default category
 	if (permission_exists('music_on_hold_default_view')) {
@@ -411,7 +410,7 @@ else {
 						echo "<tr>\n";
 						echo "	<td class='".$row_style[$c]."'>".$file."</td>\n";
 						if (strlen($file) > 0) {
-							echo "	<td valign='top' class='".$row_style["2"]." ".((!$c) ? "row_style_hor_mir_grad" : null)." tr_link_void'>";
+							echo "	<td valign='top' class='".$row_style[$c]." row_style_slim tr_link_void'>";
 							$recording_file_path = $file;
 							$recording_file_name = strtolower(pathinfo($recording_file_path, PATHINFO_BASENAME));
 							$recording_file_ext = pathinfo($recording_file_name, PATHINFO_EXTENSION);
@@ -485,7 +484,7 @@ else {
 						echo "<tr>\n";
 						echo "	<td class='".$row_style[$c]."'>".$file."</td>\n";
 						if (strlen($file) > 0) {
-							echo "	<td valign='top' class='".$row_style["2"]." ".((!$c) ? "row_style_hor_mir_grad" : null)." tr_link_void'>";
+							echo "	<td valign='top' class='".$row_style[$c]." row_style_slim tr_link_void'>";
 							$recording_file_path = $file;
 							$recording_file_name = strtolower(pathinfo($row['recording_filename'], PATHINFO_BASENAME));
 							$recording_file_ext = pathinfo($recording_file_name, PATHINFO_EXTENSION);
diff --git a/app/recordings/recordings.php b/app/recordings/recordings.php
index 0b54210e39..bf4fe35917 100644
--- a/app/recordings/recordings.php
+++ b/app/recordings/recordings.php
@@ -284,7 +284,6 @@ require_once "resources/check_auth.php";
 	$c = 0;
 	$row_style["0"] = "row_style0";
 	$row_style["1"] = "row_style1";
-	$row_style["2"] = "row_style2";
 
 	echo "<table class='tr_hover' width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 	echo "<tr>\n";
@@ -319,7 +318,7 @@ require_once "resources/check_auth.php";
 				echo "	<td class='".$row_style[$c]."' style='text-align: center;'>".$tmp_filesize."</td>\n";
 			}
 			if (permission_exists('recording_play') || permission_exists('recording_download')) {
-				echo "	<td valign='top' class='".$row_style["2"]." ".((!$c) ? "row_style_hor_mir_grad" : null)." tr_link_void'>";
+				echo "	<td valign='top' class='".$row_style[$c]." row_style_slim tr_link_void'>";
 				if (permission_exists('recording_play')) {
 					$recording_file_path = $row['recording_filename'];
 					$recording_file_name = strtolower(pathinfo($recording_file_path, PATHINFO_BASENAME));
diff --git a/app/voicemail_greetings/voicemail_greetings.php b/app/voicemail_greetings/voicemail_greetings.php
index 865c66353a..eb511333e5 100644
--- a/app/voicemail_greetings/voicemail_greetings.php
+++ b/app/voicemail_greetings/voicemail_greetings.php
@@ -352,7 +352,6 @@ require_once "resources/check_auth.php";
 	$c = 0;
 	$row_style["0"] = "row_style0";
 	$row_style["1"] = "row_style1";
-	$row_style["2"] = "row_style2";
 
 	echo "<table class='tr_hover' width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 	echo "<tr>\n";
@@ -397,7 +396,7 @@ require_once "resources/check_auth.php";
 				echo "	<td class='".$row_style[$c]."' style='text-align: right;' nowrap>".$tmp_filesize."</td>\n";
 			}
 			if (permission_exists('voicemail_greeting_play') || permission_exists('voicemail_greeting_download')) {
-				echo "	<td valign='top' class='".$row_style["2"]." ".((!$c) ? "row_style_hor_mir_grad" : null)." tr_link_void'>";
+				echo "	<td valign='top' class='".$row_style[$c]." row_style_slim tr_link_void'>";
 				if (permission_exists('voicemail_greeting_play')) {
 					$greeting_file_path = $row['greeting_filename'];
 					$greeting_file_name = strtolower(pathinfo($greeting_file_path, PATHINFO_BASENAME));
diff --git a/app/voicemails/voicemail_messages.php b/app/voicemails/voicemail_messages.php
index 242ee086ad..7e389eba45 100644
--- a/app/voicemails/voicemail_messages.php
+++ b/app/voicemails/voicemail_messages.php
@@ -93,7 +93,6 @@ if (!(check_str($_REQUEST["action"]) == "download" && check_str($_REQUEST["src"]
 	$c = 0;
 	$row_style["0"] = "row_style0";
 	$row_style["1"] = "row_style1";
-	$row_style["2"] = "row_style2";
 
 //loop through the voicemail messages
 	if (count($voicemails) > 0) {
@@ -165,7 +164,7 @@ if (!(check_str($_REQUEST["action"]) == "download" && check_str($_REQUEST["src"]
 					echo "	<td valign='top' class='".$row_style[$c]."' style=\"".$style."\" nowrap='nowrap'>".$row['created_date']."</td>\n";
 					echo "	<td valign='top' class='".$row_style[$c]."' style=\"".$style."\">".$row['caller_id_name']."&nbsp;</td>\n";
 					echo "	<td valign='top' class='".$row_style[$c]."' style=\"".$style."\">".$row['caller_id_number']."&nbsp;</td>\n";
-					echo "	<td valign='top' class='".$row_style["2"]." ".((!$c) ? "row_style_hor_mir_grad" : null)." tr_link_void' onclick=\"$(this).closest('tr').children('td').css('font-weight','normal');\">";
+					echo "	<td valign='top' class='".$row_style[$c]." row_style_slim tr_link_void' onclick=\"$(this).closest('tr').children('td').css('font-weight','normal');\">";
 						$recording_file_path = $file;
 						$recording_file_name = strtolower(pathinfo($recording_file_path, PATHINFO_BASENAME));
 						$recording_file_ext = pathinfo($recording_file_name, PATHINFO_EXTENSION);
diff --git a/app/xml_cdr/xml_cdr.php b/app/xml_cdr/xml_cdr.php
index 2fe1c06aeb..8daf9fcb64 100644
--- a/app/xml_cdr/xml_cdr.php
+++ b/app/xml_cdr/xml_cdr.php
@@ -529,7 +529,7 @@ else {
 			//recording
 				if (permission_exists('recording_play') || permission_exists('recording_download')) {
 					if ($recording_file_path != '') {
-						echo "	<td valign='top' align='center' class='".$row_style["2"]." ".((!$c) ? "row_style_hor_mir_grad" : null)." tr_link_void' nowrap='nowrap'>";
+						echo "	<td valign='top' align='center' class='".$row_style[$c]." row_style_slim tr_link_void' nowrap='nowrap'>";
 						if (permission_exists('recording_play')) {
 							echo 	"<audio id='recording_audio_".$row['uuid']."' style='display: none;' preload='none' ontimeupdate=\"update_progress('".$row['uuid']."')\" onended=\"recording_reset('".$row['uuid']."');\" src=\"".PROJECT_PATH."/app/recordings/recordings.php?a=download&type=rec&filename=".base64_encode($recording_file_path)."\" type='".$recording_type."'></audio>";
 							echo 	"<span id='recording_button_".$row['uuid']."' onclick=\"recording_play('".$row['uuid']."')\" title='".$text['label-play']." / ".$text['label-pause']."'>".$v_link_label_play."</span>";
diff --git a/app/xml_cdr/xml_cdr_inc.php b/app/xml_cdr/xml_cdr_inc.php
index 13a6cc72e9..9e08e837b6 100644
--- a/app/xml_cdr/xml_cdr_inc.php
+++ b/app/xml_cdr/xml_cdr_inc.php
@@ -362,6 +362,5 @@ else {
 	$c = 0;
 	$row_style["0"] = "row_style0";
 	$row_style["1"] = "row_style1";
-	$row_style["2"] = "row_style2";
 
 ?>
\ No newline at end of file
diff --git a/core/default_settings/default_setting_edit.php b/core/default_settings/default_setting_edit.php
index 5a22f3a132..a5ba7d4bdd 100644
--- a/core/default_settings/default_setting_edit.php
+++ b/core/default_settings/default_setting_edit.php
@@ -445,36 +445,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	elseif ($subcategory == 'password' || substr_count($subcategory, '_password') > 0 || $category == "login" && $subcategory == "password_reset_key" && $name == "text") {
 		echo "	<input class='formfld' type='password' id='default_setting_value' name='default_setting_value' onmouseover=\"this.type='text';\" onfocus=\"this.type='text';\" onmouseout=\"if (!$(this).is(':focus')) { this.type='password'; }\" onblur=\"this.type='password';\" maxlength='255' value=\"".$default_setting_value."\">\n";
 	}
-	elseif (
-		$category == "theme" && $subcategory == "body_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "body_shadow_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "background_color" && $name == "array" ||
-		$category == "theme" && $subcategory == "login_shadow_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "login_background_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "domain_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "domain_shadow_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "domain_background_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "domain_selector_shadow_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "footer_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "footer_background_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "message_default_background_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "message_default_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "message_negative_background_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "message_negative_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "message_alert_background_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "message_alert_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_main_background_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_main_text_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_main_text_color_hover" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_main_shadow_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_sub_background_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_sub_background_color_hover" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_sub_text_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_sub_text_color_hover" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_sub_shadow_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_brand_text_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_brand_text_color_hover" && $name == "text"
-		) {
+	elseif ($category == "theme" && substr_count($subcategory, "_color") > 0 && ($name == "text" || $name == 'array')) {
 		echo "	<input type='text' class='formfld colorpicker' id='default_setting_value' name='default_setting_value' value=\"".$default_setting_value."\">\n";
 	}
 	elseif ($category == "fax" && $subcategory == "page_size" && $name == "text" ) {
diff --git a/core/default_settings/default_settings.php b/core/default_settings/default_settings.php
index abb690c44c..2b5e39b356 100644
--- a/core/default_settings/default_settings.php
+++ b/core/default_settings/default_settings.php
@@ -417,6 +417,14 @@ else {
 				echo "		".str_repeat('*', strlen($row['default_setting_value']));
 			}
 			else {
+				if ($category == "theme" && substr_count($subcategory, "_color") > 0 && ($name == "text" || $name == 'array')) {
+					$border = (
+						substr_count(strtolower($row['default_setting_value']), '#fff') > 0 ||
+						substr_count(strtolower($row['default_setting_value']), '#ffffff') > 0 ||
+						substr_count(str_replace(' ','',strtolower($row['default_setting_value'])), '255,255,255,') > 0
+					) ? "border: 1px solid #ccc; padding: -1px;" : null;
+					echo "		<img src='data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7' style='background: ".$row['default_setting_value']."; width: 15px; height: 15px; margin-right: 4px; vertical-align: middle; ".$border."'>";
+				}
 				echo "		".htmlspecialchars($row['default_setting_value']);
 			}
 			echo "		&nbsp;\n";
diff --git a/core/domain_settings/domain_setting_edit.php b/core/domain_settings/domain_setting_edit.php
index f631f4c3b0..cddefb7790 100644
--- a/core/domain_settings/domain_setting_edit.php
+++ b/core/domain_settings/domain_setting_edit.php
@@ -542,36 +542,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	elseif ($subcategory == 'password' || substr_count($subcategory, '_password') > 0 || $category == "login" && $subcategory == "password_reset_key" && $name == "text") {
 		echo "	<input class='formfld' type='password' id='domain_setting_value' name='domain_setting_value' maxlength='255' onmouseover=\"this.type='text';\" onfocus=\"this.type='text';\" onmouseout=\"if (!$(this).is(':focus')) { this.type='password'; }\" onblur=\"this.type='password';\" value=\"".$row['domain_setting_value']."\">\n";
 	}
-	elseif (
-		$category == "theme" && $subcategory == "body_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "body_shadow_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "background_color" && $name == "array" ||
-		$category == "theme" && $subcategory == "login_shadow_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "login_background_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "domain_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "domain_shadow_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "domain_background_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "domain_selector_shadow_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "footer_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "footer_background_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "message_default_background_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "message_default_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "message_negative_background_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "message_negative_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "message_alert_background_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "message_alert_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_main_background_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_main_text_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_main_text_color_hover" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_main_shadow_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_sub_background_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_sub_background_color_hover" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_sub_text_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_sub_text_color_hover" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_sub_shadow_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_brand_text_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_brand_text_color_hover" && $name == "text"
-		) {
+	elseif ($category == "theme" && substr_count($subcategory, "_color") > 0 && ($name == "text" || $name == 'array')) {
 		echo "	<input type='text' class='formfld colorpicker' id='domain_setting_value' name='domain_setting_value' value=\"".$row['domain_setting_value']."\">\n";
 	}
 	elseif ($category == "fax" && $subcategory == "page_size" && $name == "text" ) {
diff --git a/core/domain_settings/domain_settings.php b/core/domain_settings/domain_settings.php
index 63387cc7b3..3619689fa5 100644
--- a/core/domain_settings/domain_settings.php
+++ b/core/domain_settings/domain_settings.php
@@ -240,12 +240,20 @@ if (sizeof($_REQUEST) > 1) {
 				( $category == "theme" && $subcategory == "menu_position" && $name == "text" ) ||
 				( $category == "theme" && $subcategory == "logo_align" && $name == "text" )
 				) {
-				echo "		".$text['label-'.$row['default_setting_value']];
+				echo "		".$text['label-'.$row['domain_setting_value']];
 			}
 			else if ($subcategory == 'password' || substr_count($subcategory, '_password') > 0 || $category == "login" && $subcategory == "password_reset_key" && $name == "text") {
 				echo "		".str_repeat('*', strlen($row['domain_setting_value']));
 			}
 			else {
+				if ($category == "theme" && substr_count($subcategory, "_color") > 0 && ($name == "text" || $name == 'array')) {
+					$border = (
+						substr_count(strtolower($row['domain_setting_value']), '#fff') > 0 ||
+						substr_count(strtolower($row['domain_setting_value']), '#ffffff') > 0 ||
+						substr_count(str_replace(' ','',strtolower($row['domain_setting_value'])), '255,255,255,') > 0
+					) ? "border: 1px solid #ccc; padding: -1px;" : null;
+					echo "		<img src='data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7' style='background: ".$row['domain_setting_value']."; width: 15px; height: 15px; margin-right: 4px; vertical-align: middle; ".$border."'>";
+				}
 				echo "		".htmlspecialchars($row['domain_setting_value']);
 			}
 			echo "		&nbsp;\n";
diff --git a/core/users/user_setting_edit.php b/core/users/user_setting_edit.php
index 0ec6e646b0..ebcfe99614 100644
--- a/core/users/user_setting_edit.php
+++ b/core/users/user_setting_edit.php
@@ -544,36 +544,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	elseif ($subcategory == 'password' || substr_count($subcategory, '_password') > 0 || $category == "login" && $subcategory == "password_reset_key" && $name == "text") {
 		echo "	<input class='formfld' type='password' id='user_setting_value' name='user_setting_value' maxlength='255' onmouseover=\"this.type='text';\" onfocus=\"this.type='text';\" onmouseout=\"if (!$(this).is(':focus')) { this.type='password'; }\" onblur=\"this.type='password';\" value=\"".$row['user_setting_value']."\">\n";
 	}
-	elseif (
-		$category == "theme" && $subcategory == "body_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "body_shadow_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "background_color" && $name == "array" ||
-		$category == "theme" && $subcategory == "login_shadow_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "login_background_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "domain_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "domain_shadow_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "domain_background_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "domain_selector_shadow_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "footer_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "footer_background_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "message_default_background_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "message_default_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "message_negative_background_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "message_negative_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "message_alert_background_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "message_alert_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_main_background_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_main_text_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_main_text_color_hover" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_main_shadow_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_sub_background_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_sub_background_color_hover" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_sub_text_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_sub_text_color_hover" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_sub_shadow_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_brand_text_color" && $name == "text" ||
-		$category == "theme" && $subcategory == "menu_brand_text_color_hover" && $name == "text"
-		) {
+	elseif ($category == "theme" && substr_count($subcategory, "_color") > 0 && ($name == "text" || $name == 'array')) {
 		echo "	<input type='text' class='formfld colorpicker' id='user_setting_value' name='user_setting_value' value=\"".$row['user_setting_value']."\">\n";
 	}
 	elseif ($category == "fax" && $subcategory == "page_size" && $name == "text" ) {
diff --git a/core/users/user_settings.php b/core/users/user_settings.php
index ec81d880b2..c29e22e09f 100644
--- a/core/users/user_settings.php
+++ b/core/users/user_settings.php
@@ -211,12 +211,20 @@ else {
 				( $category == "theme" && $subcategory == "menu_position" && $name == "text" ) ||
 				( $category == "theme" && $subcategory == "logo_align" && $name == "text" )
 				) {
-				echo "		".$text['label-'.$row['default_setting_value']];
+				echo "		".$text['label-'.$row['user_setting_value']];
 			}
 			else if ($subcategory == 'password' || substr_count($subcategory, '_password') > 0 || $category == "login" && $subcategory == "password_reset_key" && $name == "text") {
 				echo "		".str_repeat('*', strlen($row['user_setting_value']));
 			}
 			else {
+				if ($category == "theme" && substr_count($subcategory, "_color") > 0 && ($name == "text" || $name == 'array')) {
+					$border = (
+						substr_count(strtolower($row['user_setting_value']), '#fff') > 0 ||
+						substr_count(strtolower($row['user_setting_value']), '#ffffff') > 0 ||
+						substr_count(str_replace(' ','',strtolower($row['user_setting_value'])), '255,255,255,') > 0
+					) ? "border: 1px solid #ccc; padding: -1px;" : null;
+					echo "		<img src='data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7' style='background: ".$row['user_setting_value']."; width: 15px; height: 15px; margin-right: 4px; vertical-align: middle; ".$border."'>";
+				}
 				echo "		".htmlspecialchars($row['user_setting_value']);
 			}
 			echo "		&nbsp;\n";
diff --git a/themes/default/app_defaults.php b/themes/default/app_defaults.php
index 1f648e5a69..06f2f83833 100644
--- a/themes/default/app_defaults.php
+++ b/themes/default/app_defaults.php
@@ -302,6 +302,147 @@ if ($domains_processed == 1) {
 		$array[$x]['default_setting_value'] = '#69e5ff';
 		$array[$x]['default_setting_enabled'] = 'false';
 		$array[$x]['default_setting_description'] = 'Set the hover text color (and opacity) of sub menu items.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'heading_text_font';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = 'arial';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the font of the page heading text.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'heading_text_size';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '15px';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the size of the page heading text.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'heading_text_color';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '#952424';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the color (and opacity) of the page heading text.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'body_text_font';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = 'arial';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the font of body text.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'body_text_size';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '12px';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the size of the body text.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'body_text_color';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '#5f5f5f';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the color (and opacity) of the body text.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'text_link_color';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '#004083';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the link color (and opacity) of text links outside tables.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'text_link_color_hover';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '#5082ca';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the hover color (and opacity) of text links outside tables.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'table_heading_text_font';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = 'arial';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the text font of table header rows.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'table_heading_text_size';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '12px';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the text size of table header rows.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'table_heading_text_color';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '#3164ad';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the text color (and opacity) of table header rows.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'table_heading_background_color';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = 'none';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the background color (and opacity) of table header rows.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'table_heading_border_color';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '#a4aebf';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the bottom border color (and opacity) of table header rows.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'table_row_text_font';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = 'arial';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the text font of table data rows.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'table_row_text_size';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '12px';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the text size of table data rows.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'table_row_text_color';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '#000';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the text color (and opacity) of table data rows.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'table_row_background_color_dark';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '#e5e9f0';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the darker background color (and opacity) of table data rows.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'table_row_background_color_medium';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '#f0f2f6';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the medium background color (and opacity) of table data rows.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'table_row_background_color_light';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '#fff';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the lighter background color (and opacity) of table data rows.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'theme';
+		$array[$x]['default_setting_subcategory'] = 'table_row_border_color';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = '#c5d1e5';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Set the bottom border (dividing line) color (and opacity) of table data rows.';
+
 
 	//get an array of the default settings
 		$sql = "select * from v_default_settings ";
diff --git a/themes/default/config.php b/themes/default/config.php
index c3fea3b94b..e71a0851ab 100644
--- a/themes/default/config.php
+++ b/themes/default/config.php
@@ -1,12 +1,12 @@
 <?php
 
 //define the link labels
-	$v_link_label_edit = "<button type='button' class='btn btn-default control_icon'><span class='glyphicon glyphicon-pencil'></span></button>";
-	$v_link_label_add = "<button type='button' class='btn btn-default control_icon'><span class='glyphicon glyphicon-plus'></span></button>";
-	$v_link_label_delete = "<button type='button' class='btn btn-default control_icon'><span class='glyphicon glyphicon-remove'></span></button>";
-	$v_link_label_view = "<button type='button' class='btn btn-default control_icon'><span class='glyphicon glyphicon-eye-open'></span></button>";
-	$v_link_label_play = "<button type='button' class='btn btn-default control_icon'><span class='glyphicon glyphicon-play'></span></button>";
-	$v_link_label_pause = "<button type='button' class='btn btn-default control_icon'><span class='glyphicon glyphicon-pause'></span></button>";
-	$v_link_label_download = "<button type='button' class='btn btn-default control_icon'><span class='glyphicon glyphicon-cloud-download'></span></button>";
+	$v_link_label_edit = "<button type='button' class='btn btn-default list_control_icon'><span class='glyphicon glyphicon-pencil'></span></button>";
+	$v_link_label_add = "<button type='button' class='btn btn-default list_control_icon'><span class='glyphicon glyphicon-plus'></span></button>";
+	$v_link_label_delete = "<button type='button' class='btn btn-default list_control_icon'><span class='glyphicon glyphicon-remove'></span></button>";
+	$v_link_label_view = "<button type='button' class='btn btn-default list_control_icon'><span class='glyphicon glyphicon-eye-open'></span></button>";
+	$v_link_label_play = "<button type='button' class='btn btn-default list_control_icon'><span class='glyphicon glyphicon-play'></span></button>";
+	$v_link_label_pause = "<button type='button' class='btn btn-default list_control_icon'><span class='glyphicon glyphicon-pause'></span></button>";
+	$v_link_label_download = "<button type='button' class='btn btn-default list_control_icon'><span class='glyphicon glyphicon-cloud-download'></span></button>";
 
 ?>
diff --git a/themes/default/template.php b/themes/default/template.php
index 1a616ddce6..beb5d3e3f5 100644
--- a/themes/default/template.php
+++ b/themes/default/template.php
@@ -408,7 +408,8 @@
 		}
 
 	/* control icons */
-	button.control_icon {
+	button.list_control_icon,
+	button.list_control_icon_disabled {
 		font-family: Candara, Calibri, Segoe, "Segoe UI", Optima, Arial, sans-serif;
 		padding: 2px;
 		color: #fff;
@@ -431,7 +432,7 @@
 		-moz-opacity: 0.3;
 		}
 
-	button.control_icon:hover, button.control_icon:active, button.control_icon:focus {
+	button.list_control_icon:hover, button.list_control_icon:active, button.list_control_icon:focus {
 		cursor: pointer;
 		color: #fff;
 		border: 1px solid #26242a;
@@ -570,93 +571,32 @@
 		border: none;
 		}
 
+	.title, b {
+		color: <?php echo ($_SESSION['theme']['heading_text_color']['text'] != '') ? $_SESSION['theme']['heading_text_color']['text'] : '#952424'; ?>;
+		font-size: <?php echo ($_SESSION['theme']['heading_text_size']['text'] != '') ? $_SESSION['theme']['heading_text_size']['text'] : '15px'; ?>;
+		font-family: <?php echo ($_SESSION['theme']['heading_text_font']['text'] != '') ? $_SESSION['theme']['heading_text_font']['text'] : 'arial'; ?>;
+		font-weight: bold
+		}
+
 	a {
-		color: #004083;
+		color: <?php echo ($_SESSION['theme']['text_link_color']['text'] != '') ? $_SESSION['theme']['text_link_color']['text'] : '#004083'; ?>;
 		width: 100%;
 		}
 
 	a:hover {
-		color: #5082ca;
-		}
-
-	.title {
-		color: #952424;
-		font-size: 15px;
-		font-family: arial;
-		font-weight: bold
-		}
-
-	b {
-		color: #952424;
-		font-size: 15px;
-		font-family: arial;
-		}
-
-	th {
-		border-bottom: 1px solid #a4aebf;
-		text-align: left;
-		color: #3164AD;
-		font-size: 12px;
-		font-family: arial;
-		padding-top: 4px;
-		padding-bottom: 4px;
-		padding-right: 7px;
-		padding-left: 0;
-		}
-
-	th a:link{ color:#3164AD; text-decoration: none; }
-	th a:visited{ color:#3164AD; }
-	th a:hover{ color:#5082ca; text-decoration: underline; }
-	th a:active{ color:#3164AD; }
-
-	td {
-		color: #5f5f5f;
-		font-size: 12px;
-		font-family: arial;
-		}
-
-	td.list_control_icons {
-		/* multiple icons exist (horizontally) */
-		width: 52px;
-		padding: none;
-		padding-left: 2px;
-		text-align: right;
-		vertical-align: top;
-		white-space: nowrap;
-		}
-
-	td.list_control_icon {
-		/* a single icon exists */
-		width: 26px;
-		padding: none;
-		padding-left: 2px;
-		text-align: right;
-		vertical-align: top;
-		white-space: nowrap;
-		}
-
-	img.list_control_icon {
-		margin: 2px;
-		width: 21px;
-		height: 21px;
-		border: none;
-		opacity: 0.4;
-		-moz-opacity: 0.4;
-		}
-
-	img.list_control_icon_disabled {
-		margin: 2px;
-		width: 21px;
-		height: 21px;
-		border: none;
-		opacity: 0.4;
-		-moz-opacity: 0.4;
+		color: <?php echo ($_SESSION['theme']['text_link_color_hover']['text'] != '') ? $_SESSION['theme']['text_link_color_hover']['text'] : '#5082ca'; ?>;
 		}
 
 	form {
 		margin: 0;
 		}
 
+	.frm {
+		border: solid 1px #ccc;
+		color: #666;
+		background-color: #EFEFEF;
+		}
+
 	input.btn, input.button {
 		font-family: Candara, Calibri, Segoe, "Segoe UI", Optima, Arial, sans-serif;
 		padding: 3px 8px 4px 8px;
@@ -765,8 +705,68 @@
 		vertical-align: middle;
 		}
 
+	span.playback_progress_bar {
+		background-color: #c43e42;
+		height: 1px;
+		display: block;
+		}
+
 /* TABLES *****************************************************************/
 
+	th {
+		border-bottom: 1px solid <?php echo ($_SESSION['theme']['table_heading_border_color']['text'] != '') ? $_SESSION['theme']['table_heading_border_color']['text'] : '#a4aebf'; ?>;
+		text-align: left;
+		color: <?php echo ($_SESSION['theme']['table_heading_text_color']['text'] != '') ? $_SESSION['theme']['table_heading_text_color']['text'] : '#3164ad'; ?>;
+		background: <?php echo ($_SESSION['theme']['table_heading_background_color']['text'] != '') ? $_SESSION['theme']['table_heading_background_color']['text'] : 'none'; ?>;
+		font-size: <?php echo ($_SESSION['theme']['table_heading_text_size']['text'] != '') ? $_SESSION['theme']['table_heading_text_size']['text'] : '12px'; ?>;
+		font-family: <?php echo ($_SESSION['theme']['table_heading_text_font']['text'] != '') ? $_SESSION['theme']['table_heading_text_font']['text'] : 'arial'; ?>;
+		padding: 4px 7px 4px 0;
+		padding: 4px 7px;
+		}
+
+	th a, th a:visited, th a:active {
+		color: <?php echo ($_SESSION['theme']['table_heading_text_color']['text'] != '') ? $_SESSION['theme']['table_heading_text_color']['text'] : '#3164ad'; ?>;
+		text-decoration: none;
+		}
+
+	th a:hover {
+		color: <?php echo ($_SESSION['theme']['table_heading_text_color']['text'] != '') ? $_SESSION['theme']['table_heading_text_color']['text'] : '#3164ad'; ?>;
+		text-decoration: underline;
+		}
+
+	td {
+		color: <?php echo ($_SESSION['theme']['body_text_color']['text'] != '') ? $_SESSION['theme']['body_text_color']['text'] : '#5f5f5f'; ?>;
+		font-size: <?php echo ($_SESSION['theme']['body_text_size']['text'] != '') ? $_SESSION['theme']['body_text_size']['text'] : '12px'; ?>;
+		font-family: <?php echo ($_SESSION['theme']['body_text_font']['text'] != '') ? $_SESSION['theme']['body_text_font']['text'] : 'arial'; ?>;
+		}
+
+	table.tr_hover tr {
+		cursor: default;
+		}
+
+	table.tr_hover tr:hover td,
+	table.tr_hover tr:hover td a {
+		color: <?php echo ($_SESSION['theme']['text_link_color_hover']['text'] != '') ? $_SESSION['theme']['text_link_color_hover']['text'] : '#5082ca'; ?>;
+		}
+
+	td.list_control_icons {
+		width: 52px;
+		padding: none;
+		padding-left: 2px;
+		text-align: right;
+		vertical-align: top;
+		white-space: nowrap;
+		}
+
+	td.list_control_icon {
+		width: 26px;
+		padding: none;
+		padding-left: 2px;
+		text-align: right;
+		vertical-align: top;
+		white-space: nowrap;
+		}
+
 	.vncell {
 		border-bottom: 1px solid #fff;
 		background-color: #e5e9f0;
@@ -835,143 +835,41 @@
 		height: 33px;
 		}
 
-	.listbg {
-		border-bottom: 1px solid #a4aebf;
-		font-size: 11px;
-		background-color: #990000;
-		color: #000;
-		padding: 4px 16px 4px 6px;
-		}
-
-	table.tr_hover tr {
-		background-color: transparent;
-		cursor: default;
-		}
-
-	table.tr_hover tr:hover td,
-	table.tr_hover tr:hover td a {
-		color: #5082ca;
-		}
-
 	.row_style0 {
-		border-bottom: 1px solid #c5d1e5;
-		background-color: #e5e9f0;
-		color: #000;
+		border-bottom: 1px solid <?php echo ($_SESSION['theme']['table_row_border_color']['text'] != '') ? $_SESSION['theme']['table_row_border_color']['text'] : '#c5d1e5'; ?>;
+		background: <?php echo ($_SESSION['theme']['table_row_background_color_dark']['text'] != '') ? $_SESSION['theme']['table_row_background_color_dark']['text'] : '#e5e9f0'; ?>;
+		color: <?php echo ($_SESSION['theme']['table_row_text_color']['text'] != '') ? $_SESSION['theme']['table_row_text_color']['text'] : '#000'; ?>;
+		font-family: <?php echo ($_SESSION['theme']['table_row_text_font']['text'] != '') ? $_SESSION['theme']['table_row_text_font']['text'] : 'arial'; ?>
+		font-size: <?php echo ($_SESSION['theme']['table_row_text_size']['text'] != '') ? $_SESSION['theme']['table_row_text_size']['text'] : '12px'; ?>
 		text-align: left;
 		padding: 4px 7px;
 		}
 
 	.row_style1 {
-		border-bottom: 1px solid #c5d1e5;
-		background-color: #fff;
-		color: #000;
+		border-bottom: 1px solid <?php echo ($_SESSION['theme']['table_row_border_color']['text'] != '') ? $_SESSION['theme']['table_row_border_color']['text'] : '#c5d1e5'; ?>;
+		background: <?php echo ($_SESSION['theme']['table_row_background_color_light']['text'] != '') ? $_SESSION['theme']['table_row_background_color_light']['text'] : '#fff'; ?>;
+		color: <?php echo ($_SESSION['theme']['table_row_text_color']['text'] != '') ? $_SESSION['theme']['table_row_text_color']['text'] : '#000'; ?>;
+		font-family: <?php echo ($_SESSION['theme']['table_row_text_font']['text'] != '') ? $_SESSION['theme']['table_row_text_font']['text'] : 'arial'; ?>
+		font-size: <?php echo ($_SESSION['theme']['table_row_text_size']['text'] != '') ? $_SESSION['theme']['table_row_text_size']['text'] : '12px'; ?>
 		text-align: left;
 		padding: 4px 7px;
 		}
 
-	.row_style2 {
-		border-bottom: 1px solid #c5d1e5;
-		background-color: #fff;
-		color: #000;
-		text-align: center;
-		padding: 0 1px 0 1px;
-		width: 51px;
+	.row_style_slim {
+		padding: 0;
 		white-space: nowrap;
 		}
 
-	.row_style_hor_mir_grad {
-		background: -moz-linear-gradient(left, #e5e9f0 0%, #fff 25%, #fff 75%, #e5e9f0 100%);
-		background: -webkit-gradient(linear, left top, right top, color-stop(0%,#e5e9f0), color-stop(25%,#fff), color-stop(75%,#fff), color-stop(100%,#e5e9f0));
-		background: -webkit-linear-gradient(left, #e5e9f0 0%,#fff 25%,#fff 75%,#e5e9f0 100%);
-		background: -o-linear-gradient(left, #e5e9f0 0%,#fff 25%,#fff 75%,#e5e9f0 100%);
-		background: -ms-linear-gradient(left, #e5e9f0 0%,#fff 25%,#fff 75%,#e5e9f0 100%);
-		background: linear-gradient(to right, #e5e9f0 0%,#fff 25%,#fff 75%,#e5e9f0 100%);
-		filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e5e9f0', endColorstr='#e5e9f0',GradientType=1 );
-		}
-
 	.row_stylebg {
-		border-bottom: 1px solid #b9c5d8;
-		background-color: #f0f2f6;
-		color: #000;
+		border-bottom: 1px solid <?php echo ($_SESSION['theme']['table_row_border_color']['text'] != '') ? $_SESSION['theme']['table_row_border_color']['text'] : '#c5d1e5'; ?>; /* #b9c5d8 */
+		background: <?php echo ($_SESSION['theme']['table_row_background_color_medium']['text'] != '') ? $_SESSION['theme']['table_row_background_color_medium']['text'] : '#f0f2f6'; ?>;
+		color: <?php echo ($_SESSION['theme']['table_row_text_color']['text'] != '') ? $_SESSION['theme']['table_row_text_color']['text'] : '#000'; ?>;
+		font-family: <?php echo ($_SESSION['theme']['table_row_text_font']['text'] != '') ? $_SESSION['theme']['table_row_text_font']['text'] : 'arial'; ?>
+		font-size: <?php echo ($_SESSION['theme']['table_row_text_size']['text'] != '') ? $_SESSION['theme']['table_row_text_size']['text'] : '12px'; ?>
 		text-align: left;
 		padding: 4px 7px;
 		}
 
-	table th {
-		padding:4px 7px
-		}
-
-	table tr.even td {
-		background:#eee;
-		background-image: url('<!--{project_path}-->/themes/default/images/background_cell.gif');
-		border-bottom: 1px solid #a4aebf;
-		color: #333333;
-		}
-
-	table tr.odd td {
-		border-bottom: 1px solid #a4aebf;
-		color: #000000;
-		}
-
-	table tr:first-child th:first-child {
-		-moz-border-radius-topleft:7px;
-		-webkit-border-top-left-radius:7px;
-		border-top-left-radius:7px;
-		}
-
-	table tr:first-child th:last-of-type {
-		-moz-border-radius-topright:7px;
-		-webkit-border-top-right-radius:7px;
-		border-top-right-radius:7px;
-		}
-
-	table tr:nth-last-child(-5) td:first-of-type {
-		-moz-border-radius-bottomleft:7px;
-		-webkit-border-bottom-left-radius:7px;
-		border-bottom-left-radius:7px;
-		}
-
-	table tr:nth-last-child(-5) td:first-of-type {
-		-moz-border-radius-topleft:7px;
-		-webkit-border-top-left-radius:7px;
-		border-bottom-top-radius:7px;
-		}
-
-	.border {
-		border: solid 1px #a4aebf;
-		}
-
-	.frm {
-		border: solid 1px #ccc;
-		color: #666;
-		background-color: #EFEFEF;
-		}
-
-	.smalltext {
-		color: #bbb;
-		font-size: 11px;
-		font-family: arial;
-		}
-
-	fieldset {
-		padding: 8px;
-		text-align: left;
-		border: 1px solid #aeb7c6;
-		border-radius: 3px;
-		-moz-border-radius: 3px;
-		-webkit-border-radius: 3px;
-		margin: 0;
-		}
-
-	legend {
-		font-size: 13px;
-		font-family: arial;
-		font-weight: bold;
-		color: #3164ad;
-		padding-bottom: 8px;
-		padding-right: 2px;
-		}
-
 /* RESPONSE MESSAGES *******************************************************/
 
 	#message_container {
@@ -1029,7 +927,7 @@
 		color: <?php echo $_SESSION['theme']['message_alert_color']['text']; ?>;
 		}
 
-/* OPERATOR PANEL: BEGIN ********************************************************/
+/* OPERATOR PANEL ****************************************************************/
 
 	div.op_ext {
 		float: left;
@@ -1176,15 +1074,7 @@
 		border: 1px solid #5d5f5a;
 		}
 
-/* OPERATOR PANEL: END *******************************************************/
-
-	span.playback_progress_bar {
-		background-color: #c43e42;
-		height: 1px;
-		display: block;
-		}
-
-/* USER DASHBOARD: BEGIN *****************************************************/
+/* USER DASHBOARD ****************************************************************/
 
 	/* login message */
 	div.login_message {