diff --git a/datamodels/2.x/combodo-backoffice-darkmoon-theme/scss/ace_editor.scss b/datamodels/2.x/combodo-backoffice-darkmoon-theme/scss/ace_editor.scss
index 41c542db7..7c0ff19ae 100644
--- a/datamodels/2.x/combodo-backoffice-darkmoon-theme/scss/ace_editor.scss
+++ b/datamodels/2.x/combodo-backoffice-darkmoon-theme/scss/ace_editor.scss
@@ -22,10 +22,16 @@
   color: $ibo-color-red-600 !important;
 }
 .ace-eclipse .ace_marker-layer .ace_active-line {
-  background: $ibo-color-grey-600 !important;
+  &:only-child {
+    background: $ibo-color-grey-600 !important;
+  }
+
+  &:not(:only-child) {
+    background: $ibo-color-grey-700 !important;
+  }
 }
 .ace-eclipse .ace_marker-layer .ace_selection {
-  background: $ibo-color-grey-600 !important;
+  background: $ibo-color-grey-500 !important;
 }
 .ace-eclipse.ace_multiselect .ace_selection.ace_start {
   box-shadow: 0 0 3px 0px $ibo-color-grey-800 !important;
diff --git a/setup/setuppage.class.inc.php b/setup/setuppage.class.inc.php
index 8ff3a9b96..30e84666a 100644
--- a/setup/setuppage.class.inc.php
+++ b/setup/setuppage.class.inc.php
@@ -77,25 +77,25 @@ class SetupPage extends NiceWebPage
 
 	public function info($sText, $sTextForLog = null)
 	{
-		$this->add("<p class=\"info\">$sText</p>\n");
+		$this->add("<p class=\"info ibo-is-html-content\">$sText</p>\n");
 		SetupLog::Info($sTextForLog ?? $sText);
 	}
 
 	public function ok($sText, $sTextForLog = null)
 	{
-		$this->add("<div class=\"message message-valid\"><span class=\"message-title\">Success:</span>$sText</div>");
+		$this->add("<div class=\"message message-valid ibo-is-html-content\"><span class=\"message-title\">Success:</span>$sText</div>");
 		SetupLog::Ok($sTextForLog ?? $sText);
 	}
 
 	public function warning($sText, $sTextForLog = null)
 	{
-		$this->add("<div class=\"message message-warning\"><span class=\"message-title\">Warning:</span>$sText</div>");
+		$this->add("<div class=\"message message-warning ibo-is-html-content\"><span class=\"message-title\">Warning:</span>$sText</div>");
 		SetupLog::Warning($sTextForLog ?? $sText);
 	}
 
 	public function error($sText, $sTextForLog = null)
 	{
-		$this->add("<div class=\"message message-error\">$sText</div>");
+		$this->add("<div class=\"message message-error ibo-is-html-content\">$sText</div>");
 		SetupLog::Error($sTextForLog ?? $sText);
 	}