Index: lams_admin/web/orgPasswordChange.jsp
===================================================================
diff -u -rf59295888d62aa134bb04b8e20c3de76b4560931 -rbbdddbe61d1b08c08a0dbae70d8d19bdfe357307
--- lams_admin/web/orgPasswordChange.jsp	(.../orgPasswordChange.jsp)	(revision f59295888d62aa134bb04b8e20c3de76b4560931)
+++ lams_admin/web/orgPasswordChange.jsp	(.../orgPasswordChange.jsp)	(revision bbdddbe61d1b08c08a0dbae70d8d19bdfe357307)
@@ -19,7 +19,7 @@
 
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme5.css">
-	<link type="text/css" href="<lams:LAMSURL/>css/free.ui.jqgrid.min.css" rel="stylesheet" />
+	<link type="text/css" href="<lams:LAMSURL/>css/free.ui.jqgrid.custom.css" rel="stylesheet" />
 	<link rel="stylesheet" href="<lams:LAMSURL/>admin/css/admin.css" type="text/css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 	<style type="text/css">
Index: lams_monitoring/web/emailnotifications/archivedEmailList.jsp
===================================================================
diff -u -r40ae8e42e7296ce2bcaebcb35b78e1f7104f5b29 -rbbdddbe61d1b08c08a0dbae70d8d19bdfe357307
--- lams_monitoring/web/emailnotifications/archivedEmailList.jsp	(.../archivedEmailList.jsp)	(revision 40ae8e42e7296ce2bcaebcb35b78e1f7104f5b29)
+++ lams_monitoring/web/emailnotifications/archivedEmailList.jsp	(.../archivedEmailList.jsp)	(revision bbdddbe61d1b08c08a0dbae70d8d19bdfe357307)
@@ -10,7 +10,8 @@
 	</c:if>	
 	
 	<lams:css/>
-	<link type="text/css" href="<lams:LAMSURL/>css/free.ui.jqgrid.min.css" rel="stylesheet">
+	<link type="text/css" href="<lams:LAMSURL/>css/free.ui.jqgrid.custom.css" rel="stylesheet">
+	<link type="text/css" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme5.css" rel="stylesheet">
 	<style type="text/css">
 		td {
 			vertical-align: top;
Index: lams_monitoring/web/emailnotifications/courseNotifications.jsp
===================================================================
diff -u -r87c236112358ed9c229876a63816b5e14b17f2af -rbbdddbe61d1b08c08a0dbae70d8d19bdfe357307
--- lams_monitoring/web/emailnotifications/courseNotifications.jsp	(.../courseNotifications.jsp)	(revision 87c236112358ed9c229876a63816b5e14b17f2af)
+++ lams_monitoring/web/emailnotifications/courseNotifications.jsp	(.../courseNotifications.jsp)	(revision bbdddbe61d1b08c08a0dbae70d8d19bdfe357307)
@@ -8,9 +8,9 @@
 	<title><fmt:message key="${title}"/></title>
 	
 	<lams:css/>
- 	<link type="text/css" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet">
+ 	<link type="text/css" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme5.css" rel="stylesheet">
  	<link type="text/css" href="<lams:LAMSURL/>css/jquery-ui.timepicker.css" rel="stylesheet">
- 	<link type="text/css" href="<lams:LAMSURL/>css/free.ui.jqgrid.min.css" rel="stylesheet">
+ 	<link type="text/css" href="<lams:LAMSURL/>css/free.ui.jqgrid.custom.css" rel="stylesheet">
 
 	<style type="text/css">
 		#additionalParameters {min-height: 50px;}
Index: lams_monitoring/web/emailnotifications/lessonNotifications.jsp
===================================================================
diff -u -r87c236112358ed9c229876a63816b5e14b17f2af -rbbdddbe61d1b08c08a0dbae70d8d19bdfe357307
--- lams_monitoring/web/emailnotifications/lessonNotifications.jsp	(.../lessonNotifications.jsp)	(revision 87c236112358ed9c229876a63816b5e14b17f2af)
+++ lams_monitoring/web/emailnotifications/lessonNotifications.jsp	(.../lessonNotifications.jsp)	(revision bbdddbe61d1b08c08a0dbae70d8d19bdfe357307)
@@ -8,8 +8,8 @@
 	<title><fmt:message key="${fn:escapeXml(title)}"/></title>
 	
 	<lams:css/>
-	<link type="text/css" href="<lams:LAMSURL/>css/free.ui.jqgrid.min.css" rel="stylesheet">
-	<link type="text/css" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet">
+	<link type="text/css" href="<lams:LAMSURL/>css/free.ui.jqgrid.custom.css" rel="stylesheet">
+	<link type="text/css" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme5.css" rel="stylesheet">
 	<link type="text/css" href="<lams:LAMSURL/>css/jquery-ui.timepicker.css" rel="stylesheet">
 	<style type="text/css">
 		#additionalParameters {min-height: 50px;}
Index: lams_monitoring/web/emailnotifications/scheduledEmailList.jsp
===================================================================
diff -u -r87c236112358ed9c229876a63816b5e14b17f2af -rbbdddbe61d1b08c08a0dbae70d8d19bdfe357307
--- lams_monitoring/web/emailnotifications/scheduledEmailList.jsp	(.../scheduledEmailList.jsp)	(revision 87c236112358ed9c229876a63816b5e14b17f2af)
+++ lams_monitoring/web/emailnotifications/scheduledEmailList.jsp	(.../scheduledEmailList.jsp)	(revision bbdddbe61d1b08c08a0dbae70d8d19bdfe357307)
@@ -11,7 +11,7 @@
 	</c:if>	
 	
 	<lams:css/>	
-	<link type="text/css" href="<lams:LAMSURL/>/css/jquery-ui-bootstrap-theme.css" rel="stylesheet" />
+	<link type="text/css" href="<lams:LAMSURL/>/css/jquery-ui-bootstrap-theme5.css" rel="stylesheet" />
 	
 	
 	<c:choose>
Index: lams_monitoring/web/gate/scheduleGateContent.jsp
===================================================================
diff -u -r3e5d6e63b9642bb289e1fb248a7c9384bcc5abe6 -rbbdddbe61d1b08c08a0dbae70d8d19bdfe357307
--- lams_monitoring/web/gate/scheduleGateContent.jsp	(.../scheduleGateContent.jsp)	(revision 3e5d6e63b9642bb289e1fb248a7c9384bcc5abe6)
+++ lams_monitoring/web/gate/scheduleGateContent.jsp	(.../scheduleGateContent.jsp)	(revision bbdddbe61d1b08c08a0dbae70d8d19bdfe357307)
@@ -24,7 +24,7 @@
 <lams:html>
     <lams:head>
 		<lams:css/>
-		<link type="text/css" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet">
+		<link type="text/css" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme5.css" rel="stylesheet">
 		<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui.timepicker.css" type="text/css" media="screen" />
 		
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
Index: lams_monitoring/web/timeLimit.jsp
===================================================================
diff -u -rd6448910114beeaf0bf28ace95db98870dfdb80b -rbbdddbe61d1b08c08a0dbae70d8d19bdfe357307
--- lams_monitoring/web/timeLimit.jsp	(.../timeLimit.jsp)	(revision d6448910114beeaf0bf28ace95db98870dfdb80b)
+++ lams_monitoring/web/timeLimit.jsp	(.../timeLimit.jsp)	(revision bbdddbe61d1b08c08a0dbae70d8d19bdfe357307)
@@ -726,18 +726,15 @@
 </div>
 
 <div class="card" id="time-limit-widget">
-	<div class="card-header collapsed" role="button"
-		 id="time-limit-widget-heading">
+	<div class="card-header collapsed" role="button" id="time-limit-widget-heading">
        	<span class="card-title">
     	   <i class="fa fa-clock"></i>
     	   <div id="absolute-time-limit-widget-value" class="absolute-time-limit-value"
 				title="<fmt:message key="label.monitoring.time.limit" />"></div>
      	</span>
 	</div>
 
-	<div id="time-limit-widget-content" class="collapse card-body" role="tabpanel"
-		 aria-labelledby="time-limit-widget-heading">
-
+	<div id="time-limit-widget-content" class="collapse card-body" role="tabpanel" aria-labelledby="time-limit-widget-heading">
 		<div class="expired-hide-container">
 			<button class="btn btn-sm btn-success" id="time-limit-widget-add-1-minute"
 					onClick="updateTimeLimit('absolute', null, 1)">
Index: lams_tool_chat/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r9c34fd660838f37a7a22bfee4c6573848f895c9e -rbbdddbe61d1b08c08a0dbae70d8d19bdfe357307
--- lams_tool_chat/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 9c34fd660838f37a7a22bfee4c6573848f895c9e)
+++ lams_tool_chat/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision bbdddbe61d1b08c08a0dbae70d8d19bdfe357307)
@@ -4,7 +4,7 @@
 </c:set>
 <c:set var="dto" value="${requestScope.monitoringDTO}" />
 
-<link type="text/css" href="${lams}/css/jquery-ui-bootstrap-theme.css" rel="stylesheet">
+<link type="text/css" href="${lams}/css/jquery-ui-bootstrap-theme5.css" rel="stylesheet">
 <link type="text/css" href="${lams}/css/jquery-ui.timepicker.css" rel="stylesheet">
 
 <script type="text/javascript">
Index: lams_tool_doku/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r9c34fd660838f37a7a22bfee4c6573848f895c9e -rbbdddbe61d1b08c08a0dbae70d8d19bdfe357307
--- lams_tool_doku/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 9c34fd660838f37a7a22bfee4c6573848f895c9e)
+++ lams_tool_doku/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision bbdddbe61d1b08c08a0dbae70d8d19bdfe357307)
@@ -17,7 +17,7 @@
 <%@ page import="org.lamsfoundation.lams.tool.dokumaran.DokumaranConstants"%>
 
 <link href="${lams}css/rating.css" rel="stylesheet" type="text/css">
-<link href="${lams}css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css">
+<link href="${lams}css/jquery-ui-bootstrap-theme5.css" rel="stylesheet" type="text/css">
 <link rel="stylesheet" href="${lams}css/jquery.tablesorter.theme.bootstrap5.css"/>
 <link rel="stylesheet" href="${lams}css/jquery.tablesorter.pager5.css" />
 <link href="${lams}css/jquery-ui.timepicker.css" rel="stylesheet" type="text/css">
Index: lams_tool_doku/web/pages/monitoring/summary5.jsp
===================================================================
diff -u -r9c34fd660838f37a7a22bfee4c6573848f895c9e -rbbdddbe61d1b08c08a0dbae70d8d19bdfe357307
--- lams_tool_doku/web/pages/monitoring/summary5.jsp	(.../summary5.jsp)	(revision 9c34fd660838f37a7a22bfee4c6573848f895c9e)
+++ lams_tool_doku/web/pages/monitoring/summary5.jsp	(.../summary5.jsp)	(revision bbdddbe61d1b08c08a0dbae70d8d19bdfe357307)
@@ -4,7 +4,7 @@
 <c:set var="summaryList" value="${sessionMap.summaryList}"/>
 <c:set var="dokumaran" value="${sessionMap.dokumaran}" />
 
-<c:set var="timeLimitPanelUrl"><lams:LAMSURL/>monitoring/timeLimit5.jsp</c:set>
+<c:set var="timeLimitPanelUrl"><lams:LAMSURL/>monitoring/timeLimit.jsp</c:set>
 <c:url var="timeLimitPanelUrl" value="${timeLimitPanelUrl}">
 	<c:param name="toolContentId" value="${dokumaran.contentId}"/>
 	<c:param name="absoluteTimeLimitFinish" value="${dokumaran.absoluteTimeLimitFinishSeconds}"/>
@@ -306,7 +306,7 @@
 			// destroy existing absolute time limit counter before refresh
 			$('.absolute-time-limit-counter, .time-limit-widget-individual-counter').countdown('destroy');
 			let data = JSON.parse(event.data);
-			$('#time-limit-panel-placeholder').load('<lams:LAMSURL/>monitoring/timeLimit5.jsp?toolContentId=${dokumaran.contentId}&absoluteTimeLimitFinish=' + data.absoluteTimeLimitFinish
+			$('#time-limit-panel-placeholder').load('<lams:LAMSURL/>monitoring/timeLimit.jsp?toolContentId=${dokumaran.contentId}&absoluteTimeLimitFinish=' + data.absoluteTimeLimitFinish
 					+ '&relativeTimeLimit=' + data.relativeTimeLimit + '&absoluteTimeLimit=' + data.absoluteTimeLimit
 					+ '&isTbl=true&controllerContext=tool/ladoku11/monitoring');
 		});
Index: lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp
===================================================================
diff -u -r9c34fd660838f37a7a22bfee4c6573848f895c9e -rbbdddbe61d1b08c08a0dbae70d8d19bdfe357307
--- lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision 9c34fd660838f37a7a22bfee4c6573848f895c9e)
+++ lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision bbdddbe61d1b08c08a0dbae70d8d19bdfe357307)
@@ -13,7 +13,7 @@
 	<title><fmt:message key="activity.title" /></title>
 
 	<lams:css />
-	<link type="text/css" href="${lams}css/jquery-ui-bootstrap-theme.css" rel="stylesheet">
+	<link type="text/css" href="${lams}css/jquery-ui-bootstrap-theme5.css" rel="stylesheet">
 	<link type="text/css" href="${lams}css/jquery-ui.timepicker.css" rel="stylesheet">
 	<link href="${lams}css/rating.css" rel="stylesheet" type="text/css">
 	<link rel="stylesheet" type="text/css" href="${lams}css/jquery.tablesorter.theme.bootstrap5.css">
Index: lams_tool_larsrc/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r9c34fd660838f37a7a22bfee4c6573848f895c9e -rbbdddbe61d1b08c08a0dbae70d8d19bdfe357307
--- lams_tool_larsrc/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 9c34fd660838f37a7a22bfee4c6573848f895c9e)
+++ lams_tool_larsrc/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision bbdddbe61d1b08c08a0dbae70d8d19bdfe357307)
@@ -4,8 +4,8 @@
 <c:set var="summaryList" value="${sessionMap.summaryList}"/>
 
 <link href="${lams}css/rating.css" rel="stylesheet" type="text/css">
-<link type="text/css" href="${lams}css/jquery-ui-bootstrap-theme.css" rel="stylesheet"/>
-<link type="text/css" href="${lams}css/free.ui.jqgrid.min.css" rel="stylesheet">
+<link type="text/css" href="${lams}css/jquery-ui-bootstrap-theme5.css" rel="stylesheet"/>
+<link type="text/css" href="${lams}css/free.ui.jqgrid.custom.css" rel="stylesheet">
 <link type="text/css" href="<lams:WebAppURL/>css/monitor.css" rel="stylesheet" />
 
 <script type="text/javascript">
Index: lams_tool_leader/web/pages/monitoring/manageLeaders.jsp
===================================================================
diff -u -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c -rbbdddbe61d1b08c08a0dbae70d8d19bdfe357307
--- lams_tool_leader/web/pages/monitoring/manageLeaders.jsp	(.../manageLeaders.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
+++ lams_tool_leader/web/pages/monitoring/manageLeaders.jsp	(.../manageLeaders.jsp)	(revision bbdddbe61d1b08c08a0dbae70d8d19bdfe357307)
@@ -7,7 +7,7 @@
 <lams:html>
 	<lams:head>
 		<lams:css />
-		<link type="text/css" href="${lams}css/jquery-ui-bootstrap-theme.css" rel="stylesheet"/>
+		<link type="text/css" href="${lams}css/jquery-ui-bootstrap-theme5.css" rel="stylesheet"/>
 		
 		<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
 		<script type="text/javascript" src="${lams}includes/javascript/jquery.form.js"></script>
Index: lams_tool_leader/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r9c34fd660838f37a7a22bfee4c6573848f895c9e -rbbdddbe61d1b08c08a0dbae70d8d19bdfe357307
--- lams_tool_leader/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 9c34fd660838f37a7a22bfee4c6573848f895c9e)
+++ lams_tool_leader/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision bbdddbe61d1b08c08a0dbae70d8d19bdfe357307)
@@ -12,7 +12,7 @@
 		<lams:headItems />
 		
 		<link type="text/css" href="${lams}css/thickbox.css" rel="stylesheet"  media="screen">
-		<link type="text/css" href="${lams}/css/jquery-ui-bootstrap-theme.css" rel="stylesheet">
+		<link type="text/css" href="${lams}/css/jquery-ui-bootstrap-theme5.css" rel="stylesheet">
 		<style media="screen,projection" type="text/css">
 			.bottom-buttons {margin: 20px 20px 0px; padding-bottom: 10px;}
 			table {padding: 10px;}
Index: lams_tool_mindmap/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r9c34fd660838f37a7a22bfee4c6573848f895c9e -rbbdddbe61d1b08c08a0dbae70d8d19bdfe357307
--- lams_tool_mindmap/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 9c34fd660838f37a7a22bfee4c6573848f895c9e)
+++ lams_tool_mindmap/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision bbdddbe61d1b08c08a0dbae70d8d19bdfe357307)
@@ -3,7 +3,7 @@
 <c:set var="dto" value="${mindmapDTO}" />
 
 <link href="${lams}css/rating.css" rel="stylesheet" type="text/css">
-<link type="text/css" href="${lams}/css/jquery-ui-bootstrap-theme.css" rel="stylesheet">
+<link type="text/css" href="${lams}/css/jquery-ui-bootstrap-theme5.css" rel="stylesheet">
 <link type="text/css" href="${lams}/css/jquery-ui.timepicker.css" rel="stylesheet">
 <style>
 	#gallery-walk-panel {
Index: lams_tool_notebook/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r78d4b7fda7982f0f9957d6ab206ce9c741f2eea1 -rbbdddbe61d1b08c08a0dbae70d8d19bdfe357307
--- lams_tool_notebook/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 78d4b7fda7982f0f9957d6ab206ce9c741f2eea1)
+++ lams_tool_notebook/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision bbdddbe61d1b08c08a0dbae70d8d19bdfe357307)
@@ -2,8 +2,8 @@
 <c:set scope="request" var="lams"><lams:LAMSURL/></c:set>
 <c:set scope="request" var="tool"><lams:WebAppURL/></c:set>
 
-<link type="text/css" href="${lams}css/jquery-ui-bootstrap-theme.css" rel="stylesheet"/>
-<link type="text/css" href="${lams}css/free.ui.jqgrid.min.css" rel="stylesheet">
+<link type="text/css" href="${lams}css/jquery-ui-bootstrap-theme5.css" rel="stylesheet"/>
+<link type="text/css" href="${lams}css/free.ui.jqgrid.custom.css" rel="stylesheet">
 <link type="text/css" href="${lams}/css/jquery-ui.timepicker.css" rel="stylesheet"/>
 <style>
 	/* remove jqGrid border radius */
Index: lams_tool_preview/web/pages/monitoring/criteria.jsp
===================================================================
diff -u -r9c34fd660838f37a7a22bfee4c6573848f895c9e -rbbdddbe61d1b08c08a0dbae70d8d19bdfe357307
--- lams_tool_preview/web/pages/monitoring/criteria.jsp	(.../criteria.jsp)	(revision 9c34fd660838f37a7a22bfee4c6573848f895c9e)
+++ lams_tool_preview/web/pages/monitoring/criteria.jsp	(.../criteria.jsp)	(revision bbdddbe61d1b08c08a0dbae70d8d19bdfe357307)
@@ -11,8 +11,8 @@
 	<%@ include file="/common/header.jsp"%>
 
 	<link href="${lams}css/rating.css" rel="stylesheet" type="text/css">
-	<link type="text/css" href="${lams}css/jquery-ui-bootstrap-theme.css" rel="stylesheet">
-	<link type="text/css" href="${lams}css/free.ui.jqgrid.min.css" rel="stylesheet">
+	<link type="text/css" href="${lams}css/jquery-ui-bootstrap-theme5.css" rel="stylesheet">
+	<link type="text/css" href="${lams}css/free.ui.jqgrid.custom.css" rel="stylesheet">
 	<link type="text/css" href="<lams:WebAppURL/>includes/css/learning.css" rel="stylesheet" >
 	<style>
 		.tablediv {
Index: lams_tool_preview/web/pages/monitoring/manageUsers.jsp
===================================================================
diff -u -re09a23b29ce27f81ad38c3fe13d049ab4e2209d5 -rbbdddbe61d1b08c08a0dbae70d8d19bdfe357307
--- lams_tool_preview/web/pages/monitoring/manageUsers.jsp	(.../manageUsers.jsp)	(revision e09a23b29ce27f81ad38c3fe13d049ab4e2209d5)
+++ lams_tool_preview/web/pages/monitoring/manageUsers.jsp	(.../manageUsers.jsp)	(revision bbdddbe61d1b08c08a0dbae70d8d19bdfe357307)
@@ -9,8 +9,8 @@
 		<title><fmt:message key="label.monitoring.heading" /></title>
 		<%@ include file="/common/header.jsp"%>
 
-		<link type="text/css" href="${lams}css/jquery-ui-bootstrap-theme.css" rel="stylesheet">
-		<link type="text/css" href="${lams}css/free.ui.jqgrid.min.css" rel="stylesheet">
+		<link type="text/css" href="${lams}css/jquery-ui-bootstrap-theme5.css" rel="stylesheet">
+		<link type="text/css" href="${lams}css/free.ui.jqgrid.custom.css" rel="stylesheet">
 		<link type="text/css" href="<lams:WebAppURL/>includes/css/learning.css" rel="stylesheet" />
 		<style type="text/css">
 			.ui-jqgrid-labels {
Index: lams_tool_preview/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r9c34fd660838f37a7a22bfee4c6573848f895c9e -rbbdddbe61d1b08c08a0dbae70d8d19bdfe357307
--- lams_tool_preview/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 9c34fd660838f37a7a22bfee4c6573848f895c9e)
+++ lams_tool_preview/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision bbdddbe61d1b08c08a0dbae70d8d19bdfe357307)
@@ -4,10 +4,10 @@
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
 <c:set var="summaryList" value="${sessionMap.summaryList}"/>
 
-<link type="text/css" href="${lams}css/jquery-ui-bootstrap-theme.css" rel="stylesheet">
+<link type="text/css" href="${lams}css/jquery-ui-bootstrap-theme5.css" rel="stylesheet">
 <link href="${lams}css/rating.css" rel="stylesheet" type="text/css">
 <link type="text/css" href="${webapp}includes/css/learning.css" rel="stylesheet" >
-<link type="text/css" href="${lams}css/free.ui.jqgrid.min.css" rel="stylesheet">
+<link type="text/css" href="${lams}css/free.ui.jqgrid.custom.css" rel="stylesheet">
 <style type="text/css">
 	#common-buttons-area {
 		overflow: auto;
Index: lams_tool_sbmt/web/monitoring/monitoring.jsp
===================================================================
diff -u -r9c34fd660838f37a7a22bfee4c6573848f895c9e -rbbdddbe61d1b08c08a0dbae70d8d19bdfe357307
--- lams_tool_sbmt/web/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 9c34fd660838f37a7a22bfee4c6573848f895c9e)
+++ lams_tool_sbmt/web/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision bbdddbe61d1b08c08a0dbae70d8d19bdfe357307)
@@ -13,7 +13,7 @@
 <lams:head>
 	<title><fmt:message key="activity.title" /></title>
 	<lams:css/>
-	<link type="text/css" href="${lams}/css/jquery-ui-bootstrap-theme.css" rel="stylesheet">
+	<link type="text/css" href="${lams}/css/jquery-ui-bootstrap-theme5.css" rel="stylesheet">
 	<link type="text/css" href="${lams}/css/jquery-ui.timepicker.css" rel="stylesheet">
 	<link type="text/css" href="${lams}/css/jquery.tablesorter.theme.bootstrap5.css" rel="stylesheet">
 	<link type="text/css" href="${lams}/css/jquery.tablesorter.pager5.css" rel="stylesheet">
Index: lams_tool_scratchie/web/pages/learning/learning.jsp
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -rbbdddbe61d1b08c08a0dbae70d8d19bdfe357307
--- lams_tool_scratchie/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_scratchie/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision bbdddbe61d1b08c08a0dbae70d8d19bdfe357307)
@@ -16,7 +16,7 @@
 
 <lams:PageLearner title="${title}" toolSessionID="${toolSessionID}">
     <!-- ********************  CSS ********************** -->
-    <link rel="stylesheet" type="text/css" href="${lams}css/jquery-ui-bootstrap-theme.css" />
+    <link rel="stylesheet" type="text/css" href="${lams}css/jquery-ui-bootstrap-theme5.css" />
     <link rel="stylesheet" type="text/css" href="<lams:WebAppURL/>includes/css/scratchie.css">
     <link rel="stylesheet" type="text/css" href="${lams}css/jquery.countdown.css" />
     <link rel="stylesheet" type="text/css" href="${lams}css/jquery.jgrowl.css" />
Index: lams_tool_scratchie/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r9c34fd660838f37a7a22bfee4c6573848f895c9e -rbbdddbe61d1b08c08a0dbae70d8d19bdfe357307
--- lams_tool_scratchie/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 9c34fd660838f37a7a22bfee4c6573848f895c9e)
+++ lams_tool_scratchie/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision bbdddbe61d1b08c08a0dbae70d8d19bdfe357307)
@@ -10,7 +10,7 @@
 	<lams:head>
 	
 	<lams:css/>
-	<link type="text/css" href="${lams}css/jquery-ui-bootstrap-theme.css" rel="stylesheet">
+	<link type="text/css" href="${lams}css/jquery-ui-bootstrap-theme5.css" rel="stylesheet">
 	<link type="text/css" href="${lams}css/thickbox.css" rel="stylesheet"  media="screen">
 	<link href="${lams}css/jquery-ui.timepicker.css" rel="stylesheet" type="text/css" >
 	<link href="${lams}css/free.ui.jqgrid.min.css" rel="stylesheet" type="text/css">
@@ -67,8 +67,6 @@
 				);
 				
 			}
-            // avoid name clash between bootstrap and jQuery UI
-            $.fn.bootstrapTooltip = $.fn.tooltip.noConflict();            
 		</script>	  
 
 	</lams:head>
Index: lams_tool_scratchie/web/pages/monitoring/parts/itemSummary.jsp
===================================================================
diff -u -r79123cc650a4028c6dfa0e931d9a074b07234be3 -rbbdddbe61d1b08c08a0dbae70d8d19bdfe357307
--- lams_tool_scratchie/web/pages/monitoring/parts/itemSummary.jsp	(.../itemSummary.jsp)	(revision 79123cc650a4028c6dfa0e931d9a074b07234be3)
+++ lams_tool_scratchie/web/pages/monitoring/parts/itemSummary.jsp	(.../itemSummary.jsp)	(revision bbdddbe61d1b08c08a0dbae70d8d19bdfe357307)
@@ -8,8 +8,8 @@
 	<lams:head>
 		<%@ include file="/common/header.jsp"%>
 		
-		<link type="text/css" href="${lams}css/jquery-ui-bootstrap-theme.css" rel="stylesheet">
-		<link href="${lams}css/free.ui.jqgrid.min.css" rel="stylesheet" type="text/css">
+		<link type="text/css" href="${lams}css/jquery-ui-bootstrap-theme5.css" rel="stylesheet">
+		<link href="${lams}css/free.ui.jqgrid.custom.css" rel="stylesheet" type="text/css">
 		<style type="text/css">
 			/* remove jqGrid borders */
 			.ui-jqgrid {
Index: lams_tool_scratchie/web/pages/monitoring/parts/statisticpart.jsp
===================================================================
diff -u -r79123cc650a4028c6dfa0e931d9a074b07234be3 -rbbdddbe61d1b08c08a0dbae70d8d19bdfe357307
--- lams_tool_scratchie/web/pages/monitoring/parts/statisticpart.jsp	(.../statisticpart.jsp)	(revision 79123cc650a4028c6dfa0e931d9a074b07234be3)
+++ lams_tool_scratchie/web/pages/monitoring/parts/statisticpart.jsp	(.../statisticpart.jsp)	(revision bbdddbe61d1b08c08a0dbae70d8d19bdfe357307)
@@ -5,7 +5,7 @@
 
 <script type="text/javascript">
 	$(document).ready(function(){
-        $('[data-toggle="tooltip"]').bootstrapTooltip();
+        $('[data-bs-toggle="tooltip"]').tooltip();
         
 	   	// must display charts after screen is visible or cannot calculate widths.
 		drawHistogram('chartDiv', 
@@ -99,7 +99,7 @@
                 <a class="" role="button" data-toggle="collapse" href="#qb-stats" aria-expanded="true" aria-controls="qb-stats">
                     <fmt:message key="label.qb.stats" />
                 </a>
-                <i class="fa fa-question-circle" aria-hidden="true" data-toggle="tooltip" data-placement="right" title="" data-original-title="Item analysis is a technique that analyses the student answers to evaluate the effectiveness of questions in an exam."></i>
+                <i class="fa fa-question-circle" aria-hidden="true" data-bs-toggle="tooltip" data-bs-placement="right" title="" data-original-title="Item analysis is a technique that analyses the student answers to evaluate the effectiveness of questions in an exam."></i>
     		</span>
         </div>
         <div class="">
@@ -117,15 +117,15 @@
                         </th>
                         <th scope="col" class="text-center">
                             <fmt:message key="label.qb.difficulty.index"/>&nbsp;
-                            <i class="fa fa-question-circle" aria-hidden="true" data-toggle="tooltip" data-placement="right" title="<fmt:message key="label.qb.difficulty.index.tooltip" />"></i>
+                            <i class="fa fa-question-circle" aria-hidden="true" data-bs-toggle="tooltip" data-bs-placement="right" title="<fmt:message key="label.qb.difficulty.index.tooltip" />"></i>
                         </th>
                         <th scope="col" class="text-center">
                             <fmt:message key="label.qb.discrimination.index"/>&nbsp;
-							<i class="fa fa-question-circle" aria-hidden="true" data-toggle="tooltip" data-placement="right" title="<fmt:message key="label.qb.discrimination.index.tooltip" />"></i>
+							<i class="fa fa-question-circle" aria-hidden="true" data-bs-toggle="tooltip" data-bs-placement="right" title="<fmt:message key="label.qb.discrimination.index.tooltip" />"></i>
                         </th>
                         <th scope="col" class="text-center">
                             <fmt:message key="label.qb.point.biserial"/>&nbsp;
-							 <i class="fa fa-question-circle" aria-hidden="true" data-toggle="tooltip" data-placement="right" title="<fmt:message key="label.qb.point.biserial.tooltip" />"></i>
+							 <i class="fa fa-question-circle" aria-hidden="true" data-bs-toggle="tooltip" data-bs-placement="right" title="<fmt:message key="label.qb.point.biserial.tooltip" />"></i>
                         </th>
                     </tr>
 
Index: lams_tool_scratchie/web/pages/monitoring/studentChoices.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -rbbdddbe61d1b08c08a0dbae70d8d19bdfe357307
--- lams_tool_scratchie/web/pages/monitoring/studentChoices.jsp	(.../studentChoices.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_scratchie/web/pages/monitoring/studentChoices.jsp	(.../studentChoices.jsp)	(revision bbdddbe61d1b08c08a0dbae70d8d19bdfe357307)
@@ -160,7 +160,7 @@
 				<c:if test="${not empty sessionDtos}">
 					<th class="text-center">
 						<fmt:message key="label.total"/>&nbsp;
-						<i class="fa fa-question-circle text-primary" data-toggle="tooltip" data-placement="top" data-container="body" 
+						<i class="fa fa-question-circle text-primary" data-bs-toggle="tooltip" data-bs-placement="top" data-bs-container="body" 
 						   title="<fmt:message key="label.total.1st.attempt.by.team"/>"></i>
 					</th>
 					<th class="text-center">
@@ -278,7 +278,7 @@
 				<c:set var="totalPercentSum" value="0" />
 				<tr>
 					<th><fmt:message key="label.total"/>&nbsp;
-					<i class="fa fa-question-circle text-primary" data-toggle="tooltip" data-placement="top" data-container="body" 
+					<i class="fa fa-question-circle text-primary" data-bs-toggle="tooltip" data-bs-placement="top" data-bs-container="body" 
 					   title="<fmt:message key="label.total.1st.attempt.by.question"/>"></i></th>
 					   
 					<c:forEach var="item" items="${items}">
Index: lams_tool_scratchie/web/pages/monitoring/studentChoices5.jsp
===================================================================
diff -u -r37b363449af76aa235b431c3746514f8fd8193f5 -rbbdddbe61d1b08c08a0dbae70d8d19bdfe357307
--- lams_tool_scratchie/web/pages/monitoring/studentChoices5.jsp	(.../studentChoices5.jsp)	(revision 37b363449af76aa235b431c3746514f8fd8193f5)
+++ lams_tool_scratchie/web/pages/monitoring/studentChoices5.jsp	(.../studentChoices5.jsp)	(revision bbdddbe61d1b08c08a0dbae70d8d19bdfe357307)
@@ -72,7 +72,7 @@
 			// destroy existing absolute time limit counter before refresh
 			$('.absolute-time-limit-counter, .time-limit-widget-individual-counter').countdown('destroy');
 			let data = JSON.parse(event.data);
-			$('#time-limit-panel-placeholder').load('<lams:LAMSURL/>monitoring/timeLimit5.jsp?toolContentId=${toolContentID}&absoluteTimeLimitFinish=' + data.absoluteTimeLimitFinish
+			$('#time-limit-panel-placeholder').load('<lams:LAMSURL/>monitoring/timeLimit.jsp?toolContentId=${toolContentID}&absoluteTimeLimitFinish=' + data.absoluteTimeLimitFinish
 					+ '&relativeTimeLimit=' + data.relativeTimeLimit + '&absoluteTimeLimit=' + data.absoluteTimeLimit
 					+ '&isTbl=true&controllerContext=tool/lascrt11/monitoring');
 		});
Index: lams_tool_scratchie/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r52a6369ce66a2ea70d38bfa2e627dfcde6354b10 -rbbdddbe61d1b08c08a0dbae70d8d19bdfe357307
--- lams_tool_scratchie/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 52a6369ce66a2ea70d38bfa2e627dfcde6354b10)
+++ lams_tool_scratchie/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision bbdddbe61d1b08c08a0dbae70d8d19bdfe357307)
@@ -55,7 +55,7 @@
 
 <script type="text/javascript">
 	$(document).ready(function(){
-		 $('[data-toggle="tooltip"]').bootstrapTooltip();
+		 $('[data-bs-toggle="tooltip"]').tooltip();
 		 
 		var oldValue = 0;
 		
Index: lams_tool_survey/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -rde3d3bdf91f546742d7b037c6392830d19f2ef02 -rbbdddbe61d1b08c08a0dbae70d8d19bdfe357307
--- lams_tool_survey/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision de3d3bdf91f546742d7b037c6392830d19f2ef02)
+++ lams_tool_survey/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision bbdddbe61d1b08c08a0dbae70d8d19bdfe357307)
@@ -39,7 +39,7 @@
 	</script>
 	<script type="text/javascript" src="${lams}/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
 
-	<link type="text/css" href="${lams}/css/jquery-ui-bootstrap-theme.css" rel="stylesheet">
+	<link type="text/css" href="${lams}/css/jquery-ui-bootstrap-theme5.css" rel="stylesheet">
 	<link type="text/css" href="${lams}/css/jquery-ui.timepicker.css" rel="stylesheet"> 
 	<link type="text/css" href="${lams}/css/defaultHTML_chart.css" rel="stylesheet" />
 		
Index: lams_tool_task/web/common/monitorheader.jsp
===================================================================
diff -u -r9c34fd660838f37a7a22bfee4c6573848f895c9e -rbbdddbe61d1b08c08a0dbae70d8d19bdfe357307
--- lams_tool_task/web/common/monitorheader.jsp	(.../monitorheader.jsp)	(revision 9c34fd660838f37a7a22bfee4c6573848f895c9e)
+++ lams_tool_task/web/common/monitorheader.jsp	(.../monitorheader.jsp)	(revision bbdddbe61d1b08c08a0dbae70d8d19bdfe357307)
@@ -6,8 +6,8 @@
  <!-- ********************  CSS ********************** -->
 <link href="<lams:WebAppURL/>includes/css/taskList.css" rel="stylesheet" type="text/css">
 <lams:css/>
-<link type="text/css" href="${lams}css/jquery-ui-bootstrap-theme.css" rel="stylesheet">
-<link type="text/css" href="${lams}css/free.ui.jqgrid.min.css" rel="stylesheet">
+<link type="text/css" href="${lams}css/jquery-ui-bootstrap-theme5.css" rel="stylesheet">
+<link type="text/css" href="${lams}css/free.ui.jqgrid.custom.css" rel="stylesheet">
 <link type="text/css" href="${lams}/css/jquery-ui.timepicker.css" rel="stylesheet">
 
 <!-- ********************  javascript ********************** -->
Index: lams_tool_vote/web/common/monitorheader.jsp
===================================================================
diff -u -r9c34fd660838f37a7a22bfee4c6573848f895c9e -rbbdddbe61d1b08c08a0dbae70d8d19bdfe357307
--- lams_tool_vote/web/common/monitorheader.jsp	(.../monitorheader.jsp)	(revision 9c34fd660838f37a7a22bfee4c6573848f895c9e)
+++ lams_tool_vote/web/common/monitorheader.jsp	(.../monitorheader.jsp)	(revision bbdddbe61d1b08c08a0dbae70d8d19bdfe357307)
@@ -30,6 +30,6 @@
 <link rel="stylesheet" href="${lams}css/jquery.tablesorter.theme.bootstrap5.css">
 <link type="text/css" href="${lams}css/jquery.tablesorter.pager5.css" rel="stylesheet">
 
-<link type="text/css" href="${lams}/css/jquery-ui-bootstrap-theme.css" rel="stylesheet">
+<link type="text/css" href="${lams}/css/jquery-ui-bootstrap-theme5.css" rel="stylesheet">
 <link type="text/css" href="${lams}/css/jquery-ui.timepicker.css" rel="stylesheet">
 <link type="text/css" href="${lams}/css/defaultHTML_chart.css" rel="stylesheet">
\ No newline at end of file
Index: lams_tool_whiteboard/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r9c34fd660838f37a7a22bfee4c6573848f895c9e -rbbdddbe61d1b08c08a0dbae70d8d19bdfe357307
--- lams_tool_whiteboard/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 9c34fd660838f37a7a22bfee4c6573848f895c9e)
+++ lams_tool_whiteboard/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision bbdddbe61d1b08c08a0dbae70d8d19bdfe357307)
@@ -17,7 +17,7 @@
 <%@ page import="org.lamsfoundation.lams.tool.whiteboard.WhiteboardConstants"%>
 
 <link href="${lams}css/rating.css" rel="stylesheet" type="text/css">
-<link href="${lams}css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css">
+<link href="${lams}css/jquery-ui-bootstrap-theme5.css" rel="stylesheet" type="text/css">
 <link rel="stylesheet" href="${lams}css/jquery.tablesorter.theme.bootstrap5.css"/>
 <link rel="stylesheet" href="${lams}css/jquery.tablesorter.pager5.css" />
 <link href="${lams}css/jquery-ui.timepicker.css" rel="stylesheet" type="text/css">