diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 42aa4644afb7e57afc1a4014065e08afd22c474c..817c15637860ff7fc1a2496bc4b2d13ad574de0c 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -136,6 +136,13 @@ $colorbacklinepair2  =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty(
 $colorbackbody       =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKBODY)     ?$colorbackbody:$conf->global->THEME_ELDY_BACKBODY)          :(empty($user->conf->THEME_ELDY_BACKBODY)?$colorbackbody:$user->conf->THEME_ELDY_BACKBODY);
 $colortext           =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TEXT)         ?$colortext:$conf->global->THEME_ELDY_TEXT)                  :(empty($user->conf->THEME_ELDY_TEXT)?$colortext:$user->conf->THEME_ELDY_TEXT);
 
+// Set text color to black or white
+$tmppart=explode(',',$colorback1);
+$tmpval=$tmppart[1]+$tmppart[2]+$tmppart[3];
+//print $tmpval;
+if ($tmpval < 340) $colortextmain='FFFFFF';
+else $colortextmain='101010';
+
 print '/*'."\n";
 print 'colred='.$colred.' colgreen='.$colgreen.' colblue='.$colblue."\n";
 print 'isred='.$isred.' isgreen='.$isgreen.' isblue='.$isblue."\n";
@@ -379,27 +386,28 @@ a.tmenudisabled:link, a.tmenudisabled:visited, a.tmenudisabled:hover, a.tmenudis
 
 a.tmenu:link, a.tmenu:visited, a.tmenu:hover, a.tmenu:active {
     font-weight: normal;
-	color: #234046;
 	padding: 0px 5px 0px 5px;
 	margin: 0px 1px 2px 1px;
 	white-space: nowrap;
 	text-shadow: 1px 2px 4px #BFBFBF;
 }
+a.tmenu:link, a.tmenu:visited {
+	color: #<?php echo $colortextmain; ?>;
+}
 a.tmenu:hover, a.tmenu:active {
+	color: #233030;
 	margin: 0px 0px 0px 0px;
 	border-<?php print $right; ?>: 1px solid #555555;
 	border-<?php print $left; ?>: 1px solid #D8D8D8;
 	border-top: 1px solid #D8D8D8;
 	border-bottom: 2px solid #F4F4F4;
-}
-a.tmenu:hover, a.tmenu:active {
 	background: #F4F4F4;
 	text-shadow: 1px 2px 4px #BFBFBF;
 }
 
 a.tmenusel:link, a.tmenusel:visited, a.tmenusel:hover, a.tmenusel:active {
     font-weight: normal;
-	color: #234046;
+	color: #233030;
 	padding: 0px 5px 0px 5px;
 	margin: 0px 0px 0px 0px;
 	background: #F4F4F4;
@@ -629,7 +637,7 @@ div.login {
 	font-weight: bold;
 }
 div.login a {
-	color: #234046;
+	color: #233030;
 }
 div.login a:hover {
 	color: black;
@@ -666,9 +674,11 @@ td.vmenu {
 
 a.vmenu:link, a.vmenu:visited, a.vmenu:hover, a.vmenu:active { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: bold; }
 font.vmenudisabled  { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: bold; color: #93a5aa; }
+a.vmenu:link, a.vmenu:visited { color: #<?php echo $colortextmain; ?>; }
 
 a.vsmenu:link, a.vsmenu:visited, a.vsmenu:hover, a.vsmenu:active { font-size:<?php print ($fontsize-1) ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #202020; margin: 1px 1px 1px 6px; }
 font.vsmenudisabled { font-size:<?php print ($fontsize-1) ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #93a5aa; margin: 1px 1px 1px 6px; }
+a.vsmenu:link, a.vsmenu:visited { color: #<?php echo $colortextmain; ?>; }
 
 a.help:link, a.help:visited, a.help:hover, a.help:active { font-size:<?php print $fontsizesmaller ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #666666; }
 
@@ -1059,7 +1069,7 @@ div.tabs {
 }
 
 div.tabBar {
-    color: #234046;
+    color: #<?php echo $colortextmain; ?>;
     padding-top: 9px;
     padding-left: 8px;
     padding-right: 8px;
@@ -1106,7 +1116,6 @@ a.tabTitle {
 
 a.tab:link {
     background: #dee7ec;
-    color: #434956;
 	font-family: <?php print $fontlist ?>;
     padding: 0px 6px;
     margin: 0em 0.2em;
@@ -1130,7 +1139,6 @@ background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacktab1; ?>)
 }
 a.tab:visited {
     background: #dee7ec;
-    color: #434956;
 	font-family: <?php print $fontlist ?>;
     padding: 0px 6px;
     margin: 0em 0.2em;
@@ -1155,7 +1163,6 @@ background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacktab1; ?>)
 a.tab#active {
     background: white;
 	font-family: <?php print $fontlist ?>;
-    color: #434956;
     padding: 0px 6px;
     margin: 0em 0.2em;
     text-decoration: none;
@@ -1180,7 +1187,6 @@ background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacktab1; ?>)
 }
 a.tab:hover {
     background: white;
-    color: #434956;
 	font-family: <?php print $fontlist ?>;
     padding: 0px 6px;
     margin: 0em 0.2em;
@@ -1201,6 +1207,11 @@ background-image: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacktab1;
 background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacktab1; ?>) 35%, rgb(<?php echo $colorbacktab2; ?>) 100%);
 }
 
+a.tab:link, a.tab:visited, a.tab#active, a.tab:hover
+{
+    color: #<?php echo $colortextmain; ?>;
+}
+
 a.tabimage {
     color: #434956;
 	font-family: <?php print $fontlist ?>;
@@ -1455,7 +1466,7 @@ background-image: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacktitle1;
 background-image: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacktitle1; ?>) 15%, rgb(<?php echo $colorbacktitle2; ?>) 100%);
 background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacktitle1; ?>) 15%, rgb(<?php echo $colorbacktitle2; ?>) 100%);
 
-    color: #234046;
+    color: #<?php echo $colortextmain; ?>;
     font-family: <?php print $fontlist ?>;
     font-weight: normal;
     border-bottom: 1px solid #FDFFFF;
@@ -1510,6 +1521,7 @@ background: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>
 font-family: <?php print $fontlist ?>;
 border: 0px;
 margin-bottom: 1px;
+color: #202020;
 }
 /*
 .impair:hover {
@@ -1532,6 +1544,7 @@ background: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>)
 font-family: <?php print $fontlist ?>;
 border: 0px;
 margin-bottom: 1px;
+color: #202020;
 }
 /*
 .pair:hover {
@@ -1570,7 +1583,7 @@ background-image: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacktitle
 background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacktitle1; ?>) 15%, rgb(<?php echo $colorbacktitle2; ?>) 100%);
 
 background-repeat: repeat-x;
-color: #334444;
+color: #<?php echo $colortextmain; ?>;
 font-family: <?php print $fontlist ?>, sans-serif;
 font-weight: normal;
 border-bottom: 1px solid #FDFFFF;