Index: lams_admin/web/appadmin.jsp
===================================================================
diff -u -r4dfac2d5a56db552565f34ac9fa2398bc01838b5 -r509e81cd8bc4486fab7de352c4e8cfafd38efe48
--- lams_admin/web/appadmin.jsp	(.../appadmin.jsp)	(revision 4dfac2d5a56db552565f34ac9fa2398bc01838b5)
+++ lams_admin/web/appadmin.jsp	(.../appadmin.jsp)	(revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48)
@@ -9,10 +9,10 @@
 	<c:set var="title"><fmt:message key="appadmin.maintain"/></c:set>
 	<title>${title}</title>
 	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
-	
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
+
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>admin/css/admin.css" type="text/css" media="screen">
+	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 	
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
 </lams:head>
Index: lams_admin/web/cleanup.jsp
===================================================================
diff -u -r4dfac2d5a56db552565f34ac9fa2398bc01838b5 -r509e81cd8bc4486fab7de352c4e8cfafd38efe48
--- lams_admin/web/cleanup.jsp	(.../cleanup.jsp)	(revision 4dfac2d5a56db552565f34ac9fa2398bc01838b5)
+++ lams_admin/web/cleanup.jsp	(.../cleanup.jsp)	(revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48)
@@ -10,10 +10,9 @@
 	<title>${title}</title>
 	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
 
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
-	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>admin/css/admin.css" type="text/css" media="screen">
+	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 	
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
 </lams:head>
Index: lams_admin/web/cleanupPreviewLessons.jsp
===================================================================
diff -u -r4dfac2d5a56db552565f34ac9fa2398bc01838b5 -r509e81cd8bc4486fab7de352c4e8cfafd38efe48
--- lams_admin/web/cleanupPreviewLessons.jsp	(.../cleanupPreviewLessons.jsp)	(revision 4dfac2d5a56db552565f34ac9fa2398bc01838b5)
+++ lams_admin/web/cleanupPreviewLessons.jsp	(.../cleanupPreviewLessons.jsp)	(revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48)
@@ -8,10 +8,9 @@
 	<title>${title}</title>
 	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
 
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
-	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>admin/css/admin.css" type="text/css" media="screen">
+	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 	
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
Index: lams_admin/web/config/editconfig.jsp
===================================================================
diff -u -r4dfac2d5a56db552565f34ac9fa2398bc01838b5 -r509e81cd8bc4486fab7de352c4e8cfafd38efe48
--- lams_admin/web/config/editconfig.jsp	(.../editconfig.jsp)	(revision 4dfac2d5a56db552565f34ac9fa2398bc01838b5)
+++ lams_admin/web/config/editconfig.jsp	(.../editconfig.jsp)	(revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48)
@@ -10,10 +10,9 @@
 	<title>${title}</title>
 	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
 
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
-	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>admin/css/admin.css" type="text/css" media="screen">
+	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 	
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
 </lams:head>
Index: lams_admin/web/disabledusers.jsp
===================================================================
diff -u -r85121f2d5a0394c96ef2ad1859c22b82391279b7 -r509e81cd8bc4486fab7de352c4e8cfafd38efe48
--- lams_admin/web/disabledusers.jsp	(.../disabledusers.jsp)	(revision 85121f2d5a0394c96ef2ad1859c22b82391279b7)
+++ lams_admin/web/disabledusers.jsp	(.../disabledusers.jsp)	(revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48)
@@ -8,10 +8,9 @@
 	<title>${title}</title>
 	<link rel="shortcut icon" href="<lams:LAMSURL/>favicon.ico" type="image/x-icon" />
 
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
-	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>admin/css/admin.css" type="text/css" media="screen">
+	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 	
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
 </lams:head>
Index: lams_admin/web/import/importGroups.jsp
===================================================================
diff -u -r0e1571df7d1b86cb4b87043e2a5400d34b951bfe -r509e81cd8bc4486fab7de352c4e8cfafd38efe48
--- lams_admin/web/import/importGroups.jsp	(.../importGroups.jsp)	(revision 0e1571df7d1b86cb4b87043e2a5400d34b951bfe)
+++ lams_admin/web/import/importGroups.jsp	(.../importGroups.jsp)	(revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48)
@@ -19,13 +19,12 @@
 	<c:set var="title"><fmt:message key="appadmin.import.groups.title"/></c:set>
 	<title>${title}</title>
 	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
-	
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
+
+	<link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
+	<link rel="stylesheet" href="<lams:LAMSURL/>admin/css/admin.css" type="text/css" media="screen">
 	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 	<link href="<lams:LAMSURL/>css/uppy.min.css" rel="stylesheet" type="text/css" />
 	<link href="<lams:LAMSURL/>css/uppy.custom.css" rel="stylesheet" type="text/css" />
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
-	<link rel="stylesheet" href="<lams:LAMSURL/>admin/css/admin.css" type="text/css" media="screen">
 
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
Index: lams_admin/web/import/importexcel.jsp
===================================================================
diff -u -r0e1571df7d1b86cb4b87043e2a5400d34b951bfe -r509e81cd8bc4486fab7de352c4e8cfafd38efe48
--- lams_admin/web/import/importexcel.jsp	(.../importexcel.jsp)	(revision 0e1571df7d1b86cb4b87043e2a5400d34b951bfe)
+++ lams_admin/web/import/importexcel.jsp	(.../importexcel.jsp)	(revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48)
@@ -19,13 +19,12 @@
 <lams:head>
 	<c:set var="title"><fmt:message key="admin.user.management"/></c:set>
 	<title>${title}</title>
-	
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
+
+	<link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
+	<link rel="stylesheet" href="<lams:LAMSURL/>admin/css/admin.css" type="text/css" media="screen">
 	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 	<link href="<lams:LAMSURL/>css/uppy.min.css" rel="stylesheet" type="text/css" />
 	<link href="<lams:LAMSURL/>css/uppy.custom.css" rel="stylesheet" type="text/css" />
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
-	<link rel="stylesheet" href="<lams:LAMSURL/>admin/css/admin.css" type="text/css" media="screen">
 
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
Index: lams_admin/web/import/importresult.jsp
===================================================================
diff -u -r4dfac2d5a56db552565f34ac9fa2398bc01838b5 -r509e81cd8bc4486fab7de352c4e8cfafd38efe48
--- lams_admin/web/import/importresult.jsp	(.../importresult.jsp)	(revision 4dfac2d5a56db552565f34ac9fa2398bc01838b5)
+++ lams_admin/web/import/importresult.jsp	(.../importresult.jsp)	(revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48)
@@ -8,10 +8,9 @@
 	<title>${title}</title>
 	<link rel="shortcut icon" href="<lams:LAMSURL/>favicon.ico" type="image/x-icon" />
 
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
-	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>admin/css/admin.css" type="text/css" media="screen">
+	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
 </lams:head>
Index: lams_admin/web/import/status.jsp
===================================================================
diff -u -r4dfac2d5a56db552565f34ac9fa2398bc01838b5 -r509e81cd8bc4486fab7de352c4e8cfafd38efe48
--- lams_admin/web/import/status.jsp	(.../status.jsp)	(revision 4dfac2d5a56db552565f34ac9fa2398bc01838b5)
+++ lams_admin/web/import/status.jsp	(.../status.jsp)	(revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48)
@@ -6,10 +6,9 @@
 
 <lams:html>
 	<lams:head>
-		<link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
-		<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 		<link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
 		<link rel="stylesheet" href="<lams:LAMSURL/>admin/css/admin.css" type="text/css" media="screen">
+		<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 		
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
Index: lams_admin/web/integration/ltiConsumer.jsp
===================================================================
diff -u -r9a7f862d77571f30df62616d9e8d6ebc8c35ab09 -r509e81cd8bc4486fab7de352c4e8cfafd38efe48
--- lams_admin/web/integration/ltiConsumer.jsp	(.../ltiConsumer.jsp)	(revision 9a7f862d77571f30df62616d9e8d6ebc8c35ab09)
+++ lams_admin/web/integration/ltiConsumer.jsp	(.../ltiConsumer.jsp)	(revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48)
@@ -7,10 +7,9 @@
 		<title>${title}</title>
 		<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
 
-		<link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
-		<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 		<link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
 		<link rel="stylesheet" href="<lams:LAMSURL/>admin/css/admin.css" type="text/css" media="screen">
+		<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.js"></script>
Index: lams_admin/web/integration/ltiConsumerList.jsp
===================================================================
diff -u -r4dfac2d5a56db552565f34ac9fa2398bc01838b5 -r509e81cd8bc4486fab7de352c4e8cfafd38efe48
--- lams_admin/web/integration/ltiConsumerList.jsp	(.../ltiConsumerList.jsp)	(revision 4dfac2d5a56db552565f34ac9fa2398bc01838b5)
+++ lams_admin/web/integration/ltiConsumerList.jsp	(.../ltiConsumerList.jsp)	(revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48)
@@ -8,10 +8,9 @@
 	<title>${title}</title>
 	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
 
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
-	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>admin/css/admin.css" type="text/css" media="screen">
+	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 	
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
 	<script>
Index: lams_admin/web/integration/serverlist.jsp
===================================================================
diff -u -r4dfac2d5a56db552565f34ac9fa2398bc01838b5 -r509e81cd8bc4486fab7de352c4e8cfafd38efe48
--- lams_admin/web/integration/serverlist.jsp	(.../serverlist.jsp)	(revision 4dfac2d5a56db552565f34ac9fa2398bc01838b5)
+++ lams_admin/web/integration/serverlist.jsp	(.../serverlist.jsp)	(revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48)
@@ -8,10 +8,9 @@
 	<title>${title}</title>
 	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
 
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
-	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>admin/css/admin.css" type="text/css" media="screen">
+	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 	
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
 	<script>
Index: lams_admin/web/integration/servermaintain.jsp
===================================================================
diff -u -r9a7f862d77571f30df62616d9e8d6ebc8c35ab09 -r509e81cd8bc4486fab7de352c4e8cfafd38efe48
--- lams_admin/web/integration/servermaintain.jsp	(.../servermaintain.jsp)	(revision 9a7f862d77571f30df62616d9e8d6ebc8c35ab09)
+++ lams_admin/web/integration/servermaintain.jsp	(.../servermaintain.jsp)	(revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48)
@@ -9,11 +9,9 @@
 		<title>${title}</title>
 		<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
 
-
-		<link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
-		<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 		<link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
 		<link rel="stylesheet" href="<lams:LAMSURL/>admin/css/admin.css" type="text/css" media="screen">
+		<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
 		<script type="text/javascript">
Index: lams_admin/web/logevent.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r509e81cd8bc4486fab7de352c4e8cfafd38efe48
--- lams_admin/web/logevent.jsp	(.../logevent.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_admin/web/logevent.jsp	(.../logevent.jsp)	(revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48)
@@ -9,14 +9,13 @@
 	<title>${title}</title>
 	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
 
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
+	<link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
+	<link rel="stylesheet" href="<lams:LAMSURL/>admin/css/admin.css" type="text/css" media="screen">
 	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme5.css">
 	<link rel="stylesheet" href="${lams}css/jquery.tablesorter.theme.bootstrap5.css"/>
 	<link rel="stylesheet" href="${lams}css/jquery-ui.timepicker.css" />
 	<link rel="stylesheet" href="${lams}css/jquery.tablesorter.pager.css" />
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
-	<link rel="stylesheet" href="<lams:LAMSURL/>admin/css/admin.css" type="text/css" media="screen">
 	
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
Index: lams_admin/web/loginmaintain.jsp
===================================================================
diff -u -r4dfac2d5a56db552565f34ac9fa2398bc01838b5 -r509e81cd8bc4486fab7de352c4e8cfafd38efe48
--- lams_admin/web/loginmaintain.jsp	(.../loginmaintain.jsp)	(revision 4dfac2d5a56db552565f34ac9fa2398bc01838b5)
+++ lams_admin/web/loginmaintain.jsp	(.../loginmaintain.jsp)	(revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48)
@@ -8,10 +8,9 @@
 	<title>${title}</title>
 	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
 
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
-	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>admin/css/admin.css" type="text/css" media="screen">
+	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
 </lams:head>
Index: lams_admin/web/orgPasswordChange.jsp
===================================================================
diff -u -r5f8dff0cc7d791c9cb34c850aaf235ca604055d7 -r509e81cd8bc4486fab7de352c4e8cfafd38efe48
--- lams_admin/web/orgPasswordChange.jsp	(.../orgPasswordChange.jsp)	(revision 5f8dff0cc7d791c9cb34c850aaf235ca604055d7)
+++ lams_admin/web/orgPasswordChange.jsp	(.../orgPasswordChange.jsp)	(revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48)
@@ -17,9 +17,8 @@
 	<title>${title}</title>
 	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
 
-	<lams:css/>
+	<link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme5.css">
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
 	<link type="text/css" href="<lams:LAMSURL/>css/free.ui.jqgrid.min.css" rel="stylesheet" />
 	<link rel="stylesheet" href="<lams:LAMSURL/>admin/css/admin.css" type="text/css" media="screen">
 	<style type="text/css">
Index: lams_admin/web/policies/editPolicy.jsp
===================================================================
diff -u -r4dfac2d5a56db552565f34ac9fa2398bc01838b5 -r509e81cd8bc4486fab7de352c4e8cfafd38efe48
--- lams_admin/web/policies/editPolicy.jsp	(.../editPolicy.jsp)	(revision 4dfac2d5a56db552565f34ac9fa2398bc01838b5)
+++ lams_admin/web/policies/editPolicy.jsp	(.../editPolicy.jsp)	(revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48)
@@ -7,10 +7,9 @@
 	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
 	<title>${title}</title>
 
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
-	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>admin/css/admin.css" type="text/css" media="screen">
+	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.js"></script>
Index: lams_admin/web/policies/policies.jsp
===================================================================
diff -u -r4dfac2d5a56db552565f34ac9fa2398bc01838b5 -r509e81cd8bc4486fab7de352c4e8cfafd38efe48
--- lams_admin/web/policies/policies.jsp	(.../policies.jsp)	(revision 4dfac2d5a56db552565f34ac9fa2398bc01838b5)
+++ lams_admin/web/policies/policies.jsp	(.../policies.jsp)	(revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48)
@@ -7,12 +7,10 @@
 	<title>${title}</title>
 	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
 
-
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
-	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme5.css" type="text/css" media="screen">
 	<link rel="stylesheet" href="<lams:LAMSURL/>admin/css/admin.css" type="text/css" media="screen">
+	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
+	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme5.css" type="text/css" media="screen">
 	<style>
 		th, td {
 			text-align: center;
Index: lams_admin/web/policies/userConsents.jsp
===================================================================
diff -u -re977dc3c8ca28d9a515f34d0c390142ed24ae8d2 -r509e81cd8bc4486fab7de352c4e8cfafd38efe48
--- lams_admin/web/policies/userConsents.jsp	(.../userConsents.jsp)	(revision e977dc3c8ca28d9a515f34d0c390142ed24ae8d2)
+++ lams_admin/web/policies/userConsents.jsp	(.../userConsents.jsp)	(revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48)
@@ -3,11 +3,10 @@
 <!DOCTYPE html>
 <lams:html>
 <lams:head>
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
-	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/free.ui.jqgrid.custom.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>admin/css/admin.css" type="text/css" media="screen">
+	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
+	<link rel="stylesheet" href="<lams:LAMSURL/>css/free.ui.jqgrid.custom.css">
 	<style>
 		th, td {
 			text-align: center;
Index: lams_admin/web/remove.jsp
===================================================================
diff -u -r4dfac2d5a56db552565f34ac9fa2398bc01838b5 -r509e81cd8bc4486fab7de352c4e8cfafd38efe48
--- lams_admin/web/remove.jsp	(.../remove.jsp)	(revision 4dfac2d5a56db552565f34ac9fa2398bc01838b5)
+++ lams_admin/web/remove.jsp	(.../remove.jsp)	(revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48)
@@ -8,10 +8,9 @@
 	<title>${title}</title>
 	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
 
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
-	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>admin/css/admin.css" type="text/css" media="screen">
+	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
 </lams:head>
Index: lams_admin/web/sessionmaintain.jsp
===================================================================
diff -u -r4dfac2d5a56db552565f34ac9fa2398bc01838b5 -r509e81cd8bc4486fab7de352c4e8cfafd38efe48
--- lams_admin/web/sessionmaintain.jsp	(.../sessionmaintain.jsp)	(revision 4dfac2d5a56db552565f34ac9fa2398bc01838b5)
+++ lams_admin/web/sessionmaintain.jsp	(.../sessionmaintain.jsp)	(revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48)
@@ -8,15 +8,13 @@
 	<title>${title}</title>
 	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
 	
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
+	<link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
+	<link rel="stylesheet" href="<lams:LAMSURL/>admin/css/admin.css" type="text/css" media="screen">
 	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme5.css" type="text/css" media="screen">
 	<link rel="stylesheet" href="<lams:LAMSURL/>/css/jquery.tablesorter.theme.bootstrap5.css">
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
-	<link rel="stylesheet" href="<lams:LAMSURL/>admin/css/admin.css" type="text/css" media="screen">
 
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
-
 	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.timeago.js"></script>	
 	<script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery.tablesorter.js"></script>
Index: lams_admin/web/signupmanagement/add.jsp
===================================================================
diff -u -r4dfac2d5a56db552565f34ac9fa2398bc01838b5 -r509e81cd8bc4486fab7de352c4e8cfafd38efe48
--- lams_admin/web/signupmanagement/add.jsp	(.../add.jsp)	(revision 4dfac2d5a56db552565f34ac9fa2398bc01838b5)
+++ lams_admin/web/signupmanagement/add.jsp	(.../add.jsp)	(revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48)
@@ -7,10 +7,9 @@
 	<title>${title}</title>
 	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
 
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
-	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>admin/css/admin.css" type="text/css" media="screen">
+	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 	
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
 </lams:head>
Index: lams_admin/web/signupmanagement/list.jsp
===================================================================
diff -u -r4dfac2d5a56db552565f34ac9fa2398bc01838b5 -r509e81cd8bc4486fab7de352c4e8cfafd38efe48
--- lams_admin/web/signupmanagement/list.jsp	(.../list.jsp)	(revision 4dfac2d5a56db552565f34ac9fa2398bc01838b5)
+++ lams_admin/web/signupmanagement/list.jsp	(.../list.jsp)	(revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48)
@@ -9,10 +9,9 @@
 	<title>${title}</title>
 	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
 
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
-	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>admin/css/admin.css" type="text/css" media="screen">
+	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 	
 	<script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.timeago.js"></script>
Index: lams_admin/web/statistics.jsp
===================================================================
diff -u -r4dfac2d5a56db552565f34ac9fa2398bc01838b5 -r509e81cd8bc4486fab7de352c4e8cfafd38efe48
--- lams_admin/web/statistics.jsp	(.../statistics.jsp)	(revision 4dfac2d5a56db552565f34ac9fa2398bc01838b5)
+++ lams_admin/web/statistics.jsp	(.../statistics.jsp)	(revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48)
@@ -8,11 +8,9 @@
 	<title>${title}</title>
 	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
 
-
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
-	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>admin/css/admin.css" type="text/css" media="screen">
+	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 	
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
Index: lams_admin/web/themeManagement.jsp
===================================================================
diff -u -r4dfac2d5a56db552565f34ac9fa2398bc01838b5 -r509e81cd8bc4486fab7de352c4e8cfafd38efe48
--- lams_admin/web/themeManagement.jsp	(.../themeManagement.jsp)	(revision 4dfac2d5a56db552565f34ac9fa2398bc01838b5)
+++ lams_admin/web/themeManagement.jsp	(.../themeManagement.jsp)	(revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48)
@@ -8,10 +8,9 @@
 	<title>${title}</title>
 	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
 
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
-	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>admin/css/admin.css" type="text/css" media="screen">
+	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
 	
Index: lams_admin/web/timezoneManagement.jsp
===================================================================
diff -u -r4dfac2d5a56db552565f34ac9fa2398bc01838b5 -r509e81cd8bc4486fab7de352c4e8cfafd38efe48
--- lams_admin/web/timezoneManagement.jsp	(.../timezoneManagement.jsp)	(revision 4dfac2d5a56db552565f34ac9fa2398bc01838b5)
+++ lams_admin/web/timezoneManagement.jsp	(.../timezoneManagement.jsp)	(revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48)
@@ -9,10 +9,9 @@
 	<title>${title}</title>
 	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
 
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
-	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>admin/css/admin.css" type="text/css" media="screen">
+	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 	
 	<script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
Index: lams_admin/web/toolcontent/toolcontentlist.jsp
===================================================================
diff -u -r4dfac2d5a56db552565f34ac9fa2398bc01838b5 -r509e81cd8bc4486fab7de352c4e8cfafd38efe48
--- lams_admin/web/toolcontent/toolcontentlist.jsp	(.../toolcontentlist.jsp)	(revision 4dfac2d5a56db552565f34ac9fa2398bc01838b5)
+++ lams_admin/web/toolcontent/toolcontentlist.jsp	(.../toolcontentlist.jsp)	(revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48)
@@ -8,11 +8,10 @@
 	<title>${title}</title>
 	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
 
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
-	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme5.css" type="text/css" media="screen">
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>admin/css/admin.css" type="text/css" media="screen">
+	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
+	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme5.css" type="text/css" media="screen">
 	
 	<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>
Index: lams_admin/web/user.jsp
===================================================================
diff -u -r6b09352f0035857637c5accfa2ffc66a4385f120 -r509e81cd8bc4486fab7de352c4e8cfafd38efe48
--- lams_admin/web/user.jsp	(.../user.jsp)	(revision 6b09352f0035857637c5accfa2ffc66a4385f120)
+++ lams_admin/web/user.jsp	(.../user.jsp)	(revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48)
@@ -22,29 +22,18 @@
 			</c:set>
 		</c:if>
 		<title>${title}</title>
-		<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" />
 
-		<link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
-		<link rel="stylesheet"
-			  href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
-		<link rel="stylesheet"
-			  href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme5.css"
-			  type="text/css" media="screen">
 		<link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
-		<link rel="stylesheet" href="<lams:LAMSURL/>admin/css/admin.css"
-			  type="text/css" media="screen">
+		<link rel="stylesheet" href="<lams:LAMSURL/>admin/css/admin.css" type="text/css" media="screen">
+		<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
+		<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme5.css" type="text/css" media="screen">
 
-		<script type="text/javascript"
-				src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
-		<script type="text/javascript"
-				src="/lams/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/bootstrap5.bundle.min.js"></script>
-		<script type="text/javascript"
-				src="/lams/includes/javascript/portrait5.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+		<script type="text/javascript" src="/lams/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/bootstrap5.bundle.min.js"></script>
+		<script type="text/javascript" src="/lams/includes/javascript/portrait5.js"></script>
 
 		<script type="text/javascript">
 			var mustHaveUppercase = ${mustHaveUppercase},
Index: lams_admin/web/usersearchlist.jsp
===================================================================
diff -u -r4dfac2d5a56db552565f34ac9fa2398bc01838b5 -r509e81cd8bc4486fab7de352c4e8cfafd38efe48
--- lams_admin/web/usersearchlist.jsp	(.../usersearchlist.jsp)	(revision 4dfac2d5a56db552565f34ac9fa2398bc01838b5)
+++ lams_admin/web/usersearchlist.jsp	(.../usersearchlist.jsp)	(revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48)
@@ -11,13 +11,12 @@
 	<title>${title}</title>
 	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
 
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
+	<link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
+	<link rel="stylesheet" href="<lams:LAMSURL/>admin/css/admin.css" type="text/css" media="screen">
 	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme5.css" type="text/css" media="screen">	
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery.tablesorter.theme.bootstrap5.css">
 	<link type="text/css"  href="<lams:LAMSURL/>css/jquery.tablesorter.pager5.css" rel="stylesheet">
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
-	<link rel="stylesheet" href="<lams:LAMSURL/>admin/css/admin.css" type="text/css" media="screen">
 	<style>
 		#tablesorter thead .disabled {
 			display: none
Index: lams_central/conf/scss/_lams_variables.scss
===================================================================
diff -u -r058199190bf32ffe6ff05db75f19262f476e0da9 -r509e81cd8bc4486fab7de352c4e8cfafd38efe48
--- lams_central/conf/scss/_lams_variables.scss	(.../_lams_variables.scss)	(revision 058199190bf32ffe6ff05db75f19262f476e0da9)
+++ lams_central/conf/scss/_lams_variables.scss	(.../_lams_variables.scss)	(revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48)
@@ -105,3 +105,4 @@
 // this has to be url encoded and added to the background below
 $canvas-dot-background: url("data:image/svg+xml,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20width%3D%2720%27%20height%3D%2720%27%3E%0D%0A%20%20%3Crect%20width%3D%2720%27%20height%3D%2720%27%20fill%3D%27%23fefefe%27%2F%3E%0D%0A%3Crect%20x%3D%2710%27%20y%3D%2710%27%20width%3D%271.5%27%20height%3D%271.5%27%20fill%3D%27%23b6b6b6%27%2F%3E%0D%0A%3C%2Fsvg%3E");
 
+$component-page-wrapper-margin: 0.25rem;
Index: lams_central/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r9576915785bfd47231fe20f9da6f130d39dc9c34 -r509e81cd8bc4486fab7de352c4e8cfafd38efe48
--- lams_central/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 9576915785bfd47231fe20f9da6f130d39dc9c34)
+++ lams_central/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48)
@@ -38,10 +38,8 @@
         </c:if>
 
         <link rel="icon" type="image/x-icon" href="<lams:LAMSURL/>images/svg/lamsv5_logo.svg">
-        <link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
-        <link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
-        <link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
         <link rel="stylesheet" href="<lams:LAMSURL/>learning/css/components-learner.css">
+        <link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 
         <script src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
Index: lams_central/web/css/bootstrap5.custom.scss
===================================================================
diff -u -rb5dd3686dc0394105288a7961668903057541633 -r509e81cd8bc4486fab7de352c4e8cfafd38efe48
--- lams_central/web/css/bootstrap5.custom.scss	(.../bootstrap5.custom.scss)	(revision b5dd3686dc0394105288a7961668903057541633)
+++ lams_central/web/css/bootstrap5.custom.scss	(.../bootstrap5.custom.scss)	(revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48)
@@ -13,14 +13,4 @@
 
 :root {
 	--lams-background-gray: #e0e0e0; /* rgb(224, 224, 224) */
-	--lams-component-page-wrapper-margin: 0.25rem;
-}
-
-#container-main {
-    @extend .container-lg;
-}
-
-.btn-secondary-darker {
-	@extend .btn-secondary;
-	background-color: shade-color($secondary, 20%);
 }
\ No newline at end of file
Index: lams_central/web/css/components.scss
===================================================================
diff -u -r81f928586161dd03042b6353f68c7d7b8279ccde -r509e81cd8bc4486fab7de352c4e8cfafd38efe48
--- lams_central/web/css/components.scss	(.../components.scss)	(revision 81f928586161dd03042b6353f68c7d7b8279ccde)
+++ lams_central/web/css/components.scss	(.../components.scss)	(revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48)
@@ -1,5 +1,15 @@
+@import "bootstrap5.custom.scss";
 @import "_lams_variables.scss";
 
+#container-main {
+    @extend .container-lg;
+}
+
+.btn-secondary-darker {
+	@extend .btn-secondary;
+	background-color: shade-color($secondary, 20%);
+}
+
 /* For Boostrap 3 & 5 compability */
 .img-responsive {
   max-width: 100%;
@@ -278,22 +288,7 @@
 }
 
 body.component .cke_textarea_inline {
-  /* From bootstrap form-control */
-  display: block;
-  width: 100%;
-  padding: 6px 12px;
-  font-size: 14px;
-  line-height: 1.42857143;
-  color: #555;
-  background-color: var(--bs-white);
-  background-image: none;
-  border-radius: 0.375rem; /* from .form-control */
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-  -webkit-transition: border-color ease-in-out 0.15s, -webkit-box-shadow ease-in-out 0.15s;
-  -o-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;
-  transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;
-  border: 1px solid #ced4da; /* from .form-control */
+  @extend .form-control;
   overflow: hidden;
   /* keeps floating objects within ckeditor area */
   /* LAMS -  min height is set in ckconfig_custom.js but keep the default here too so that most fields
@@ -484,7 +479,8 @@
   border-radius: 2.8rem;
   overflow: hidden;
   background-color: var(--bs-white);
-  margin: var(--lams-component-page-wrapper-margin);
+  margin: $component-page-wrapper-margin;
+  min-height: calc(100vh - 2*$component-page-wrapper-margin);
 }
 
 .component-page-wrapper button.no-decoration {
@@ -634,7 +630,7 @@
 .rating-comment{
   background-image: none;
   border: $border-thin-default-light;
-  border-radius: 0.375rem; /* from .form-control */
+  @include border-radius($input-border-radius, 0); /* from .form-control */ 
 }
 
 .rating-comment-posted-by{
Index: lams_central/web/groups.jsp
===================================================================
diff -u -re0dbd6beaeea905447bd9a87cd23272c4cfee853 -r509e81cd8bc4486fab7de352c4e8cfafd38efe48
--- lams_central/web/groups.jsp	(.../groups.jsp)	(revision e0dbd6beaeea905447bd9a87cd23272c4cfee853)
+++ lams_central/web/groups.jsp	(.../groups.jsp)	(revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48)
@@ -15,11 +15,10 @@
 	<lams:head>
 		<title>${title}</title>
 
-		<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme5.css">
-		<link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
-		<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 		<link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
 		<link rel="stylesheet" href="<lams:LAMSURL/>css/groups.css">
+		<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme5.css">
+		<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 
 		<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>
@@ -112,7 +111,7 @@
 	</lams:head>
 
 	<body class="component my-2">
-	<lams:Page5 title="${title}" type="monitoring">
+	<lams:Page5 title="${title}" type="admin">
 		<c:if test="${not empty lessonID}">
 			<a class="btn btn-primary mb-2" href="<lams:LAMSURL/>home/monitorLesson.do?lessonID=${lessonID}">
 				<i class="fa-solid fa-arrow-left"></i>&nbsp;<fmt:message key="label.grouping.return.to.monitoring"/>
Index: lams_central/web/orgGrouping.jsp
===================================================================
diff -u -r596dd2e595ead6b91ad47f9dc0635532e2886753 -r509e81cd8bc4486fab7de352c4e8cfafd38efe48
--- lams_central/web/orgGrouping.jsp	(.../orgGrouping.jsp)	(revision 596dd2e595ead6b91ad47f9dc0635532e2886753)
+++ lams_central/web/orgGrouping.jsp	(.../orgGrouping.jsp)	(revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48)
@@ -18,11 +18,10 @@
 	<lams:head>
 		<title><c:out value="${title}" /></title>
 
-		<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme5.css">
-		<link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
-		<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 		<link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
 		<link rel="stylesheet" href="<lams:LAMSURL/>css/orgGrouping.css" type="text/css" media="screen" />
+		<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme5.css">
+		<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 
 		<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>
Index: lams_central/web/outcome/outcomeEdit.jsp
===================================================================
diff -u -r54a3c302d29d64b55efa18189083dadd13c51708 -r509e81cd8bc4486fab7de352c4e8cfafd38efe48
--- lams_central/web/outcome/outcomeEdit.jsp	(.../outcomeEdit.jsp)	(revision 54a3c302d29d64b55efa18189083dadd13c51708)
+++ lams_central/web/outcome/outcomeEdit.jsp	(.../outcomeEdit.jsp)	(revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48)
@@ -5,11 +5,10 @@
 <lams:head>
 	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
 	
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
-	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme5.css" type="text/css" media="screen">
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/outcome.css" type="text/css" media="screen">
+	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
+	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme5.css" type="text/css" media="screen">
 	
 	<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>
Index: lams_central/web/outcome/outcomeManage.jsp
===================================================================
diff -u -r54a3c302d29d64b55efa18189083dadd13c51708 -r509e81cd8bc4486fab7de352c4e8cfafd38efe48
--- lams_central/web/outcome/outcomeManage.jsp	(.../outcomeManage.jsp)	(revision 54a3c302d29d64b55efa18189083dadd13c51708)
+++ lams_central/web/outcome/outcomeManage.jsp	(.../outcomeManage.jsp)	(revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48)
@@ -5,11 +5,10 @@
 	<title><fmt:message key="index.outcome.manage" /></title>
 	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
 
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
-	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme5.css" type="text/css" media="screen">
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/outcome.css" type="text/css" media="screen">
+	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
+	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme5.css" type="text/css" media="screen">
 	
 	<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>
Index: lams_central/web/outcome/scaleManage.jsp
===================================================================
diff -u -r54a3c302d29d64b55efa18189083dadd13c51708 -r509e81cd8bc4486fab7de352c4e8cfafd38efe48
--- lams_central/web/outcome/scaleManage.jsp	(.../scaleManage.jsp)	(revision 54a3c302d29d64b55efa18189083dadd13c51708)
+++ lams_central/web/outcome/scaleManage.jsp	(.../scaleManage.jsp)	(revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48)
@@ -5,11 +5,10 @@
 <lams:head>
 	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
 	
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
-	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme5.css" type="text/css" media="screen">
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/outcome.css" type="text/css" media="screen">
+	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
+	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme5.css" type="text/css" media="screen">
 	
 	<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>
Index: lams_learning/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r9576915785bfd47231fe20f9da6f130d39dc9c34 -r509e81cd8bc4486fab7de352c4e8cfafd38efe48
--- lams_learning/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 9576915785bfd47231fe20f9da6f130d39dc9c34)
+++ lams_learning/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48)
@@ -38,10 +38,8 @@
         </c:if>
 
         <link rel="icon" type="image/x-icon" href="<lams:LAMSURL/>images/svg/lamsv5_logo.svg">
-        <link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
-        <link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
-        <link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
         <link rel="stylesheet" href="<lams:LAMSURL/>learning/css/components-learner.css">
+        <link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 
         <script src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
Index: lams_learning/web/css/components-learner.scss
===================================================================
diff -u -r793d3319ee7d2aa94af0559c0ee64c08ea6a4581 -r509e81cd8bc4486fab7de352c4e8cfafd38efe48
--- lams_learning/web/css/components-learner.scss	(.../components-learner.scss)	(revision 793d3319ee7d2aa94af0559c0ee64c08ea6a4581)
+++ lams_learning/web/css/components-learner.scss	(.../components-learner.scss)	(revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48)
@@ -1,3 +1,4 @@
+@import "../../../lams_central/web/css/components.scss";
 @import "_lams_variables.scss"; 
 
 .component-page-wrapper h6, .h6, h5, .h5, h4, .h4, h3, .h3, h2, .h2, h1, .h1 {
@@ -39,10 +40,6 @@
 	text-align: -webkit-center;
 }
 
-.component-page-wrapper .component-page-content {
-    min-height: calc(100vh - 2*var(--lams-component-page-wrapper-margin));
-}
-
 .component-page-wrapper .component-page-content #header {
     box-shadow: 0px 1px 0px var(--bs-gray-400);
 }
@@ -228,18 +225,16 @@
     border-top-right-radius: 0rem;
     border-bottom-right-radius: 1.25rem;
     border: 0;
-    box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15);//copied from .shadow class
     margin-bottom: 2rem;
+    @extend .shadow;
 }
 
 .lcard>.card-header {
     border-top-left-radius: 1.25rem;
     border-top-right-radius: 0rem;
     font-size: 1.3rem;
     padding: 1rem;
-	color: #fff !important; //.text-bg-secondary
-    background-color: RGBA(108, 117, 125, var(--bs-bg-opacity, 1)) !important; //.text-bg-secondary
-    
+    @extend .text-bg-secondary;
 }
 
 .instructions {
@@ -254,12 +249,6 @@
 	font-size: initial;
 }
 
-/* coommented out for now by Andrey
-.lcard .card-header {
-    border-bottom: 0.2rem solid var(--bs-primary);
-}
-*/
-
 /* Assessment and Scratchie Countdown - growl settings need to be moved too */
 #timelimit-start-dialog {
 	display:none; cursor: default; padding: 10px;
Index: lams_monitoring/web/emailnotifications/archivedEmailList5.jsp
===================================================================
diff -u -re977dc3c8ca28d9a515f34d0c390142ed24ae8d2 -r509e81cd8bc4486fab7de352c4e8cfafd38efe48
--- lams_monitoring/web/emailnotifications/archivedEmailList5.jsp	(.../archivedEmailList5.jsp)	(revision e977dc3c8ca28d9a515f34d0c390142ed24ae8d2)
+++ lams_monitoring/web/emailnotifications/archivedEmailList5.jsp	(.../archivedEmailList5.jsp)	(revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48)
@@ -7,8 +7,8 @@
 		<c:set var="sessionMapID" value="${param.sessionMapID}" />
 	</c:if>	
 
+	<link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/free.ui.jqgrid.custom.css">
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 	
 	<style type="text/css">
Index: lams_monitoring/web/emailnotifications/lessonNotifications5.jsp
===================================================================
diff -u -re977dc3c8ca28d9a515f34d0c390142ed24ae8d2 -r509e81cd8bc4486fab7de352c4e8cfafd38efe48
--- lams_monitoring/web/emailnotifications/lessonNotifications5.jsp	(.../lessonNotifications5.jsp)	(revision e977dc3c8ca28d9a515f34d0c390142ed24ae8d2)
+++ lams_monitoring/web/emailnotifications/lessonNotifications5.jsp	(.../lessonNotifications5.jsp)	(revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48)
@@ -5,9 +5,9 @@
 <lams:html>
 <lams:head>
 
+	<link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/free.ui.jqgrid.custom.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme5.css">
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/tempus-dominus.min.css">
 	<style type="text/css">
Index: lams_monitoring/web/emailnotifications/scheduledEmailList5.jsp
===================================================================
diff -u -r87c236112358ed9c229876a63816b5e14b17f2af -r509e81cd8bc4486fab7de352c4e8cfafd38efe48
--- lams_monitoring/web/emailnotifications/scheduledEmailList5.jsp	(.../scheduledEmailList5.jsp)	(revision 87c236112358ed9c229876a63816b5e14b17f2af)
+++ lams_monitoring/web/emailnotifications/scheduledEmailList5.jsp	(.../scheduledEmailList5.jsp)	(revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48)
@@ -8,7 +8,7 @@
 		<c:set var="sessionMapID" value="${param.sessionMapID}" />
 	</c:if>	
 	
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
+	<link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
 	<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 	
 	<c:choose>
Index: lams_monitoring/web/gate/permissionGateContent.jsp
===================================================================
diff -u -r35dd47046a83ab2f9e80f76dc22d1521412219b5 -r509e81cd8bc4486fab7de352c4e8cfafd38efe48
--- lams_monitoring/web/gate/permissionGateContent.jsp	(.../permissionGateContent.jsp)	(revision 35dd47046a83ab2f9e80f76dc22d1521412219b5)
+++ lams_monitoring/web/gate/permissionGateContent.jsp	(.../permissionGateContent.jsp)	(revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48)
@@ -24,7 +24,7 @@
 
 <lams:html>
     <lams:head>
-    	<link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
+    	<link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
 		<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 	
     	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
Index: lams_monitoring/web/grouping/viewGroups.jsp
===================================================================
diff -u -r305246a229ea020cd0677daa6fc7953772f7ed54 -r509e81cd8bc4486fab7de352c4e8cfafd38efe48
--- lams_monitoring/web/grouping/viewGroups.jsp	(.../viewGroups.jsp)	(revision 305246a229ea020cd0677daa6fc7953772f7ed54)
+++ lams_monitoring/web/grouping/viewGroups.jsp	(.../viewGroups.jsp)	(revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48)
@@ -24,15 +24,14 @@
 
 <lams:html>
     <lams:head>
-		<link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
-		<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 		<link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
+		<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 		
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
     </lams:head>
     
     <body class="component">
-		<lams:Page5 type="monitor" title="${title}">
+		<lams:Page5 type="admin" title="${title}">
 		
 			<div class="container-fluid">
 				<c:choose>
Index: lams_monitoring/web/monitor.jsp
===================================================================
diff -u -r81f928586161dd03042b6353f68c7d7b8279ccde -r509e81cd8bc4486fab7de352c4e8cfafd38efe48
--- lams_monitoring/web/monitor.jsp	(.../monitor.jsp)	(revision 81f928586161dd03042b6353f68c7d7b8279ccde)
+++ lams_monitoring/web/monitor.jsp	(.../monitor.jsp)	(revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48)
@@ -13,18 +13,17 @@
 	<head>
 		<meta charset="utf-8" />
 		<title><fmt:message key="monitor.title" /></title>
-
 		<link rel="icon" type="image/x-icon" href="<lams:LAMSURL/>images/svg/lamsv5_logo.svg">
+		
+		<link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
+		<link rel="stylesheet" href="<lams:WebAppURL/>css/components-monitoring.css">
 		<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme5.css">
-		<link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
 		<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 		<link rel="stylesheet" href="<lams:LAMSURL/>css/vertical-timeline.css">
 		<link rel="stylesheet" href="<lams:LAMSURL/>css/x-editable.css">
 		<link rel="stylesheet" href="<lams:LAMSURL/>css/free.ui.jqgrid.custom.css">
 		<link rel="stylesheet" href="<lams:LAMSURL/>css/tempus-dominus.min.css">
 		<link rel="stylesheet" href="<lams:LAMSURL/>gradebook/includes/css/gradebook.css" />
-		<link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
-		<link rel="stylesheet" href="<lams:WebAppURL/>css/components-monitoring.css">
 
 		<lams:css suffix="chart"/>
 
Index: lams_tool_doku/web/pages/monitoring/viewGalleryWalkClusters.jsp
===================================================================
diff -u -r305246a229ea020cd0677daa6fc7953772f7ed54 -r509e81cd8bc4486fab7de352c4e8cfafd38efe48
--- lams_tool_doku/web/pages/monitoring/viewGalleryWalkClusters.jsp	(.../viewGalleryWalkClusters.jsp)	(revision 305246a229ea020cd0677daa6fc7953772f7ed54)
+++ lams_tool_doku/web/pages/monitoring/viewGalleryWalkClusters.jsp	(.../viewGalleryWalkClusters.jsp)	(revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48)
@@ -27,9 +27,8 @@
 	<lams:head>
 		<title><fmt:message key="monitoring.gallery.walk.cluster.view"/></title>
 
-		<link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
-		<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 		<link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
+		<link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 		<style>
 			.group-item {
 				min-width: 20rem;
@@ -41,11 +40,12 @@
 				border-bottom: none !important;
 			}
 		</style>
+		
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
 	</lams:head>
 
 	<body class="component">
-	<lams:Page5 type="monitor" title="${title}">
+	<lams:Page5 type="admin" title="${title}">
 
 		<div class="d-flex flex-wrap">
 			<c:choose>
Index: lams_tool_mindmap/web/pages/learning/singleMindmap.jsp
===================================================================
diff -u -rba4898999f40be22618e9225a8d02361cf7c4a0f -r509e81cd8bc4486fab7de352c4e8cfafd38efe48
--- lams_tool_mindmap/web/pages/learning/singleMindmap.jsp	(.../singleMindmap.jsp)	(revision ba4898999f40be22618e9225a8d02361cf7c4a0f)
+++ lams_tool_mindmap/web/pages/learning/singleMindmap.jsp	(.../singleMindmap.jsp)	(revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48)
@@ -18,11 +18,9 @@
 				</c:if>
 			</title>
 		</c:if>
-		
-        <link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
-        <link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
-        <link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
+
         <link rel="stylesheet" href="<lams:LAMSURL/>learning/css/components-learner.css">
+        <link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 		<link rel="stylesheet" type="text/css" href="${lams}css/jquery.minicolors.css"></link>
 		<link rel="stylesheet" type="text/css" href="${tool}includes/css/mapjs.css"></link>
 		<link rel="stylesheet" type="text/css" href="${tool}includes/css/mindmap.css"></link>
Index: lams_tool_nb/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r9576915785bfd47231fe20f9da6f130d39dc9c34 -r509e81cd8bc4486fab7de352c4e8cfafd38efe48
--- lams_tool_nb/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 9576915785bfd47231fe20f9da6f130d39dc9c34)
+++ lams_tool_nb/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48)
@@ -38,10 +38,8 @@
         </c:if>
 
         <link rel="icon" type="image/x-icon" href="<lams:LAMSURL/>images/svg/lamsv5_logo.svg">
-        <link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
-        <link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
-        <link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
         <link rel="stylesheet" href="<lams:LAMSURL/>learning/css/components-learner.css">
+        <link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 
         <script src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
Index: lams_tool_task/web/pages/learning/parts/addtask.jsp
===================================================================
diff -u -r793d3319ee7d2aa94af0559c0ee64c08ea6a4581 -r509e81cd8bc4486fab7de352c4e8cfafd38efe48
--- lams_tool_task/web/pages/learning/parts/addtask.jsp	(.../addtask.jsp)	(revision 793d3319ee7d2aa94af0559c0ee64c08ea6a4581)
+++ lams_tool_task/web/pages/learning/parts/addtask.jsp	(.../addtask.jsp)	(revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48)
@@ -3,10 +3,8 @@
 
 <lams:html>
 <lams:head>
-    <link rel="stylesheet" href="<lams:LAMSURL/>css/bootstrap5.custom.css">
-    <link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
-    <link rel="stylesheet" href="<lams:LAMSURL/>css/components.css">
     <link rel="stylesheet" href="<lams:LAMSURL/>learning/css/components-learner.css">
+    <link rel="stylesheet" href="<lams:LAMSURL/>includes/font-awesome6/css/all.css">
 	
     <script src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
     <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>