diff --git a/generator/static/js/templates/banner-name-left.js b/generator/static/js/templates/banner-name-left.js
index 11968bd782c67f9c1523979b60d80e3c5a41f06a..ab8ba48fb858f6914a2e9fd2345407829e33378a 100644
--- a/generator/static/js/templates/banner-name-left.js
+++ b/generator/static/js/templates/banner-name-left.js
@@ -694,7 +694,7 @@ class BannerNameLeft extends Template {
 				this.backgroundColor = "#000000";
 				this.nameBackgroundColor = "#ffffff";
 				this.nameTextColor = "#000000";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextColor = "#000000";
 				this.terciaryTextBackgroundColor = "#999999";
@@ -706,7 +706,7 @@ class BannerNameLeft extends Template {
 				this.backgroundColor = "#ffffff";
 				this.nameBackgroundColor = "#ffffff";
 				this.nameTextColor = "#000000";
-				// this.primaryTextHighlightColor = "#ffeda5";
+				// this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextColor = "#ffffff";
 				this.terciaryTextBackgroundColor = "#32948b";
@@ -718,7 +718,7 @@ class BannerNameLeft extends Template {
 				this.backgroundColor = "#962a51";
 				this.nameBackgroundColor = "#ffffff";
 				this.nameTextColor = "#000000";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextColor = "#ffffff";
 				this.terciaryTextBackgroundColor = "#000000";
@@ -730,7 +730,7 @@ class BannerNameLeft extends Template {
 				this.backgroundColor = "#ffffff";
 				this.nameBackgroundColor = "#ffffff";
 				this.nameTextColor = "#000000";
-				// this.primaryTextHighlightColor = "#ffeda5";
+				// this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextColor = "#ffffff";
 				this.terciaryTextBackgroundColor = "#000000";
@@ -742,7 +742,7 @@ class BannerNameLeft extends Template {
 				this.backgroundColor = "#00ad43";
 				this.nameBackgroundColor = "#ffffff";
 				this.nameTextColor = "#000000";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextColor = "#ffffff";
 				this.terciaryTextBackgroundColor = "#000000";
@@ -754,7 +754,7 @@ class BannerNameLeft extends Template {
 				this.backgroundColor = "#ffffff";
 				this.nameBackgroundColor = "#ffffff";
 				this.nameTextColor = "#000000";
-				// this.primaryTextHighlightColor = "#ffeda5";
+				// this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextColor = "#ffffff";
 				this.terciaryTextBackgroundColor = "#000000";
@@ -766,7 +766,7 @@ class BannerNameLeft extends Template {
 				this.backgroundColor = "#21274e";
 				this.nameBackgroundColor = "#ffffff";
 				this.nameTextColor = "#000000";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextColor = "#000000";
 				this.terciaryTextBackgroundColor = "#9796ca";
@@ -778,7 +778,7 @@ class BannerNameLeft extends Template {
 				this.backgroundColor = "#ffffff";
 				this.nameBackgroundColor = "#ffffff";
 				this.nameTextColor = "#000000";
-				// this.primaryTextHighlightColor = "#ffeda5";
+				// this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextColor = "#000000";
 				this.terciaryTextBackgroundColor = "#9796ca";
@@ -790,7 +790,7 @@ class BannerNameLeft extends Template {
 				this.backgroundColor = "#3e2a5b";
 				this.nameBackgroundColor = "#ffffff";
 				this.nameTextColor = "#000000";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextColor = "#000000";
 				this.terciaryTextBackgroundColor = "#e2d7a9";
@@ -802,7 +802,7 @@ class BannerNameLeft extends Template {
 				this.backgroundColor = "#ffffff";
 				this.nameBackgroundColor = "#ffffff";
 				this.nameTextColor = "#000000";
-				// this.primaryTextHighlightColor = "#ffeda5";
+				// this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextColor = "#000000";
 				this.terciaryTextBackgroundColor = "#e2d7a9";
@@ -826,7 +826,7 @@ class BannerNameLeft extends Template {
 				this.backgroundColor = "#ffffff";
 				this.nameBackgroundColor = "#ffffff";
 				this.nameTextColor = "#000000";
-				// this.primaryTextHighlightColor = "#ffeda5";
+				// this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextColor = "#000000";
 				this.terciaryTextBackgroundColor = "#cccccc";
@@ -1004,7 +1004,7 @@ class BannerNameLeft extends Template {
 				this.nameBackgroundColor = "#a9ce2d";
 				this.nameTextColor = "#000000";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				this.underNameTextColor = "#ffffff";
 				
@@ -1020,7 +1020,7 @@ class BannerNameLeft extends Template {
 				this.nameBackgroundColor = "#a9ce2d";
 				this.nameTextColor = "#000000";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				this.underNameTextColor = "#ffffff";
 				
diff --git a/generator/static/js/templates/banner-name-right.js b/generator/static/js/templates/banner-name-right.js
index a600ca6fb658a22102798dd24b2a553e9f341f66..6474702119452190b8ec065ee79c0fcd890a5d43 100644
--- a/generator/static/js/templates/banner-name-right.js
+++ b/generator/static/js/templates/banner-name-right.js
@@ -564,7 +564,7 @@ class BannerNameRight extends Template {
 				this.foregroundColor = "#ffffff";
 				this.backgroundColor = "#000000";
 				this.nameTextColor = "#ffffff";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextColor = "#000000";
 				this.terciaryTextBackgroundColor = "#999999";
@@ -575,7 +575,7 @@ class BannerNameRight extends Template {
 				this.foregroundColor = "#000000";
 				this.backgroundColor = "#ffffff";
 				this.nameTextColor = "#ffffff";
-				// this.primaryTextHighlightColor = "#ffeda5";
+				// this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextColor = "#ffffff";
 				this.terciaryTextBackgroundColor = "#32948b";
@@ -586,7 +586,7 @@ class BannerNameRight extends Template {
 				this.foregroundColor = "#ffffff";
 				this.backgroundColor = "#962a51";
 				this.nameTextColor = "#ffffff";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextColor = "#ffffff";
 				this.terciaryTextBackgroundColor = "#000000";
@@ -597,7 +597,7 @@ class BannerNameRight extends Template {
 				this.foregroundColor = "#962a51";
 				this.backgroundColor = "#ffffff";
 				this.nameTextColor = "#ffffff";
-				// this.primaryTextHighlightColor = "#ffeda5";
+				// this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextColor = "#ffffff";
 				this.terciaryTextBackgroundColor = "#000000";
@@ -608,7 +608,7 @@ class BannerNameRight extends Template {
 				this.foregroundColor = "#ffffff";
 				this.backgroundColor = "#00ad43";
 				this.nameTextColor = "#ffffff";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextColor = "#ffffff";
 				this.terciaryTextBackgroundColor = "#000000";
@@ -619,7 +619,7 @@ class BannerNameRight extends Template {
 				this.foregroundColor = "#00ad43";
 				this.backgroundColor = "#ffffff";
 				this.nameTextColor = "#ffffff";
-				// this.primaryTextHighlightColor = "#ffeda5";
+				// this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextColor = "#ffffff";
 				this.terciaryTextBackgroundColor = "#000000";
@@ -630,7 +630,7 @@ class BannerNameRight extends Template {
 				this.foregroundColor = "#ffffff";
 				this.backgroundColor = "#21274e";
 				this.nameTextColor = "#ffffff";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextColor = "#000000";
 				this.terciaryTextBackgroundColor = "#9796ca";
@@ -641,7 +641,7 @@ class BannerNameRight extends Template {
 				this.foregroundColor = "#21274e";
 				this.backgroundColor = "#ffffff";
 				this.nameTextColor = "#ffffff";
-				// this.primaryTextHighlightColor = "#ffeda5";
+				// this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextColor = "#000000";
 				this.terciaryTextBackgroundColor = "#9796ca";
@@ -652,7 +652,7 @@ class BannerNameRight extends Template {
 				this.foregroundColor = "#ffffff";
 				this.backgroundColor = "#3e2a5b";
 				this.nameTextColor = "#ffffff";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextColor = "#000000";
 				this.terciaryTextBackgroundColor = "#e2d7a9";
@@ -663,7 +663,7 @@ class BannerNameRight extends Template {
 				this.foregroundColor = "#3e2a5b";
 				this.backgroundColor = "#ffffff";
 				this.nameTextColor = "#ffffff";
-				// this.primaryTextHighlightColor = "#ffeda5";
+				// this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextColor = "#000000";
 				this.terciaryTextBackgroundColor = "#e2d7a9";
@@ -685,7 +685,7 @@ class BannerNameRight extends Template {
 				this.foregroundColor = "#123172";
 				this.backgroundColor = "#ffffff";
 				this.nameTextColor = "#ffffff";
-				// this.primaryTextHighlightColor = "#ffeda5";
+				// this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextColor = "#123172";
 				this.terciaryTextBackgroundColor = "#cccccc";
@@ -696,7 +696,7 @@ class BannerNameRight extends Template {
 				this.foregroundColor = "#4d4d4d";
 				this.backgroundColor = "#ffd500";
 				this.nameTextColor = "#ffffff";
-				// this.primaryTextHighlightColor = "#ffeda5";
+				// this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextColor = "#4d4d4d";
 				this.terciaryTextBackgroundColor = "#ffffff";
@@ -729,7 +729,7 @@ class BannerNameRight extends Template {
 				this.foregroundColor = "#000000";
 				this.backgroundColor = "#ffd500";
 				this.nameTextColor = "#ffffff";
-				// this.primaryTextHighlightColor = "#ffeda5";
+				// this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextColor = "#000000";
 				this.terciaryTextBackgroundColor = "#ffffff";
@@ -852,7 +852,7 @@ class BannerNameRight extends Template {
 				this.terciaryTextColor = "#ffffff";
 				this.terciaryTextBackgroundColor = "#000000";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "novarole-green-on-black":
@@ -866,7 +866,7 @@ class BannerNameRight extends Template {
 				this.terciaryTextColor = "#000000";
 				this.terciaryTextBackgroundColor = "#ffffff";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "zeleni-melnik-yellow-name-rect":
diff --git a/generator/static/js/templates/billboard.js b/generator/static/js/templates/billboard.js
index 05b87f1e4ba3a66b56ea4a0318daae148445a1da..c4a527c16edfeace322a5ec79df2125547d851e5 100644
--- a/generator/static/js/templates/billboard.js
+++ b/generator/static/js/templates/billboard.js
@@ -477,7 +477,7 @@ class Billboard extends Template {
 				this.foregroundColor = "#ffffff";
 				this.backgroundColor = "#000000";
 				this.nameTextColor = "#ffffff";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				
 				break;
@@ -486,7 +486,7 @@ class Billboard extends Template {
 				this.foregroundColor = "#000000";
 				this.backgroundColor = "#ffffff";
 				this.nameTextColor = "#ffffff";
-				// this.primaryTextHighlightColor = "#ffeda5";
+				// this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				
 				break;
@@ -495,7 +495,7 @@ class Billboard extends Template {
 				this.foregroundColor = "#ffffff";
 				this.backgroundColor = "#962a51";
 				this.nameTextColor = "#ffffff";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				
 				break;
@@ -504,7 +504,7 @@ class Billboard extends Template {
 				this.foregroundColor = "#962a51";
 				this.backgroundColor = "#ffffff";
 				this.nameTextColor = "#ffffff";
-				// this.primaryTextHighlightColor = "#ffeda5";
+				// this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				
 				break;
@@ -513,7 +513,7 @@ class Billboard extends Template {
 				this.foregroundColor = "#ffffff";
 				this.backgroundColor = "#00ad43";
 				this.nameTextColor = "#ffffff";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				
 				break;
@@ -522,7 +522,7 @@ class Billboard extends Template {
 				this.foregroundColor = "#00ad43";
 				this.backgroundColor = "#ffffff";
 				this.nameTextColor = "#ffffff";
-				// this.primaryTextHighlightColor = "#ffeda5";
+				// this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				
 				break;
@@ -531,7 +531,7 @@ class Billboard extends Template {
 				this.foregroundColor = "#ffffff";
 				this.backgroundColor = "#21274e";
 				this.nameTextColor = "#ffffff";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				
 				break;
@@ -540,7 +540,7 @@ class Billboard extends Template {
 				this.foregroundColor = "#21274e";
 				this.backgroundColor = "#ffffff";
 				this.nameTextColor = "#ffffff";
-				// this.primaryTextHighlightColor = "#ffeda5";
+				// this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				
 				break;
@@ -549,7 +549,7 @@ class Billboard extends Template {
 				this.foregroundColor = "#ffffff";
 				this.backgroundColor = "#3e2a5b";
 				this.nameTextColor = "#ffffff";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				
 				break;
@@ -558,7 +558,7 @@ class Billboard extends Template {
 				this.foregroundColor = "#3e2a5b";
 				this.backgroundColor = "#ffffff";
 				this.nameTextColor = "#ffffff";
-				// this.primaryTextHighlightColor = "#ffeda5";
+				// this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				
 				break;
@@ -576,7 +576,7 @@ class Billboard extends Template {
 				this.foregroundColor = "#123172";
 				this.backgroundColor = "#ffffff";
 				this.nameTextColor = "#ffffff";
-				// this.primaryTextHighlightColor = "#ffeda5";
+				// this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				
 				break;
@@ -704,7 +704,7 @@ class Billboard extends Template {
 				this.nameTextColor = "#ffffff";
 				this.underNameTextColor = "#ffffff";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "novarole-green-on-black":
@@ -716,7 +716,7 @@ class Billboard extends Template {
 				this.nameTextColor = "#ffffff";
 				this.underNameTextColor = "#ffffff";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "zeleni-melnik-yellow-name-rect":
diff --git a/generator/static/js/templates/bottom-slogan-full-width.js b/generator/static/js/templates/bottom-slogan-full-width.js
index ecab06296fce45880e3705f5a57bcc913e808e59..902c56543df013967318e3bfec70d5909cac63a8 100644
--- a/generator/static/js/templates/bottom-slogan-full-width.js
+++ b/generator/static/js/templates/bottom-slogan-full-width.js
@@ -669,13 +669,13 @@ class BottomSloganFullWidth extends Template {
 			case "novarole-green-on-white":
 				this.primaryTextColor = "#000000";
 				this.foregroundColor = "#a9ce2d";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "novarole-green-on-black":
 				this.primaryTextColor = "#000000";
 				this.foregroundColor = "#a9ce2d";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "zeleni-melnik-yellow-name-rect":
@@ -697,7 +697,7 @@ class BottomSloganFullWidth extends Template {
 	async setPrimaryTextHighlightColorScheme(scheme, skipRedraw = false) {
 		switch(scheme) {
 			case "gold":
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				break;
 			case "litomerice":
 				this.primaryTextHighlightColor = "#afe87e";
diff --git a/generator/static/js/templates/bottom-slogan-person.js b/generator/static/js/templates/bottom-slogan-person.js
index 891d31869caacbee5472a185a9a108c579ba05b4..7734f3bfd73170e3e2654b32ba633e7dbf0a51ef 100644
--- a/generator/static/js/templates/bottom-slogan-person.js
+++ b/generator/static/js/templates/bottom-slogan-person.js
@@ -739,14 +739,14 @@ class BottomSloganPerson extends Template {
 				this.primaryTextColor = "#000000";
 				this.foregroundColor = "#a9ce2d";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "novarole-green-on-black":
 				this.primaryTextColor = "#000000";
 				this.foregroundColor = "#a9ce2d";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "zeleni-melnik-yellow-name-rect":
@@ -768,7 +768,7 @@ class BottomSloganPerson extends Template {
 	async setPrimaryTextHighlightColorScheme(scheme, skipRedraw = false) {
 		switch(scheme) {
 			case "gold":
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				break;
 			case "litomerice":
 				this.primaryTextHighlightColor = "#afe87e";
diff --git a/generator/static/js/templates/bottom-slogan.js b/generator/static/js/templates/bottom-slogan.js
index e364f0d60553798641574325e54abd8285f58abd..259b7badd36b5bdbb1c7e59024e7fe1071864c60 100644
--- a/generator/static/js/templates/bottom-slogan.js
+++ b/generator/static/js/templates/bottom-slogan.js
@@ -1112,7 +1112,7 @@ class BottomSloganTemplate extends Template {
 	async setPrimaryTextHighlightColorScheme(scheme, skipRedraw = false) {
 		switch(scheme) {
 			case "gold":
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				break;
 			case "litomerice":
 				this.primaryTextHighlightColor = "#afe87e";
diff --git a/generator/static/js/templates/cover-static-name-and-logo-left.js b/generator/static/js/templates/cover-static-name-and-logo-left.js
index f803580659da9d2b559af1556aad0e105ab363ac..822199a6d9c4c9bc332b9dab8c34f130da192585 100644
--- a/generator/static/js/templates/cover-static-name-and-logo-left.js
+++ b/generator/static/js/templates/cover-static-name-and-logo-left.js
@@ -640,7 +640,7 @@ class CoverStaticNameAndLogoLeft extends Template {
 				this.foregroundColor = "#ffffff";
 				this.backgroundColor = "#000000";
 				this.nameTextColor = "#ffffff";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextBackgroundColor = "#32948b";
 				this.terciaryTextColor = "#ffffff";
@@ -651,7 +651,7 @@ class CoverStaticNameAndLogoLeft extends Template {
 				this.foregroundColor = "#000000";
 				this.backgroundColor = "#ffffff";
 				this.nameTextColor = "#ffffff";
-				// this.primaryTextHighlightColor = "#ffeda5";
+				// this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextBackgroundColor = "#32948b";
 				this.terciaryTextColor = "#ffffff";
@@ -662,7 +662,7 @@ class CoverStaticNameAndLogoLeft extends Template {
 				this.foregroundColor = "#ffffff";
 				this.backgroundColor = "#962a51";
 				this.nameTextColor = "#ffffff";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextBackgroundColor = "#000000";
 				this.terciaryTextColor = "#ffffff";
@@ -673,7 +673,7 @@ class CoverStaticNameAndLogoLeft extends Template {
 				this.foregroundColor = "#962a51";
 				this.backgroundColor = "#ffffff";
 				this.nameTextColor = "#ffffff";
-				// this.primaryTextHighlightColor = "#ffeda5";
+				// this.primaryTextHighlightColor = "#ffcc00";
 				this.terciaryTextBackgroundColor = "#000000";
 				this.terciaryTextColor = "#ffffff";
 				
@@ -683,7 +683,7 @@ class CoverStaticNameAndLogoLeft extends Template {
 				this.foregroundColor = "#ffffff";
 				this.backgroundColor = "#00ad43";
 				this.nameTextColor = "#ffffff";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextBackgroundColor = "#000000";
 				this.terciaryTextColor = "#ffffff";
@@ -694,7 +694,7 @@ class CoverStaticNameAndLogoLeft extends Template {
 				this.foregroundColor = "#00ad43";
 				this.backgroundColor = "#ffffff";
 				this.nameTextColor = "#ffffff";
-				// this.primaryTextHighlightColor = "#ffeda5";
+				// this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextBackgroundColor = "#000000";
 				this.terciaryTextColor = "#ffffff";
@@ -705,7 +705,7 @@ class CoverStaticNameAndLogoLeft extends Template {
 				this.foregroundColor = "#ffffff";
 				this.backgroundColor = "#21274e";
 				this.nameTextColor = "#ffffff";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextBackgroundColor = "#9796ca";
 				this.terciaryTextColor = "#000000";
@@ -716,7 +716,7 @@ class CoverStaticNameAndLogoLeft extends Template {
 				this.foregroundColor = "#21274e";
 				this.backgroundColor = "#ffffff";
 				this.nameTextColor = "#ffffff";
-				// this.primaryTextHighlightColor = "#ffeda5";
+				// this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextBackgroundColor = "#9796ca";
 				this.terciaryTextColor = "#000000";
@@ -727,7 +727,7 @@ class CoverStaticNameAndLogoLeft extends Template {
 				this.foregroundColor = "#ffffff";
 				this.backgroundColor = "#3e2a5b";
 				this.nameTextColor = "#ffffff";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextBackgroundColor = "#e2d7a9";
 				this.terciaryTextColor = "#000000";
@@ -738,7 +738,7 @@ class CoverStaticNameAndLogoLeft extends Template {
 				this.foregroundColor = "#3e2a5b";
 				this.backgroundColor = "#ffffff";
 				this.nameTextColor = "#ffffff";
-				// this.primaryTextHighlightColor = "#ffeda5";
+				// this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextBackgroundColor = "#e2d7a9";
 				this.terciaryTextColor = "#000000";
@@ -760,7 +760,7 @@ class CoverStaticNameAndLogoLeft extends Template {
 				this.foregroundColor = "#123172";
 				this.backgroundColor = "#ffffff";
 				this.nameTextColor = "#ffffff";
-				// this.primaryTextHighlightColor = "#ffeda5";
+				// this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextBackgroundColor = "#cccccc";
 				this.terciaryTextColor = "#123172";
@@ -773,7 +773,7 @@ class CoverStaticNameAndLogoLeft extends Template {
 				this.foregroundColor = "#4d4d4d";
 				this.backgroundColor = "#ffd500";
 				this.nameTextColor = "#ffffff";
-				// this.primaryTextHighlightColor = "#ffeda5";
+				// this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextBackgroundColor = "#ffffff";
 				this.terciaryTextColor = "#4d4d4d";
@@ -784,7 +784,7 @@ class CoverStaticNameAndLogoLeft extends Template {
 				this.foregroundColor = "#000000";
 				this.backgroundColor = "#ffd500";
 				this.nameTextColor = "#ffffff";
-				// this.primaryTextHighlightColor = "#ffeda5";
+				// this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextBackgroundColor = "#ffffff";
 				this.terciaryTextColor = "#000000";
@@ -882,7 +882,7 @@ class CoverStaticNameAndLogoLeft extends Template {
 				this.terciaryTextBackgroundColor = "#000000";
 				this.terciaryTextColor = "#ffffff";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "novarole-green-on-black":
@@ -896,7 +896,7 @@ class CoverStaticNameAndLogoLeft extends Template {
 				this.terciaryTextBackgroundColor = "#ffffff";
 				this.terciaryTextColor = "#000000";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "zeleni-melnik-yellow-name-rect":
diff --git a/generator/static/js/templates/cover-static-name-and-logo.js b/generator/static/js/templates/cover-static-name-and-logo.js
index 28b7395638f694d1e61248ccfa13f26cba5f1c30..34d4be9bd36261f96b561ce2da11bd8f79c99aee 100644
--- a/generator/static/js/templates/cover-static-name-and-logo.js
+++ b/generator/static/js/templates/cover-static-name-and-logo.js
@@ -677,7 +677,7 @@ class CoverStaticNameAndLogo extends Template {
 				this.foregroundColor = "#ffffff";
 				this.backgroundColor = "#000000";
 				this.nameTextColor = "#ffffff";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextBackgroundColor = "#32948b";
 				this.terciaryTextColor = "#ffffff";
@@ -688,7 +688,7 @@ class CoverStaticNameAndLogo extends Template {
 				this.foregroundColor = "#000000";
 				this.backgroundColor = "#ffffff";
 				this.nameTextColor = "#ffffff";
-				// this.primaryTextHighlightColor = "#ffeda5";
+				// this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextBackgroundColor = "#32948b";
 				this.terciaryTextColor = "#ffffff";
@@ -699,7 +699,7 @@ class CoverStaticNameAndLogo extends Template {
 				this.foregroundColor = "#ffffff";
 				this.backgroundColor = "#962a51";
 				this.nameTextColor = "#ffffff";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextBackgroundColor = "#000000";
 				this.terciaryTextColor = "#ffffff";
@@ -710,7 +710,7 @@ class CoverStaticNameAndLogo extends Template {
 				this.foregroundColor = "#962a51";
 				this.backgroundColor = "#ffffff";
 				this.nameTextColor = "#ffffff";
-				// this.primaryTextHighlightColor = "#ffeda5";
+				// this.primaryTextHighlightColor = "#ffcc00";
 				this.terciaryTextBackgroundColor = "#000000";
 				this.terciaryTextColor = "#ffffff";
 				
@@ -720,7 +720,7 @@ class CoverStaticNameAndLogo extends Template {
 				this.foregroundColor = "#ffffff";
 				this.backgroundColor = "#00ad43";
 				this.nameTextColor = "#ffffff";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextBackgroundColor = "#000000";
 				this.terciaryTextColor = "#ffffff";
@@ -731,7 +731,7 @@ class CoverStaticNameAndLogo extends Template {
 				this.foregroundColor = "#00ad43";
 				this.backgroundColor = "#ffffff";
 				this.nameTextColor = "#ffffff";
-				// this.primaryTextHighlightColor = "#ffeda5";
+				// this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextBackgroundColor = "#000000";
 				this.terciaryTextColor = "#ffffff";
@@ -742,7 +742,7 @@ class CoverStaticNameAndLogo extends Template {
 				this.foregroundColor = "#ffffff";
 				this.backgroundColor = "#21274e";
 				this.nameTextColor = "#ffffff";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextBackgroundColor = "#9796ca";
 				this.terciaryTextColor = "#000000";
@@ -753,7 +753,7 @@ class CoverStaticNameAndLogo extends Template {
 				this.foregroundColor = "#21274e";
 				this.backgroundColor = "#ffffff";
 				this.nameTextColor = "#ffffff";
-				// this.primaryTextHighlightColor = "#ffeda5";
+				// this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextBackgroundColor = "#9796ca";
 				this.terciaryTextColor = "#000000";
@@ -764,7 +764,7 @@ class CoverStaticNameAndLogo extends Template {
 				this.foregroundColor = "#ffffff";
 				this.backgroundColor = "#3e2a5b";
 				this.nameTextColor = "#ffffff";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextBackgroundColor = "#e2d7a9";
 				this.terciaryTextColor = "#000000";
@@ -775,7 +775,7 @@ class CoverStaticNameAndLogo extends Template {
 				this.foregroundColor = "#3e2a5b";
 				this.backgroundColor = "#ffffff";
 				this.nameTextColor = "#ffffff";
-				// this.primaryTextHighlightColor = "#ffeda5";
+				// this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextBackgroundColor = "#e2d7a9";
 				this.terciaryTextColor = "#000000";
@@ -797,7 +797,7 @@ class CoverStaticNameAndLogo extends Template {
 				this.foregroundColor = "#123172";
 				this.backgroundColor = "#ffffff";
 				this.nameTextColor = "#ffffff";
-				// this.primaryTextHighlightColor = "#ffeda5";
+				// this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextBackgroundColor = "#cccccc";
 				this.terciaryTextColor = "#123172";
@@ -810,7 +810,7 @@ class CoverStaticNameAndLogo extends Template {
 				this.foregroundColor = "#4d4d4d";
 				this.backgroundColor = "#ffd500";
 				this.nameTextColor = "#ffffff";
-				// this.primaryTextHighlightColor = "#ffeda5";
+				// this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextBackgroundColor = "#ffffff";
 				this.terciaryTextColor = "#4d4d4d";
@@ -821,7 +821,7 @@ class CoverStaticNameAndLogo extends Template {
 				this.foregroundColor = "#000000";
 				this.backgroundColor = "#ffd500";
 				this.nameTextColor = "#ffffff";
-				// this.primaryTextHighlightColor = "#ffeda5";
+				// this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextBackgroundColor = "#ffffff";
 				this.terciaryTextColor = "#000000";
@@ -919,7 +919,7 @@ class CoverStaticNameAndLogo extends Template {
 				this.terciaryTextBackgroundColor = "#000000";
 				this.terciaryTextColor = "#ffffff";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "novarole-green-on-black":
@@ -933,7 +933,7 @@ class CoverStaticNameAndLogo extends Template {
 				this.terciaryTextBackgroundColor = "#ffffff";
 				this.terciaryTextColor = "#000000";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "zeleni-melnik-yellow-name-rect":
diff --git a/generator/static/js/templates/cover.js b/generator/static/js/templates/cover.js
index 6b425e9cf2a645bc6e51e58e03a30ba38cc2d924..fb62c27699fbbd39683b0f102997bdc0e91a4c7b 100644
--- a/generator/static/js/templates/cover.js
+++ b/generator/static/js/templates/cover.js
@@ -684,7 +684,7 @@ class Cover extends Template {
 				this.foregroundColor = "#ffffff";
 				this.backgroundColor = "#000000";
 				this.nameTextColor = "#ffffff";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextBackgroundColor = "#32948b";
 				this.terciaryTextColor = "#ffffff";
@@ -695,7 +695,7 @@ class Cover extends Template {
 				this.foregroundColor = "#000000";
 				this.backgroundColor = "#ffffff";
 				this.nameTextColor = "#ffffff";
-				// this.primaryTextHighlightColor = "#ffeda5";
+				// this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextBackgroundColor = "#32948b";
 				this.terciaryTextColor = "#ffffff";
@@ -706,7 +706,7 @@ class Cover extends Template {
 				this.foregroundColor = "#ffffff";
 				this.backgroundColor = "#962a51";
 				this.nameTextColor = "#ffffff";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextBackgroundColor = "#000000";
 				this.terciaryTextColor = "#ffffff";
@@ -717,7 +717,7 @@ class Cover extends Template {
 				this.foregroundColor = "#962a51";
 				this.backgroundColor = "#ffffff";
 				this.nameTextColor = "#ffffff";
-				// this.primaryTextHighlightColor = "#ffeda5";
+				// this.primaryTextHighlightColor = "#ffcc00";
 				this.terciaryTextBackgroundColor = "#000000";
 				this.terciaryTextColor = "#ffffff";
 				
@@ -727,7 +727,7 @@ class Cover extends Template {
 				this.foregroundColor = "#ffffff";
 				this.backgroundColor = "#00ad43";
 				this.nameTextColor = "#ffffff";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextBackgroundColor = "#000000";
 				this.terciaryTextColor = "#ffffff";
@@ -738,7 +738,7 @@ class Cover extends Template {
 				this.foregroundColor = "#00ad43";
 				this.backgroundColor = "#ffffff";
 				this.nameTextColor = "#ffffff";
-				// this.primaryTextHighlightColor = "#ffeda5";
+				// this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextBackgroundColor = "#000000";
 				this.terciaryTextColor = "#ffffff";
@@ -749,7 +749,7 @@ class Cover extends Template {
 				this.foregroundColor = "#ffffff";
 				this.backgroundColor = "#21274e";
 				this.nameTextColor = "#ffffff";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextBackgroundColor = "#9796ca";
 				this.terciaryTextColor = "#000000";
@@ -760,7 +760,7 @@ class Cover extends Template {
 				this.foregroundColor = "#21274e";
 				this.backgroundColor = "#ffffff";
 				this.nameTextColor = "#ffffff";
-				// this.primaryTextHighlightColor = "#ffeda5";
+				// this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextBackgroundColor = "#9796ca";
 				this.terciaryTextColor = "#000000";
@@ -771,7 +771,7 @@ class Cover extends Template {
 				this.foregroundColor = "#ffffff";
 				this.backgroundColor = "#3e2a5b";
 				this.nameTextColor = "#ffffff";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextBackgroundColor = "#e2d7a9";
 				this.terciaryTextColor = "#000000";
@@ -782,7 +782,7 @@ class Cover extends Template {
 				this.foregroundColor = "#3e2a5b";
 				this.backgroundColor = "#ffffff";
 				this.nameTextColor = "#ffffff";
-				// this.primaryTextHighlightColor = "#ffeda5";
+				// this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextBackgroundColor = "#e2d7a9";
 				this.terciaryTextColor = "#000000";
@@ -804,7 +804,7 @@ class Cover extends Template {
 				this.foregroundColor = "#123172";
 				this.backgroundColor = "#ffffff";
 				this.nameTextColor = "#ffffff";
-				// this.primaryTextHighlightColor = "#ffeda5";
+				// this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextBackgroundColor = "#cccccc";
 				this.terciaryTextColor = "#123172";
@@ -815,7 +815,7 @@ class Cover extends Template {
 				this.foregroundColor = "#4d4d4d";
 				this.backgroundColor = "#ffd500";
 				this.nameTextColor = "#ffffff";
-				// this.primaryTextHighlightColor = "#ffeda5";
+				// this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextBackgroundColor = "#ffffff";
 				this.terciaryTextColor = "#4d4d4d";
@@ -837,7 +837,7 @@ class Cover extends Template {
 				this.foregroundColor = "#ffffff";
 				this.backgroundColor = "#ffd500";
 				this.nameTextColor = "#ffffff";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextBackgroundColor = "#4d4d4d";
 				this.terciaryTextColor = "#ffffff";
@@ -848,7 +848,7 @@ class Cover extends Template {
 				this.foregroundColor = "#000000";
 				this.backgroundColor = "#ffd500";
 				this.nameTextColor = "#ffffff";
-				// this.primaryTextHighlightColor = "#ffeda5";
+				// this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextBackgroundColor = "#ffffff";
 				this.terciaryTextColor = "#000000";
@@ -870,7 +870,7 @@ class Cover extends Template {
 				this.foregroundColor = "#ffffff";
 				this.backgroundColor = "#ffd500";
 				this.nameTextColor = "#ffffff";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				this.terciaryTextBackgroundColor = "#000000";
 				this.terciaryTextColor = "#ffffff";
@@ -967,7 +967,7 @@ class Cover extends Template {
 				this.terciaryTextBackgroundColor = "#000000";
 				this.terciaryTextColor = "#ffffff";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "novarole-green-on-black":
@@ -981,7 +981,7 @@ class Cover extends Template {
 				this.terciaryTextBackgroundColor = "#ffffff";
 				this.terciaryTextColor = "#000000";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "zeleni-melnik-yellow-name-rect":
diff --git a/generator/static/js/templates/eu-big-text-image.js b/generator/static/js/templates/eu-big-text-image.js
index 92f48389c0eac6cb850cb3f8b4e09f521771a3aa..da49a6a09b0ecc1f14d40a95cacb2ce523ae4a49 100644
--- a/generator/static/js/templates/eu-big-text-image.js
+++ b/generator/static/js/templates/eu-big-text-image.js
@@ -766,7 +766,7 @@ class EuBigTextImage extends Template {
 				this.foregroundColor = "#a9ce2d";
 				this.secondaryTextColor = "#000000";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "novarole-green-on-black":
@@ -774,7 +774,7 @@ class EuBigTextImage extends Template {
 				this.foregroundColor = "#a9ce2d";
 				this.secondaryTextColor = "#000000";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "zeleni-melnik-yellow-name-rect":
@@ -796,7 +796,7 @@ class EuBigTextImage extends Template {
 	async setPrimaryTextHighlightColorScheme(scheme, skipRedraw = false) {
 		switch(scheme) {
 			case "gold":
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				break;
 			case "litomerice":
 				this.primaryTextHighlightColor = "#afe87e";
diff --git a/generator/static/js/templates/eu-icons-image.js b/generator/static/js/templates/eu-icons-image.js
index c25516a80c937197b65ce54f89528880edb2f560..27b1f24285efe7d5c28b0063fa1d07b00f7480b9 100644
--- a/generator/static/js/templates/eu-icons-image.js
+++ b/generator/static/js/templates/eu-icons-image.js
@@ -901,7 +901,7 @@ class EuIconsImage extends Template {
 				this.foregroundColor = "#a9ce2d";
 				this.secondaryTextColor = "#000000";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "novarole-green-on-black":
@@ -909,7 +909,7 @@ class EuIconsImage extends Template {
 				this.foregroundColor = "#a9ce2d";
 				this.secondaryTextColor = "#000000";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "zeleni-melnik-yellow-name-rect":
@@ -931,7 +931,7 @@ class EuIconsImage extends Template {
 	async setPrimaryTextHighlightColorScheme(scheme, skipRedraw = false) {
 		switch(scheme) {
 			case "gold":
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				break;
 			case "litomerice":
 				this.primaryTextHighlightColor = "#afe87e";
diff --git a/generator/static/js/templates/eu-image-slogan.js b/generator/static/js/templates/eu-image-slogan.js
index 302956b7b7581e57ed50e2eba2cb1ae6e1b30456..de927fd512bb056d3a2ea9121154a8287c8d2125 100644
--- a/generator/static/js/templates/eu-image-slogan.js
+++ b/generator/static/js/templates/eu-image-slogan.js
@@ -810,7 +810,7 @@ class EuImageSlogan extends Template {
 				this.foregroundColor = "#a9ce2d";
 				this.secondaryTextColor = "#000000";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "novarole-green-on-black":
@@ -818,7 +818,7 @@ class EuImageSlogan extends Template {
 				this.foregroundColor = "#a9ce2d";
 				this.secondaryTextColor = "#000000";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "zeleni-melnik-yellow-name-rect":
@@ -840,7 +840,7 @@ class EuImageSlogan extends Template {
 	async setPrimaryTextHighlightColorScheme(scheme, skipRedraw = false) {
 		switch(scheme) {
 			case "gold":
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				break;
 			case "litomerice":
 				this.primaryTextHighlightColor = "#afe87e";
diff --git a/generator/static/js/templates/event-text-bottom.js b/generator/static/js/templates/event-text-bottom.js
index 1d5faed32148d99825fb14c102c9acb6d71459ca..2c2b040743d94ce28def3c2217d44c7ac8321d9d 100644
--- a/generator/static/js/templates/event-text-bottom.js
+++ b/generator/static/js/templates/event-text-bottom.js
@@ -899,7 +899,7 @@ class EventTextBottom extends Template {
 				this.iconColor = "#ffffff";
 				this.foregroundColor = "#ffffff";
 				this.backgroundColor = "#000000";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				this.setNameColorScheme("white-on-black", true);
 				
@@ -920,7 +920,7 @@ class EventTextBottom extends Template {
 				this.iconColor = "#ffffff";
 				this.foregroundColor = "#ffffff";
 				this.backgroundColor = "#962a51";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				break;
 			case "forum-white-on-purple":
 				this.primaryTextColor = "#ffffff";
@@ -955,7 +955,7 @@ class EventTextBottom extends Template {
 				this.iconColor = "#ffffff";
 				this.foregroundColor = "#ffffff";
 				this.backgroundColor = "#21274e";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				this.setNameColorScheme("pirati-spolecne", true);
 				
@@ -976,7 +976,7 @@ class EventTextBottom extends Template {
 				this.iconColor = "#ffffff";
 				this.foregroundColor = "#ffffff";
 				this.backgroundColor = "#3e2a5b";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				this.nameBackgroundColor = "#e2d7a9";
 				this.nameTextColor = "#000000";
 				
@@ -987,7 +987,7 @@ class EventTextBottom extends Template {
 				this.iconColor = "#000000";
 				this.foregroundColor = "#3e2a5b";
 				this.backgroundColor = "#ffffff";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				this.nameBackgroundColor = "#e2d7a9";
 				this.nameTextColor = "#000000";
 				
@@ -1168,7 +1168,7 @@ class EventTextBottom extends Template {
 				this.nameBackgroundColor = "#ffffff";
 				this.nameTextColor = "#000000";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "novarole-green-on-black":
@@ -1182,7 +1182,7 @@ class EventTextBottom extends Template {
 				this.nameBackgroundColor = "#ffffff";
 				this.nameTextColor = "#000000";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "zeleni-melnik-yellow-name-rect":
diff --git a/generator/static/js/templates/event-text-right.js b/generator/static/js/templates/event-text-right.js
index 769f92efac77476e29ff6013fa08be452472e91c..3689f7e59f6fcfaa9328f1aa5d0f3bd96a21cf21 100644
--- a/generator/static/js/templates/event-text-right.js
+++ b/generator/static/js/templates/event-text-right.js
@@ -877,7 +877,7 @@ class EventTextRight extends Template {
 				this.primaryTextColor = "#000000";
 				this.foregroundColor = "#ffffff";
 				this.backgroundColor = "#000000";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "white-on-black":
@@ -890,7 +890,7 @@ class EventTextRight extends Template {
 				this.primaryTextColor = "#000000";
 				this.foregroundColor = "#ffffff";
 				this.backgroundColor = "#962a51";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "forum-white-on-purple":
@@ -903,7 +903,7 @@ class EventTextRight extends Template {
 				this.primaryTextColor = "#000000";
 				this.foregroundColor = "#ffffff";
 				this.backgroundColor = "#00ad43";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "zeleni-volary-bystrc-most-white-on-green":
@@ -916,7 +916,7 @@ class EventTextRight extends Template {
 				this.primaryTextColor = "#000000";
 				this.foregroundColor = "#ffffff";
 				this.backgroundColor = "#21274e";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "spolecne-s-piraty-white-on-blue":
@@ -929,7 +929,7 @@ class EventTextRight extends Template {
 				this.primaryTextColor = "#000000";
 				this.foregroundColor = "#ffffff";
 				this.backgroundColor = "#3e2a5b";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "louny-spolecne-white-on-purple":
@@ -1041,7 +1041,7 @@ class EventTextRight extends Template {
 				this.foregroundColor = "#a9ce2d";
 				this.backgroundColor = "#ffffff";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "novarole-green-on-black":
@@ -1049,7 +1049,7 @@ class EventTextRight extends Template {
 				this.foregroundColor = "#a9ce2d";
 				this.backgroundColor = "#000000";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "zeleni-melnik-yellow-name-rect":
diff --git a/generator/static/js/templates/humans-no-quotes.js b/generator/static/js/templates/humans-no-quotes.js
index 2df2a95d611443f3e2d152e590a610f118ad1e1d..2462f40293002e616b330f0fc520ca74e9f4265e 100644
--- a/generator/static/js/templates/humans-no-quotes.js
+++ b/generator/static/js/templates/humans-no-quotes.js
@@ -21,7 +21,7 @@ class HumansNoQuote extends Template {
 	secondaryText = "";
 
 	primaryTextColor = "#ffffff";
-	primaryTextHighlightColor = "#ffeda5";
+	primaryTextHighlightColor = "#ffcc00";
 	foregroundColor = "#000000";
 	nameTextColor = "#ffffff";
 	requesterTextColor = "#000000";
diff --git a/generator/static/js/templates/humans.js b/generator/static/js/templates/humans.js
index 200b14babe6036d2870e64e5bee2c1e301fc5408..b73b5996e25ff02df7e31bd7c6a3082542357755 100644
--- a/generator/static/js/templates/humans.js
+++ b/generator/static/js/templates/humans.js
@@ -18,7 +18,7 @@ class Humans extends Template {
 	];
 
 	primaryTextColor = "#ffffff";
-	primaryTextHighlightColor = "#ffeda5";
+	primaryTextHighlightColor = "#ffcc00";
 	foregroundColor = "#000000";
 	nameTextColor = "#ffffff";
 	requesterTextColor = "#000000";
diff --git a/generator/static/js/templates/komise-story.js b/generator/static/js/templates/komise-story.js
index 51d838ce12b56bcf6f59a0d3c39a487bca40808b..e6e0ee49cd6a170e04e2613dcc63902decfb82ca 100644
--- a/generator/static/js/templates/komise-story.js
+++ b/generator/static/js/templates/komise-story.js
@@ -747,7 +747,7 @@ class KomiseStory extends Template {
 				this.secondaryTextColor = "#ffffff";
 				this.foregroundColor = "#a9ce2d";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "novarole-green-on-black":
@@ -755,7 +755,7 @@ class KomiseStory extends Template {
 				this.secondaryTextColor = "#ffffff";
 				this.foregroundColor = "#a9ce2d";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "zeleni-melnik-yellow-name-rect":
@@ -777,7 +777,7 @@ class KomiseStory extends Template {
 	async setPrimaryTextHighlightColorScheme(scheme, skipRedraw = false) {
 		switch(scheme) {
 			case "gold":
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				break;
 			case "litomerice":
 				this.primaryTextHighlightColor = "#afe87e";
diff --git a/generator/static/js/templates/komise.js b/generator/static/js/templates/komise.js
index cecbdbd6f7262ebc8976497ed915d99061089655..98d4c68772b61b231e1336f75c7a363e920fe122 100644
--- a/generator/static/js/templates/komise.js
+++ b/generator/static/js/templates/komise.js
@@ -805,7 +805,7 @@ class Komise extends Template {
 				this.secondaryTextColor = "#ffffff";
 				this.foregroundColor = "#a9ce2d";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "novarole-green-on-black":
@@ -813,7 +813,7 @@ class Komise extends Template {
 				this.secondaryTextColor = "#ffffff";
 				this.foregroundColor = "#a9ce2d";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "zeleni-melnik-yellow-name-rect":
@@ -835,7 +835,7 @@ class Komise extends Template {
 	async setPrimaryTextHighlightColorScheme(scheme, skipRedraw = false) {
 		switch(scheme) {
 			case "gold":
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				break;
 			case "litomerice":
 				this.primaryTextHighlightColor = "#afe87e";
diff --git a/generator/static/js/templates/koneckorupci-poll.js b/generator/static/js/templates/koneckorupci-poll.js
index 82c84371fe85846266f091b6283dff65f479d6a2..c9c2c0f56ccecda49e75eec2e3eb435ae49354dc 100644
--- a/generator/static/js/templates/koneckorupci-poll.js
+++ b/generator/static/js/templates/koneckorupci-poll.js
@@ -735,14 +735,14 @@ class KonecKorupciPoll extends Template {
 				this.reactionTextColor = "#000000";
 				this.foregroundColor = "#a9ce2d";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "novarole-green-on-black":
 				this.reactionTextColor = "#000000";
 				this.foregroundColor = "#a9ce2d";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "zeleni-melnik-yellow-name-rect":
diff --git a/generator/static/js/templates/left-corner-slogan.js b/generator/static/js/templates/left-corner-slogan.js
index 8865f980f5ff1d16d581fd2b1a125c1cf859246d..a040442d442dcefbccc8838c228b7640aec59dc7 100644
--- a/generator/static/js/templates/left-corner-slogan.js
+++ b/generator/static/js/templates/left-corner-slogan.js
@@ -1057,7 +1057,7 @@ class LeftCornerSloganTemplate extends Template {
 				this.foregroundColor = "#ffffff";
 				this.backgroundColor = "#000000";
 				this.secondaryTextColor = "#ffffff";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "white-on-black":
@@ -1065,7 +1065,7 @@ class LeftCornerSloganTemplate extends Template {
 				this.foregroundColor = "#000000";
 				this.backgroundColor = "#ffffff";
 				this.secondaryTextColor = "#000000";
-				// this.primaryTextHighlightColor = "#ffeda5";
+				// this.primaryTextHighlightColor = "#ffcc00";
 				this.underNameTextColor = "#ffffff";
 				
 				break;
@@ -1074,7 +1074,7 @@ class LeftCornerSloganTemplate extends Template {
 				this.foregroundColor = "#ffffff";
 				this.backgroundColor = "#962a51";
 				this.secondaryTextColor = "#ffffff";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "forum-white-on-purple":
@@ -1082,7 +1082,7 @@ class LeftCornerSloganTemplate extends Template {
 				this.foregroundColor = "#962a51";
 				this.backgroundColor = "#ffffff";
 				this.secondaryTextColor = "#000000";
-				// this.primaryTextHighlightColor = "#ffeda5";
+				// this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "zeleni-volary-bystrc-most-black-on-white":
@@ -1090,7 +1090,7 @@ class LeftCornerSloganTemplate extends Template {
 				this.foregroundColor = "#ffffff";
 				this.backgroundColor = "#00ad43";
 				this.secondaryTextColor = "#ffffff";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "zeleni-volary-bystrc-most-white-on-green":
@@ -1098,7 +1098,7 @@ class LeftCornerSloganTemplate extends Template {
 				this.foregroundColor = "#00ad43";
 				this.backgroundColor = "#ffffff";
 				this.secondaryTextColor = "#000000";
-				// this.primaryTextHighlightColor = "#ffeda5";
+				// this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "spolecne-s-piraty-black-on-white":
@@ -1106,7 +1106,7 @@ class LeftCornerSloganTemplate extends Template {
 				this.foregroundColor = "#ffffff";
 				this.backgroundColor = "#21274e";
 				this.secondaryTextColor = "#ffffff";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "spolecne-s-piraty-white-on-blue":
@@ -1114,7 +1114,7 @@ class LeftCornerSloganTemplate extends Template {
 				this.foregroundColor = "#21274e";
 				this.backgroundColor = "#ffffff";
 				this.secondaryTextColor = "#000000";
-				// this.primaryTextHighlightColor = "#ffeda5";
+				// this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "louny-spolecne-black-on-white":
@@ -1122,7 +1122,7 @@ class LeftCornerSloganTemplate extends Template {
 				this.foregroundColor = "#ffffff";
 				this.backgroundColor = "#3e2a5b";
 				this.secondaryTextColor = "#ffffff";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "louny-spolecne-white-on-purple":
@@ -1130,7 +1130,7 @@ class LeftCornerSloganTemplate extends Template {
 				this.foregroundColor = "#3e2a5b";
 				this.backgroundColor = "#ffffff";
 				this.secondaryTextColor = "#000000";
-				// this.primaryTextHighlightColor = "#ffeda5";
+				// this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "litomerice-blue-on-white":
@@ -1146,7 +1146,7 @@ class LeftCornerSloganTemplate extends Template {
 				this.foregroundColor = "#123172";
 				this.backgroundColor = "#ffffff";
 				this.secondaryTextColor = "#123172";
-				// this.primaryTextHighlightColor = "#ffeda5";
+				// this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "stranane-gray-on-yellow":
@@ -1154,7 +1154,7 @@ class LeftCornerSloganTemplate extends Template {
 				this.foregroundColor = "#4d4d4d";
 				this.backgroundColor = "#ffd500";
 				this.secondaryTextColor = "#4d4d4d";
-				// this.primaryTextHighlightColor = "#ffeda5";
+				// this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "stranane-yellow-on-white":
@@ -1178,7 +1178,7 @@ class LeftCornerSloganTemplate extends Template {
 				this.foregroundColor = "#000000";
 				this.backgroundColor = "#ffd500";
 				this.secondaryTextColor = "#000000";
-				// this.primaryTextHighlightColor = "#ffeda5";
+				// this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "prusanky-yellow-on-white":
@@ -1255,7 +1255,7 @@ class LeftCornerSloganTemplate extends Template {
 				this.backgroundColor = "#ffffff";
 				this.secondaryTextColor = "#000000";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "novarole-green-on-black":
@@ -1264,7 +1264,7 @@ class LeftCornerSloganTemplate extends Template {
 				this.backgroundColor = "#000000";
 				this.secondaryTextColor = "#ffffff";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "zeleni-melnik-yellow-name-rect":
diff --git a/generator/static/js/templates/left-long-text.js b/generator/static/js/templates/left-long-text.js
index a8bc1f86f645419ae7dfcac02f5296f996a5a856..712a44db78839e51f1c7ed952ff3c19a931a34df 100644
--- a/generator/static/js/templates/left-long-text.js
+++ b/generator/static/js/templates/left-long-text.js
@@ -641,7 +641,7 @@ class LeftLongTextTemplate extends Template {
 				this.foregroundColor = "#a9ce2d";
 				this.backgroundColor = "#ffffff";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "novarole-green-on-black":
@@ -651,7 +651,7 @@ class LeftLongTextTemplate extends Template {
 				this.foregroundColor = "#a9ce2d";
 				this.backgroundColor = "#000000";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "zeleni-melnik-yellow-name-rect":
@@ -673,7 +673,7 @@ class LeftLongTextTemplate extends Template {
 	async setSecondaryTextHighlightColorScheme(scheme, skipRedraw = false) {
 		switch(scheme) {
 			case "gold":
-				this.secondaryTextHighlightColor = "#ffeda5";
+				this.secondaryTextHighlightColor = "#ffcc00";
 				break;
 			case "litomerice":
 				this.secondaryTextHighlightColor = "#afe87e";
diff --git a/generator/static/js/templates/nalodeni-story.js b/generator/static/js/templates/nalodeni-story.js
index 149c56dcec8739df136adea2c9384ca69567549a..6c3cedbdebe5eaf702e1ae1257c0d248f0867333 100644
--- a/generator/static/js/templates/nalodeni-story.js
+++ b/generator/static/js/templates/nalodeni-story.js
@@ -801,7 +801,7 @@ class NalodeniStory extends Template {
 				this.secondaryTextColor = "#ffffff";
 				this.foregroundColor = "#a9ce2d";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "novarole-green-on-black":
@@ -809,7 +809,7 @@ class NalodeniStory extends Template {
 				this.secondaryTextColor = "#ffffff";
 				this.foregroundColor = "#a9ce2d";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "zeleni-melnik-yellow-name-rect":
@@ -831,7 +831,7 @@ class NalodeniStory extends Template {
 	async setPrimaryTextHighlightColorScheme(scheme, skipRedraw = false) {
 		switch(scheme) {
 			case "gold":
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				break;
 			case "litomerice":
 				this.primaryTextHighlightColor = "#afe87e";
diff --git a/generator/static/js/templates/nalodeni.js b/generator/static/js/templates/nalodeni.js
index 75775d824b1d6818b1daba62982a96c53db88d74..816e4dc37f0adb36b1863e96d3db2d38c171a897 100644
--- a/generator/static/js/templates/nalodeni.js
+++ b/generator/static/js/templates/nalodeni.js
@@ -850,7 +850,7 @@ class Nalodeni extends Template {
 				this.secondaryTextColor = "#ffffff";
 				this.foregroundColor = "#a9ce2d";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "novarole-green-on-black":
@@ -858,7 +858,7 @@ class Nalodeni extends Template {
 				this.secondaryTextColor = "#ffffff";
 				this.foregroundColor = "#a9ce2d";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "zeleni-melnik-yellow-name-rect":
@@ -880,7 +880,7 @@ class Nalodeni extends Template {
 	async setPrimaryTextHighlightColorScheme(scheme, skipRedraw = false) {
 		switch(scheme) {
 			case "gold":
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				break;
 			case "litomerice":
 				this.primaryTextHighlightColor = "#afe87e";
diff --git a/generator/static/js/templates/no-image-big-text-icon-with-terciary.js b/generator/static/js/templates/no-image-big-text-icon-with-terciary.js
index 911f55f2dcafcb753da5ea1e7702aca2347e7f39..465448ef62307c59241f62fcb148bb4de14cd283 100644
--- a/generator/static/js/templates/no-image-big-text-icon-with-terciary.js
+++ b/generator/static/js/templates/no-image-big-text-icon-with-terciary.js
@@ -784,7 +784,7 @@ class NoImageBigTextIconWithTerciary extends Template {
 				this.secondaryTextBackgroundColor = "#ffffff";
 				this.secondaryTextColor = "#000000";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "novarole-green-on-black":
@@ -793,7 +793,7 @@ class NoImageBigTextIconWithTerciary extends Template {
 				this.secondaryTextBackgroundColor = "#a9ce2d";
 				this.secondaryTextColor = "#000000";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "zeleni-melnik-yellow-name-rect":
@@ -890,7 +890,7 @@ class NoImageBigTextIconWithTerciary extends Template {
 	async setPrimaryTextHighlightColorScheme(scheme, skipRedraw = false) {
 		switch(scheme) {
 			case "gold":
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				break;
 			case "litomerice":
 				this.secondaryTextHighlightColor = "#afe87e";
diff --git a/generator/static/js/templates/no-image-big-text-icon.js b/generator/static/js/templates/no-image-big-text-icon.js
index 168ed59ac8225bd14296a9afd38761f2a9a47389..bc2b62d86aaa636d7f61bb3e9872ca0a2444bca9 100644
--- a/generator/static/js/templates/no-image-big-text-icon.js
+++ b/generator/static/js/templates/no-image-big-text-icon.js
@@ -553,7 +553,7 @@ class NoImageBigTextIcon extends Template {
 				this.primaryTextColor = "#52d7cb";
 				this.secondaryTextColor = "#ffffff";
 				this.foregroundColor ="#000000";
-				this.terciaryTextBackgroundColor = "#ffeda5";
+				this.terciaryTextBackgroundColor = "#ffcc00";
 				this.terciaryTextColor = "#000000";
 				
 				break;
@@ -751,7 +751,7 @@ class NoImageBigTextIcon extends Template {
 				this.terciaryTextBackgroundColor = "#ffffff";
 				this.terciaryTextColor = "#000000";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "novarole-green-on-black":
@@ -761,7 +761,7 @@ class NoImageBigTextIcon extends Template {
 				this.terciaryTextBackgroundColor = "#a9ce2d";
 				this.terciaryTextColor = "#000000";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "zeleni-melnik-yellow-name-rect":
@@ -786,7 +786,7 @@ class NoImageBigTextIcon extends Template {
 	async setPrimaryTextHighlightColorScheme(scheme, skipRedraw = false) {
 		switch(scheme) {
 			case "gold":
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				break;
 			case "litomerice":
 				this.terciaryTextHighlightColor = "#afe87e";
diff --git a/generator/static/js/templates/no-image-icon-text.js b/generator/static/js/templates/no-image-icon-text.js
index 2d9f017d1c85b9146351f44637cadd47aa14a3ac..c9b18846c17040fd13719dfd6c9c272a48e6816f 100644
--- a/generator/static/js/templates/no-image-icon-text.js
+++ b/generator/static/js/templates/no-image-icon-text.js
@@ -558,14 +558,14 @@ class NoImageIconText extends Template {
 				this.primaryTextColor = "#000000";
 				this.foregroundColor = "#a9ce2d";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "novarole-green-on-black":
 				this.primaryTextColor = "#a9ce2d";
 				this.foregroundColor = "#000000";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "zeleni-melnik-yellow-name-rect":
@@ -587,7 +587,7 @@ class NoImageIconText extends Template {
 	async setPrimaryTextHighlightColorScheme(scheme, skipRedraw = false) {
 		switch(scheme) {
 			case "gold":
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				break;
 			case "litomerice":
 				this.primaryTextHighlightColor = "#afe87e";
diff --git a/generator/static/js/templates/no-image-quote.js b/generator/static/js/templates/no-image-quote.js
index 4527b2ec614c4886cdfa902bed8d4b00d946a47c..a1241b83d6b198d65bf5d3c46b388af17ee16945 100644
--- a/generator/static/js/templates/no-image-quote.js
+++ b/generator/static/js/templates/no-image-quote.js
@@ -795,7 +795,7 @@ class NoImageQuote extends Template {
 				this.nameBackgroundColor = "#000000";
 				this.nameTextColor = "#ffffff";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "novarole-green-on-black":
@@ -806,7 +806,7 @@ class NoImageQuote extends Template {
 				this.nameBackgroundColor = "#ffffff";
 				this.nameTextColor = "#000000";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "zeleni-melnik-yellow-name-rect":
@@ -871,7 +871,7 @@ class NoImageQuote extends Template {
 	async setPrimaryTextHighlightColorScheme(scheme, skipRedraw = false) {
 		switch(scheme) {
 			case "gold":
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				break;
 			case "litomerice":
 				this.primaryTextHighlightColor = "#afe87e";
diff --git a/generator/static/js/templates/no-image-text-icon-vertical-logo.js b/generator/static/js/templates/no-image-text-icon-vertical-logo.js
index 31273ba65ad0db49243610dd7e06206f8a2634b0..98d65dcbf2b860649c7c35eab826da949d266109 100644
--- a/generator/static/js/templates/no-image-text-icon-vertical-logo.js
+++ b/generator/static/js/templates/no-image-text-icon-vertical-logo.js
@@ -489,7 +489,7 @@ class NoImageTextIconVerticalLogo extends Template {
 				this.nameTextColor = "#000000";
 				this.primaryTextColor = "#000000";
 				this.iconColor = "#000000";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "white-on-black":
@@ -498,7 +498,7 @@ class NoImageTextIconVerticalLogo extends Template {
 				this.nameTextColor = "#ffffff";
 				this.primaryTextColor = "#ffffff";
 				this.iconColor = "#ffffff";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "forum-black-on-white":
@@ -507,7 +507,7 @@ class NoImageTextIconVerticalLogo extends Template {
 				this.nameTextColor = "#000000";
 				this.primaryTextColor = "#ffffff";
 				this.iconColor = "#ffffff";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "forum-white-on-purple":
@@ -516,7 +516,7 @@ class NoImageTextIconVerticalLogo extends Template {
 				this.nameTextColor = "#000000";
 				this.primaryTextColor = "#962a51";
 				this.iconColor = "#962a51";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "zeleni-volary-bystrc-most-black-on-white":
@@ -525,7 +525,7 @@ class NoImageTextIconVerticalLogo extends Template {
 				this.nameTextColor = "#000000";
 				this.primaryTextColor = "#ffffff";
 				this.iconColor = "#ffffff";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "zeleni-volary-bystrc-most-white-on-green":
@@ -534,7 +534,7 @@ class NoImageTextIconVerticalLogo extends Template {
 				this.nameTextColor = "#ffffff";
 				this.primaryTextColor = "#00ad43";
 				this.iconColor = "#00ad43";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "spolecne-s-piraty-black-on-white":
@@ -543,7 +543,7 @@ class NoImageTextIconVerticalLogo extends Template {
 				this.nameTextColor = "#000000";
 				this.primaryTextColor = "#21274e";
 				this.iconColor = "#21274e";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "spolecne-s-piraty-white-on-blue":
@@ -552,7 +552,7 @@ class NoImageTextIconVerticalLogo extends Template {
 				this.nameTextColor = "#ffffff";
 				this.primaryTextColor = "#ffffff";
 				this.iconColor = "#ffffff";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "louny-spolecne-black-on-white":
@@ -669,7 +669,7 @@ class NoImageTextIconVerticalLogo extends Template {
 				this.nameTextColor = "#000000";
 				this.primaryTextColor = "#e63812";
 				this.iconColor = "#e63812";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "cssd-black-on-red":
@@ -678,7 +678,7 @@ class NoImageTextIconVerticalLogo extends Template {
 				this.nameTextColor = "#000000";
 				this.primaryTextColor = "#000000";
 				this.iconColor = "#000000";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "jilemnice-purple-on-black":
@@ -687,7 +687,7 @@ class NoImageTextIconVerticalLogo extends Template {
 				this.nameTextColor = "#000000";
 				this.primaryTextColor = "#6e1646";
 				this.iconColor = "#6e1646";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "jilemnice-black-on-purple":
@@ -696,7 +696,7 @@ class NoImageTextIconVerticalLogo extends Template {
 				this.nameTextColor = "#000000";
 				this.primaryTextColor = "#000000";
 				this.iconColor = "#000000";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "novarole-white-on-green":
@@ -705,7 +705,7 @@ class NoImageTextIconVerticalLogo extends Template {
 				this.nameTextColor = "#000000";
 				this.primaryTextColor = "#000000";
 				this.iconColor = "#000000";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "novarole-green-on-white":
@@ -723,7 +723,7 @@ class NoImageTextIconVerticalLogo extends Template {
 				this.nameTextColor = "#000000";
 				this.primaryTextColor = "#a9ce2d";
 				this.iconColor = "#a9ce2d";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "zeleni-melnik-yellow-name-rect":
diff --git a/generator/static/js/templates/no-image-text-more-info.js b/generator/static/js/templates/no-image-text-more-info.js
index 2d413fe5ef8102118bde25030253a9599dc15125..b55df7a522496b3ee1129861f80c27754bd180ea 100644
--- a/generator/static/js/templates/no-image-text-more-info.js
+++ b/generator/static/js/templates/no-image-text-more-info.js
@@ -563,7 +563,7 @@ class NoImageTextMoreInfo extends Template {
 				this.iconColor = "#000000";
 				this.terciaryTextColor = "#000000";
 				this.quoteColor = "#000000";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "white-on-black":
@@ -575,7 +575,7 @@ class NoImageTextMoreInfo extends Template {
 				this.iconColor = "#ffffff";
 				this.terciaryTextColor = "#ffffff";
 				this.quoteColor = "#ffffff";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "forum-black-on-white":
@@ -587,7 +587,7 @@ class NoImageTextMoreInfo extends Template {
 				this.iconColor = "#ffffff";
 				this.terciaryTextColor = "#ffffff";
 				this.quoteColor = "#000000";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "forum-white-on-purple":
@@ -599,7 +599,7 @@ class NoImageTextMoreInfo extends Template {
 				this.iconColor = "#962a51";
 				this.terciaryTextColor = "#962a51";
 				this.quoteColor = "#000000";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "zeleni-volary-bystrc-most-black-on-white":
@@ -611,7 +611,7 @@ class NoImageTextMoreInfo extends Template {
 				this.iconColor = "#ffffff";
 				this.terciaryTextColor = "#ffffff";
 				this.quoteColor = "#000000";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "zeleni-volary-bystrc-most-white-on-green":
@@ -623,7 +623,7 @@ class NoImageTextMoreInfo extends Template {
 				this.iconColor = "#00ad43";
 				this.terciaryTextColor = "#00ad43";
 				this.quoteColor = "#00ad43";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "spolecne-s-piraty-black-on-white":
@@ -635,7 +635,7 @@ class NoImageTextMoreInfo extends Template {
 				this.iconColor = "#21274e";
 				this.terciaryTextColor = "#21274e";
 				this.quoteColor = "#21274e";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "spolecne-s-piraty-white-on-blue":
@@ -647,7 +647,7 @@ class NoImageTextMoreInfo extends Template {
 				this.iconColor = "#ffffff";
 				this.terciaryTextColor = "#ffffff";
 				this.quoteColor = "#9796ca";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "louny-spolecne-black-on-white":
@@ -803,7 +803,7 @@ class NoImageTextMoreInfo extends Template {
 				this.iconColor = "#e63812";
 				this.terciaryTextColor = "#e63812";
 				this.quoteColor = "#e63812";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "cssd-black-on-red":
@@ -815,7 +815,7 @@ class NoImageTextMoreInfo extends Template {
 				this.iconColor = "#000000";
 				this.terciaryTextColor = "#000000";
 				this.quoteColor = "#000000";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "jilemnice-purple-on-black":
@@ -827,7 +827,7 @@ class NoImageTextMoreInfo extends Template {
 				this.iconColor = "#6e1646";
 				this.terciaryTextColor = "#6e1646";
 				this.quoteColor = "#6e1646";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "jilemnice-black-on-purple":
@@ -839,7 +839,7 @@ class NoImageTextMoreInfo extends Template {
 				this.iconColor = "#000000";
 				this.terciaryTextColor = "#000000";
 				this.quoteColor = "#000000";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "novarole-white-on-green":
@@ -851,7 +851,7 @@ class NoImageTextMoreInfo extends Template {
 				this.iconColor = "#000000";
 				this.terciaryTextColor = "#000000";
 				this.quoteColor = "#000000";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "novarole-green-on-white":
@@ -875,7 +875,7 @@ class NoImageTextMoreInfo extends Template {
 				this.iconColor = "#a9ce2d";
 				this.terciaryTextColor = "#a9ce2d";
 				this.quoteColor = "#a9ce2d";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "zeleni-melnik-yellow-name-rect":
diff --git a/generator/static/js/templates/poll.js b/generator/static/js/templates/poll.js
index 9553d35e37025a8f64b83304261f282f9fd6d3dc..c73256892f8305dd9dd4568281684f4f53cb1724 100644
--- a/generator/static/js/templates/poll.js
+++ b/generator/static/js/templates/poll.js
@@ -779,7 +779,7 @@ class Poll extends Template {
 				this.foregroundColor = "#ffffff";
 				this.backgroundColor = "#000000";
 				this.reactionTextColor = "#ffffff";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "white-on-black":
@@ -787,7 +787,7 @@ class Poll extends Template {
 				this.foregroundColor ="#000000";
 				this.backgroundColor ="#ffffff";
 				this.reactionTextColor = "#000000";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "forum-black-on-white":
@@ -795,7 +795,7 @@ class Poll extends Template {
 				this.foregroundColor = "#ffffff";
 				this.backgroundColor = "#962a51";
 				this.reactionTextColor = "#ffffff";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "forum-white-on-purple":
@@ -803,7 +803,7 @@ class Poll extends Template {
 				this.foregroundColor = "#962a51";
 				this.backgroundColor = "#ffffff";
 				this.reactionTextColor = "#000000";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "zeleni-volary-bystrc-most-black-on-white":
@@ -811,7 +811,7 @@ class Poll extends Template {
 				this.foregroundColor = "#ffffff";
 				this.backgroundColor = "#00ad43";
 				this.reactionTextColor = "#ffffff";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "zeleni-volary-bystrc-most-white-on-green":
@@ -819,7 +819,7 @@ class Poll extends Template {
 				this.foregroundColor = "#00ad43";
 				this.backgroundColor = "#ffffff";
 				this.reactionTextColor = "#000000";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "spolecne-s-piraty-black-on-white":
@@ -827,7 +827,7 @@ class Poll extends Template {
 				this.foregroundColor = "#ffffff";
 				this.backgroundColor = "#21274e";
 				this.reactionTextColor = "#ffffff";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "spolecne-s-piraty-white-on-blue":
@@ -835,7 +835,7 @@ class Poll extends Template {
 				this.foregroundColor = "#21274e";
 				this.backgroundColor = "#ffffff";
 				this.reactionTextColor = "#21274e";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "louny-spolecne-black-on-white":
@@ -843,7 +843,7 @@ class Poll extends Template {
 				this.foregroundColor = "#ffffff";
 				this.backgroundColor = "#3e2a5b";
 				this.reactionTextColor = "#ffffff";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "louny-spolecne-white-on-purple":
@@ -851,7 +851,7 @@ class Poll extends Template {
 				this.foregroundColor = "#3e2a5b";
 				this.backgroundColor = "#ffffff";
 				this.reactionTextColor = "#3e2a5b";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "litomerice-blue-on-white":
@@ -974,7 +974,7 @@ class Poll extends Template {
 				this.backgroundColor = "#ffffff";
 				this.reactionTextColor = "#000000";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "novarole-green-on-black":
@@ -983,7 +983,7 @@ class Poll extends Template {
 				this.backgroundColor = "#000000";
 				this.reactionTextColor = "#ffffff";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "zeleni-melnik-yellow-name-rect":
diff --git a/generator/static/js/templates/poster-bottom-slogan-no-icon.js b/generator/static/js/templates/poster-bottom-slogan-no-icon.js
index a3d3ca629505cb474c7906d9cdb5d0da7aaaf865..5f5d43d87dfdacb3292826de4de6788fcada0caa 100644
--- a/generator/static/js/templates/poster-bottom-slogan-no-icon.js
+++ b/generator/static/js/templates/poster-bottom-slogan-no-icon.js
@@ -1044,7 +1044,7 @@ class PosterBottomSloganTemplateNoIcon extends Template {
 				this.terciaryTextBackgroundColor = "#000000";
 				this.terciaryTextColor = "#ffffff";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "novarole-green-on-black":
@@ -1059,7 +1059,7 @@ class PosterBottomSloganTemplateNoIcon extends Template {
 				this.terciaryTextBackgroundColor = "#ffffff";
 				this.terciaryTextColor = "#000000";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "zeleni-melnik-yellow-name-rect":
@@ -1124,7 +1124,7 @@ class PosterBottomSloganTemplateNoIcon extends Template {
 	async setPrimaryTextHighlightColorScheme(scheme, skipRedraw = false) {
 		switch(scheme) {
 			case "gold":
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				break;
 			case "litomerice":
 				this.primaryTextHighlightColor = "#afe87e";
diff --git a/generator/static/js/templates/poster-bottom-slogan.js b/generator/static/js/templates/poster-bottom-slogan.js
index 9626953cbafde8664c29fdc15f4bbdf61b3f8244..0d402aad3acf6a510d5332c19c0472974262e7bb 100644
--- a/generator/static/js/templates/poster-bottom-slogan.js
+++ b/generator/static/js/templates/poster-bottom-slogan.js
@@ -989,7 +989,7 @@ class PosterBottomSloganTemplate extends Template {
 
 	// Color schemes
 	async setPrimaryColorScheme(scheme, skipRedraw = false) {
-		this.primaryTextHighlightColor = "#ffeda5";
+		this.primaryTextHighlightColor = "#ffcc00";
 		
 		switch (scheme) {
 			case "black-on-white":
@@ -1363,7 +1363,7 @@ class PosterBottomSloganTemplate extends Template {
 				this.terciaryTextBackgroundColor = "#000000";
 				this.terciaryTextColor = "#ffffff";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "novarole-green-on-black":
@@ -1382,7 +1382,7 @@ class PosterBottomSloganTemplate extends Template {
 				this.terciaryTextBackgroundColor = "#ffffff";
 				this.terciaryTextColor = "#000000";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "zeleni-melnik-yellow-name-rect":
@@ -1531,7 +1531,7 @@ class PosterBottomSloganTemplate extends Template {
 	async setPrimaryTextHighlightColorScheme(scheme, skipRedraw = false) {
 		switch(scheme) {
 			case "gold":
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				break
 			default:
 				throw new Error("This scheme does not exist.");
diff --git a/generator/static/js/templates/poster-center-slogan-icons-no-image.js b/generator/static/js/templates/poster-center-slogan-icons-no-image.js
index f8cfb72c6d64081f269daff827638fc0ef7a8ff7..d6dcd0920cdf3001ed7feaf40435c0e9304d9cbf 100644
--- a/generator/static/js/templates/poster-center-slogan-icons-no-image.js
+++ b/generator/static/js/templates/poster-center-slogan-icons-no-image.js
@@ -865,7 +865,7 @@ class PosterCenterSloganIconsNoImage extends Template {
 				this.secondaryTextColor = "#000000";
 				this.secondaryTextBackgroundColor = "#ffffff";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "novarole-green-on-black":
@@ -875,7 +875,7 @@ class PosterCenterSloganIconsNoImage extends Template {
 				this.secondaryTextColor = "#000000";
 				this.secondaryTextBackgroundColor = "#a9ce2d";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "zeleni-melnik-yellow-name-rect":
@@ -900,7 +900,7 @@ class PosterCenterSloganIconsNoImage extends Template {
 	async setPrimaryTextHighlightColorScheme(scheme, skipRedraw = false) {
 		switch(scheme) {
 			case "gold":
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				break;
 			case "litomerice":
 				this.primaryTextHighlightColor = "#afe87e";
diff --git a/generator/static/js/templates/poster-center-slogan-no-image.js b/generator/static/js/templates/poster-center-slogan-no-image.js
index c76a56aa57a195096f85d889765ffe9b082cfae4..af2860ac5f83ee7c8779624c6f1be63a9a65db30 100644
--- a/generator/static/js/templates/poster-center-slogan-no-image.js
+++ b/generator/static/js/templates/poster-center-slogan-no-image.js
@@ -409,7 +409,7 @@ class PosterCenterSloganNoImage extends Template {
 	
 	// Color schemes
 	async setPrimaryColorScheme(scheme, skipRedraw = false) {
-		this.primaryTextHighlightColor = "#ffeda5";
+		this.primaryTextHighlightColor = "#ffcc00";
 		
 		switch (scheme) {
 			case "black-on-white":
@@ -564,7 +564,7 @@ class PosterCenterSloganNoImage extends Template {
 				this.foregroundColor = "#a9ce2d";
 				this.backgroundColor = "#ffffff";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "novarole-green-on-black":
@@ -572,7 +572,7 @@ class PosterCenterSloganNoImage extends Template {
 				this.foregroundColor = "#a9ce2d";
 				this.backgroundColor = "#000000";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "zeleni-melnik-yellow-name-rect":
@@ -594,7 +594,7 @@ class PosterCenterSloganNoImage extends Template {
 	async setPrimaryTextHighlightColorScheme(scheme, skipRedraw = false) {
 		switch(scheme) {
 			case "gold":
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				break;
 			case "litomerice":
 				this.primaryTextHighlightColor = "#afe87e";
diff --git a/generator/static/js/templates/poster-event.js b/generator/static/js/templates/poster-event.js
index a67552f5df0bd3b282881bac0f5f4c4839b27925..88041f78fe3c72cc3262ada0613333d432d91b7c 100644
--- a/generator/static/js/templates/poster-event.js
+++ b/generator/static/js/templates/poster-event.js
@@ -850,7 +850,7 @@ class PosterEvent extends Template {
 		switch (scheme) {
 			case "black-on-white":
 				this.primaryTextColor = "#000000";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				this.informationTextColor = "#ffffff";
 				this.informationTextBackgroundColor = "#000000";
 				this.terciaryTextColor = "#ffffff";
@@ -869,7 +869,7 @@ class PosterEvent extends Template {
 				break;
 			case "forum-black-on-white":
 				this.primaryTextColor = "#000000";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				this.informationTextColor = "#962a51";
 				this.informationTextBackgroundColor = "#ffffff";
 				this.terciaryTextColor = "#ffffff";
@@ -888,7 +888,7 @@ class PosterEvent extends Template {
 				break;
 			case "zeleni-volary-bystrc-most-black-on-white":
 				this.primaryTextColor = "#000000";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				this.informationTextColor = "#ffffff";
 				this.informationTextBackgroundColor = "#000000";
 				this.terciaryTextColor = "#ffffff";
@@ -907,7 +907,7 @@ class PosterEvent extends Template {
 				break;
 			case "spolecne-s-piraty-black-on-white":
 				this.primaryTextColor = "#000000";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				this.informationTextColor = "#000000";
 				this.informationTextBackgroundColor = "#9796ca";
 				this.terciaryTextColor = "#ffffff";
@@ -926,7 +926,7 @@ class PosterEvent extends Template {
 				break;
 			case "louny-spolecne-black-on-white":
 				this.primaryTextColor = "#000000";
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				this.informationTextColor = "#000000";
 				this.informationTextBackgroundColor = "#e2d7a9";
 				this.terciaryTextColor = "#ffffff";
@@ -1100,7 +1100,7 @@ class PosterEvent extends Template {
 				this.foregroundColor = "#a9ce2d";
 				this.backgroundColor = "#ffffff";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "novarole-green-on-black":
@@ -1114,7 +1114,7 @@ class PosterEvent extends Template {
 				this.foregroundColor = "#a9ce2d";
 				this.backgroundColor = "#000000";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "zeleni-melnik-yellow-name-rect":
diff --git a/generator/static/js/templates/right-big-text.js b/generator/static/js/templates/right-big-text.js
index e9d8cbcc3f5ac32c1a87f18e767ef4cac448c011..d2bb8cc48e5cc4a25b92f40917e0db2ec2ff94dc 100644
--- a/generator/static/js/templates/right-big-text.js
+++ b/generator/static/js/templates/right-big-text.js
@@ -934,7 +934,7 @@ class RightBigTextTemplate extends Template {
 				this.foregroundColor = "#a9ce2d";
 				this.backgroundColor = "#ffffff";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "novarole-green-on-black":
@@ -944,7 +944,7 @@ class RightBigTextTemplate extends Template {
 				this.foregroundColor = "#a9ce2d";
 				this.backgroundColor = "#000000";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "zeleni-melnik-yellow-name-rect":
@@ -966,7 +966,7 @@ class RightBigTextTemplate extends Template {
 	async setPrimaryTextHighlightColorScheme(scheme, skipRedraw = false) {
 		switch(scheme) {
 			case "gold":
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				break;
 			case "litomerice":
 				this.primaryTextHighlightColor = "#afe87e";
diff --git a/generator/static/js/templates/right-long-text.js b/generator/static/js/templates/right-long-text.js
index d54aeb188c225ef64ae5f6bd9d619aa7132f4906..5eac34558609fa17744dc724773f2649c71c998f 100644
--- a/generator/static/js/templates/right-long-text.js
+++ b/generator/static/js/templates/right-long-text.js
@@ -690,7 +690,7 @@ class RightLongTextTemplate extends Template {
 				this.foregroundColor = "#a9ce2d";
 				this.backgroundColor = "#ffffff";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "novarole-green-on-black":
@@ -700,7 +700,7 @@ class RightLongTextTemplate extends Template {
 				this.foregroundColor = "#a9ce2d";
 				this.backgroundColor = "#000000";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "zeleni-melnik-yellow-name-rect":
diff --git a/generator/static/js/templates/story-full-width-rectangle.js b/generator/static/js/templates/story-full-width-rectangle.js
index 4e531f44b86bc107084382ff507aec7875ccbda9..7955c719c0633dce0aeb7329294f0d1804d3e998 100644
--- a/generator/static/js/templates/story-full-width-rectangle.js
+++ b/generator/static/js/templates/story-full-width-rectangle.js
@@ -602,7 +602,7 @@ class StoryWithFullWidthRectangleTemplate extends Template {
 				this.foregroundColor = "#ffd500";
 				this.nameBackgroundColor = "#50c450";
 				this.nameTextColor = "#000000";
-// 				this.primaryTextHighlightColor = "#ffeda5";
+// 				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "prusanky-yellow-on-white":
@@ -679,7 +679,7 @@ class StoryWithFullWidthRectangleTemplate extends Template {
 				this.nameBackgroundColor = "#000000";
 				this.nameTextColor = "#ffffff";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "novarole-green-on-black":
@@ -688,7 +688,7 @@ class StoryWithFullWidthRectangleTemplate extends Template {
 				this.nameBackgroundColor = "#a9ce2d";
 				this.nameTextColor = "#000000";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "zeleni-melnik-yellow-name-rect":
@@ -753,7 +753,7 @@ class StoryWithFullWidthRectangleTemplate extends Template {
 	async setPrimaryTextHighlightColorScheme(scheme, skipRedraw = false) {
 		switch(scheme) {
 			case "gold":
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				break;
 			case "litomerice":
 				this.primaryTextHighlightColor = "#afe87e";
diff --git a/generator/static/js/templates/story-with-rectangle.js b/generator/static/js/templates/story-with-rectangle.js
index 7f3c2ea81bb60c2b2db64ec823985de0e0853ad3..2127f41e603adbafd1e57a3e792586650dd5abe6 100644
--- a/generator/static/js/templates/story-with-rectangle.js
+++ b/generator/static/js/templates/story-with-rectangle.js
@@ -716,7 +716,7 @@ class StoryWithRectangleTemplate extends Template {
 				this.nameTextColor = "#000000";
 				this.secondaryTextBackgroundColor = "#ffffff";
 				this.secondaryTextColor = "#000000";
-// 				this.primaryTextHighlightColor = "#ffeda5";
+// 				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "prusanky-yellow-on-white":
@@ -824,7 +824,7 @@ class StoryWithRectangleTemplate extends Template {
 				this.secondaryTextColor = "#ffffff";
 				this.primaryTextHighlightColor = "#000000";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "novarole-green-on-black":
@@ -837,7 +837,7 @@ class StoryWithRectangleTemplate extends Template {
 				this.secondaryTextColor = "#000000";
 				this.primaryTextHighlightColor = "#000000";
 				
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				
 				break;
 			case "zeleni-melnik-yellow-name-rect":
@@ -942,7 +942,7 @@ class StoryWithRectangleTemplate extends Template {
 	async setPrimaryTextHighlightColorScheme(scheme, skipRedraw = false) {
 		switch(scheme) {
 			case "gold":
-				this.primaryTextHighlightColor = "#ffeda5";
+				this.primaryTextHighlightColor = "#ffcc00";
 				break;
 			case "litomerice":
 				this.primaryTextHighlightColor = "#afe87e";