Index: lams_admin/web/WEB-INF/tags/TabName.tag
===================================================================
diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -r7329c82c5388fbb86b6a0a2b27a71151ee8f116e
--- lams_admin/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6)
+++ lams_admin/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 7329c82c5388fbb86b6a0a2b27a71151ee8f116e)
@@ -1,60 +1,59 @@
-<%/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
-
-/**
- * TabName Tag
- *	Author: Mitchell Seaton
- *	Description: Shortens name that are too long to fit inside a tab
- */
-
-		%>
-<%@ tag body-content="scriptless" %>
-
-<%@ attribute name="url" required="true" rtexprvalue="true"%>
-<%@ attribute name="highlight" required="false" rtexprvalue="true" %>
-
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-function" prefix="fn"%>
-
-<c:set var="limit">12</c:set>
-<c:set var="fullname"><jsp:doBody/></c:set>
-<c:set var="titleValue" value=""/>
-
-<c:choose>
-	<c:when test="${fn:length(fullname) > limit}">
-			<c:set var="titleValue" value="${fullname}"/>
-			<c:set var="tabname" value="${fn:substring(fullname, 0, limit-2)}..."/>
-	</c:when>
-	<c:otherwise>
-		<c:set var="tabname" value="${fullname}"/>
-	</c:otherwise>
-</c:choose>
-
-<c:set var="styleVar" value="border:0;" />
-<c:if test="${highlight eq true}">
-	<c:set var="styleVar" value="border:0; color: #e7eef8;" />
-</c:if>
-
-<a class="tab-middle-link" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="${styleVar}">
-	<c:out value="${tabname}" escapeXml="false"/>	
+<%/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/**
+ * TabName Tag
+ *	Author: Mitchell Seaton
+ *	Description: Shortens name that are too long to fit inside a tab
+ */
+
+		%>
+<%@ tag body-content="scriptless" %>
+
+<%@ attribute name="url" required="true" rtexprvalue="true"%>
+<%@ attribute name="highlight" required="false" rtexprvalue="true" %>
+
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-function" prefix="fn"%>
+
+<c:set var="limit">12</c:set>
+<c:set var="fullname"><jsp:doBody/></c:set>
+<c:set var="titleValue" value=""/>
+
+<c:choose>
+	<c:when test="${fn:length(fullname) > limit}">
+			<c:set var="titleValue" value="${fullname}"/>
+			<c:set var="tabname" value="${fn:substring(fullname, 0, limit-2)}..."/>
+	</c:when>
+	<c:otherwise>
+		<c:set var="tabname" value="${fullname}"/>
+	</c:otherwise>
+</c:choose>
+
+<c:if test="${highlight eq true}">
+	<c:set var="classVar" value="tab-link-highlight" />
+</c:if>
+
+<a class="tab-middle-link ${classVar}" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="border:0;">
+	<c:out value="${tabname}" escapeXml="false"/>	
 </a>
\ No newline at end of file
Index: lams_central/web/WEB-INF/tags/TabName.tag
===================================================================
diff -u -r2c48435c81eb6e6c5801073020eda94d3d2f2e58 -r7329c82c5388fbb86b6a0a2b27a71151ee8f116e
--- lams_central/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 2c48435c81eb6e6c5801073020eda94d3d2f2e58)
+++ lams_central/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 7329c82c5388fbb86b6a0a2b27a71151ee8f116e)
@@ -50,11 +50,10 @@
 	</c:otherwise>
 </c:choose>
 
-<c:set var="styleVar" value="border:0;" />
 <c:if test="${highlight eq true}">
-	<c:set var="styleVar" value="border:0; color: #e7eef8;" />
+	<c:set var="classVar" value="tab-link-highlight" />
 </c:if>
 
-<a class="tab-middle-link" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="${styleVar}">
+<a class="tab-middle-link ${classVar}" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="border:0;">
 	<c:out value="${tabname}" escapeXml="false"/>	
 </a>
\ No newline at end of file
Index: lams_central/web/css/defaultHTML.css
===================================================================
diff -u -r87df3266389ed5ab53d41f2a3c4fd0a9c1a4655e -r7329c82c5388fbb86b6a0a2b27a71151ee8f116e
--- lams_central/web/css/defaultHTML.css	(.../defaultHTML.css)	(revision 87df3266389ed5ab53d41f2a3c4fd0a9c1a4655e)
+++ lams_central/web/css/defaultHTML.css	(.../defaultHTML.css)	(revision 7329c82c5388fbb86b6a0a2b27a71151ee8f116e)
@@ -307,6 +307,10 @@
          background: url('../images/css/button_highlight_right.jpg') no-repeat top right; 
          float: left 	 
  }
+ 
+ #nav-right a.tab-link-highlight, #nav-right a.tab-link-highlight:hover {
+ 	color: #e7eef8;
+ }
 
 /*
 *************************************************
Index: lams_central/web/css/defaultHTML_rtl.css
===================================================================
diff -u -r87df3266389ed5ab53d41f2a3c4fd0a9c1a4655e -r7329c82c5388fbb86b6a0a2b27a71151ee8f116e
--- lams_central/web/css/defaultHTML_rtl.css	(.../defaultHTML_rtl.css)	(revision 87df3266389ed5ab53d41f2a3c4fd0a9c1a4655e)
+++ lams_central/web/css/defaultHTML_rtl.css	(.../defaultHTML_rtl.css)	(revision 7329c82c5388fbb86b6a0a2b27a71151ee8f116e)
@@ -302,6 +302,10 @@
          background: url('../images/css/button_highlight_right.jpg') no-repeat top right;
          float: left 	 
  }
+ 
+ #nav-right a.tab-link-highlight, #nav-right a.tab-link-highlight:hover {
+ 	color: #e7eef8;
+ }
 
 /*
 *************************************************
Index: lams_central/web/css/defaultMainHTML.css
===================================================================
diff -u -rea79f29aed5c764a223234e456442bc1e49fcf85 -r7329c82c5388fbb86b6a0a2b27a71151ee8f116e
--- lams_central/web/css/defaultMainHTML.css	(.../defaultMainHTML.css)	(revision ea79f29aed5c764a223234e456442bc1e49fcf85)
+++ lams_central/web/css/defaultMainHTML.css	(.../defaultMainHTML.css)	(revision 7329c82c5388fbb86b6a0a2b27a71151ee8f116e)
@@ -286,6 +286,10 @@
          background: url('../images/css/button_highlight_right.jpg') no-repeat top right; 
          float: left 	 
  }
+ 
+ #nav-right a.tab-link-highlight, #nav-right a.tab-link-highlight:hover {
+ 	color: #e7eef8;
+ }
 
 /*
 *************************************************
Index: lams_central/web/css/defaultMainHTML_rtl.css
===================================================================
diff -u -r4abf8ee86bc60a0b94edfdc4c907c28c6c5df13e -r7329c82c5388fbb86b6a0a2b27a71151ee8f116e
--- lams_central/web/css/defaultMainHTML_rtl.css	(.../defaultMainHTML_rtl.css)	(revision 4abf8ee86bc60a0b94edfdc4c907c28c6c5df13e)
+++ lams_central/web/css/defaultMainHTML_rtl.css	(.../defaultMainHTML_rtl.css)	(revision 7329c82c5388fbb86b6a0a2b27a71151ee8f116e)
@@ -284,6 +284,10 @@
          background: url('../images/css/button_highlight_right.jpg') no-repeat top right;
          float: left 	 
  }
+ 
+ #nav-right a.tab-link-highlight, #nav-right a.tab-link-highlight:hover {
+ 	color: #e7eef8;
+ }
 
 /*
 *************************************************
Index: lams_central/web/css/highContrast.css
===================================================================
diff -u -r06be19e416acd49df38de4b1e3c99b84a6c3f97e -r7329c82c5388fbb86b6a0a2b27a71151ee8f116e
--- lams_central/web/css/highContrast.css	(.../highContrast.css)	(revision 06be19e416acd49df38de4b1e3c99b84a6c3f97e)
+++ lams_central/web/css/highContrast.css	(.../highContrast.css)	(revision 7329c82c5388fbb86b6a0a2b27a71151ee8f116e)
@@ -307,6 +307,10 @@
          background: url('../images/css/button_highlight_right.jpg') no-repeat top right; 
          float: left 	 
  }
+ 
+ #nav-right a.tab-link-highlight, #nav-right a.tab-link-highlight:hover {
+ 	color: #e7eef8;
+ }
 
 /*
 *************************************************
Index: lams_central/web/css/highContrast_rtl.css
===================================================================
diff -u -r06be19e416acd49df38de4b1e3c99b84a6c3f97e -r7329c82c5388fbb86b6a0a2b27a71151ee8f116e
--- lams_central/web/css/highContrast_rtl.css	(.../highContrast_rtl.css)	(revision 06be19e416acd49df38de4b1e3c99b84a6c3f97e)
+++ lams_central/web/css/highContrast_rtl.css	(.../highContrast_rtl.css)	(revision 7329c82c5388fbb86b6a0a2b27a71151ee8f116e)
@@ -302,6 +302,10 @@
          background: url('../images/css/button_highlight_right.jpg') no-repeat top right;
          float: left 	 
  }
+ 
+ #nav-right a.tab-link-highlight, #nav-right a.tab-link-highlight:hover {
+ 	color: #e7eef8;
+ }
 
 /*
 *************************************************
Index: lams_central/web/css/ramsthemeHTML.css
===================================================================
diff -u -racc8d2acf5b6b0002e0c8129947040a779ab4077 -r7329c82c5388fbb86b6a0a2b27a71151ee8f116e
--- lams_central/web/css/ramsthemeHTML.css	(.../ramsthemeHTML.css)	(revision acc8d2acf5b6b0002e0c8129947040a779ab4077)
+++ lams_central/web/css/ramsthemeHTML.css	(.../ramsthemeHTML.css)	(revision 7329c82c5388fbb86b6a0a2b27a71151ee8f116e)
@@ -243,6 +243,10 @@
     background: url('../images/ramsthemecss/button_highlight_right.jpg') no-repeat top right;
 }
 
+#nav-right a.tab-link-highlight, #nav-right a.tab-link-highlight:hover {
+ 	color: #e7eef8;
+ }
+
 #nav a.tab-middle-link-selected {
 	color: #333333
 }
Index: lams_gradebook/web/WEB-INF/tags/TabName.tag
===================================================================
diff -u -re074865bde063cd3ac9e531a90857d07de9d121c -r7329c82c5388fbb86b6a0a2b27a71151ee8f116e
--- lams_gradebook/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision e074865bde063cd3ac9e531a90857d07de9d121c)
+++ lams_gradebook/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 7329c82c5388fbb86b6a0a2b27a71151ee8f116e)
@@ -50,11 +50,10 @@
 	</c:otherwise>
 </c:choose>
 
-<c:set var="styleVar" value="border:0;" />
 <c:if test="${highlight eq true}">
-	<c:set var="styleVar" value="border:0; color: #e7eef8;" />
+	<c:set var="classVar" value="tab-link-highlight" />
 </c:if>
 
-<a class="tab-middle-link" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="${styleVar}">
+<a class="tab-middle-link ${classVar}" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="border:0;">
 	<c:out value="${tabname}" escapeXml="false"/>	
-</a>
+</a>
\ No newline at end of file
Index: lams_learning/web/WEB-INF/tags/TabName.tag
===================================================================
diff -u -r2c48435c81eb6e6c5801073020eda94d3d2f2e58 -r7329c82c5388fbb86b6a0a2b27a71151ee8f116e
--- lams_learning/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 2c48435c81eb6e6c5801073020eda94d3d2f2e58)
+++ lams_learning/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 7329c82c5388fbb86b6a0a2b27a71151ee8f116e)
@@ -50,11 +50,10 @@
 	</c:otherwise>
 </c:choose>
 
-<c:set var="styleVar" value="border:0;" />
 <c:if test="${highlight eq true}">
-	<c:set var="styleVar" value="border:0; color: #e7eef8;" />
+	<c:set var="classVar" value="tab-link-highlight" />
 </c:if>
 
-<a class="tab-middle-link" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="${styleVar}">
+<a class="tab-middle-link ${classVar}" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="border:0;">
 	<c:out value="${tabname}" escapeXml="false"/>	
 </a>
\ No newline at end of file
Index: lams_monitoring/web/WEB-INF/tags/TabName.tag
===================================================================
diff -u -r2c48435c81eb6e6c5801073020eda94d3d2f2e58 -r7329c82c5388fbb86b6a0a2b27a71151ee8f116e
--- lams_monitoring/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 2c48435c81eb6e6c5801073020eda94d3d2f2e58)
+++ lams_monitoring/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 7329c82c5388fbb86b6a0a2b27a71151ee8f116e)
@@ -50,11 +50,10 @@
 	</c:otherwise>
 </c:choose>
 
-<c:set var="styleVar" value="border:0;" />
 <c:if test="${highlight eq true}">
-	<c:set var="styleVar" value="border:0; color: #e7eef8;" />
+	<c:set var="classVar" value="tab-link-highlight" />
 </c:if>
 
-<a class="tab-middle-link" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="${styleVar}">
+<a class="tab-middle-link ${classVar}" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="border:0;">
 	<c:out value="${tabname}" escapeXml="false"/>	
 </a>
\ No newline at end of file
Index: lams_tool_assessment/web/WEB-INF/tags/TabName.tag
===================================================================
diff -u -r3fdcee6fa67ca8bbbf112bb01a95873fc76a6b0f -r7329c82c5388fbb86b6a0a2b27a71151ee8f116e
--- lams_tool_assessment/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 3fdcee6fa67ca8bbbf112bb01a95873fc76a6b0f)
+++ lams_tool_assessment/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 7329c82c5388fbb86b6a0a2b27a71151ee8f116e)
@@ -50,11 +50,10 @@
 	</c:otherwise>
 </c:choose>
 
-<c:set var="styleVar" value="border:0;" />
 <c:if test="${highlight eq true}">
-	<c:set var="styleVar" value="border:0; color: #e7eef8;" />
+	<c:set var="classVar" value="tab-link-highlight" />
 </c:if>
 
-<a class="tab-middle-link" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="${styleVar}">
+<a class="tab-middle-link ${classVar}" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="border:0;">
 	<c:out value="${tabname}" escapeXml="false"/>	
 </a>
\ No newline at end of file
Index: lams_tool_chat/web/WEB-INF/tags/TabName.tag
===================================================================
diff -u -r2c48435c81eb6e6c5801073020eda94d3d2f2e58 -r7329c82c5388fbb86b6a0a2b27a71151ee8f116e
--- lams_tool_chat/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 2c48435c81eb6e6c5801073020eda94d3d2f2e58)
+++ lams_tool_chat/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 7329c82c5388fbb86b6a0a2b27a71151ee8f116e)
@@ -50,11 +50,10 @@
 	</c:otherwise>
 </c:choose>
 
-<c:set var="styleVar" value="border:0;" />
 <c:if test="${highlight eq true}">
-	<c:set var="styleVar" value="border:0; color: #e7eef8;" />
+	<c:set var="classVar" value="tab-link-highlight" />
 </c:if>
 
-<a class="tab-middle-link" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="${styleVar}">
+<a class="tab-middle-link ${classVar}" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="border:0;">
 	<c:out value="${tabname}" escapeXml="false"/>	
 </a>
\ No newline at end of file
Index: lams_tool_daco/web/WEB-INF/tags/TabName.tag
===================================================================
diff -u -rbe03cfbba16a388e85d82cb8986f63d6b2ad568b -r7329c82c5388fbb86b6a0a2b27a71151ee8f116e
--- lams_tool_daco/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision be03cfbba16a388e85d82cb8986f63d6b2ad568b)
+++ lams_tool_daco/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 7329c82c5388fbb86b6a0a2b27a71151ee8f116e)
@@ -50,11 +50,10 @@
 	</c:otherwise>
 </c:choose>
 
-<c:set var="styleVar" value="border:0;" />
 <c:if test="${highlight eq true}">
-	<c:set var="styleVar" value="border:0; color: #e7eef8;" />
+	<c:set var="classVar" value="tab-link-highlight" />
 </c:if>
 
-<a class="tab-middle-link" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="${styleVar}">
+<a class="tab-middle-link ${classVar}" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="border:0;">
 	<c:out value="${tabname}" escapeXml="false"/>	
-</a>
+</a>
\ No newline at end of file
Index: lams_tool_dimdim/web/WEB-INF/tags/TabName.tag
===================================================================
diff -u -r4c8de20e6e3ea73f98892f70662508e4011e96f6 -r7329c82c5388fbb86b6a0a2b27a71151ee8f116e
--- lams_tool_dimdim/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 4c8de20e6e3ea73f98892f70662508e4011e96f6)
+++ lams_tool_dimdim/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 7329c82c5388fbb86b6a0a2b27a71151ee8f116e)
@@ -50,11 +50,10 @@
 	</c:otherwise>
 </c:choose>
 
-<c:set var="styleVar" value="border:0;" />
 <c:if test="${highlight eq true}">
-	<c:set var="styleVar" value="border:0; color: #e7eef8;" />
+	<c:set var="classVar" value="tab-link-highlight" />
 </c:if>
 
-<a class="tab-middle-link" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="${styleVar}">
+<a class="tab-middle-link ${classVar}" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="border:0;">
 	<c:out value="${tabname}" escapeXml="false"/>	
-</a>
+</a>
\ No newline at end of file
Index: lams_tool_forum/web/WEB-INF/tags/TabName.tag
===================================================================
diff -u -r2c48435c81eb6e6c5801073020eda94d3d2f2e58 -r7329c82c5388fbb86b6a0a2b27a71151ee8f116e
--- lams_tool_forum/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 2c48435c81eb6e6c5801073020eda94d3d2f2e58)
+++ lams_tool_forum/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 7329c82c5388fbb86b6a0a2b27a71151ee8f116e)
@@ -50,11 +50,10 @@
 	</c:otherwise>
 </c:choose>
 
-<c:set var="styleVar" value="border:0;" />
 <c:if test="${highlight eq true}">
-	<c:set var="styleVar" value="border:0; color: #e7eef8;" />
+	<c:set var="classVar" value="tab-link-highlight" />
 </c:if>
 
-<a class="tab-middle-link" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="${styleVar}">
+<a class="tab-middle-link ${classVar}" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="border:0;">
 	<c:out value="${tabname}" escapeXml="false"/>	
 </a>
\ No newline at end of file
Index: lams_tool_gmap/web/WEB-INF/tags/TabName.tag
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -r7329c82c5388fbb86b6a0a2b27a71151ee8f116e
--- lams_tool_gmap/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 7329c82c5388fbb86b6a0a2b27a71151ee8f116e)
@@ -50,11 +50,10 @@
 	</c:otherwise>
 </c:choose>
 
-<c:set var="styleVar" value="border:0;" />
 <c:if test="${highlight eq true}">
-	<c:set var="styleVar" value="border:0; color: #e7eef8;" />
+	<c:set var="classVar" value="tab-link-highlight" />
 </c:if>
 
-<a class="tab-middle-link" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="${styleVar}">
+<a class="tab-middle-link ${classVar}" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="border:0;">
 	<c:out value="${tabname}" escapeXml="false"/>	
-</a>
+</a>
\ No newline at end of file
Index: lams_tool_images/web/WEB-INF/tags/TabName.tag
===================================================================
diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -r7329c82c5388fbb86b6a0a2b27a71151ee8f116e
--- lams_tool_images/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 8a7c47632a6a93892f015f068d12adb376c0ae2d)
+++ lams_tool_images/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 7329c82c5388fbb86b6a0a2b27a71151ee8f116e)
@@ -50,11 +50,10 @@
 	</c:otherwise>
 </c:choose>
 
-<c:set var="styleVar" value="border:0;" />
 <c:if test="${highlight eq true}">
-	<c:set var="styleVar" value="border:0; color: #e7eef8;" />
+	<c:set var="classVar" value="tab-link-highlight" />
 </c:if>
 
-<a class="tab-middle-link" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="${styleVar}">
+<a class="tab-middle-link ${classVar}" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="border:0;">
 	<c:out value="${tabname}" escapeXml="false"/>	
-</a>
+</a>
\ No newline at end of file
Index: lams_tool_lamc/web/WEB-INF/tags/TabName.tag
===================================================================
diff -u -r2c48435c81eb6e6c5801073020eda94d3d2f2e58 -r7329c82c5388fbb86b6a0a2b27a71151ee8f116e
--- lams_tool_lamc/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 2c48435c81eb6e6c5801073020eda94d3d2f2e58)
+++ lams_tool_lamc/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 7329c82c5388fbb86b6a0a2b27a71151ee8f116e)
@@ -50,11 +50,10 @@
 	</c:otherwise>
 </c:choose>
 
-<c:set var="styleVar" value="border:0;" />
 <c:if test="${highlight eq true}">
-	<c:set var="styleVar" value="border:0; color: #e7eef8;" />
+	<c:set var="classVar" value="tab-link-highlight" />
 </c:if>
 
-<a class="tab-middle-link" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="${styleVar}">
+<a class="tab-middle-link ${classVar}" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="border:0;">
 	<c:out value="${tabname}" escapeXml="false"/>	
 </a>
\ No newline at end of file
Index: lams_tool_laqa/web/WEB-INF/tags/TabName.tag
===================================================================
diff -u -r2c48435c81eb6e6c5801073020eda94d3d2f2e58 -r7329c82c5388fbb86b6a0a2b27a71151ee8f116e
--- lams_tool_laqa/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 2c48435c81eb6e6c5801073020eda94d3d2f2e58)
+++ lams_tool_laqa/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 7329c82c5388fbb86b6a0a2b27a71151ee8f116e)
@@ -50,11 +50,10 @@
 	</c:otherwise>
 </c:choose>
 
-<c:set var="styleVar" value="border:0;" />
 <c:if test="${highlight eq true}">
-	<c:set var="styleVar" value="border:0; color: #e7eef8;" />
+	<c:set var="classVar" value="tab-link-highlight" />
 </c:if>
 
-<a class="tab-middle-link" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="${styleVar}">
+<a class="tab-middle-link ${classVar}" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="border:0;">
 	<c:out value="${tabname}" escapeXml="false"/>	
 </a>
\ No newline at end of file
Index: lams_tool_larsrc/web/WEB-INF/tags/TabName.tag
===================================================================
diff -u -r2c48435c81eb6e6c5801073020eda94d3d2f2e58 -r7329c82c5388fbb86b6a0a2b27a71151ee8f116e
--- lams_tool_larsrc/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 2c48435c81eb6e6c5801073020eda94d3d2f2e58)
+++ lams_tool_larsrc/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 7329c82c5388fbb86b6a0a2b27a71151ee8f116e)
@@ -50,11 +50,10 @@
 	</c:otherwise>
 </c:choose>
 
-<c:set var="styleVar" value="border:0;" />
 <c:if test="${highlight eq true}">
-	<c:set var="styleVar" value="border:0; color: #e7eef8;" />
+	<c:set var="classVar" value="tab-link-highlight" />
 </c:if>
 
-<a class="tab-middle-link" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="${styleVar}">
+<a class="tab-middle-link ${classVar}" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="border:0;">
 	<c:out value="${tabname}" escapeXml="false"/>	
 </a>
\ No newline at end of file
Index: lams_tool_mindmap/web/WEB-INF/tags/TabName.tag
===================================================================
diff -u -r26ce6de9fba8494203a85a4ce076b6ffea4238ed -r7329c82c5388fbb86b6a0a2b27a71151ee8f116e
--- lams_tool_mindmap/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 26ce6de9fba8494203a85a4ce076b6ffea4238ed)
+++ lams_tool_mindmap/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 7329c82c5388fbb86b6a0a2b27a71151ee8f116e)
@@ -50,11 +50,10 @@
 	</c:otherwise>
 </c:choose>
 
-<c:set var="styleVar" value="border:0;" />
 <c:if test="${highlight eq true}">
-	<c:set var="styleVar" value="border:0; color: #e7eef8;" />
+	<c:set var="classVar" value="tab-link-highlight" />
 </c:if>
 
-<a class="tab-middle-link" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="${styleVar}">
+<a class="tab-middle-link ${classVar}" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="border:0;">
 	<c:out value="${tabname}" escapeXml="false"/>	
-</a>
+</a>
\ No newline at end of file
Index: lams_tool_nb/web/WEB-INF/tags/TabName.tag
===================================================================
diff -u -r2c48435c81eb6e6c5801073020eda94d3d2f2e58 -r7329c82c5388fbb86b6a0a2b27a71151ee8f116e
--- lams_tool_nb/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 2c48435c81eb6e6c5801073020eda94d3d2f2e58)
+++ lams_tool_nb/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 7329c82c5388fbb86b6a0a2b27a71151ee8f116e)
@@ -50,11 +50,10 @@
 	</c:otherwise>
 </c:choose>
 
-<c:set var="styleVar" value="border:0;" />
 <c:if test="${highlight eq true}">
-	<c:set var="styleVar" value="border:0; color: #e7eef8;" />
+	<c:set var="classVar" value="tab-link-highlight" />
 </c:if>
 
-<a class="tab-middle-link" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="${styleVar}">
+<a class="tab-middle-link ${classVar}" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="border:0;">
 	<c:out value="${tabname}" escapeXml="false"/>	
 </a>
\ No newline at end of file
Index: lams_tool_notebook/web/WEB-INF/tags/TabName.tag
===================================================================
diff -u -r2c48435c81eb6e6c5801073020eda94d3d2f2e58 -r7329c82c5388fbb86b6a0a2b27a71151ee8f116e
--- lams_tool_notebook/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 2c48435c81eb6e6c5801073020eda94d3d2f2e58)
+++ lams_tool_notebook/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 7329c82c5388fbb86b6a0a2b27a71151ee8f116e)
@@ -50,11 +50,10 @@
 	</c:otherwise>
 </c:choose>
 
-<c:set var="styleVar" value="border:0;" />
 <c:if test="${highlight eq true}">
-	<c:set var="styleVar" value="border:0; color: #e7eef8;" />
+	<c:set var="classVar" value="tab-link-highlight" />
 </c:if>
 
-<a class="tab-middle-link" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="${styleVar}">
+<a class="tab-middle-link ${classVar}" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="border:0;">
 	<c:out value="${tabname}" escapeXml="false"/>	
 </a>
\ No newline at end of file
Index: lams_tool_pixlr/web/WEB-INF/tags/TabName.tag
===================================================================
diff -u -rb703d43cf69269e0afcc716321fd5ef42c249a43 -r7329c82c5388fbb86b6a0a2b27a71151ee8f116e
--- lams_tool_pixlr/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision b703d43cf69269e0afcc716321fd5ef42c249a43)
+++ lams_tool_pixlr/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 7329c82c5388fbb86b6a0a2b27a71151ee8f116e)
@@ -50,11 +50,10 @@
 	</c:otherwise>
 </c:choose>
 
-<c:set var="styleVar" value="border:0;" />
 <c:if test="${highlight eq true}">
-	<c:set var="styleVar" value="border:0; color: #e7eef8;" />
+	<c:set var="classVar" value="tab-link-highlight" />
 </c:if>
 
-<a class="tab-middle-link" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="${styleVar}">
+<a class="tab-middle-link ${classVar}" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="border:0;">
 	<c:out value="${tabname}" escapeXml="false"/>	
-</a>
+</a>
\ No newline at end of file
Index: lams_tool_sbmt/web/WEB-INF/tags/TabName.tag
===================================================================
diff -u -r2c48435c81eb6e6c5801073020eda94d3d2f2e58 -r7329c82c5388fbb86b6a0a2b27a71151ee8f116e
--- lams_tool_sbmt/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 2c48435c81eb6e6c5801073020eda94d3d2f2e58)
+++ lams_tool_sbmt/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 7329c82c5388fbb86b6a0a2b27a71151ee8f116e)
@@ -50,11 +50,10 @@
 	</c:otherwise>
 </c:choose>
 
-<c:set var="styleVar" value="border:0;" />
 <c:if test="${highlight eq true}">
-	<c:set var="styleVar" value="border:0; color: #e7eef8;" />
+	<c:set var="classVar" value="tab-link-highlight" />
 </c:if>
 
-<a class="tab-middle-link" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="${styleVar}">
+<a class="tab-middle-link ${classVar}" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="border:0;">
 	<c:out value="${tabname}" escapeXml="false"/>	
 </a>
\ No newline at end of file
Index: lams_tool_scribe/web/WEB-INF/tags/TabName.tag
===================================================================
diff -u -r2c48435c81eb6e6c5801073020eda94d3d2f2e58 -r7329c82c5388fbb86b6a0a2b27a71151ee8f116e
--- lams_tool_scribe/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 2c48435c81eb6e6c5801073020eda94d3d2f2e58)
+++ lams_tool_scribe/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 7329c82c5388fbb86b6a0a2b27a71151ee8f116e)
@@ -50,11 +50,10 @@
 	</c:otherwise>
 </c:choose>
 
-<c:set var="styleVar" value="border:0;" />
 <c:if test="${highlight eq true}">
-	<c:set var="styleVar" value="border:0; color: #e7eef8;" />
+	<c:set var="classVar" value="tab-link-highlight" />
 </c:if>
 
-<a class="tab-middle-link" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="${styleVar}">
+<a class="tab-middle-link ${classVar}" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="border:0;">
 	<c:out value="${tabname}" escapeXml="false"/>	
 </a>
\ No newline at end of file
Index: lams_tool_spreadsheet/web/WEB-INF/tags/TabName.tag
===================================================================
diff -u -r7f9f772433a7fd55c4475241d4e3bc0765f474e8 -r7329c82c5388fbb86b6a0a2b27a71151ee8f116e
--- lams_tool_spreadsheet/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 7f9f772433a7fd55c4475241d4e3bc0765f474e8)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 7329c82c5388fbb86b6a0a2b27a71151ee8f116e)
@@ -50,11 +50,10 @@
 	</c:otherwise>
 </c:choose>
 
-<c:set var="styleVar" value="border:0;" />
 <c:if test="${highlight eq true}">
-	<c:set var="styleVar" value="border:0; color: #e7eef8;" />
+	<c:set var="classVar" value="tab-link-highlight" />
 </c:if>
 
-<a class="tab-middle-link" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="${styleVar}">
+<a class="tab-middle-link ${classVar}" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="border:0;">
 	<c:out value="${tabname}" escapeXml="false"/>	
-</a>
+</a>
\ No newline at end of file
Index: lams_tool_survey/web/WEB-INF/tags/TabName.tag
===================================================================
diff -u -r2c48435c81eb6e6c5801073020eda94d3d2f2e58 -r7329c82c5388fbb86b6a0a2b27a71151ee8f116e
--- lams_tool_survey/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 2c48435c81eb6e6c5801073020eda94d3d2f2e58)
+++ lams_tool_survey/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 7329c82c5388fbb86b6a0a2b27a71151ee8f116e)
@@ -50,11 +50,10 @@
 	</c:otherwise>
 </c:choose>
 
-<c:set var="styleVar" value="border:0;" />
 <c:if test="${highlight eq true}">
-	<c:set var="styleVar" value="border:0; color: #e7eef8;" />
+	<c:set var="classVar" value="tab-link-highlight" />
 </c:if>
 
-<a class="tab-middle-link" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="${styleVar}">
+<a class="tab-middle-link ${classVar}" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="border:0;">
 	<c:out value="${tabname}" escapeXml="false"/>	
 </a>
\ No newline at end of file
Index: lams_tool_task/web/WEB-INF/tags/TabName.tag
===================================================================
diff -u -r68cefba7d15519f37436278fb0790fef8abc3b62 -r7329c82c5388fbb86b6a0a2b27a71151ee8f116e
--- lams_tool_task/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 68cefba7d15519f37436278fb0790fef8abc3b62)
+++ lams_tool_task/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 7329c82c5388fbb86b6a0a2b27a71151ee8f116e)
@@ -1,60 +1,59 @@
-<%/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
-
-/**
- * TabName Tag
- *	Author: Mitchell Seaton
- *	Description: Shortens name that are too long to fit inside a tab
- */
-
-		%>
-<%@ tag body-content="scriptless" %>
-
-<%@ attribute name="url" required="true" rtexprvalue="true"%>
-<%@ attribute name="highlight" required="false" rtexprvalue="true" %>
-
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-function" prefix="fn"%>
-
-<c:set var="limit">12</c:set>
-<c:set var="fullname"><jsp:doBody/></c:set>
-<c:set var="titleValue" value=""/>
-
-<c:choose>
-	<c:when test="${fn:length(fullname) > limit}">
-			<c:set var="titleValue" value="${fullname}"/>
-			<c:set var="tabname" value="${fn:substring(fullname, 0, limit-2)}..."/>
-	</c:when>
-	<c:otherwise>
-		<c:set var="tabname" value="${fullname}"/>
-	</c:otherwise>
-</c:choose>
-
-<c:set var="styleVar" value="border:0;" />
-<c:if test="${highlight eq true}">
-	<c:set var="styleVar" value="border:0; color: #e7eef8;" />
-</c:if>
-
-<a class="tab-middle-link" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="${styleVar}">
-	<c:out value="${tabname}" escapeXml="false"/>	
+<%/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/**
+ * TabName Tag
+ *	Author: Mitchell Seaton
+ *	Description: Shortens name that are too long to fit inside a tab
+ */
+
+		%>
+<%@ tag body-content="scriptless" %>
+
+<%@ attribute name="url" required="true" rtexprvalue="true"%>
+<%@ attribute name="highlight" required="false" rtexprvalue="true" %>
+
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-function" prefix="fn"%>
+
+<c:set var="limit">12</c:set>
+<c:set var="fullname"><jsp:doBody/></c:set>
+<c:set var="titleValue" value=""/>
+
+<c:choose>
+	<c:when test="${fn:length(fullname) > limit}">
+			<c:set var="titleValue" value="${fullname}"/>
+			<c:set var="tabname" value="${fn:substring(fullname, 0, limit-2)}..."/>
+	</c:when>
+	<c:otherwise>
+		<c:set var="tabname" value="${fullname}"/>
+	</c:otherwise>
+</c:choose>
+
+<c:if test="${highlight eq true}">
+	<c:set var="classVar" value="tab-link-highlight" />
+</c:if>
+
+<a class="tab-middle-link ${classVar}" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="border:0;">
+	<c:out value="${tabname}" escapeXml="false"/>	
 </a>
\ No newline at end of file
Index: lams_tool_videorecorder/web/WEB-INF/tags/TabName.tag
===================================================================
diff -u -r3d081de4a45da632ee6029251318fac795d41813 -r7329c82c5388fbb86b6a0a2b27a71151ee8f116e
--- lams_tool_videorecorder/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 3d081de4a45da632ee6029251318fac795d41813)
+++ lams_tool_videorecorder/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 7329c82c5388fbb86b6a0a2b27a71151ee8f116e)
@@ -50,11 +50,10 @@
 	</c:otherwise>
 </c:choose>
 
-<c:set var="styleVar" value="border:0;" />
 <c:if test="${highlight eq true}">
-	<c:set var="styleVar" value="border:0; color: #e7eef8;" />
+	<c:set var="classVar" value="tab-link-highlight" />
 </c:if>
 
-<a class="tab-middle-link" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="${styleVar}">
+<a class="tab-middle-link ${classVar}" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="border:0;">
 	<c:out value="${tabname}" escapeXml="false"/>	
-</a>
+</a>
\ No newline at end of file
Index: lams_tool_vote/web/WEB-INF/tags/TabName.tag
===================================================================
diff -u -r2c48435c81eb6e6c5801073020eda94d3d2f2e58 -r7329c82c5388fbb86b6a0a2b27a71151ee8f116e
--- lams_tool_vote/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 2c48435c81eb6e6c5801073020eda94d3d2f2e58)
+++ lams_tool_vote/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 7329c82c5388fbb86b6a0a2b27a71151ee8f116e)
@@ -50,11 +50,10 @@
 	</c:otherwise>
 </c:choose>
 
-<c:set var="styleVar" value="border:0;" />
 <c:if test="${highlight eq true}">
-	<c:set var="styleVar" value="border:0; color: #e7eef8;" />
+	<c:set var="classVar" value="tab-link-highlight" />
 </c:if>
 
-<a class="tab-middle-link" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="${styleVar}">
+<a class="tab-middle-link ${classVar}" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="border:0;">
 	<c:out value="${tabname}" escapeXml="false"/>	
 </a>
\ No newline at end of file
Index: lams_tool_wiki/web/WEB-INF/tags/TabName.tag
===================================================================
diff -u -r1082bdcc357c105126a5641cecc68acfa645b66b -r7329c82c5388fbb86b6a0a2b27a71151ee8f116e
--- lams_tool_wiki/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 1082bdcc357c105126a5641cecc68acfa645b66b)
+++ lams_tool_wiki/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 7329c82c5388fbb86b6a0a2b27a71151ee8f116e)
@@ -50,11 +50,10 @@
 	</c:otherwise>
 </c:choose>
 
-<c:set var="styleVar" value="border:0;" />
 <c:if test="${highlight eq true}">
-	<c:set var="styleVar" value="border:0; color: #e7eef8;" />
+	<c:set var="classVar" value="tab-link-highlight" />
 </c:if>
 
-<a class="tab-middle-link" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="${styleVar}">
+<a class="tab-middle-link ${classVar}" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="border:0;">
 	<c:out value="${tabname}" escapeXml="false"/>	
-</a>
+</a>
\ No newline at end of file
Index: lams_www/web/WEB-INF/tags/TabName.tag
===================================================================
diff -u -r2c48435c81eb6e6c5801073020eda94d3d2f2e58 -r7329c82c5388fbb86b6a0a2b27a71151ee8f116e
--- lams_www/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 2c48435c81eb6e6c5801073020eda94d3d2f2e58)
+++ lams_www/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 7329c82c5388fbb86b6a0a2b27a71151ee8f116e)
@@ -50,11 +50,10 @@
 	</c:otherwise>
 </c:choose>
 
-<c:set var="styleVar" value="border:0;" />
 <c:if test="${highlight eq true}">
-	<c:set var="styleVar" value="border:0; color: #e7eef8;" />
+	<c:set var="classVar" value="tab-link-highlight" />
 </c:if>
 
-<a class="tab-middle-link" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="${styleVar}">
+<a class="tab-middle-link ${classVar}" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="border:0;">
 	<c:out value="${tabname}" escapeXml="false"/>	
 </a>
\ No newline at end of file