Index: lams_admin/web/user.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/user.jsp,v
diff -u -r1.29.2.10 -r1.29.2.11
--- lams_admin/web/user.jsp	28 Nov 2016 01:19:59 -0000	1.29.2.10
+++ lams_admin/web/user.jsp	12 May 2017 17:42:07 -0000	1.29.2.11
@@ -1,23 +1,20 @@
-
 <%@ include file="/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
 <%@ page import="org.apache.struts.action.ActionMessages"%>
 
-
-<script src="/lams/includes/javascript/jquery.js"></script>
-<script src="/lams/includes/javascript/jquery-ui.js"></script>
-<script src="/lams/includes/javascript/groupDisplay.js"></script>
-<script src="/lams/includes/javascript/jquery.validate.js"></script>
-
 <c:set var="minNumChars"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_MINIMUM_CHARACTERS)%></c:set>
 <c:set var="mustHaveUppercase"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_UPPERCASE)%></c:set>
 <c:set var="mustHaveLowercase"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_LOWERCASE)%></c:set>
 <c:set var="mustHaveNumerics"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_NUMERICS)%></c:set>
 <c:set var="mustHaveSymbols"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_SYMBOLS)%></c:set>
 
-<link rel="stylesheet" href="css/defaultHTML_learner.css" type="text/css" />
+<lams:css/>
 
+<script src="/lams/includes/javascript/jquery.js"></script>
+<script src="/lams/includes/javascript/jquery-ui.js"></script>
+<script src="/lams/includes/javascript/groupDisplay.js"></script>
+<script src="/lams/includes/javascript/jquery.validate.js"></script>
 <script type="text/javascript">
 var mustHaveUppercase = ${mustHaveUppercase},
 mustHaveNumerics  = ${mustHaveNumerics},
Index: lams_admin/web/userChangePass.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/Attic/userChangePass.jsp,v
diff -u -r1.1.2.2 -r1.1.2.3
--- lams_admin/web/userChangePass.jsp	30 Nov 2016 02:00:39 -0000	1.1.2.2
+++ lams_admin/web/userChangePass.jsp	12 May 2017 17:42:07 -0000	1.1.2.3
@@ -1,27 +1,21 @@
 <%@ include file="/taglibs.jsp"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
-<%-- javascript --%>
-<script type="text/javascript"
-	src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
-<script type="text/javascript"
-	src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
-<script type="text/javascript"
-	src="<lams:LAMSURL/>includes/javascript/jquery.validate.js"></script>
-<script type="text/javascript"
-	src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"></script>
-<link href="/lams/css/defaultHTML_learner.css" rel="stylesheet"
-	type="text/css">
 <%@ page import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
 <%@ page import="org.apache.struts.action.ActionMessages"%>
-
-
 <c:set var="minNumChars"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_MINIMUM_CHARACTERS)%></c:set>
 <c:set var="mustHaveUppercase"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_UPPERCASE)%></c:set>
 <c:set var="mustHaveNumerics"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_NUMERICS)%></c:set>
 <c:set var="mustHaveLowercase"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_LOWERCASE)%></c:set>
 <c:set var="mustHaveSymbols"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_SYMBOLS)%></c:set>
 
+<lams:css/>
+
+<%-- javascript --%>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"></script>
 <script type="text/javascript">
      var mustHaveUppercase = ${mustHaveUppercase},
      mustHaveNumerics  = ${mustHaveNumerics},
Index: lams_central/web/addLesson.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/addLesson.jsp,v
diff -u -r1.16.2.20 -r1.16.2.21
--- lams_central/web/addLesson.jsp	28 Apr 2017 21:30:11 -0000	1.16.2.20
+++ lams_central/web/addLesson.jsp	12 May 2017 17:42:09 -0000	1.16.2.21
@@ -6,9 +6,9 @@
 <!DOCTYPE html>
 <lams:html>
 <lams:head>
+	<lams:css/>
 	<link rel="stylesheet" href="css/yui/treeview.css" type="text/css" media="screen" />
 	<link rel="stylesheet" href="css/yui/folders.css" type="text/css" media="screen" />
-	<link rel="stylesheet" href="css/defaultHTML_learner.css" type="text/css" media="screen" />
 	<link rel="stylesheet" href="css/jquery-ui.timepicker.css" type="text/css" media="screen" />
 	<link rel="stylesheet" href="css/jquery-ui-bootstrap-theme.css" type="text/css" media="screen" />
 	<link rel="stylesheet" href="css/addLesson.css" type="text/css" media="screen" />
Index: lams_central/web/forgotPasswordChange.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/forgotPasswordChange.jsp,v
diff -u -r1.5.2.7 -r1.5.2.8
--- lams_central/web/forgotPasswordChange.jsp	25 Nov 2016 03:33:25 -0000	1.5.2.7
+++ lams_central/web/forgotPasswordChange.jsp	12 May 2017 17:42:10 -0000	1.5.2.8
@@ -19,20 +19,15 @@
 <lams:html>
 
 <lams:head>
-	<link rel="stylesheet" href="css/defaultHTML_learner.css"
-		type="text/css" />
+	<lams:css/>
 	<script type="text/javascript" src="includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="includes/javascript/jquery-ui.js"></script>
-	<script type="text/javascript"
-		src="includes/javascript/jquery.validate.js"></script>
-	<lams:css />
+	<script type="text/javascript" src="includes/javascript/jquery.validate.js"></script>
 	<title><fmt:message key="title.forgot.password" /></title>
 	<link rel="icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
-	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico"
-		type="image/x-icon" />
+	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
 	<script type="text/javascript">
 		function toHome() {
-
 			window.location = "<lams:LAMSURL/>index.do";
 		};
 
@@ -108,7 +103,6 @@
 	<fmt:message key="title.forgot.password" />
 </c:set>
 
-
 <body class="stripes">
 	<lams:Page type="admin" title="${title}">
 		<form action="<lams:LAMSURL/>/ForgotPasswordRequest" method="post"
Index: lams_central/web/lessonIntro.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/lessonIntro.jsp,v
diff -u -r1.8.2.8 -r1.8.2.9
--- lams_central/web/lessonIntro.jsp	11 Nov 2016 15:52:12 -0000	1.8.2.8
+++ lams_central/web/lessonIntro.jsp	12 May 2017 17:42:09 -0000	1.8.2.9
@@ -11,7 +11,7 @@
 <lams:html>
 <lams:head>
 	<TITLE><fmt:message key="title.learner.window"/></TITLE>
-	<link rel="stylesheet" href="css/defaultHTML_learner.css" type="text/css" media="screen" />
+	<lams:css/>
 	
 	<script type="text/javascript" src="includes/javascript/jquery.js"></script>	
 	<c:if test="${displayDesignImage}">
Index: lams_central/web/lessons.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/lessons.jsp,v
diff -u -r1.2.16.5 -r1.2.16.6
--- lams_central/web/lessons.jsp	8 Dec 2016 11:36:56 -0000	1.2.16.5
+++ lams_central/web/lessons.jsp	12 May 2017 17:42:09 -0000	1.2.16.6
@@ -10,7 +10,7 @@
 
 <lams:html>
 <lams:head>
-	<link rel="stylesheet" href="css/defaultHTML_learner.css" type="text/css" />
+	<lams:css/>
 	
 	<script type="text/javascript" src="includes/javascript/getSysInfo.js"></script>
 	<script type="text/javascript" src="loadVars.jsp"></script>
Index: lams_central/web/notificationsprivate.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/Attic/notificationsprivate.jsp,v
diff -u -r1.1.2.2 -r1.1.2.3
--- lams_central/web/notificationsprivate.jsp	31 Oct 2016 10:24:20 -0000	1.1.2.2
+++ lams_central/web/notificationsprivate.jsp	12 May 2017 17:42:09 -0000	1.1.2.3
@@ -1,19 +1,16 @@
 <!DOCTYPE html>
-
 <%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%>
-
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 <c:set var="lams" ><lams:LAMSURL/></c:set>
 
-<link rel="stylesheet" href="${lams}css/defaultHTML_learner.css" type="text/css" />
+<lams:css/>
 <link rel="stylesheet" href="${lams}css/main.css" type="text/css" />
 
 <script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
 <script type="text/javascript" src="${lams}/includes/javascript/bootstrap.min.js"></script>
-
 <script type="text/javascript">
 
 	var LAMS_URL = '<lams:LAMSURL/>',
Index: lams_central/web/passwordChangeContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/passwordChangeContent.jsp,v
diff -u -r1.10.12.11 -r1.10.12.12
--- lams_central/web/passwordChangeContent.jsp	30 Nov 2016 06:33:01 -0000	1.10.12.11
+++ lams_central/web/passwordChangeContent.jsp	12 May 2017 17:42:09 -0000	1.10.12.12
@@ -19,7 +19,7 @@
 	
 <lams:html>
 <lams:head>
-	<link rel="stylesheet" href="css/defaultHTML_learner.css" type="text/css" />
+	<lams:css/>
 
 	<script type="text/javascript" src="includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="includes/javascript/jquery-ui.js"></script>
Index: lams_central/web/passwordChangeOkContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/passwordChangeOkContent.jsp,v
diff -u -r1.5.22.3 -r1.5.22.4
--- lams_central/web/passwordChangeOkContent.jsp	7 Nov 2016 09:32:31 -0000	1.5.22.3
+++ lams_central/web/passwordChangeOkContent.jsp	12 May 2017 17:42:09 -0000	1.5.22.4
@@ -10,7 +10,7 @@
 
 <lams:html>
 <lams:head>
-	<link rel="stylesheet" href="css/defaultHTML_learner.css" type="text/css" />
+	<lams:css/>
 </lams:head>
 
 <body>
@@ -27,7 +27,7 @@
 					
 					<div class="col-xs-12 text-center voffset10">
 						<a class="btn btn-sm btn-default"
-						href="<lams:LAMSURL/>${empty redirectURL ? 'index.do' : redirectURL}" role="button">
+								href="<lams:LAMSURL/>${empty redirectURL ? 'index.do' : redirectURL}" role="button">
 							Ok
 						</a>
 					</div>
Index: lams_central/web/portrait.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/portrait.jsp,v
diff -u -r1.8.2.9 -r1.8.2.10
--- lams_central/web/portrait.jsp	22 Nov 2016 08:04:09 -0000	1.8.2.9
+++ lams_central/web/portrait.jsp	12 May 2017 17:42:09 -0000	1.8.2.10
@@ -10,7 +10,7 @@
 
 <lams:html>
 <lams:head>
-	<link rel="stylesheet" href="css/defaultHTML_learner.css" type="text/css" />
+	<lams:css/>
 	<style type="text/css">
 		.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited, .ui-state-active a:hover {
 			color: #47bc23 !important;
Index: lams_central/web/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/authoring/authoring.jsp,v
diff -u -r1.6.2.51 -r1.6.2.52
--- lams_central/web/authoring/authoring.jsp	4 Apr 2017 06:46:29 -0000	1.6.2.51
+++ lams_central/web/authoring/authoring.jsp	12 May 2017 17:42:10 -0000	1.6.2.52
@@ -11,7 +11,7 @@
 <lams:head>
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/yui/treeview.css" type="text/css" media="screen" />
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/yui/folders.css" type="text/css" media="screen" />
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/defaultHTML_learner.css" type="text/css">
+	<lams:css/>
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" type="text/css" media="screen" />
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/authoring.css" type="text/css" media="screen" />
 	
Index: lams_central/web/signup/signup.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/signup/signup.jsp,v
diff -u -r1.4.2.6 -r1.4.2.7
--- lams_central/web/signup/signup.jsp	4 Nov 2016 11:29:14 -0000	1.4.2.6
+++ lams_central/web/signup/signup.jsp	12 May 2017 17:42:10 -0000	1.4.2.7
@@ -1,15 +1,4 @@
-<%@ page language="java" pageEncoding="UTF-8"
-	contentType="text/html;charset=utf-8"%>
-<script type="text/javascript" src="/lams/includes/javascript/jquery.js"></script>
-<script type="text/javascript"
-	src="/lams/includes/javascript/jquery-ui.js"></script>
-<script type="text/javascript"
-	src="/lams/includes/javascript/jquery.validate.js"></script>
-<link rel="stylesheet" href="/lams/css/defaultHTML_learner.css"
-	type="text/css" />
-<script type="text/javascript"
-	src="/lams/includes/javascript/bootstrap.min.js"></script>
-
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%>
 <%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
@@ -19,65 +8,61 @@
 <lams:html>
 <lams:head>
 	<title><fmt:message key="title.lams.signup" /></title>
+	
 	<lams:css/>
 	<link rel="icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
-	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico"
-		type="image/x-icon" />
-	<link type="text/css"
-		href="<lams:LAMSURL/>css/jquery-ui-redmond-theme.css" rel="stylesheet" />
-
+	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
+	<link type="text/css" href="<lams:LAMSURL/>css/jquery-ui-redmond-theme.css" rel="stylesheet" />
 	<style media="screen,projection" type="text/css">
-.with-nav-tabs.panel-default .nav-tabs>li>a, .with-nav-tabs.panel-default .nav-tabs>li>a:hover,
-	.with-nav-tabs.panel-default .nav-tabs>li>a:focus {
-	color: #777;
-}
+		.with-nav-tabs.panel-default .nav-tabs>li>a, .with-nav-tabs.panel-default .nav-tabs>li>a:hover,
+		.with-nav-tabs.panel-default .nav-tabs>li>a:focus {
+			color: #777;
+		}
+	
+		.with-nav-tabs.panel-default .nav-tabs>.open>a, .with-nav-tabs.panel-default .nav-tabs>.open>a:hover,
+			.with-nav-tabs.panel-default .nav-tabs>.open>a:focus, .with-nav-tabs.panel-default .nav-tabs>li>a:hover,
+			.with-nav-tabs.panel-default .nav-tabs>li>a:focus {
+			color: #777;
+			background-color: #ddd;
+			border-color: transparent;
+		}
+		
+		.with-nav-tabs.panel-default .nav-tabs>li.active>a, .with-nav-tabs.panel-default .nav-tabs>li.active>a:hover,
+			.with-nav-tabs.panel-default .nav-tabs>li.active>a:focus {
+			color: #555;
+			background-color: #fff;
+			border-color: #ddd;
+			border-bottom-color: transparent;
+		}
+		
+		.with-nav-tabs.panel-default .nav-tabs>li.dropdown .dropdown-menu {
+			background-color: #f5f5f5;
+			border-color: #ddd;
+		}
+		
+		.with-nav-tabs.panel-default .nav-tabs>li.dropdown .dropdown-menu>li>a {
+			color: #777;
+		}
+		
+		.with-nav-tabs.panel-default .nav-tabs>li.dropdown .dropdown-menu>li>a:hover,
+			.with-nav-tabs.panel-default .nav-tabs>li.dropdown .dropdown-menu>li>a:focus
+			{
+			background-color: #ddd;
+		}
+		
+		.with-nav-tabs.panel-default .nav-tabs>li.dropdown .dropdown-menu>.active>a,
+			.with-nav-tabs.panel-default .nav-tabs>li.dropdown .dropdown-menu>.active>a:hover,
+			.with-nav-tabs.panel-default .nav-tabs>li.dropdown .dropdown-menu>.active>a:focus
+			{
+			color: #fff;
+			background-color: #555;
+		}
+	</style>
 
-.with-nav-tabs.panel-default .nav-tabs>.open>a, .with-nav-tabs.panel-default .nav-tabs>.open>a:hover,
-	.with-nav-tabs.panel-default .nav-tabs>.open>a:focus, .with-nav-tabs.panel-default .nav-tabs>li>a:hover,
-	.with-nav-tabs.panel-default .nav-tabs>li>a:focus {
-	color: #777;
-	background-color: #ddd;
-	border-color: transparent;
-}
-
-.with-nav-tabs.panel-default .nav-tabs>li.active>a, .with-nav-tabs.panel-default .nav-tabs>li.active>a:hover,
-	.with-nav-tabs.panel-default .nav-tabs>li.active>a:focus {
-	color: #555;
-	background-color: #fff;
-	border-color: #ddd;
-	border-bottom-color: transparent;
-}
-
-.with-nav-tabs.panel-default .nav-tabs>li.dropdown .dropdown-menu {
-	background-color: #f5f5f5;
-	border-color: #ddd;
-}
-
-.with-nav-tabs.panel-default .nav-tabs>li.dropdown .dropdown-menu>li>a {
-	color: #777;
-}
-
-.with-nav-tabs.panel-default .nav-tabs>li.dropdown .dropdown-menu>li>a:hover,
-	.with-nav-tabs.panel-default .nav-tabs>li.dropdown .dropdown-menu>li>a:focus
-	{
-	background-color: #ddd;
-}
-
-.with-nav-tabs.panel-default .nav-tabs>li.dropdown .dropdown-menu>.active>a,
-	.with-nav-tabs.panel-default .nav-tabs>li.dropdown .dropdown-menu>.active>a:hover,
-	.with-nav-tabs.panel-default .nav-tabs>li.dropdown .dropdown-menu>.active>a:focus
-	{
-	color: #fff;
-	background-color: #555;
-}
-</style>
-
-	<script type="text/javascript"
-		src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
-	<script type="text/javascript"
-		src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
-	<script type="text/javascript"
-		src="/lams/includes/javascript/bootstrap.min.js"></script>
+	<script type="text/javascript" src="/lams/includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="/lams/includes/javascript/jquery-ui.js"></script>
+	<script type="text/javascript" src="/lams/includes/javascript/jquery.validate.js"></script>
+	<script type="text/javascript" src="/lams/includes/javascript/bootstrap.min.js"></script>
 	<script type="text/javascript">
 		jQuery(document).ready(function(){
 			var selectedTab = (${(signupOrganisation != null) && signupOrganisation.loginTabActive}) ? 1 : 0;
Index: lams_central/web/signup/singupTab.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/signup/singupTab.jsp,v
diff -u -r1.3.2.8 -r1.3.2.9
--- lams_central/web/signup/singupTab.jsp	30 Nov 2016 02:07:38 -0000	1.3.2.8
+++ lams_central/web/signup/singupTab.jsp	12 May 2017 17:42:10 -0000	1.3.2.9
@@ -13,17 +13,12 @@
 <c:set var="mustHaveSymbols"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_SYMBOLS)%></c:set>
 <c:set var="mustHaveLowercase"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_LOWERCASE)%></c:set>
 
-<script type="text/javascript" src="/lams/includes/javascript/jquery.js"></script>
-<script type="text/javascript"
-	src="/lams/includes/javascript/jquery-ui.js"></script>
-<script type="text/javascript"
-	src="/lams/includes/javascript/jquery.validate.js"></script>
-<link rel="stylesheet" href="/lams/css/defaultHTML_learner.css"
-	type="text/css" />
-<script type="text/javascript"
-	src="/lams/includes/javascript/bootstrap.min.js"></script>
+<lams:css/>
 
-
+<script type="text/javascript" src="/lams/includes/javascript/jquery.js"></script>
+<script type="text/javascript" src="/lams/includes/javascript/jquery-ui.js"></script>
+<script type="text/javascript" src="/lams/includes/javascript/jquery.validate.js"></script>
+<script type="text/javascript" src="/lams/includes/javascript/bootstrap.min.js"></script>
 <script type="text/javascript">
 	var mustHaveUppercase = ${mustHaveUppercase},
 	mustHaveNumerics  = ${mustHaveNumerics},
Index: lams_central/web/signup/successfulSignup.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/signup/successfulSignup.jsp,v
diff -u -r1.2.2.3 -r1.2.2.4
--- lams_central/web/signup/successfulSignup.jsp	4 Nov 2016 11:29:14 -0000	1.2.2.3
+++ lams_central/web/signup/successfulSignup.jsp	12 May 2017 17:42:10 -0000	1.2.2.4
@@ -2,17 +2,15 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-html" prefix="html"%>
-<%@ page language="java" pageEncoding="UTF-8"
-	contentType="text/html;charset=utf-8"%>
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%>
+
+<lams:css/>
+
 <script type="text/javascript" src="/lams/includes/javascript/jquery.js"></script>
-<script type="text/javascript"
-	src="/lams/includes/javascript/jquery-ui.js"></script>
-<script type="text/javascript"
-	src="/lams/includes/javascript/jquery.validate.js"></script>
-<link rel="stylesheet" href="/lams/css/defaultHTML_learner.css"
-	type="text/css" />
-<script type="text/javascript"
-	src="/lams/includes/javascript/bootstrap.min.js"></script>
+<script type="text/javascript" src="/lams/includes/javascript/jquery-ui.js"></script>
+<script type="text/javascript" src="/lams/includes/javascript/jquery.validate.js"></script>
+<script type="text/javascript" src="/lams/includes/javascript/bootstrap.min.js"></script>
+
 <div class="panel-heading text-center">
 	<img src="<lams:LAMSURL/>/images/svg/lams_logo_black.svg" class="img-center" width="200px"></img>
 </div>
Index: lams_monitoring/web/monitor.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/monitor.jsp,v
diff -u -r1.27.2.58 -r1.27.2.59
--- lams_monitoring/web/monitor.jsp	4 May 2017 04:17:54 -0000	1.27.2.58
+++ lams_monitoring/web/monitor.jsp	12 May 2017 17:42:06 -0000	1.27.2.59
@@ -10,7 +10,7 @@
 <lams:html>
 <lams:head>
 
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/defaultHTML_learner.css" type="text/css">
+	<lams:css/>
 	<!-- Need both ui stylesheets or we lose the grey headers on the grids. -->
 	<link type="text/css" href="<lams:LAMSURL/>css/jquery-ui-smoothness-theme.css" rel="stylesheet">
 	<link type="text/css" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet">