diff --git a/bin/app/data/color_schemes/bad_rainbow.xml b/bin/app/data/color_schemes/bad_rainbow.xml
index 75fa763e..a552d148 100644
--- a/bin/app/data/color_schemes/bad_rainbow.xml
+++ b/bin/app/data/color_schemes/bad_rainbow.xml
@@ -93,7 +93,7 @@
 			</title>
 
 			<ref_count>
-				<text>#C4C4C4</text>
+				<text>#D4D4D4</text>
 				<background>#494949</background>
 			</ref_count>
 		</file>
@@ -108,21 +108,21 @@
 			</title>
 
 			<line_number>
-				<text>#C4C4C4</text>
+				<text>#D4D4D4</text>
 				<inactive_text>#A0A0A0</inactive_text>
 				<background>#494949</background>
-				<marker>#C4C4C4</marker>
+				<marker>#D4D4D4</marker>
 			</line_number>
 
 			<syntax>
-				<normal>#C4C4C4</normal>
+				<normal>#D4D4D4</normal>
 				<directive>#00A0B6</directive>
-				<keyword>#00A0B6</keyword>
-				<type>#FF4A52</type>
-				<comment>#9DC28D</comment>
-				<number>#EE7326</number>
-				<quotation>#D663D6</quotation>
-				<function>#FBBA00</function>
+				<keyword>#00BCD6</keyword>
+				<type>#FF5961</type>
+				<comment>#78946B</comment>
+				<number>#FC7F30</number>
+				<quotation>#F283F2</quotation>
+				<function>#FFCC3B</function>
 			</syntax>
 
 			<selection>
@@ -255,7 +255,7 @@
 
 			<function>
 				<fill>
-					<normal>#FBBA00</normal>
+					<normal>#FFCC3B</normal>
 					<focus>#FFD05A</focus>
 				</fill>
 				<border>
@@ -272,8 +272,8 @@
 
 			<global_variable>
 				<fill>
-					<normal>#00A0B6</normal>
-					<focus>#3BAFB2</focus>
+					<normal>#00BCD6</normal>
+					<focus>#38D3E8</focus>
 				</fill>
 				<border>
 					<normal>transparent</normal>
@@ -396,12 +396,12 @@
 			</override>
 
 			<call>
-				<normal>#FBBA00</normal>
+				<normal>#DEA400</normal>
 				<trail_focus>#FFFFFF</trail_focus>
 			</call>
 
 			<use>
-				<normal>#2A6484</normal>
+				<normal>#00A0B6</normal>
 			</use>
 
 			<template_argument>
@@ -435,9 +435,9 @@
 	</graph>
 	<table>
 		<background>#494949</background>
-		<table>#C4C4C4</table>
+		<table>#D4D4D4</table>
 		<text>
-			<normal>#C4C4C4</normal>
+			<normal>#D4D4D4</normal>
 			<active>black</active>
 		</text>
 		<table_line_1>
@@ -451,7 +451,7 @@
 	</table>
 	<tab>
 		<background>#494949</background>
-		<active>#C4C4C4</active>
+		<active>#D4D4D4</active>
 		<hover>#878787</hover>
 		<text>#878787</text>
 	</tab>
diff --git a/bin/app/data/color_schemes/bright.xml b/bin/app/data/color_schemes/bright.xml
index 959f0d88..ca80d04d 100644
--- a/bin/app/data/color_schemes/bright.xml
+++ b/bin/app/data/color_schemes/bright.xml
@@ -119,7 +119,7 @@
 				<directive>#1B8856</directive>
 				<keyword>#1B8856</keyword>
 				<type>#C1492D</type>
-				<comment>#287299</comment>
+				<comment>#8FB2C4</comment>
 				<number>#C1315E</number>
 				<quotation>#865F9E</quotation>
 				<function>#CC9533</function>
diff --git a/bin/app/data/color_schemes/dark.xml b/bin/app/data/color_schemes/dark.xml
index f01c30e3..2facfae6 100644
--- a/bin/app/data/color_schemes/dark.xml
+++ b/bin/app/data/color_schemes/dark.xml
@@ -119,7 +119,7 @@
 				<directive>#1F9C62</directive>
 				<keyword>#1F9C62</keyword>
 				<type>#D95233</type>
-				<comment>#487F9C</comment>
+				<comment>#456A7D</comment>
 				<number>#CC3463</number>
 				<quotation>#9368AD</quotation>
 				<function>#D69C36</function>
diff --git a/src/lib_gui/qt/element/QtCodeArea.cpp b/src/lib_gui/qt/element/QtCodeArea.cpp
index 0dfb8b47..88ec5cc8 100644
--- a/src/lib_gui/qt/element/QtCodeArea.cpp
+++ b/src/lib_gui/qt/element/QtCodeArea.cpp
@@ -459,11 +459,23 @@ void QtCodeArea::contextMenuEvent(QContextMenuEvent* event)
 
 void QtCodeArea::focusTokenIds(const std::vector<Id>& tokenIds)
 {
+	if (m_navigator->hasErrors() && tokenIds.size() == 1)
+	{
+		QtCodeField::focusTokenIds(tokenIds);
+		return;
+	}
+
 	MessageFocusIn(tokenIds, TOOLTIP_ORIGIN_CODE).dispatch();
 }
 
 void QtCodeArea::defocusTokenIds(const std::vector<Id>& tokenIds)
 {
+	if (m_navigator->hasErrors() && tokenIds.size() == 1)
+	{
+		QtCodeField::defocusTokenIds(tokenIds);
+		return;
+	}
+
 	MessageFocusOut(tokenIds).dispatch();
 }
 
diff --git a/src/lib_gui/qt/element/QtCodeNavigator.cpp b/src/lib_gui/qt/element/QtCodeNavigator.cpp
index 544fee4d..e0bc412c 100644
--- a/src/lib_gui/qt/element/QtCodeNavigator.cpp
+++ b/src/lib_gui/qt/element/QtCodeNavigator.cpp
@@ -88,8 +88,6 @@ QtCodeNavigator::QtCodeNavigator(QWidget* parent)
 		navigation->setLayout(navLayout);
 		layout->addWidget(navigation);
 
-		refreshStyle();
-
 		QHBoxLayout* separatorLayout = new QHBoxLayout();
 
 		QWidget* widget = new QWidget();
@@ -128,6 +126,8 @@ QtCodeNavigator::QtCodeNavigator(QWidget* parent)
 		setModeList();
 	}
 
+	refreshStyle();
+
 	connect(this, &QtCodeNavigator::scrollRequest, this, &QtCodeNavigator::handleScrollRequest, Qt::QueuedConnection);
 }
 
@@ -260,6 +260,8 @@ void QtCodeNavigator::clearCodeSnippets()
 void QtCodeNavigator::clearFile()
 {
 	m_single->clearFile();
+
+	updateRefLabel();
 }
 
 void QtCodeNavigator::clearCaches()
@@ -543,6 +545,8 @@ void QtCodeNavigator::refreshStyle()
 	m_nextButton->setIconSize(QSize(12, 12));
 	m_listButton->setIconSize(QSize(14, 14));
 	m_fileButton->setIconSize(QSize(14, 14));
+
+	clearCaches();
 }
 
 void QtCodeNavigator::scrollToValue(int value, bool inListMode)