diff --git a/data/definition.js b/data/definition.js
index ff1cea6..cad3411 100755
--- a/data/definition.js
+++ b/data/definition.js
@@ -305,7 +305,7 @@ var separator = ";";
 	Please find some examples above.  
 */  
 
-var design = ["default.css","buttons-colors-on.css", "progressbar.css"];
+var design = ["default.css","buttons-colors-on.css", "progressbar.css", "navigation.css"];
 
 
 /*
diff --git a/styles/navigation.css b/styles/navigation.css
new file mode 100644
index 0000000..dc686cb
--- /dev/null
+++ b/styles/navigation.css
@@ -0,0 +1,27 @@
+/* JumpToQuestion-table custom classes, which can override default bg-classes */
+
+.td-jump-to-question-decline {
+    background-color: #d9534f !important;
+}
+
+.td-jump-to-question-neutral {
+    background-color: #f0ad4e !important;
+}
+
+.td-jump-to-question-approve {
+    background-color: #5cb85c !important;
+}
+
+.td-jump-to-question-skip {
+    color: #c0c0c0;
+    background-color: #c0c0c0;
+}
+
+.td-jump-to-question-voting-double {
+    font-weight: bold;
+}
+
+.td-jump-to-question-current {
+    border-color: #0050A0 !important;
+    background-color: #c0c0c0;
+}
\ No newline at end of file
diff --git a/system/general.js b/system/general.js
index 2183699..fc97699 100755
--- a/system/general.js
+++ b/system/general.js
@@ -174,7 +174,6 @@ function fnSendResults(arResults, arPersonalPositions)
 {
 	// Korrektur der Parteiposition (-1,0,1) mit den Informationen aus der doppelten Wertung (-2,-1,0,1,2)
 	// Marius Nisslmueller, Bad Honnef, Juni 2020
-	// Bedingung für übersprungene Frage hinzugefügt
 	arPersonalPositionsForStats = arPersonalPositions.slice(); // Damit arPersonalPositions nicht verändert wird
 	for(let i=0; i<arPersonalPositionsForStats.length; i++){
 		if(arVotingDouble[i] && arPersonalPositionsForStats[i] < 99){
@@ -316,22 +315,19 @@ function fnTransformPositionToIcon(position)
 	return positionIcon;
 }
 
-// ersetzt die Partei-Position (-1, 0, 1) mit der passenden Farbe
-function fnTransformPositionToColor(position)
-{
-	// red, yellow, green - "#ff0000","#ffff00","#00ff00"
-	// Bootstrap-colors: https://github.com/twbs/bootstrap/blob/master/dist/css/bootstrap.css
-	var arColors = new Array("#d9534f","#f0ad4e","#5cb85c")
-	var positionColor = "#c0c0c0";
-	for (z = -1; z <= 1; z++)
-	{
-	 	if (z == position)
-		{
-			positionColor = arColors[(z+1)];
-		}
-	}
-	return positionColor;
-	
+// Gibt die entsprechenden css-Klassen für Partei-Position (-1, 0, 1) und default zurück.
+function fnGetJumpToQuestionColorForPosition(position) {
+    console.log("position", position);
+    switch (position) {
+        case -1:
+            return "bg-danger td-jump-to-question-decline";
+        case 0:
+            return "bg-warning td-jump-to-question-neutral";
+        case 1:
+            return "bg-success td-jump-to-question-approve";
+        default:
+            return "td-jump-to-question-skip";
+    }
 }
 
 
diff --git a/system/output.js b/system/output.js
index f41032f..de4d22a 100755
--- a/system/output.js
+++ b/system/output.js
@@ -302,38 +302,19 @@ function fnJumpToQuestionNumber(questionNumber)
 	var tableContent = "<table width='100%' class='table table-bordered table-striped table-hover' aria-role='presentation'>";
 	for (i = 1; i <= arQuestionsLong.length; i++)
 	{
+		let jumpToQuestionClass = i-1 === questionNumber ? "td-jump-to-question-current" : fnGetJumpToQuestionColorForPosition(arPersonalPositions[(i-1)]);
+		const votingDoubleClass = arVotingDouble[(i-1)] ? " td-jump-to-question-voting-double" : "";
+		jumpToQuestionClass = jumpToQuestionClass  + votingDoubleClass;
 		var modulo = i % questionsPerLine;
 		// neue Zeile
 		if (modulo == 1) { tableContent += "<tr>"; }
-		tableContent += "<td align='center' id='jumpToQuestionNr"+i+"' title='"+arQuestionsShort[(i-1)]+" - "+arQuestionsLong[(i-1)]+"'>"; 
+		tableContent += "<td align='center' id='jumpToQuestionNr"+i+"' title='"+arQuestionsShort[(i-1)]+" - "+arQuestionsLong[(i-1)]+"' class='"+jumpToQuestionClass+"'>";
 		tableContent += "<a href='javascript:fnShowQuestionNumber("+(i-2)+")' style='display:block;'>"+i+" </a>"; 
 		tableContent += "</td>";
 		if (modulo == 0) { tableContent += "</tr>"; }
 	}
 	tableContent += "</table>";
 	$("#navigationJumpToQuestion").append(tableContent).fadeIn(500);
-
-	// alte Meinungen farblich hervorheben und aktuelle Frage markieren
-	for (i = 1; i <= arQuestionsLong.length; i++)
-	{
-		// beantwortete Fragen farblich markieren
-		var positionColor = fnTransformPositionToColor(arPersonalPositions[(i-1)]);
-	   $("#jumpToQuestionNr"+i+"").css("border-color", positionColor);
-	   
-	   // aktuelle Frage markieren
-	   if ((i-1) <= questionNumber)
-	   {
-//	   	$("#jumpToQuestionNr"+i+"").css("background-color", middleColor);	// alt: graue "Mittelfarbe" als Hintergrund
-	   	$("#jumpToQuestionNr"+i+"").css("background-color", positionColor);	// neu (0.2.3.2) Farbe der Auswahl (rot/gruen/...)
-	   }
-
-		if (arVotingDouble[(i-1)])
-		{
-			$("#jumpToQuestionNr"+i+"").css("font-weight","bold");
-		}
-
-	}	
-	
 }
 
 // Anzeige der Ergebnisse - zusammengefasst (Prozentwerte) - nur Parteien