Index: lams_central/web/WEB-INF/tags/WaitForLeader.tag
===================================================================
diff -u -r5a58ebc3f2aaf6ea5183e1ed1204d2e94ea45d10 -r8ab1c658eca81a42d7f21d0067bff04c15f70c38
--- lams_central/web/WEB-INF/tags/WaitForLeader.tag	(.../WaitForLeader.tag)	(revision 5a58ebc3f2aaf6ea5183e1ed1204d2e94ea45d10)
+++ lams_central/web/WEB-INF/tags/WaitForLeader.tag	(.../WaitForLeader.tag)	(revision 8ab1c658eca81a42d7f21d0067bff04c15f70c38)
@@ -39,7 +39,7 @@
 	</lams:Alert5>
 
 	<div class="card lcard mt-1">
-		<div class="card-header lcard-header-button-border">
+		<div class="card-header">
 			<fmt:message key="label.users.from.group" />
 		</div>
 
Index: lams_central/web/css/bootstrap5.custom.scss
===================================================================
diff -u -r65f9fa5e6b4533f220017e5238ceb9d861eff5b1 -r8ab1c658eca81a42d7f21d0067bff04c15f70c38
--- lams_central/web/css/bootstrap5.custom.scss	(.../bootstrap5.custom.scss)	(revision 65f9fa5e6b4533f220017e5238ceb9d861eff5b1)
+++ lams_central/web/css/bootstrap5.custom.scss	(.../bootstrap5.custom.scss)	(revision 8ab1c658eca81a42d7f21d0067bff04c15f70c38)
@@ -6,6 +6,8 @@
 $green: #018847; /* rgb(1, 136, 71) */
 $red: #D73961; /* rgb(215, 57, 97) */
 
+$enable-shadows:              true !default;
+$enable-negative-margins:     true !default;
 
 @import "bootstrap/bootstrap.scss";
 
Index: lams_central/web/css/components.scss
===================================================================
diff -u -rd43d1e67bb589b4f565a222a3f33ea17debc68a7 -r8ab1c658eca81a42d7f21d0067bff04c15f70c38
--- lams_central/web/css/components.scss	(.../components.scss)	(revision d43d1e67bb589b4f565a222a3f33ea17debc68a7)
+++ lams_central/web/css/components.scss	(.../components.scss)	(revision 8ab1c658eca81a42d7f21d0067bff04c15f70c38)
@@ -616,18 +616,21 @@
 
 /*----------collapsable-icon-left----------------*/ 
 
-.component-page-wrapper .collapsable-icon-left button.collapsed:after {
-	content: "\f054";
-}
-
 .component-page-wrapper .collapsable-icon-left button[data-bs-toggle="collapse"]:after {
 	font-family: FontAwesome;
-	content: "\f078";
 	float: left;
 	color: #6c757d;
 	margin-right: .5rem;
 }
 
+.component-page-wrapper .collapsable-icon-left button.collapsed:after {
+	content: "\f054";
+}
+
+.component-page-wrapper .collapsable-icon-left button:not(.collapsed):after {
+	content: "\f078";
+}
+
 /*----------slider----------------*/
 
 .bootstrap-slider input[type="range"] {
Index: lams_learning/web/css/components-learner.scss
===================================================================
diff -u -r8de3eaa9202afa22c16447d5236943cbe4749eb1 -r8ab1c658eca81a42d7f21d0067bff04c15f70c38
--- lams_learning/web/css/components-learner.scss	(.../components-learner.scss)	(revision 8de3eaa9202afa22c16447d5236943cbe4749eb1)
+++ lams_learning/web/css/components-learner.scss	(.../components-learner.scss)	(revision 8ab1c658eca81a42d7f21d0067bff04c15f70c38)
@@ -231,7 +231,7 @@
     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 bootstrap .shadow class
+    box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15);//copied from .shadow class
     margin-bottom: 2rem;
 }
 
@@ -240,6 +240,9 @@
     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
+    --bs-bg-opacity: 0.8;
 }
 
 .instructions {
@@ -255,7 +258,7 @@
 }
 
 /* coommented out for now by Andrey
-.lcard .lcard-header-button-border {
+.lcard .card-header {
     border-bottom: 0.2rem solid var(--bs-primary);
 }
 */
Index: lams_tool_chat/web/includes/css/chat.scss
===================================================================
diff -u -rc7da4cc1741df96dcdf19d62846e95f7e9ddf870 -r8ab1c658eca81a42d7f21d0067bff04c15f70c38
--- lams_tool_chat/web/includes/css/chat.scss	(.../chat.scss)	(revision c7da4cc1741df96dcdf19d62846e95f7e9ddf870)
+++ lams_tool_chat/web/includes/css/chat.scss	(.../chat.scss)	(revision 8ab1c658eca81a42d7f21d0067bff04c15f70c38)
@@ -32,7 +32,7 @@
 		height: 100px;
 		resize: vertical;
 		overflow: auto;
-		border: $border-thin-default;
+		border: $border-thin-default-light;
 		padding: 2px;
 		padding-left:5px;
 	}
@@ -44,7 +44,7 @@
 		height: 200px;
 		resize: vertical;
 		overflow: auto;
-		border: $border-thin-default;
+		border: $border-thin-default-light;
 		padding: 2px;
 		padding-left:5px;
 	}
@@ -56,7 +56,7 @@
 	height: 200px;
 	resize: vertical;
 	overflow: auto;
-	border: $border-thin-default;
+	border: $border-thin-default-light;
 	padding: 2px;
 }
 
@@ -72,7 +72,7 @@
 }
 	
 #sendMessageArea {
-	border: $border-thin-default;
+	border: $border-thin-default-light;
 	width: 100%;
 }
 
Index: lams_tool_notebook/web/pages/learning/notebook.jsp
===================================================================
diff -u -r97e50f3cc8a7bdf90b41f33f6f17fc6f48373341 -r8ab1c658eca81a42d7f21d0067bff04c15f70c38
--- lams_tool_notebook/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 97e50f3cc8a7bdf90b41f33f6f17fc6f48373341)
+++ lams_tool_notebook/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 8ab1c658eca81a42d7f21d0067bff04c15f70c38)
@@ -3,8 +3,6 @@
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <lams:PageLearner title="${notebookDTO.title}" toolSessionID="${messageForm.toolSessionID}" >
-		<lams:headItems/>
-		<lams:JSImport src="learning/includes/javascript/gate-check.js" />
 		<script type="text/javascript">
 			checkNextGateActivity('finishButton', '${messageForm.toolSessionID}', '', function(){
 				submitForm('finish');
Index: lams_tool_preview/web/includes/css/learning.scss
===================================================================
diff -u -ra08fb689e1bb174869cb981d301b204d2f573590 -r8ab1c658eca81a42d7f21d0067bff04c15f70c38
--- lams_tool_preview/web/includes/css/learning.scss	(.../learning.scss)	(revision a08fb689e1bb174869cb981d301b204d2f573590)
+++ lams_tool_preview/web/includes/css/learning.scss	(.../learning.scss)	(revision 8ab1c658eca81a42d7f21d0067bff04c15f70c38)
@@ -76,4 +76,8 @@
 
 .tablesorter {
 	margin-bottom: 0px;
+}
+
+#rubrics-user-cards button.btn, #rubrics-row-cards button.btn{
+	box-shadow: none !important;
 }
\ No newline at end of file
Index: lams_tool_preview/web/pages/learning/comment.jsp
===================================================================
diff -u -rda1d6852bb351ff58c8ddc48a80144681106fd4b -r8ab1c658eca81a42d7f21d0067bff04c15f70c38
--- lams_tool_preview/web/pages/learning/comment.jsp	(.../comment.jsp)	(revision da1d6852bb351ff58c8ddc48a80144681106fd4b)
+++ lams_tool_preview/web/pages/learning/comment.jsp	(.../comment.jsp)	(revision 8ab1c658eca81a42d7f21d0067bff04c15f70c38)
@@ -333,7 +333,7 @@
 		<input type="hidden" name="criteriaId" value="${criteriaRatings.ratingCriteria.ratingCriteriaId}"/>
 		<input type="hidden" name="next" id="next" value=""/>		
 
-		<lams:TSTable5 numColumns="2" test="1">
+		<lams:TSTable5 numColumns="2">
 			<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" style="width:25%" > 
 				<fmt:message key="label.user.name" />
 			</th>
Index: lams_tool_preview/web/pages/learning/hedging.jsp
===================================================================
diff -u -r25fa7a462f907084b2a8aa550082d70994d66609 -r8ab1c658eca81a42d7f21d0067bff04c15f70c38
--- lams_tool_preview/web/pages/learning/hedging.jsp	(.../hedging.jsp)	(revision 25fa7a462f907084b2a8aa550082d70994d66609)
+++ lams_tool_preview/web/pages/learning/hedging.jsp	(.../hedging.jsp)	(revision 8ab1c658eca81a42d7f21d0067bff04c15f70c38)
@@ -19,7 +19,6 @@
 			} else {
 				hideButtons();
 			}
-
 		} 		
 				
 		function submitEntry(next){
@@ -127,11 +126,20 @@
 
 		<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
 			<div class="m-3">
+			
 				<div>
 					<label for="justify" class="fst-italic">
 						<fmt:message key="label.justify.hedging.marks" />
 					</label>
 				</div>
+				<c:if test="${criteriaRatings.ratingCriteria.commentsMinWordsLimit != 0}">
+					<lams:Alert5 type="info" id="commentsMinWordsLimit-info" close="false">
+						<fmt:message key="label.minimum.number.words">
+							<fmt:param value="${criteriaRatings.ratingCriteria.commentsMinWordsLimit}"/>
+						</fmt:message>
+					</lams:Alert5>
+				</c:if>
+				
 				<c:choose>
 					<c:when test="${finishedLock}">
 						<span>${criteriaRatings.justificationComment}</span>
Index: lams_tool_preview/web/pages/learning/rubrics.jsp
===================================================================
diff -u -r25fa7a462f907084b2a8aa550082d70994d66609 -r8ab1c658eca81a42d7f21d0067bff04c15f70c38
--- lams_tool_preview/web/pages/learning/rubrics.jsp	(.../rubrics.jsp)	(revision 25fa7a462f907084b2a8aa550082d70994d66609)
+++ lams_tool_preview/web/pages/learning/rubrics.jsp	(.../rubrics.jsp)	(revision 8ab1c658eca81a42d7f21d0067bff04c15f70c38)
@@ -80,7 +80,7 @@
         			alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.error.rate" /></spring:escapeBody>');
     				return;
     			}
-    			$(cell).addClass('text-bg-success').siblings('div').removeClass('text-bg-success');
+    			$(cell).addClass('text-bg-success').siblings('button').removeClass('text-bg-success');
     			
         		if (rubricsRequireRatings) {
 					$('#finishButton').prop('disabled', isRatingMissing());
Index: lams_tool_scratchie/web/pages/learning/learning.jsp
===================================================================
diff -u -r51787e125e5356a3558da7a1443a329f1565ee47 -r8ab1c658eca81a42d7f21d0067bff04c15f70c38
--- lams_tool_scratchie/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 51787e125e5356a3558da7a1443a329f1565ee47)
+++ lams_tool_scratchie/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 8ab1c658eca81a42d7f21d0067bff04c15f70c38)
@@ -275,7 +275,7 @@
 						'</div>' +
 						'<hr class="hr-confidence-level" />' +
 						'<div style="padding-bottom: 10px;">' +
-							'<lams:Portrait userId="${sessionMap.groupLeaderUserId}"/>' +
+							'<spring:escapeBody javaScriptEscape="true"><lams:Portrait userId="${sessionMap.groupLeaderUserId}"/></spring:escapeBody>' +
 						'</div>' +
 					'</div>' +
 				'</div>';
Index: lams_tool_scratchie/web/pages/learning/scratchies.jsp
===================================================================
diff -u -r261520f042046fcb6f4f85c596495e3ea98311aa -r8ab1c658eca81a42d7f21d0067bff04c15f70c38
--- lams_tool_scratchie/web/pages/learning/scratchies.jsp	(.../scratchies.jsp)	(revision 261520f042046fcb6f4f85c596495e3ea98311aa)
+++ lams_tool_scratchie/web/pages/learning/scratchies.jsp	(.../scratchies.jsp)	(revision 8ab1c658eca81a42d7f21d0067bff04c15f70c38)
@@ -22,7 +22,7 @@
 	       </c:if>
 		
 			<c:if test="${(sessionMap.userFinished && (mode == 'teacher')) || showResults}">
-				<div class="badge bg-success bg-opacity-75 float-end item-score">
+				<div class="badge bg-success float-end item-score p-2">
 					<fmt:message key="label.score" />&nbsp;${item.mark}
 				</div>
 			</c:if>
Index: lams_tool_survey/web/pages/learning/resultOtherUsers.jsp
===================================================================
diff -u -r51787e125e5356a3558da7a1443a329f1565ee47 -r8ab1c658eca81a42d7f21d0067bff04c15f70c38
--- lams_tool_survey/web/pages/learning/resultOtherUsers.jsp	(.../resultOtherUsers.jsp)	(revision 51787e125e5356a3558da7a1443a329f1565ee47)
+++ lams_tool_survey/web/pages/learning/resultOtherUsers.jsp	(.../resultOtherUsers.jsp)	(revision 8ab1c658eca81a42d7f21d0067bff04c15f70c38)
@@ -267,7 +267,7 @@
 						<c:if test="${question.type == 3}">
 							<tr>
 								<td colspan="2">
-									<lams:TSTable5 numColumns="1" dataId='data-question-uid="${question.uid}"' test="2"> 
+									<lams:TSTable5 numColumns="1" dataId='data-question-uid="${question.uid}"'> 
 										<th title="<fmt:message key='label.sort.by.answer'/>"><fmt:message key="label.answer" /></th>
 									</lams:TSTable5>