Index: lams_admin/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -r7584e0047537ac0e15b56eb9829b035e02b458d7
--- lams_admin/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_admin/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
@@ -35,7 +35,6 @@
 <!-- <script type="text/javascript">
 	// Adding jquery-ui.js if it hasn't been loaded already
 	if (!jQuery.ui) {
-		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
 		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
 	}
 
Index: lams_central/conf/scss/_mixins.scss
===================================================================
diff -u -rf6ec928138a1e687ccf2059e8b50f3afce8f3640 -r7584e0047537ac0e15b56eb9829b035e02b458d7
--- lams_central/conf/scss/_mixins.scss	(.../_mixins.scss)	(revision f6ec928138a1e687ccf2059e8b50f3afce8f3640)
+++ lams_central/conf/scss/_mixins.scss	(.../_mixins.scss)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
@@ -2,6 +2,7 @@
 @import "material-kit/bootstrap/scss/mixins/breakpoints.scss";
 @import "material-kit/bootstrap/scss/mixins/buttons.scss";
 @import "material-kit/bootstrap/scss/mixins/box-shadow.scss";
+@import "material-kit/mixins/_colored-shadows.scss";
 @import "material-kit/mixins/animations.scss";
 
 	@mixin form-control-focus() {
Index: lams_central/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -r7584e0047537ac0e15b56eb9829b035e02b458d7
--- lams_central/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_central/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
@@ -35,7 +35,6 @@
 <!-- <script type="text/javascript">
 	// Adding jquery-ui.js if it hasn't been loaded already
 	if (!jQuery.ui) {
-		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
 		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
 	}
 
Index: lams_central/web/css/_learner_base.scss
===================================================================
diff -u -rf6ec928138a1e687ccf2059e8b50f3afce8f3640 -r7584e0047537ac0e15b56eb9829b035e02b458d7
--- lams_central/web/css/_learner_base.scss	(.../_learner_base.scss)	(revision f6ec928138a1e687ccf2059e8b50f3afce8f3640)
+++ lams_central/web/css/_learner_base.scss	(.../_learner_base.scss)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
@@ -155,6 +155,7 @@
   box-shadow: none;
   margin-top: 15px;
   margin-bottom: 15px;
+  font-size: $font-size-base;
 }
 
 .card.card-no-border .card-body {
@@ -397,6 +398,25 @@
 
 
 /** Authoring */
+// Toggle buttons that are on but disabled are usually forced on for leader selection so don't show with grey in the 
+// dot but with the primary colour as this reinforces the on and wanted on status.
+.togglebutton {
+	input[type=checkbox] {
+		&[disabled] {
+        &:checked ~ .toggle:after {
+          background-color: $brand-primary !important;
+        }
+      }
+     }
+}
+
+// selects followed by a button look too close together so add some more padding here
+.form-group {
+	select + a {
+		margin-left:5px;
+	}
+}
+
 /*layout of adding a topic button */
 a.button-add-item:before {
   content: "\f067";
@@ -627,6 +647,96 @@
 	font-size: smaller;
 }
 
+// Autocomplete. Removing the jquery-ui css file but keeping the javascript requires copying some styles 
+// Combined these with the current styles.
+.ui-autocomplete { 
+	position: absolute; 
+	top: 0;
+	left: 0;
+	cursor: default; 
+	font-size: $font-size-small;
+
+	&.ui-menu {
+		padding: $bmd-dropdown-margin-y 0;
+		  transform: scale(0);
+		  transform-origin: 0 0;
+		  will-change: transform, opacity;
+		  transition: transform $bmd-menu-expand-duration $bmd-animation-curve-default,
+		              opacity $bmd-menu-fade-duration $bmd-animation-curve-default;
+ 	  	box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.26);
+ 	    animation-name: bmd-dropdown-animation;
+ 	    animation-duration: $bmd-menu-expand-duration;
+ 	    animation-fill-mode: forwards;
+ 	    animation-timing-function: $bmd-animation-curve-default;
+	    margin: 0;
+	    float: left;
+	    outline: none;
+	    border-radius: 0.25rem;
+		}
+    &.ui-widget-content {
+	    background-color: white;
+	    color: $text-color;
+	}
+	&.ui-front {
+	    z-index: 100;
+	}
+
+	li.ui-menu-item {
+	    position: relative;
+	    width: auto;
+		list-style: none;
+
+	    display: flex;
+	    flex-flow: nowrap;
+	    align-items: center;
+	    color: $bmd-dropdown-link-color;
+	    font-weight: normal;
+	    text-decoration: none;
+	
+	    font-size: .8125rem;
+	    border-radius: $border-radius / 2;
+	    margin: 0 $bmd-dropdown-margin-y;
+	    @include transitions($fast-transition-time, $transition-linear);
+	
+	    min-width: $bmd-menu-item-min-width;
+	
+	    padding: $dropdown-item-padding-y  $dropdown-item-padding-x;
+	
+	    overflow: hidden;
+	    line-height: $bmd-line-height;
+	    text-overflow: ellipsis;
+	    word-wrap: break-word;
+	
+	    @include media-breakpoint-up(md) {
+	      padding-right: $bmd-menu-item-padding-right-md;
+	      padding-left: $bmd-menu-item-padding-left-md;
+	    }
+
+		&:hover,
+		&:focus,
+		&:active {
+			@include shadow-small-color($brand-primary);
+			background-color: $brand-primary;
+			color: #FFFFFF;
+		}
+	
+		.ui-menu-item-wrapper {
+			border: 0;
+		}
+	}
+}
+.ui-helper-hidden-accessible {
+    border: 0;
+    clip: rect(0 0 0 0);
+    height: 1px;
+    margin: -1px;
+    overflow: hidden;
+    padding: 0;
+    position: absolute;
+    width: 1px;
+}
+
+
 /* Growl functionality, jquery.blockUI (version: 2.38) */
 .growlUI {
 	width: auto;
Index: lams_central/web/findUserLessons.jsp
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -r7584e0047537ac0e15b56eb9829b035e02b458d7
--- lams_central/web/findUserLessons.jsp	(.../findUserLessons.jsp)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_central/web/findUserLessons.jsp	(.../findUserLessons.jsp)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
@@ -15,11 +15,8 @@
 	<lams:css />
 	<title><fmt:message key="index.searchlesson" /></title>
 
-	<link rel="stylesheet" href="${lams}/css/jquery-ui-bootstrap-theme.css" type="text/css" media="screen">
 	<style media="screen,projection" type="text/css">
-		li.ui-menu-item {
-			list-style: none;
-		}
+		#query {	width: 200px; }
 	</style>
 
 	<script type="text/javascript" src="${lams}/includes/javascript/getSysInfo.js"></script>
@@ -50,14 +47,14 @@
 	
 	<lams:Page type="admin" title="${title}">
 
-		<div class="card card-plain">
+		<div class="card card-no-border">
 			<fmt:message key="lessonsearch.instuctions" />
 		</div>
 
-		<form action="${lams}/findUserLessons/getResults.do">
-			<input type="text" id="query" name="query" />
+		<form action="${lams}/findUserLessons/getResults.do" class="form form-inline">
+			<input type="text" id="query" name="query" class="form-control" />
 			<input type="hidden" name="courseID" value="${courseID}" />
-			<button type="submit" class="btn btn-sm btn-primary">
+			<button type="submit" class="loffset5 btn btn-sm btn-primary">
 				<i class="fa fa-sm fa-search"></i>
 			</button>
 		</form>
Index: lams_gradebook/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -r7584e0047537ac0e15b56eb9829b035e02b458d7
--- lams_gradebook/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_gradebook/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
@@ -35,7 +35,6 @@
 <!-- <script type="text/javascript">
 	// Adding jquery-ui.js if it hasn't been loaded already
 	if (!jQuery.ui) {
-		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
 		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
 	}
 
Index: lams_learning/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -r7584e0047537ac0e15b56eb9829b035e02b458d7
--- lams_learning/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_learning/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
@@ -35,7 +35,6 @@
 <!-- <script type="text/javascript">
 	// Adding jquery-ui.js if it hasn't been loaded already
 	if (!jQuery.ui) {
-		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
 		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
 	}
 
Index: lams_monitoring/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -r7584e0047537ac0e15b56eb9829b035e02b458d7
--- lams_monitoring/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_monitoring/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
@@ -35,7 +35,6 @@
 <!-- <script type="text/javascript">
 	// Adding jquery-ui.js if it hasn't been loaded already
 	if (!jQuery.ui) {
-		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
 		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
 	}
 
Index: lams_monitoring/web/monitor.jsp
===================================================================
diff -u -rf6ec928138a1e687ccf2059e8b50f3afce8f3640 -r7584e0047537ac0e15b56eb9829b035e02b458d7
--- lams_monitoring/web/monitor.jsp	(.../monitor.jsp)	(revision f6ec928138a1e687ccf2059e8b50f3afce8f3640)
+++ lams_monitoring/web/monitor.jsp	(.../monitor.jsp)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
@@ -13,8 +13,6 @@
 <lams:head>
 
 	<lams:css/>
-	<link type="text/css" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet">
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui.timepicker.css" type="text/css" media="screen" />
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap-tour.min.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/x-editable.css"> 
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/x-editable-lams.css"> 
Index: lams_tool_assessment/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -r7584e0047537ac0e15b56eb9829b035e02b458d7
--- lams_tool_assessment/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_tool_assessment/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
@@ -35,7 +35,6 @@
 <!-- <script type="text/javascript">
 	// Adding jquery-ui.js if it hasn't been loaded already
 	if (!jQuery.ui) {
-		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
 		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
 	}
 
Index: lams_tool_assessment/web/common/header.jsp
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -r7584e0047537ac0e15b56eb9829b035e02b458d7
--- lams_tool_assessment/web/common/header.jsp	(.../header.jsp)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_tool_assessment/web/common/header.jsp	(.../header.jsp)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
@@ -1,13 +1,5 @@
 <%@ include file="/common/taglibs.jsp"%>
 <c:set var="lams"><lams:LAMSURL/></c:set>
 
- <!-- ********************  CSS ********************** -->
-<lams:css />
+<lams:headItems minimal="true"/>
 <link href="<lams:WebAppURL/>includes/css/assessment.css" rel="stylesheet" type="text/css">
-
- <!-- ********************  javascript ********************** -->
-<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/popper.min.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/bootstrap-material-design.min.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/bootstrap.tabcontroller.js"></script>
\ No newline at end of file
Index: lams_tool_assessment/web/common/tabbedheader.jsp
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -r7584e0047537ac0e15b56eb9829b035e02b458d7
--- lams_tool_assessment/web/common/tabbedheader.jsp	(.../tabbedheader.jsp)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_tool_assessment/web/common/tabbedheader.jsp	(.../tabbedheader.jsp)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
@@ -1,15 +1,7 @@
 <%@ include file="/common/taglibs.jsp"%>
 <c:set var="lams"><lams:LAMSURL/></c:set>
 
- <!-- ********************  CSS ********************** -->
-<lams:css/>
+<lams:headItems/>
 <link href="<lams:WebAppURL/>includes/css/assessment.css" rel="stylesheet" type="text/css">
 
-<!-- ********************  javascript ********************** -->
-<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>   
-<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/popper.min.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/bootstrap-material-design.min.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/bootstrap.tabcontroller.js"></script> 
-
 	
Index: lams_tool_assessment/web/pages/authoring/advance.jsp
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -r7584e0047537ac0e15b56eb9829b035e02b458d7
--- lams_tool_assessment/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_tool_assessment/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
@@ -54,9 +54,10 @@
 <!-- Advance Tab Content -->
 
 <lams:SimplePanel titleKey="label.select.leader">
-<div class="checkbox">
+<div class="togglebutton">
 	<label for="useSelectLeaderToolOuput">
 		<form:checkbox path="assessment.useSelectLeaderToolOuput" value="1" id="useSelectLeaderToolOuput"/>
+		 <span class="toggle"></span>
 		<fmt:message key="label.use.select.leader.tool.output" />
 	</label>
 </div>
@@ -85,16 +86,18 @@
 	</label>
 </div>
 
-<div class="checkbox">
+<div class="togglebutton">
 	<label for="shuffled">
 		<form:checkbox path="assessment.shuffled" id="shuffled"/>
+		 <span class="toggle"></span>
 		<fmt:message key="label.authoring.advance.shuffle.questions" />
 	</label>
 </div>
 
-<div class="checkbox">
+<div class="togglebutton">
 	<label for="questions-numbering">
 		<form:checkbox path="assessment.numbered" id="questions-numbering"/>
+		<span class="toggle"></span>
 		<fmt:message key="label.authoring.advance.numbered.questions" />
 	</label>
 </div>
@@ -149,69 +152,78 @@
 
 <lams:SimplePanel cardBodyClass="card-body-sm">
 
-<div class="checkbox">
+<div class="togglebutton">
 	<label for="display-summary">
 		<form:checkbox path="assessment.displaySummary" id="display-summary"/>
+		<span class="toggle"></span>
 		<fmt:message key="label.authoring.advance.display.summary" />
 	</label>
 </div>
 
 <div id="display-summary-area" class="loffset20" 
 		<c:if test="${!assessmentForm.assessment.displaySummary}">style="display:none;"</c:if>>
 
-	<div class="checkbox">
+	<div class="togglebutton">
 		<label for="allowQuestionFeedback">
 			<form:checkbox path="assessment.allowQuestionFeedback" id="allowQuestionFeedback"/>
+			<span class="toggle"></span>
 			<fmt:message key="label.authoring.advance.allow.students.question.feedback" />
 		</label>
 	</div>
 	
-	<div class="checkbox">
+	<div class="togglebutton">
 		<label for="allowDiscloseAnswers">
 			<form:checkbox path="assessment.allowDiscloseAnswers" id="allowDiscloseAnswers"/>
+			<span class="toggle"></span>
 			<fmt:message key="label.authoring.advance.disclose.answers" />
 		</label>
 	</div>
 
-	<div class="checkbox">
+	<div class="togglebutton">
 		<label for="allowRightAnswersAfterQuestion">
 			<form:checkbox path="assessment.allowRightAnswersAfterQuestion" id="allowRightAnswersAfterQuestion"/>
+			<span class="toggle"></span>
 			<fmt:message key="label.authoring.advance.allow.students.right.answers" />
 		</label>
 	</div>
 
-	<div class="checkbox">
+	<div class="togglebutton">
 		<label for="allowWrongAnswersAfterQuestion">
 			<form:checkbox path="assessment.allowWrongAnswersAfterQuestion" id="allowWrongAnswersAfterQuestion"/>
+			<span class="toggle"></span>
 			<fmt:message key="label.authoring.advance.allow.students.wrong.answers" />
 		</label>
 	</div>
 
-	<div class="checkbox">
+	<div class="togglebutton">
 		<label for="allowHistoryResponsesAfterAttempt">
 			<form:checkbox path="assessment.allowHistoryResponses" id="allowHistoryResponsesAfterAttempt"/>
+			<span class="toggle"></span>
 			<fmt:message key="label.authoring.advance.allow.students.history.responses" />
 		</label>
 	</div>
 </div>
 
-<div class="checkbox">
+<div class="togglebutton">
 	<label for="allowOverallFeedbackAfterQuestion">
 		<form:checkbox path="assessment.allowOverallFeedbackAfterQuestion" id="allowOverallFeedbackAfterQuestion"/>
+		<span class="toggle"></span>
 		<fmt:message key="label.authoring.advance.allow.students.overall.feedback" />
 	</label>
 </div>
 
-<div class="checkbox">
+<div class="togglebutton">
 	<label for="allowGradesAfterAttempt">
 		<form:checkbox path="assessment.allowGradesAfterAttempt" id="allowGradesAfterAttempt"/>
+		<span class="toggle"></span>
 		<fmt:message key="label.authoring.advance.allow.students.grades" />
 	</label>
 </div>
 
-<div class="checkbox">
+<div class="togglebutton">
 	<label for="enable-confidence-levels">
 		<form:checkbox path="assessment.enableConfidenceLevels" id="enable-confidence-levels"/>
+		<span class="toggle"></span>
 		<fmt:message key="label.enable.confidence.levels" />
 	</label>
 </div>
@@ -220,9 +232,10 @@
 </lams:SimplePanel>
 
 <lams:SimplePanel titleKey="label.notifications">
-<div class="checkbox">
+<div class="togglebutton">
 	<label for="notifyTeachersOnAttemptCompletion">
 		<form:checkbox path="assessment.notifyTeachersOnAttemptCompletion" id="notifyTeachersOnAttemptCompletion"/>
+		<span class="toggle"></span>
 		<fmt:message key="label.authoring.advanced.notify.on.attempt.completion" />
 	</label>
 </div>
@@ -241,9 +254,10 @@
 
 <lams:SimplePanel titleKey="label.activity.completion">
 
-<div class="checkbox">
+<div class="togglebutton">
 	<label for="reflectOnActivity">
 		<form:checkbox path="assessment.reflectOnActivity" id="reflectOnActivity"/>
+		<span class="toggle"></span>
 		<fmt:message key="advanced.reflectOnActivity" />
 	</label>
 </div>
Index: lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -r7584e0047537ac0e15b56eb9829b035e02b458d7
--- lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp	(.../questionsummary.jsp)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp	(.../questionsummary.jsp)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
@@ -163,7 +163,7 @@
             <c:out value="${questionSummary.question.question}" escapeXml="false"/>
 
 
-            <div class="row"><div class="col-xs-12 col-sm-6">
+            <div class="row"><div class="col-12 col-sm-6">
             <h5><fmt:message key="label.question.options"/></h5>    
 			<table class="table table-sm table-striped">
 				<c:if test="${questionSummary.question.type == 1}">
Index: lams_tool_assessment/web/pages/monitoring/statisticpart.jsp
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -r7584e0047537ac0e15b56eb9829b035e02b458d7
--- lams_tool_assessment/web/pages/monitoring/statisticpart.jsp	(.../statisticpart.jsp)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_tool_assessment/web/pages/monitoring/statisticpart.jsp	(.../statisticpart.jsp)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
@@ -101,7 +101,7 @@
 			</tr>
  		</table>
  		<div class="row">
-			 <div class="col-xs-12"></div>
+			 <div class="col-12"></div>
 				 <div id="chartDivLeader${sessionMap.toolContentID}" class="markChartDiv"></div>
 		</div>
 		</div>
@@ -152,7 +152,7 @@
 				</tr>
 			</table>
 			<div class="row">
-				 <div class="col-xs-12"></div>
+				 <div class="col-12"></div>
  				 <div id="chartDivSession${sessionDto.sessionId}" class="markChartDiv"></div>
 				</div>
 			</div>
Index: lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp
===================================================================
diff -u -r70e6fe3062072e2c6188217c562a4f33f0838604 -r7584e0047537ac0e15b56eb9829b035e02b458d7
--- lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp	(.../assessment.jsp)	(revision 70e6fe3062072e2c6188217c562a4f33f0838604)
+++ lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp	(.../assessment.jsp)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
@@ -89,7 +89,7 @@
 
 <!-- Header -->
 <div class="row no-gutter">
-	<div class="col-xs-12 col-md-12 col-lg-8">
+	<div class="col-12 col-md-12 col-lg-8">
 		<h3>
 			<c:choose>
 				<c:when test="${isIraAssessment}">
@@ -106,7 +106,7 @@
 
 <!-- Notifications -->  
 <div class="row no-gutter">
-	<div class="col-xs-6 col-md-4 col-lg-4 ">
+	<div class="col-6 col-md-4 col-lg-4 ">
 		<div class="card card-plain">
 			<div class="card-header">
 				<h4 class="card-title">
@@ -117,7 +117,7 @@
 		</div>
 	</div>
 
-	<div class="col-xs-6 col-md-4 col-md-offset-4 col-lg-4 col-lg-offset-2">
+	<div class="col-6 col-md-4 col-md-offset-4 col-lg-4 col-lg-offset-2">
 		<a href="#nogo" type="button" class="btn btn-sm btn-default buttons_column"
 				onclick="javascript:loadTab('${method}', document.getElementById('selected-content-id').value); return false;">
 			<i class="fa fa-file"></i>
@@ -156,7 +156,7 @@
 			<c:if test="${assessmentDto.assessment.allowDiscloseAnswers}">
 				<%-- Release correct/groups answers for all questions in this assessment --%>
 				<div class="row no-gutter">
-					<div class="col-xs-12 col-md-12 col-lg-12">
+					<div class="col-12 col-md-12 col-lg-12">
 						<div class="btn-group-sm pull-right disclose-all-button-group">
 							<div class="btn btn-default disclose-all-correct-button">
 								<fmt:message key="label.disclose.all.correct.answers"/>
@@ -171,7 +171,7 @@
 			
 			<c:forEach var="question" items="${assessmentDto.questions}" varStatus="i">
 				<div class="row no-gutter">
-				<div class="col-xs-12 col-md-12 col-lg-12">
+				<div class="col-12 col-md-12 col-lg-12">
 				<div class="card card-plain">
 					<div class="card-header">
 						<div class="card-title">
Index: lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -r7584e0047537ac0e15b56eb9829b035e02b458d7
--- lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp	(.../assessmentStudentChoices.jsp)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp	(.../assessmentStudentChoices.jsp)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
@@ -7,7 +7,7 @@
 
 <!-- Header -->
 <div class="row no-gutter">
-	<div class="col-xs-12 col-md-12 col-lg-8">
+	<div class="col--12 col-md-12 col-lg-8">
 		<h3>
 			<fmt:message key="label.ae.questions.marks"/>
 		</h3>
@@ -20,7 +20,7 @@
 	<div class="col-md-6 col-lg-4 ">
 	</div>
 	
-	<div class="col-xs-12 col-md-6 col-lg-4 col-lg-offset-2">
+	<div class="col--12 col-md-6 col-lg-4 col-lg-offset-2">
 		<a href="#nogo" type="button" class="btn btn-sm btn-default buttons_column"
 				onclick="javascript:loadTab('aes', ${toolContentID}); return false;">
 			<i class="fa fa-undo"></i>
@@ -41,7 +41,7 @@
 
 <!-- Table --> 
 <div class="row no-gutter">
-<div class="col-xs-12 col-md-12 col-lg-12">
+<div class="col--12 col-md-12 col-lg-12">
 <div class="card card-plain">
 <div class="card-body table-responsive">
           
Index: lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -r7584e0047537ac0e15b56eb9829b035e02b458d7
--- lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp	(.../iraAssessmentStudentChoices.jsp)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp	(.../iraAssessmentStudentChoices.jsp)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
@@ -7,7 +7,7 @@
 
 <!-- Header -->
 <div class="row no-gutter">
-	<div class="col-xs-12 col-md-12 col-lg-8">
+	<div class="col-12 col-md-12 col-lg-8">
 		<h3>
 			<fmt:message key="label.ira.questions.marks"/>
 		</h3>
@@ -20,7 +20,7 @@
 	<div class="col-md-6 col-lg-4 ">
 	</div>
 	
-	<div class="col-xs-12 col-md-6 col-lg-4 col-lg-offset-2">
+	<div class="col-12 col-md-6 col-lg-4 col-lg-offset-2">
 		<a href="#nogo" type="button" class="btn btn-sm btn-default buttons_column"
 				onclick="javascript:loadTab('iraAssessment'); return false;">
 			<i class="fa fa-undo"></i>
@@ -41,7 +41,7 @@
 
 <!-- Table -->
 <div class="row no-gutter">
-<div class="col-xs-12 col-md-12 col-lg-12">
+<div class="col-12 col-md-12 col-lg-12">
 <div class="card card-plain">
 <div class="card-body">
 <div class="table-responsive" style="margin:0">
Index: lams_tool_chat/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -r7584e0047537ac0e15b56eb9829b035e02b458d7
--- lams_tool_chat/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_tool_chat/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
@@ -35,7 +35,6 @@
 <!-- <script type="text/javascript">
 	// Adding jquery-ui.js if it hasn't been loaded already
 	if (!jQuery.ui) {
-		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
 		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
 	}
 
Index: lams_tool_daco/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -r7584e0047537ac0e15b56eb9829b035e02b458d7
--- lams_tool_daco/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_tool_daco/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
@@ -35,7 +35,6 @@
 <!-- <script type="text/javascript">
 	// Adding jquery-ui.js if it hasn't been loaded already
 	if (!jQuery.ui) {
-		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
 		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
 	}
 
Index: lams_tool_doku/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -r7584e0047537ac0e15b56eb9829b035e02b458d7
--- lams_tool_doku/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_tool_doku/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
@@ -35,7 +35,6 @@
 <!-- <script type="text/javascript">
 	// Adding jquery-ui.js if it hasn't been loaded already
 	if (!jQuery.ui) {
-		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
 		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
 	}
 
Index: lams_tool_forum/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -r7584e0047537ac0e15b56eb9829b035e02b458d7
--- lams_tool_forum/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_tool_forum/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
@@ -35,7 +35,6 @@
 <!-- <script type="text/javascript">
 	// Adding jquery-ui.js if it hasn't been loaded already
 	if (!jQuery.ui) {
-		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
 		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
 	}
 
Index: lams_tool_gmap/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -r7584e0047537ac0e15b56eb9829b035e02b458d7
--- lams_tool_gmap/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_tool_gmap/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
@@ -35,7 +35,6 @@
 <!-- <script type="text/javascript">
 	// Adding jquery-ui.js if it hasn't been loaded already
 	if (!jQuery.ui) {
-		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
 		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
 	}
 
Index: lams_tool_images/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -r7584e0047537ac0e15b56eb9829b035e02b458d7
--- lams_tool_images/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_tool_images/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
@@ -35,7 +35,6 @@
 <!-- <script type="text/javascript">
 	// Adding jquery-ui.js if it hasn't been loaded already
 	if (!jQuery.ui) {
-		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
 		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
 	}
 
Index: lams_tool_imscc/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -r7584e0047537ac0e15b56eb9829b035e02b458d7
--- lams_tool_imscc/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_tool_imscc/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
@@ -35,7 +35,6 @@
 <!-- <script type="text/javascript">
 	// Adding jquery-ui.js if it hasn't been loaded already
 	if (!jQuery.ui) {
-		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
 		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
 	}
 
Index: lams_tool_lamc/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -r7584e0047537ac0e15b56eb9829b035e02b458d7
--- lams_tool_lamc/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_tool_lamc/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
@@ -35,7 +35,6 @@
 <!-- <script type="text/javascript">
 	// Adding jquery-ui.js if it hasn't been loaded already
 	if (!jQuery.ui) {
-		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
 		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
 	}
 
Index: lams_tool_laqa/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -r7584e0047537ac0e15b56eb9829b035e02b458d7
--- lams_tool_laqa/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_tool_laqa/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
@@ -35,7 +35,6 @@
 <!-- <script type="text/javascript">
 	// Adding jquery-ui.js if it hasn't been loaded already
 	if (!jQuery.ui) {
-		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
 		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
 	}
 
Index: lams_tool_larsrc/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -r7584e0047537ac0e15b56eb9829b035e02b458d7
--- lams_tool_larsrc/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_tool_larsrc/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
@@ -35,7 +35,6 @@
 <!-- <script type="text/javascript">
 	// Adding jquery-ui.js if it hasn't been loaded already
 	if (!jQuery.ui) {
-		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
 		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
 	}
 
Index: lams_tool_leader/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -r7584e0047537ac0e15b56eb9829b035e02b458d7
--- lams_tool_leader/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_tool_leader/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
@@ -35,7 +35,6 @@
 <!-- <script type="text/javascript">
 	// Adding jquery-ui.js if it hasn't been loaded already
 	if (!jQuery.ui) {
-		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
 		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
 	}
 
Index: lams_tool_mindmap/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -r7584e0047537ac0e15b56eb9829b035e02b458d7
--- lams_tool_mindmap/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_tool_mindmap/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
@@ -35,7 +35,6 @@
 <!-- <script type="text/javascript">
 	// Adding jquery-ui.js if it hasn't been loaded already
 	if (!jQuery.ui) {
-		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
 		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
 	}
 
Index: lams_tool_nb/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -r7584e0047537ac0e15b56eb9829b035e02b458d7
--- lams_tool_nb/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_tool_nb/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
@@ -35,7 +35,6 @@
 <!-- <script type="text/javascript">
 	// Adding jquery-ui.js if it hasn't been loaded already
 	if (!jQuery.ui) {
-		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
 		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
 	}
 
Index: lams_tool_notebook/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -r7584e0047537ac0e15b56eb9829b035e02b458d7
--- lams_tool_notebook/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_tool_notebook/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
@@ -35,7 +35,6 @@
 <!-- <script type="text/javascript">
 	// Adding jquery-ui.js if it hasn't been loaded already
 	if (!jQuery.ui) {
-		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
 		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
 	}
 
Index: lams_tool_pixlr/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -r7584e0047537ac0e15b56eb9829b035e02b458d7
--- lams_tool_pixlr/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_tool_pixlr/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
@@ -35,7 +35,6 @@
 <!-- <script type="text/javascript">
 	// Adding jquery-ui.js if it hasn't been loaded already
 	if (!jQuery.ui) {
-		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
 		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
 	}
 
Index: lams_tool_preview/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -r7584e0047537ac0e15b56eb9829b035e02b458d7
--- lams_tool_preview/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_tool_preview/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
@@ -35,7 +35,6 @@
 <!-- <script type="text/javascript">
 	// Adding jquery-ui.js if it hasn't been loaded already
 	if (!jQuery.ui) {
-		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
 		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
 	}
 
Index: lams_tool_sbmt/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -r7584e0047537ac0e15b56eb9829b035e02b458d7
--- lams_tool_sbmt/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_tool_sbmt/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
@@ -35,7 +35,6 @@
 <!-- <script type="text/javascript">
 	// Adding jquery-ui.js if it hasn't been loaded already
 	if (!jQuery.ui) {
-		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
 		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
 	}
 
Index: lams_tool_scratchie/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -r7584e0047537ac0e15b56eb9829b035e02b458d7
--- lams_tool_scratchie/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_tool_scratchie/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
@@ -35,7 +35,6 @@
 <!-- <script type="text/javascript">
 	// Adding jquery-ui.js if it hasn't been loaded already
 	if (!jQuery.ui) {
-		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
 		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
 	}
 
Index: lams_tool_scribe/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -r7584e0047537ac0e15b56eb9829b035e02b458d7
--- lams_tool_scribe/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_tool_scribe/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
@@ -35,7 +35,6 @@
 <!-- <script type="text/javascript">
 	// Adding jquery-ui.js if it hasn't been loaded already
 	if (!jQuery.ui) {
-		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
 		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
 	}
 
Index: lams_tool_spreadsheet/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -r7584e0047537ac0e15b56eb9829b035e02b458d7
--- lams_tool_spreadsheet/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
@@ -35,7 +35,6 @@
 <!-- <script type="text/javascript">
 	// Adding jquery-ui.js if it hasn't been loaded already
 	if (!jQuery.ui) {
-		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
 		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
 	}
 
Index: lams_tool_survey/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -r7584e0047537ac0e15b56eb9829b035e02b458d7
--- lams_tool_survey/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_tool_survey/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
@@ -35,7 +35,6 @@
 <!-- <script type="text/javascript">
 	// Adding jquery-ui.js if it hasn't been loaded already
 	if (!jQuery.ui) {
-		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
 		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
 	}
 
Index: lams_tool_task/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -r7584e0047537ac0e15b56eb9829b035e02b458d7
--- lams_tool_task/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_tool_task/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
@@ -35,7 +35,6 @@
 <!-- <script type="text/javascript">
 	// Adding jquery-ui.js if it hasn't been loaded already
 	if (!jQuery.ui) {
-		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
 		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
 	}
 
Index: lams_tool_vote/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -r7584e0047537ac0e15b56eb9829b035e02b458d7
--- lams_tool_vote/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_tool_vote/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
@@ -35,7 +35,6 @@
 <!-- <script type="text/javascript">
 	// Adding jquery-ui.js if it hasn't been loaded already
 	if (!jQuery.ui) {
-		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
 		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
 	}
 
Index: lams_tool_wiki/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -r7584e0047537ac0e15b56eb9829b035e02b458d7
--- lams_tool_wiki/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_tool_wiki/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
@@ -35,7 +35,6 @@
 <!-- <script type="text/javascript">
 	// Adding jquery-ui.js if it hasn't been loaded already
 	if (!jQuery.ui) {
-		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
 		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
 	}
 
Index: lams_tool_zoom/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -r7584e0047537ac0e15b56eb9829b035e02b458d7
--- lams_tool_zoom/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_tool_zoom/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
@@ -35,7 +35,6 @@
 <!-- <script type="text/javascript">
 	// Adding jquery-ui.js if it hasn't been loaded already
 	if (!jQuery.ui) {
-		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
 		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
 	}
 
Index: lams_www/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f -r7584e0047537ac0e15b56eb9829b035e02b458d7
--- lams_www/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
+++ lams_www/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 7584e0047537ac0e15b56eb9829b035e02b458d7)
@@ -35,7 +35,6 @@
 <!-- <script type="text/javascript">
 	// Adding jquery-ui.js if it hasn't been loaded already
 	if (!jQuery.ui) {
-		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
 		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
 	}