Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/OverallCourseReport.java
===================================================================
--- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/OverallCourseReport.java	(revision 7d849a440d812335f4e9f88c8b8376bc56f17f05)
+++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/OverallCourseReport.java	(revision 0ff6664bc415ca8abfb892907b0a853d03bc9d3f)
@@ -184,4 +184,5 @@
 		newWorkReport.setActivity(a);
 		newWorkReport.setPerson(genericService.getByPK(Person.class, userInfo.getPersonId()));
+		newWorkReport.setTitle(systemConfigService.getString(AppConstants.SystemParameterTplNewWorkReportByAdmin));
 		if (request.isXHR()) {
 			ajaxResponseRenderer.addRender(zWorkReport);
@@ -204,4 +205,5 @@
 		newWorkReport = null;
 		newWorkEvaluation = new WorkEvaluation();
+		newWorkEvaluation.setTitle(systemConfigService.getString(AppConstants.SystemParameterTplNewWorkEvaluation));
 		newWorkEvaluation.setEvaluationDate(new Date());
 		newWorkEvaluation.setPerson(genericService.getByPK(Person.class, userInfo.getPersonId()));
Index: eprms-tap/src/main/resources/META-INF/assets/OverallCourseReport.css
===================================================================
--- eprms-tap/src/main/resources/META-INF/assets/OverallCourseReport.css	(revision 7d849a440d812335f4e9f88c8b8376bc56f17f05)
+++ eprms-tap/src/main/resources/META-INF/assets/OverallCourseReport.css	(revision 0ff6664bc415ca8abfb892907b0a853d03bc9d3f)
@@ -38,5 +38,5 @@
 
 table td {
-	background: #fff;
+/*	background: #fff;*/
 }
 
@@ -48,5 +48,5 @@
 	position: sticky;
 	left: 0;
-	background: #eee;
+/*	background: #eee;*/
 	z-index: 1;
 }
Index: eprms-tap/src/main/resources/META-INF/assets/site-overrides.css
===================================================================
--- eprms-tap/src/main/resources/META-INF/assets/site-overrides.css	(revision 7d849a440d812335f4e9f88c8b8376bc56f17f05)
+++ eprms-tap/src/main/resources/META-INF/assets/site-overrides.css	(revision 0ff6664bc415ca8abfb892907b0a853d03bc9d3f)
@@ -8,4 +8,7 @@
 	--color-noevaluation: #white;
 	--color-exception: #404040;
+	--main-bg-color-accent: #eceef3ff;
+	--main-bg-color-accent2: #00000080;
+	--inlinecomment-bg-color: #cfef60;
 }
 
@@ -33,4 +36,5 @@
   --color-incorrect: #7b000c; 	/* https://www.w3schools.com/colors/colors_british.asp - Carnival red */
   --color-correct: #277c2c; /* https://www.w3schools.com/colors/colors_british.asp - Bright green / Goblin / Garland */ 
+		--inlinecomment-bg-color: #8faf10;
   }
 }
@@ -125,2 +129,62 @@
 	width: 30em !important; 
 }
+
+
+
+
+
+@media ( prefers-color-scheme : dark) {
+	a {
+		color: #E2F72F;
+	}
+	a:hover {
+		color: #A1B400;
+	}
+	body {
+		background-color: var(--main-bg-color2);
+		color: var(--main-font-color);
+	}
+	.card {
+		background-color: var(--main-bg-color) !important;
+		border-color: var(--main-bg-color3) !important;
+	}
+	.card-header {
+		background-color: var(--main-bg-color-accent) !important;
+	}
+    .testType .card-header.bg-success {
+            background-color: var(--color-correct) !important;
+    }
+	.card-header h3 {
+		color: var(--main-font-color) !important;
+	}
+	.bg-light {
+		background-color: var(--main-bg-color3) !important;
+	}
+	.table {
+		color: var(--main-font-color);
+		background-color: var(--main-bg-color) !important;
+	}
+	.table-hover tbody tr:hover td, .table-hover tbody tr:hover th {
+		background-color: var(--main-bg-color-accent);
+		color: var(--main-font-color-hover);
+	}
+	.dropdown-menu {
+		background-color: var(--main-bg-color2);
+	}
+	.dropdown-menu a {
+		color: var(--main-link-color) !important;
+	}
+	pre {
+		color: var(--main-font-color);
+	}
+	.modal-content {
+		background-color: var(--main-bg-color2);
+		border-color: var(--main-bg-color2);
+	}
+	.cke_wysiwyg_frame {
+		background-color: #6060ff !important;
+	}
+	p.comment {
+		background: #7C8B00;
+	}
+}
Index: eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/admin/OverallCourseReport.tml
===================================================================
--- eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/admin/OverallCourseReport.tml	(revision 7d849a440d812335f4e9f88c8b8376bc56f17f05)
+++ eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/admin/OverallCourseReport.tml	(revision 0ff6664bc415ca8abfb892907b0a853d03bc9d3f)
@@ -160,11 +160,14 @@
 
 							<div class="report">
-								<p class="mb-1">
-									<strong>${workReport.title}</strong> <t:if
-											t:test="workReport.person">
-											<br /> -
-										${workReport?.person?.lastName} ${workReport?.person?.firstName}</t:if>
-								</p>
+								<div class="float-right">
+									<t:if t:test="workReport.person">
+									- ${workReport?.person?.lastName} ${workReport?.person?.firstName}
+									</t:if>
+									- ${workReport?.submissionDate}   
+								</div>
+								<p><strong>${workReport.title}</strong></p>
+								<t:if t:test="workReport.description">
 								<t:outputraw t:value="workReport.description" />
+								</t:if>
 							</div>
 
@@ -177,24 +180,27 @@
 									<div class="row">
 										<div class="col-2">
-											<p>
-												<a class="btn btn-sm btn-primary p-0" href=""
+											<p><a class="btn btn-sm btn-primary p-0" href=""
 													t:type="eventlink" t:id="editWorkEvaluation"
 													t:context="workEvaluation" t:async="true" ><img t:type="svgicon"
-													t:path="edit"/></a><br /> <a
+													t:path="edit"/></a>   <span
+													class="ml-3 badge badge-dark text-nowrap">${workEvaluation.points}</span>
+													<a
 													class="btn btn-sm btn-secondary p-0" href=""
 													t:type="eventlink" t:id="toggleWorkEvaluationStatus"
 													t:context="workEvaluation" t:async="true"><img
-													t:type="svgicon" t:path="toggle-left" /></a> <br /> <span
-													class="badge badge-dark text-nowrap">${workEvaluation.points}</span>
+													t:type="svgicon" t:path="toggle-left" /></a>
 											</p>
 										</div>
 										<div class="col-10">
+											<div class="float-right">
+                                                                                                       <t:if  t:test="workEvaluation">
+                                                                                                                <span class="small">-
+                                                                                                                        ${workEvaluation?.person?.lastName}
+                                                                                                                        ${workEvaluation?.person?.firstName}       
+                                                                                                                - ${workEvaluation?.evaluationDate}</span>
+                                                                                                        </t:if>
+											</div>
 											<p class="mb-0">
-												<strong>${workEvaluation.title} <t:if
-														t:test="workEvaluation">
-														<br />-<span class="small">
-															${workEvaluation?.person?.lastName}
-															${workEvaluation?.person?.firstName}</span>
-													</t:if></strong>
+												<strong>${workEvaluation.title}</strong>
 											</p>
 											<t:outputRaw t:value="workEvaluation.description" />
@@ -205,5 +211,5 @@
 
 							<p class="mt-2 text-right ">
-								<a href="" class="p-1 btn btn-sm btn-primary"
+								<a href="" class="p-1 btn btn-sm btn-link"
 									t:type="eventlink" t:id="addWorkEvaluation"
 									t:context="workReport"><img t:type="svgicon" t:path="corner-down-left" />