diff --git a/symbols/Bundeswehr_Einheiten/Einheit_der_Bundeswehr.j2 b/symbols/Bundeswehr_Einheiten/Einheit_der_Bundeswehr.j2
index 05ba8b4c2..2135eec41 100644
--- a/symbols/Bundeswehr_Einheiten/Einheit_der_Bundeswehr.j2
+++ b/symbols/Bundeswehr_Einheiten/Einheit_der_Bundeswehr.j2
@@ -6,7 +6,7 @@
 		{% include './fonts/fonts.j2' %}
 		</style>
 	</defs>
-	<rect x="13" y="67" width="230" height="122" fill="{{ bundeswehr.colorPrimary }}" stroke="{{ bundeswehr.colorStroke }}" stroke-width="6" />
+	<rect x="13" y="67" width="230" height="122" fill="{{ bundeswehr.colorPrimary }}" stroke="{{ bundeswehr.colorSecondary }}" stroke-width="6" />
 	<rect x="10" y="64" width="236" height="128" fill="none" stroke="{{ bundeswehr.colorStroke }}" stroke-width="1" />
 	<text style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 48px;" fill="{{ bundeswehr.colorSecondary }}" x="128" y="145">BW</text>
 </svg>
\ No newline at end of file
diff --git "a/symbols/Bundeswehr_Personen/F\303\274hrungskraft.j2" "b/symbols/Bundeswehr_Personen/F\303\274hrungskraft.j2"
index f6ea22a5f..1db7d9c64 100644
--- "a/symbols/Bundeswehr_Personen/F\303\274hrungskraft.j2"
+++ "b/symbols/Bundeswehr_Personen/F\303\274hrungskraft.j2"
@@ -1,7 +1,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewbox="0 0 256 256">
 	<title>Führungskraft</title>
-	<path d="M69,128 L128,69 L187,128 L128,187 Z" stroke-width="5" stroke="{{ bundeswehr.colorStroke }}" fill="{{ bundeswehr.colorPrimary }}" />
+	<path d="M69,128 L128,69 L187,128 L128,187 Z" stroke-width="5" stroke="{{ bundeswehr.colorSecondary }}" fill="{{ bundeswehr.colorPrimary }}" />
 	<path d="M128,64 L152,88 L104,88 Z" stroke-width="0" fill="{{ bundeswehr.colorSecondary }}" />
 	<path d="M64,128 L128,64 L192,128 L128,192 Z" stroke-width="2" stroke="{{ bundeswehr.colorStroke }}" fill="none" />
 </svg>
\ No newline at end of file
diff --git "a/symbols/Bundeswehr_Personen/Gruppenf\303\274hrer.j2" "b/symbols/Bundeswehr_Personen/Gruppenf\303\274hrer.j2"
index b2167e1a1..2250406d0 100644
--- "a/symbols/Bundeswehr_Personen/Gruppenf\303\274hrer.j2"
+++ "b/symbols/Bundeswehr_Personen/Gruppenf\303\274hrer.j2"
@@ -1,7 +1,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewbox="0 0 256 256">
 	<title>Gruppenführer</title>
-	<path d="M69,128 L128,69 L187,128 L128,187 Z" stroke-width="5" stroke="{{ bundeswehr.colorStroke }}" fill="{{ bundeswehr.colorPrimary }}" />
+	<path d="M69,128 L128,69 L187,128 L128,187 Z" stroke-width="5" stroke="{{ bundeswehr.colorSecondary }}" fill="{{ bundeswehr.colorPrimary }}" />
 	<path d="M128,64 L152,88 L104,88 Z" stroke-width="0" fill="{{ bundeswehr.colorSecondary }}" />
 	<ellipse cx="100" cy="44" rx="10" ry="10" fill="#000000" />
 	<ellipse cx="156" cy="44" rx="10" ry="10" fill="#000000" />
diff --git a/symbols/Bundeswehr_Personen/Person_mit_Sonderfunktion.j2 b/symbols/Bundeswehr_Personen/Person_mit_Sonderfunktion.j2
index 848641a45..87c4f1d67 100644
--- a/symbols/Bundeswehr_Personen/Person_mit_Sonderfunktion.j2
+++ b/symbols/Bundeswehr_Personen/Person_mit_Sonderfunktion.j2
@@ -1,7 +1,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewbox="0 0 256 256">
 	<title>Person mit Sonderfunktion</title>
-	<path d="M69,128 L128,69 L187,128 L128,187 Z" stroke-width="5" stroke="{{ bundeswehr.colorStroke }}" fill="{{ bundeswehr.colorPrimary }}" />
-	<path d="M147,88 L108,88" stroke-width="5" stroke="{{ bundeswehr.colorStroke }}" />
+	<path d="M69,128 L128,69 L187,128 L128,187 Z" stroke-width="5" stroke="{{ bundeswehr.colorSecondary }}" fill="{{ bundeswehr.colorPrimary }}" />
+	<path d="M147,88 L108,88" stroke-width="5" stroke="{{ bundeswehr.colorSecondary }}" />
 	<path d="M64,128 L128,64 L192,128 L128,192 Z" stroke-width="2" stroke="{{ bundeswehr.colorStroke }}" fill="none" />
 </svg>
\ No newline at end of file
diff --git "a/symbols/Bundeswehr_Personen/Staffelf\303\274hrer.j2" "b/symbols/Bundeswehr_Personen/Staffelf\303\274hrer.j2"
index 227a6e1f3..8a112d354 100644
--- "a/symbols/Bundeswehr_Personen/Staffelf\303\274hrer.j2"
+++ "b/symbols/Bundeswehr_Personen/Staffelf\303\274hrer.j2"
@@ -1,7 +1,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewbox="0 0 256 256">
 	<title>Staffelführer</title>
-	<path d="M69,128 L128,69 L187,128 L128,187 Z" stroke-width="5" stroke="{{ bundeswehr.colorStroke }}" fill="{{ bundeswehr.colorPrimary }}" />
+	<path d="M69,128 L128,69 L187,128 L128,187 Z" stroke-width="5" stroke="{{ bundeswehr.colorSecondary }}" fill="{{ bundeswehr.colorPrimary }}" />
 	<path d="M128,64 L152,88 L104,88 Z" stroke-width="0" fill="{{ bundeswehr.colorSecondary }}" />
 	<ellipse cx="128" cy="44" rx="10" ry="10" fill="#000000" />
 	<ellipse cx="128" cy="20" rx="10" ry="10" fill="#000000" />
diff --git "a/symbols/Bundeswehr_Personen/Truppf\303\274hrer.j2" "b/symbols/Bundeswehr_Personen/Truppf\303\274hrer.j2"
index dec737980..8705daf11 100644
--- "a/symbols/Bundeswehr_Personen/Truppf\303\274hrer.j2"
+++ "b/symbols/Bundeswehr_Personen/Truppf\303\274hrer.j2"
@@ -1,7 +1,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewbox="0 0 256 256">
 	<title>Truppführer</title>
-	<path d="M69,128 L128,69 L187,128 L128,187 Z" stroke-width="5" stroke="{{ bundeswehr.colorStroke }}" fill="{{ bundeswehr.colorPrimary }}" />
+	<path d="M69,128 L128,69 L187,128 L128,187 Z" stroke-width="5" stroke="{{ bundeswehr.colorSecondary }}" fill="{{ bundeswehr.colorPrimary }}" />
 	<path d="M128,64 L152,88 L104,88 Z" stroke-width="0" fill="{{ bundeswehr.colorSecondary }}" />
 	<ellipse cx="128" cy="44" rx="10" ry="10" fill="#000000" />
 	<path d="M64,128 L128,64 L192,128 L128,192 Z" stroke-width="2" stroke="{{ bundeswehr.colorStroke }}" fill="none" />
diff --git "a/symbols/Bundeswehr_Personen/Zugf\303\274hrer.j2" "b/symbols/Bundeswehr_Personen/Zugf\303\274hrer.j2"
index 4d06a5451..fbf7ca7af 100644
--- "a/symbols/Bundeswehr_Personen/Zugf\303\274hrer.j2"
+++ "b/symbols/Bundeswehr_Personen/Zugf\303\274hrer.j2"
@@ -1,7 +1,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewbox="0 0 256 256">
 	<title>Zugführer</title>
-	<path d="M69,128 L128,69 L187,128 L128,187 Z" stroke-width="5" stroke="{{ bundeswehr.colorStroke }}" fill="{{ bundeswehr.colorPrimary }}" />
+	<path d="M69,128 L128,69 L187,128 L128,187 Z" stroke-width="5" stroke="{{ bundeswehr.colorSecondary }}" fill="{{ bundeswehr.colorPrimary }}" />
 	<path d="M128,64 L152,88 L104,88 Z" stroke-width="0" fill="{{ bundeswehr.colorSecondary }}" />
 	<ellipse cx="100" cy="44" rx="10" ry="10" fill="#000000" />
 	<ellipse cx="128" cy="44" rx="10" ry="10" fill="#000000" />
diff --git a/symbols/Feuerwehr_Einheiten/RettR-UAV_Erkundungsgruppe.j2 b/symbols/Feuerwehr_Einheiten/RettR-UAV_Erkundungsgruppe.j2
index 4210b7f3f..df11d3457 100644
--- a/symbols/Feuerwehr_Einheiten/RettR-UAV_Erkundungsgruppe.j2
+++ b/symbols/Feuerwehr_Einheiten/RettR-UAV_Erkundungsgruppe.j2
@@ -12,5 +12,5 @@
 
   <ellipse cx="64"  cy="48" rx="10" ry="10" fill="{{ feuerwehr.colorStroke }}" />
   <ellipse cx="192" cy="48" rx="10" ry="10" fill="{{ feuerwehr.colorStroke }}" />
-  <path d="M204.61,110.63a11.82,11.82,0,0,1-6.15,8.73L131.39,155a7.33,7.33,0,0,1-6.9,0L57.42,119.36a11.89,11.89,0,0,1-6.14-8.73l-1.07-7.38a1.11,1.11,0,0,1,1.44-1.2L127.94,128l76.31-25.91a1.1,1.1,0,0,1,1.44,1.2Z" style="fill: #fff"/>
+  <path d="M204.61,110.63a11.82,11.82,0,0,1-6.15,8.73L131.39,155a7.33,7.33,0,0,1-6.9,0L57.42,119.36a11.89,11.89,0,0,1-6.14-8.73l-1.07-7.38a1.11,1.11,0,0,1,1.44-1.2L127.94,128l76.31-25.91a1.1,1.1,0,0,1,1.44,1.2Z" style="fill: {{ feuerwehr.colorSecondary }}"/>
 </svg>
diff --git a/symbols/Feuerwehr_Einheiten/RettR-UAV_Erkundungsstaffel.j2 b/symbols/Feuerwehr_Einheiten/RettR-UAV_Erkundungsstaffel.j2
index 5f4295b18..7ab6be766 100644
--- a/symbols/Feuerwehr_Einheiten/RettR-UAV_Erkundungsstaffel.j2
+++ b/symbols/Feuerwehr_Einheiten/RettR-UAV_Erkundungsstaffel.j2
@@ -12,5 +12,5 @@
 
 	<ellipse cx="128" cy="48" rx="10" ry="10" fill="{{ feuerwehr.colorStroke }}" />
 	<ellipse cx="128" cy="24" rx="10" ry="10" fill="{{ feuerwehr.colorStroke }}" />
-  <path d="M204.61,110.63a11.82,11.82,0,0,1-6.15,8.73L131.39,155a7.33,7.33,0,0,1-6.9,0L57.42,119.36a11.89,11.89,0,0,1-6.14-8.73l-1.07-7.38a1.11,1.11,0,0,1,1.44-1.2L127.94,128l76.31-25.91a1.1,1.1,0,0,1,1.44,1.2Z" style="fill: #fff"/>
+  <path d="M204.61,110.63a11.82,11.82,0,0,1-6.15,8.73L131.39,155a7.33,7.33,0,0,1-6.9,0L57.42,119.36a11.89,11.89,0,0,1-6.14-8.73l-1.07-7.38a1.11,1.11,0,0,1,1.44-1.2L127.94,128l76.31-25.91a1.1,1.1,0,0,1,1.44,1.2Z" style="fill: {{ feuerwehr.colorSecondary }}"/>
 </svg>
diff --git a/symbols/Feuerwehr_Einheiten/RettR-UAV_Erkundungstrupp.j2 b/symbols/Feuerwehr_Einheiten/RettR-UAV_Erkundungstrupp.j2
index 21dd71444..780c5c118 100644
--- a/symbols/Feuerwehr_Einheiten/RettR-UAV_Erkundungstrupp.j2
+++ b/symbols/Feuerwehr_Einheiten/RettR-UAV_Erkundungstrupp.j2
@@ -11,5 +11,5 @@
   <rect x="10" y="64" width="236" height="128" stroke="{{ feuerwehr.colorStroke }}" stroke-width="1" fill="none" />
 
 	<ellipse cx="128" cy="48" rx="10" ry="10" fill="{{ feuerwehr.colorStroke }}" />
-  <path d="M204.61,110.63a11.82,11.82,0,0,1-6.15,8.73L131.39,155a7.33,7.33,0,0,1-6.9,0L57.42,119.36a11.89,11.89,0,0,1-6.14-8.73l-1.07-7.38a1.11,1.11,0,0,1,1.44-1.2L127.94,128l76.31-25.91a1.1,1.1,0,0,1,1.44,1.2Z" style="fill: #fff"/>
+  <path d="M204.61,110.63a11.82,11.82,0,0,1-6.15,8.73L131.39,155a7.33,7.33,0,0,1-6.9,0L57.42,119.36a11.89,11.89,0,0,1-6.14-8.73l-1.07-7.38a1.11,1.11,0,0,1,1.44-1.2L127.94,128l76.31-25.91a1.1,1.1,0,0,1,1.44,1.2Z" style="fill: {{ feuerwehr.colorSecondary }}"/>
 </svg>
diff --git "a/symbols/Feuerwehr_Personen/Truppf\303\274hrer.j2" "b/symbols/Feuerwehr_Personen/Truppf\303\274hrer.j2"
index c23616fda..6b86768cb 100644
--- "a/symbols/Feuerwehr_Personen/Truppf\303\274hrer.j2"
+++ "b/symbols/Feuerwehr_Personen/Truppf\303\274hrer.j2"
@@ -9,7 +9,7 @@
 			<path d="M64,128 L128,64 L192,128 L128,192 Z" />
 		</clipPath>
 	</defs>
-	<path d="M64,128 L128,64 L192,128 L128,192 Z" stroke-width="5" stroke="{{ feuerwehr.colorSecondary }}" fill="{{ feuerwehr.colorPrimary }}" />
+	<path d="M69,128 L128,69 L187,128 L128,187 Z" stroke-width="5" stroke="{{ feuerwehr.colorSecondary }}" fill="{{ feuerwehr.colorPrimary }}" />
 	<path d="M128,64 L152,88 L104,88 Z" stroke-width="0" fill="{{ feuerwehr.colorSecondary }}" />
 	<path d="M64,128 L128,64 L192,128 L128,192 Z" stroke-width="2" stroke="{{ feuerwehr.colorStroke }}" fill="none" />
 </svg>
diff --git a/symbols/Katastrophenschutz_Einheiten/Baugruppe.j2 b/symbols/Katastrophenschutz_Einheiten/Baugruppe.j2
index d3cf3a258..bcb31580e 100644
--- a/symbols/Katastrophenschutz_Einheiten/Baugruppe.j2
+++ b/symbols/Katastrophenschutz_Einheiten/Baugruppe.j2
@@ -6,10 +6,10 @@
 			<rect x="10" y="64" width="236" height="128" />
 		</clipPath>
 	</defs>
-	<rect x="10" y="64" width="236" height="128" stroke="#000000" stroke-width="10" fill="#DF6711" clip-path="url(#symbol)" />
-	<path d="M10 64 l118 96 l0 -64 l118 96" stroke="#000000" stroke-width="5" fill="none" clip-path="url(#symbol)" />
-	<path d="M20 160 l90 0" stroke="#000000" stroke-width="7" fill="none" />
-	<path d="M210 140 l0 -48 m-10 -10 a10 10 0 1 0 20 0" stroke="#000000" stroke-width="5" fill="none" />
-	<ellipse cx="64"  cy="48" rx="10" ry="10" fill="#000000" />
-	<ellipse cx="192" cy="48" rx="10" ry="10" fill="#000000" />
+	<rect x="10" y="64" width="236" height="128" stroke="{{ katastrophenschutz.colorStroke }}" stroke-width="10" fill="{{ katastrophenschutz.colorPrimary }}" clip-path="url(#symbol)" />
+	<path d="M10 64 l118 96 l0 -64 l118 96" stroke="{{ katastrophenschutz.colorStroke }}" stroke-width="5" fill="none" clip-path="url(#symbol)" />
+	<path d="M20 160 l90 0" stroke="{{ katastrophenschutz.colorStroke }}" stroke-width="7" fill="none" />
+	<path d="M210 140 l0 -48 m-10 -10 a10 10 0 1 0 20 0" stroke="{{ katastrophenschutz.colorStroke }}" stroke-width="5" fill="none" />
+	<ellipse cx="64"  cy="48" rx="10" ry="10" fill="{{ katastrophenschutz.colorStroke }}" />
+	<ellipse cx="192" cy="48" rx="10" ry="10" fill="{{ katastrophenschutz.colorStroke }}" />
 </svg>
\ No newline at end of file
diff --git a/symbols/Katastrophenschutz_Einheiten/Facheinheit_IuK.j2 b/symbols/Katastrophenschutz_Einheiten/Facheinheit_IuK.j2
index b2be29422..715e6cede 100644
--- a/symbols/Katastrophenschutz_Einheiten/Facheinheit_IuK.j2
+++ b/symbols/Katastrophenschutz_Einheiten/Facheinheit_IuK.j2
@@ -6,9 +6,9 @@
 			<rect x="10" y="64" width="236" height="128" />
 		</clipPath>
 	</defs>
-	<rect x="10" y="64" width="236" height="128" stroke="#000000" stroke-width="10" fill="#DF6711" clip-path="url(#symbol)" />
-	<path d="M10 64 l118 96 l0 -64 l118 96" stroke="#000000" stroke-width="5" fill="none" clip-path="url(#symbol)" />
-	<ellipse cx="128" cy="48" rx="10" ry="10" fill="#000000" />
-	<ellipse cx="64"  cy="48" rx="10" ry="10" fill="#000000" />
-	<ellipse cx="192" cy="48" rx="10" ry="10" fill="#000000" />
+	<rect x="10" y="64" width="236" height="128" stroke="{{ katastrophenschutz.colorStroke }}" stroke-width="10" fill="{{ katastrophenschutz.colorPrimary }}" clip-path="url(#symbol)" />
+	<path d="M10 64 l118 96 l0 -64 l118 96" stroke="{{ katastrophenschutz.colorStroke }}" stroke-width="5" fill="none" clip-path="url(#symbol)" />
+	<ellipse cx="128" cy="48" rx="10" ry="10" fill="{{ katastrophenschutz.colorStroke }}" />
+	<ellipse cx="64"  cy="48" rx="10" ry="10" fill="{{ katastrophenschutz.colorStroke }}" />
+	<ellipse cx="192" cy="48" rx="10" ry="10" fill="{{ katastrophenschutz.colorStroke }}" />
 </svg>
\ No newline at end of file
diff --git a/symbols/Katastrophenschutz_Einheiten/Funkgruppe.j2 b/symbols/Katastrophenschutz_Einheiten/Funkgruppe.j2
index f7a79a5f3..84a4a80a2 100644
--- a/symbols/Katastrophenschutz_Einheiten/Funkgruppe.j2
+++ b/symbols/Katastrophenschutz_Einheiten/Funkgruppe.j2
@@ -6,10 +6,10 @@
 			<rect x="10" y="64" width="236" height="128" />
 		</clipPath>
 	</defs>
-	<rect x="10" y="64" width="236" height="128" stroke="#000000" stroke-width="10" fill="#DF6711" clip-path="url(#symbol)" />
-	<path d="M10 64 l118 96 l0 -64 l118 96" stroke="#000000" stroke-width="5" fill="none" clip-path="url(#symbol)" />
-	<path d="M155 80 l72 0" stroke="#000000" stroke-width="5" fill="none" />
-	<path d="M155 88 l12 12 l12 -12 l12 12 l12 -12 l12 12 l12 -12" stroke="#000000" stroke-width="3" fill="none" />
-	<ellipse cx="64"  cy="48" rx="10" ry="10" fill="#000000" />
-	<ellipse cx="192" cy="48" rx="10" ry="10" fill="#000000" />
+	<rect x="10" y="64" width="236" height="128" stroke="{{ katastrophenschutz.colorStroke }}" stroke-width="10" fill="{{ katastrophenschutz.colorPrimary }}" clip-path="url(#symbol)" />
+	<path d="M10 64 l118 96 l0 -64 l118 96" stroke="{{ katastrophenschutz.colorStroke }}" stroke-width="5" fill="none" clip-path="url(#symbol)" />
+	<path d="M155 80 l72 0" stroke="{{ katastrophenschutz.colorStroke }}" stroke-width="5" fill="none" />
+	<path d="M155 88 l12 12 l12 -12 l12 12 l12 -12 l12 12 l12 -12" stroke="{{ katastrophenschutz.colorStroke }}" stroke-width="3" fill="none" />
+	<ellipse cx="64"  cy="48" rx="10" ry="10" fill="{{ katastrophenschutz.colorStroke }}" />
+	<ellipse cx="192" cy="48" rx="10" ry="10" fill="{{ katastrophenschutz.colorStroke }}" />
 </svg>
\ No newline at end of file
diff --git a/symbols/Katastrophenschutz_Einheiten/Schlacht_und_Untersuchungsgruppe.j2 b/symbols/Katastrophenschutz_Einheiten/Schlacht_und_Untersuchungsgruppe.j2
index 5168a9f24..3316f7ffd 100644
--- a/symbols/Katastrophenschutz_Einheiten/Schlacht_und_Untersuchungsgruppe.j2
+++ b/symbols/Katastrophenschutz_Einheiten/Schlacht_und_Untersuchungsgruppe.j2
@@ -6,13 +6,13 @@
 			<rect x="10" y="64" width="236" height="128" />
 		</clipPath>
 	</defs>
-	<rect x="10" y="64" width="236" height="128" stroke="#000000" stroke-width="10" fill="#DF6711" clip-path="url(#symbol)" />
+	<rect x="10" y="64" width="236" height="128" stroke="{{ katastrophenschutz.colorStroke }}" stroke-width="10" fill="{{ katastrophenschutz.colorPrimary }}" clip-path="url(#symbol)" />
 	
-	<path d="M59 80 l25 0 L128 176 L172 80 l25 0" stroke-width="5" stroke="#000000" fill="none" />
+	<path d="M59 80 l25 0 L128 176 L172 80 l25 0" stroke-width="5" stroke="{{ katastrophenschutz.colorStroke }}" fill="none" />
 	
-	<ellipse cx="64"  cy="48" rx="10" ry="10" fill="#000000" />
-	<ellipse cx="192" cy="48" rx="10" ry="10" fill="#000000" />
+	<ellipse cx="64"  cy="48" rx="10" ry="10" fill="{{ katastrophenschutz.colorStroke }}" />
+	<ellipse cx="192" cy="48" rx="10" ry="10" fill="{{ katastrophenschutz.colorStroke }}" />
 
-	<path d="M25 180 l30 0 l-15 -25 l-15 25 Z" stroke-width="3" stroke="#000000" fill="none" />
-	<path d="M25 154 l80 0" stroke-width="5" stroke="#000000" fill="none" />
+	<path d="M25 180 l30 0 l-15 -25 l-15 25 Z" stroke-width="3" stroke="{{ katastrophenschutz.colorStroke }}" fill="none" />
+	<path d="M25 154 l80 0" stroke-width="5" stroke="{{ katastrophenschutz.colorStroke }}" fill="none" />
 </svg>
\ No newline at end of file
diff --git a/symbols/Katastrophenschutz_Einheiten/Tier_Dekon_und_Transportgruppe.j2 b/symbols/Katastrophenschutz_Einheiten/Tier_Dekon_und_Transportgruppe.j2
index 96265d423..6ce40317b 100644
--- a/symbols/Katastrophenschutz_Einheiten/Tier_Dekon_und_Transportgruppe.j2
+++ b/symbols/Katastrophenschutz_Einheiten/Tier_Dekon_und_Transportgruppe.j2
@@ -6,18 +6,18 @@
 			<rect x="10" y="64" width="236" height="128" />
 		</clipPath>
 	</defs>
-	<rect x="10" y="64" width="236" height="128" stroke="#000000" stroke-width="10" fill="#DF6711" clip-path="url(#symbol)" />
+	<rect x="10" y="64" width="236" height="128" stroke="{{ katastrophenschutz.colorStroke }}" stroke-width="10" fill="{{ katastrophenschutz.colorPrimary }}" clip-path="url(#symbol)" />
 	
-	<path d="M59 80 l25 0 L128 176 L172 80 l25 0" stroke-width="5" stroke="#000000" fill="none" />
+	<path d="M59 80 l25 0 L128 176 L172 80 l25 0" stroke-width="5" stroke="{{ katastrophenschutz.colorStroke }}" fill="none" />
 	
-	<ellipse cx="64"  cy="48" rx="10" ry="10" fill="#000000" />
-	<ellipse cx="192" cy="48" rx="10" ry="10" fill="#000000" />
+	<ellipse cx="64"  cy="48" rx="10" ry="10" fill="{{ katastrophenschutz.colorStroke }}" />
+	<ellipse cx="192" cy="48" rx="10" ry="10" fill="{{ katastrophenschutz.colorStroke }}" />
 
 	<g transform="translate(-50,35) scale(0.8)">
-		<path d="M104,128 l50,50 M152,128 l-50,50" stroke-width="8" stroke="#000000" fill="none" />
-		<path d="M108,182 L98,182 L98,172 Z" fill="#000000" />
-		<path d="M148,182 L158,182 L158,172 Z" fill="#000000" />
-		<ellipse cx="104" cy="134" rx="10" ry="10" fill="#000000" />
-		<ellipse cx="152" cy="134" rx="10" ry="10" fill="#000000" />
+		<path d="M104,128 l50,50 M152,128 l-50,50" stroke-width="8" stroke="{{ katastrophenschutz.colorStroke }}" fill="none" />
+		<path d="M108,182 L98,182 L98,172 Z" fill="{{ katastrophenschutz.colorStroke }}" />
+		<path d="M148,182 L158,182 L158,172 Z" fill="{{ katastrophenschutz.colorStroke }}" />
+		<ellipse cx="104" cy="134" rx="10" ry="10" fill="{{ katastrophenschutz.colorStroke }}" />
+		<ellipse cx="152" cy="134" rx="10" ry="10" fill="{{ katastrophenschutz.colorStroke }}" />
 	</g>
 </svg>
\ No newline at end of file
diff --git "a/symbols/Katastrophenschutz_Einheiten/Veterin\303\244rzug.j2" "b/symbols/Katastrophenschutz_Einheiten/Veterin\303\244rzug.j2"
index 5ebd10516..c7f1339a8 100644
--- "a/symbols/Katastrophenschutz_Einheiten/Veterin\303\244rzug.j2"
+++ "b/symbols/Katastrophenschutz_Einheiten/Veterin\303\244rzug.j2"
@@ -6,11 +6,11 @@
 			<rect x="10" y="64" width="236" height="128" />
 		</clipPath>
 	</defs>
-	<rect x="10" y="64" width="236" height="128" stroke="#000000" stroke-width="10" fill="#DF6711" clip-path="url(#symbol)" />
+	<rect x="10" y="64" width="236" height="128" stroke="{{ katastrophenschutz.colorStroke }}" stroke-width="10" fill="{{ katastrophenschutz.colorPrimary }}" clip-path="url(#symbol)" />
 	
-	<path d="M59 80 l25 0 L128 176 L172 80 l25 0" stroke-width="5" stroke="#000000" fill="none" />
+	<path d="M59 80 l25 0 L128 176 L172 80 l25 0" stroke-width="5" stroke="{{ katastrophenschutz.colorStroke }}" fill="none" />
 	
-	<ellipse cx="128" cy="48" rx="10" ry="10" fill="#000000" />
-	<ellipse cx="64"  cy="48" rx="10" ry="10" fill="#000000" />
-	<ellipse cx="192" cy="48" rx="10" ry="10" fill="#000000" />
+	<ellipse cx="128" cy="48" rx="10" ry="10" fill="{{ katastrophenschutz.colorStroke }}" />
+	<ellipse cx="64"  cy="48" rx="10" ry="10" fill="{{ katastrophenschutz.colorStroke }}" />
+	<ellipse cx="192" cy="48" rx="10" ry="10" fill="{{ katastrophenschutz.colorStroke }}" />
 </svg>
\ No newline at end of file
diff --git a/symbols/Katastrophenschutz_Einheiten/Zugtrupp.j2 b/symbols/Katastrophenschutz_Einheiten/Zugtrupp.j2
index 1025d951c..6a58fb89f 100644
--- a/symbols/Katastrophenschutz_Einheiten/Zugtrupp.j2
+++ b/symbols/Katastrophenschutz_Einheiten/Zugtrupp.j2
@@ -9,10 +9,10 @@
 			<rect x="10" y="64" width="236" height="128" />
 		</clipPath>
 	</defs>
-	<rect x="10" y="64" width="236" height="128" fill="#DF6711" stroke="#000000" stroke-width="10" clip-path="url(#symbol)" />
-	<ellipse cx="128" cy="48" rx="10" ry="10" fill="#000000" />
-	<ellipse cx="64"  cy="86" rx="10" ry="10" fill="#000000" />
-	<ellipse cx="128" cy="86" rx="10" ry="10" fill="#000000" />
-	<ellipse cx="192" cy="86" rx="10" ry="10" fill="#000000" />
-	<text style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: end;" fill="#000000" x="236" y="180">IuK</text>
+	<rect x="10" y="64" width="236" height="128" fill="{{ katastrophenschutz.colorPrimary }}" stroke="{{ katastrophenschutz.colorStroke }}" stroke-width="10" clip-path="url(#symbol)" />
+	<ellipse cx="128" cy="48" rx="10" ry="10" fill="{{ katastrophenschutz.colorStroke }}" />
+	<ellipse cx="64"  cy="86" rx="10" ry="10" fill="{{ katastrophenschutz.colorStroke }}" />
+	<ellipse cx="128" cy="86" rx="10" ry="10" fill="{{ katastrophenschutz.colorStroke }}" />
+	<ellipse cx="192" cy="86" rx="10" ry="10" fill="{{ katastrophenschutz.colorStroke }}" />
+	<text style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: end;" fill="{{ katastrophenschutz.colorStroke }}" x="236" y="180">IuK</text>
 </svg>
\ No newline at end of file
diff --git a/symbols/Polizei_Einheiten/Einheit.j2 b/symbols/Polizei_Einheiten/Einheit.j2
index 5fc994818..fcbd8c3c3 100644
--- a/symbols/Polizei_Einheiten/Einheit.j2
+++ b/symbols/Polizei_Einheiten/Einheit.j2
@@ -1,6 +1,6 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewbox="0 0 256 256">
-	<title>Einheit</title>
+	<title>Einheit der Polizei</title>
 	<defs>
 		<style type="text/css">
 		{% include './fonts/fonts.j2' %}
@@ -9,6 +9,6 @@
 			<rect x="10" y="64" width="236" height="128" />
 		</clipPath>
 	</defs>
-	<rect x="10" y="64" width="236" height="128" fill="#13A538" stroke="#000000" stroke-width="10" clip-path="url(#symbol)" />
-	<rect x="10" y="64" width="236" height="128" fill="none" stroke="#000000" stroke-width="1" />
+	<rect x="10" y="64" width="236" height="128" fill="{{ polizei.colorPrimary }}" stroke="{{ polizei.colorSecondary }}" stroke-width="10" clip-path="url(#symbol)" />
+	<rect x="10" y="64" width="236" height="128" fill="none" stroke="{{ polizei.colorStroke }}" stroke-width="1" />
 </svg>
\ No newline at end of file
diff --git a/symbols/Polizei_Einheiten/Einheit_der_Bundespolizei.j2 b/symbols/Polizei_Einheiten/Einheit_der_Bundespolizei.j2
index ea0869a3b..e2db9ebdc 100644
--- a/symbols/Polizei_Einheiten/Einheit_der_Bundespolizei.j2
+++ b/symbols/Polizei_Einheiten/Einheit_der_Bundespolizei.j2
@@ -9,7 +9,7 @@
 			<rect x="10" y="64" width="236" height="128" />
 		</clipPath>
 	</defs>
-	<rect x="10" y="64" width="236" height="128" fill="#13A538" stroke="#000000" stroke-width="10" clip-path="url(#symbol)" />
-	<rect x="10" y="64" width="236" height="128" fill="none" stroke="#000000" stroke-width="1" />
-	<text style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 48px;" fill="#000000" x="128" y="145">BPOL</text>
+	<rect x="10" y="64" width="236" height="128" fill="{{ polizei.colorPrimary }}" stroke="{{ polizei.colorSecondary }}" stroke-width="10" clip-path="url(#symbol)" />
+	<rect x="10" y="64" width="236" height="128" fill="none" stroke="{{ polizei.colorStroke }}" stroke-width="1" />
+	<text style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 48px;" fill="{{ polizei.colorStroke }}" x="128" y="145">BPOL</text>
 </svg>
\ No newline at end of file
diff --git a/symbols/Polizei_Einheiten/Einheit_der_Polizei.j2 b/symbols/Polizei_Einheiten/Einheit_der_Polizei.j2
index f11e41fa1..c80d2287c 100644
--- a/symbols/Polizei_Einheiten/Einheit_der_Polizei.j2
+++ b/symbols/Polizei_Einheiten/Einheit_der_Polizei.j2
@@ -9,7 +9,7 @@
 			<rect x="10" y="64" width="236" height="128" />
 		</clipPath>
 	</defs>
-	<rect x="10" y="64" width="236" height="128" fill="#13A538" stroke="#000000" stroke-width="10" clip-path="url(#symbol)" />
-	<rect x="10" y="64" width="236" height="128" fill="none" stroke="#000000" stroke-width="1" />
-	<text style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 48px;" fill="#000000" x="128" y="145">POL</text>
+	<rect x="10" y="64" width="236" height="128" fill="{{ polizei.colorPrimary }}" stroke="{{ polizei.colorSecondary }}" stroke-width="10" clip-path="url(#symbol)" />
+	<rect x="10" y="64" width="236" height="128" fill="none" stroke="{{ polizei.colorStroke }}" stroke-width="1" />
+	<text style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 48px;" fill="{{ polizei.colorStroke }}" x="128" y="145">POL</text>
 </svg>
\ No newline at end of file
diff --git "a/symbols/Polizei_Fahrzeuge/Anh\303\244nger.j2" "b/symbols/Polizei_Fahrzeuge/Anh\303\244nger.j2"
index 663f07455..41a473475 100644
--- "a/symbols/Polizei_Fahrzeuge/Anh\303\244nger.j2"
+++ "b/symbols/Polizei_Fahrzeuge/Anh\303\244nger.j2"
@@ -9,8 +9,8 @@
 			<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" />
 		</clipPath>
 	</defs>
-	<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" fill="#13A538" stroke-width="10" stroke="#FFFFFF" clip-path="url(#symbol)" />
-	<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" fill="none" stroke-width="1" stroke="#000000" />
-	<rect x="0" y="121.5" width="11" height="15" fill="#FFFFFF" />
-	<path d="M10,121 L10,121.5 L0,121.5 M0,136.5 L10,136.5 L10,137" stroke="#000000" stroke-width="1" />
+	<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" fill="{{ polizei.colorPrimary }}" stroke-width="10" stroke="{{ polizei.colorSecondary }}" clip-path="url(#symbol)" />
+	<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" fill="none" stroke-width="1" stroke="{{ polizei.colorStroke }}" />
+	<rect x="0" y="121.5" width="11" height="15" fill="{{ polizei.colorSecondary }}" />
+	<path d="M10,121 L10,121.5 L0,121.5 M0,136.5 L10,136.5 L10,137" stroke="{{ polizei.colorStroke }}" stroke-width="1" fill="none" />
 </svg>
\ No newline at end of file
diff --git a/symbols/Polizei_Fahrzeuge/Kraftfahrzeug.j2 b/symbols/Polizei_Fahrzeuge/Kraftfahrzeug.j2
index bf0d51275..9eb2e15cc 100644
--- a/symbols/Polizei_Fahrzeuge/Kraftfahrzeug.j2
+++ b/symbols/Polizei_Fahrzeuge/Kraftfahrzeug.j2
@@ -9,8 +9,8 @@
 			<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" />
 		</clipPath>
 	</defs>
-	<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" fill="#13A538" stroke-width="10" stroke="#FFFFFF" clip-path="url(#symbol)" />
-	<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" fill="none" stroke-width="1" stroke="#000000" />
-	<ellipse cx="40" cy="210" rx="10" ry="10" stroke="#000000" fill="none" stroke-width="5" />
-	<ellipse cx="216" cy="210" rx="10" ry="10" stroke="#000000" fill="none" stroke-width="5" />
+	<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" fill="{{ polizei.colorPrimary }}" stroke-width="10" stroke="{{ polizei.colorSecondary }}" clip-path="url(#symbol)" />
+	<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" fill="none" stroke-width="1" stroke="{{ polizei.colorStroke }}" />
+	<ellipse cx="40" cy="210" rx="10" ry="10" stroke="{{ polizei.colorStroke }}" fill="none" stroke-width="5" />
+	<ellipse cx="216" cy="210" rx="10" ry="10" stroke="{{ polizei.colorStroke }}" fill="none" stroke-width="5" />
 </svg>
\ No newline at end of file
diff --git a/symbols/Polizei_Fahrzeuge/PKW_Bundespolizei.j2 b/symbols/Polizei_Fahrzeuge/PKW_Bundespolizei.j2
index de40b98fb..8418bad66 100644
--- a/symbols/Polizei_Fahrzeuge/PKW_Bundespolizei.j2
+++ b/symbols/Polizei_Fahrzeuge/PKW_Bundespolizei.j2
@@ -9,9 +9,9 @@
 			<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" />
 		</clipPath>
 	</defs>
-	<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" fill="#13A538" stroke-width="10" stroke="#FFFFFF" clip-path="url(#symbol)" />
-	<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" fill="none" stroke-width="1" stroke="#000000" />
-	<ellipse cx="40" cy="210" rx="10" ry="10" stroke="#000000" fill="none" stroke-width="5" />
-	<ellipse cx="216" cy="210" rx="10" ry="10" stroke="#000000" fill="none" stroke-width="5" />
-	<text style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: end;" fill="#FFFFFF" x="236" y="180">BPol</text>
+	<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" fill="{{ polizei.colorPrimary }}" stroke-width="10" stroke="{{ polizei.colorSecondary }}" clip-path="url(#symbol)" />
+	<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" fill="none" stroke-width="1" stroke="{{ polizei.colorStroke }}" />
+	<ellipse cx="40" cy="210" rx="10" ry="10" stroke="{{ polizei.colorStroke }}" fill="none" stroke-width="5" />
+	<ellipse cx="216" cy="210" rx="10" ry="10" stroke="{{ polizei.colorStroke }}" fill="none" stroke-width="5" />
+	<text style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: end;" fill="{{ polizei.colorSecondary }}" x="236" y="180">BPol</text>
 </svg>
\ No newline at end of file
diff --git a/symbols/Polizei_Fahrzeuge/PKW_Polizei.j2 b/symbols/Polizei_Fahrzeuge/PKW_Polizei.j2
index 20ed179eb..32fb8e720 100644
--- a/symbols/Polizei_Fahrzeuge/PKW_Polizei.j2
+++ b/symbols/Polizei_Fahrzeuge/PKW_Polizei.j2
@@ -9,9 +9,9 @@
 			<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" />
 		</clipPath>
 	</defs>
-	<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" fill="#13A538" stroke-width="10" stroke="#FFFFFF" clip-path="url(#symbol)" />
-	<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" fill="none" stroke-width="1" stroke="#000000" />
-	<ellipse cx="40" cy="210" rx="10" ry="10" stroke="#000000" fill="none" stroke-width="5" />
-	<ellipse cx="216" cy="210" rx="10" ry="10" stroke="#000000" fill="none" stroke-width="5" />
-	<text style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: end;" fill="#FFFFFF" x="236" y="180">Pol</text>
+	<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" fill="{{ polizei.colorPrimary }}" stroke-width="10" stroke="{{ polizei.colorSecondary }}" clip-path="url(#symbol)" />
+	<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" fill="none" stroke-width="1" stroke="{{ polizei.colorStroke }}" />
+	<ellipse cx="40" cy="210" rx="10" ry="10" stroke="{{ polizei.colorStroke }}" fill="none" stroke-width="5" />
+	<ellipse cx="216" cy="210" rx="10" ry="10" stroke="{{ polizei.colorStroke }}" fill="none" stroke-width="5" />
+	<text style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: end;" fill="{{ polizei.colorSecondary }}" x="236" y="180">Pol</text>
 </svg>
\ No newline at end of file
diff --git a/symbols/THW_Einheiten/Weitverkehrstrupp.j2 b/symbols/THW_Einheiten/Weitverkehrstrupp.j2
index 91c494a22..2b9fb535e 100644
--- a/symbols/THW_Einheiten/Weitverkehrstrupp.j2
+++ b/symbols/THW_Einheiten/Weitverkehrstrupp.j2
@@ -18,7 +18,7 @@
 	<rect x="10" y="64" width="236" height="128" fill="none" stroke="{{ thw.colorStroke }}" stroke-width="1" />
 	<ellipse cx="128" cy="48" rx="10" ry="10" fill="{{ thw.colorStroke }}" />
 	<text style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 48px;" fill="{{ thw.colorSecondary }}" x="128" y="120">WV</text>
-	<path d="M50 160 a16 16 0 0 0 0 -32 M206 160 a16 16 0 0 1 0 -32" stroke="{{ thw.colorStroke }}" stroke-width="5" fill="none" />
-	<path d="M56 132 l24 24 l24 -24 l24 24 l24 -24 l24 24 l24 -24" stroke="{{ thw.colorStroke }}" stroke-width="5" fill="none" mask="url(#ends)" />
+	<path d="M50 160 a16 16 0 0 0 0 -32 M206 160 a16 16 0 0 1 0 -32" stroke="{{ thw.colorSecondary }}" stroke-width="5" fill="none" />
+	<path d="M56 132 l24 24 l24 -24 l24 24 l24 -24 l24 24 l24 -24" stroke="{{ thw.colorSecondary }}" stroke-width="5" fill="none" mask="url(#ends)" />
 	<text style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: end;" fill="{{ thw.colorSecondary }}" x="236" y="180">THW</text>
 </svg>
\ No newline at end of file
diff --git a/symbols/THW_Personen/Fachberater.j2 b/symbols/THW_Personen/Fachberater.j2
index 632c1a70e..87edef6ae 100644
--- a/symbols/THW_Personen/Fachberater.j2
+++ b/symbols/THW_Personen/Fachberater.j2
@@ -7,7 +7,7 @@
 		</style>
 	</defs>
 	<path d="M69,128 L128,69 L187,128 L128,187 Z" stroke-width="5" stroke="{{ thw.colorSecondary }}" fill="{{ thw.colorPrimary }}" />
-	<path d="M147,88 L108,88" stroke-width="5" stroke="#FFFFFF" />
+	<path d="M147,88 L108,88" stroke-width="5" stroke="{{ thw.colorSecondary }}" />
 	<path d="M64,128 L128,64 L192,128 L128,192 Z" stroke-width="2" stroke="{{ thw.colorStroke }}" fill="none" />
 	<text x="128" y="140" style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 32px;" fill="{{ thw.colorSecondary }}">THW</text>
 </svg>
\ No newline at end of file
diff --git a/symbols/THW_Personen/Flugleiter.j2 b/symbols/THW_Personen/Flugleiter.j2
index a138b5a2d..3503260e2 100644
--- a/symbols/THW_Personen/Flugleiter.j2
+++ b/symbols/THW_Personen/Flugleiter.j2
@@ -7,7 +7,7 @@
 		</style>
 	</defs>
 	<path d="M69,128 L128,69 L187,128 L128,187 Z" stroke-width="5" stroke="{{ thw.colorSecondary }}" fill="{{ thw.colorPrimary }}" />
-	<path d="M147,88 L108,88" stroke-width="5" stroke="#FFFFFF" />
+	<path d="M147,88 L108,88" stroke-width="5" stroke="{{ thw.colorSecondary }}" />
 	<path d="M64,128 L128,64 L192,128 L128,192 Z" stroke-width="2" stroke="{{ thw.colorStroke }}" fill="none" />
 	<text x="128" y="145" style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 48px;" fill="{{ thw.colorSecondary }}">FL</text>
 </svg>
\ No newline at end of file
diff --git "a/symbols/THW_Personen/Gruppenf\303\274hrer_MT.j2" "b/symbols/THW_Personen/Gruppenf\303\274hrer_MT.j2"
index 2edd814e2..ced972e74 100644
--- "a/symbols/THW_Personen/Gruppenf\303\274hrer_MT.j2"
+++ "b/symbols/THW_Personen/Gruppenf\303\274hrer_MT.j2"
@@ -11,5 +11,5 @@
 	<ellipse cx="100" cy="44" rx="10" ry="10" fill="{{ thw.colorStroke }}" />
 	<ellipse cx="156" cy="44" rx="10" ry="10" fill="{{ thw.colorStroke }}" />
 	<path d="M64,128 L128,64 L192,128 L128,192 Z" stroke-width="2" stroke="{{ thw.colorStroke }}" fill="none" />
-	<text x="128" y="145" style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 48px;" fill="{{ thw.colorSecondary }}">MT</text>
+	<text x="128" y="145" style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 40px;" fill="{{ thw.colorSecondary }}">MT</text>
 </svg>
\ No newline at end of file
diff --git "a/symbols/THW_Personen/Gruppenf\303\274hrer_TW.j2" "b/symbols/THW_Personen/Gruppenf\303\274hrer_TW.j2"
index 28007670d..5bb1ebb00 100644
--- "a/symbols/THW_Personen/Gruppenf\303\274hrer_TW.j2"
+++ "b/symbols/THW_Personen/Gruppenf\303\274hrer_TW.j2"
@@ -11,5 +11,5 @@
 	<ellipse cx="100" cy="44" rx="10" ry="10" fill="{{ thw.colorStroke }}" />
 	<ellipse cx="156" cy="44" rx="10" ry="10" fill="{{ thw.colorStroke }}" />
 	<path d="M64,128 L128,64 L192,128 L128,192 Z" stroke-width="2" stroke="{{ thw.colorStroke }}" fill="none" />
-	<text x="128" y="150" style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 48px;" fill="{{ thw.colorSecondary }}">TW</text>
+	<text x="128" y="145" style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 40px;" fill="{{ thw.colorSecondary }}">TW</text>
 </svg>
\ No newline at end of file
diff --git "a/symbols/THW_Personen/Gruppenf\303\274hrer_W.j2" "b/symbols/THW_Personen/Gruppenf\303\274hrer_W.j2"
index afea4c552..30ad0ad04 100644
--- "a/symbols/THW_Personen/Gruppenf\303\274hrer_W.j2"
+++ "b/symbols/THW_Personen/Gruppenf\303\274hrer_W.j2"
@@ -11,5 +11,5 @@
 	<ellipse cx="100" cy="44" rx="10" ry="10" fill="{{ thw.colorStroke }}" />
 	<ellipse cx="156" cy="44" rx="10" ry="10" fill="{{ thw.colorStroke }}" />
 	<path d="M64,128 L128,64 L192,128 L128,192 Z" stroke-width="2" stroke="{{ thw.colorStroke }}" fill="none" />
-	<text x="128" y="145" style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 48px;" fill="{{ thw.colorSecondary }}">W</text>
+	<text x="128" y="150" style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 48px;" fill="{{ thw.colorSecondary }}">W</text>
 </svg>
diff --git a/symbols/THW_Personen/Technischer_Berater.j2 b/symbols/THW_Personen/Technischer_Berater.j2
index 7ed093796..177fb0b64 100644
--- a/symbols/THW_Personen/Technischer_Berater.j2
+++ b/symbols/THW_Personen/Technischer_Berater.j2
@@ -7,7 +7,7 @@
 		</style>
 	</defs>
 	<path d="M69,128 L128,69 L187,128 L128,187 Z" stroke-width="5" stroke="{{ thw.colorSecondary }}" fill="{{ thw.colorPrimary }}" />
-	<path d="M147,88 L108,88" stroke-width="5" stroke="#FFFFFF" />
+	<path d="M147,88 L108,88" stroke-width="5" stroke="{{ thw.colorSecondary }}" />
 	<path d="M64,128 L128,64 L192,128 L128,192 Z" stroke-width="2" stroke="{{ thw.colorStroke }}" fill="none" />
 	<text x="128" y="140" style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 32px;" fill="{{ thw.colorSecondary }}">TeBe</text>
 </svg>
\ No newline at end of file
diff --git a/symbols/THW_Personen/Technischer_Berater_Bau.j2 b/symbols/THW_Personen/Technischer_Berater_Bau.j2
index 3a331333a..4a3a03f95 100644
--- a/symbols/THW_Personen/Technischer_Berater_Bau.j2
+++ b/symbols/THW_Personen/Technischer_Berater_Bau.j2
@@ -7,7 +7,7 @@
 		</style>
 	</defs>
 	<path d="M69,128 L128,69 L187,128 L128,187 Z" stroke-width="5" stroke="{{ thw.colorSecondary }}" fill="{{ thw.colorPrimary }}" />
-	<path d="M147,88 L108,88" stroke-width="5" stroke="#FFFFFF" />
+	<path d="M147,88 L108,88" stroke-width="5" stroke="{{ thw.colorSecondary }}" />
 	<path d="M64,128 L128,64 L192,128 L128,192 Z" stroke-width="2" stroke="{{ thw.colorStroke }}" fill="none" />
 	<text x="128" y="140" style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 32px;" fill="{{ thw.colorSecondary }}">TeBe</text>
     <text x="90" y="187" style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: end; font-size: 28px;" fill="{{ thw.colorStroke }}">Bau</text>
diff --git a/symbols/THW_Personen/Technischer_Berater_Ortung.j2 b/symbols/THW_Personen/Technischer_Berater_Ortung.j2
index 0ab4d1313..115120dfe 100644
--- a/symbols/THW_Personen/Technischer_Berater_Ortung.j2
+++ b/symbols/THW_Personen/Technischer_Berater_Ortung.j2
@@ -7,7 +7,7 @@
 		</style>
 	</defs>
 	<path d="M69,128 L128,69 L187,128 L128,187 Z" stroke-width="5" stroke="{{ thw.colorSecondary }}" fill="{{ thw.colorPrimary }}" />
-	<path d="M147,88 L108,88" stroke-width="5" stroke="#FFFFFF" />
+	<path d="M147,88 L108,88" stroke-width="5" stroke="{{ thw.colorSecondary }}" />
 	<path d="M64,128 L128,64 L192,128 L128,192 Z" stroke-width="2" stroke="{{ thw.colorStroke }}" fill="none" />
 	<text x="128" y="140" style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 32px;" fill="{{ thw.colorSecondary }}">TeBe</text>
     <text x="90" y="187" style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: end; font-size: 28px;" fill="{{ thw.colorStroke }}">O</text>
diff --git "a/symbols/THW_Personen/Technischer_Berater_\303\226l.j2" "b/symbols/THW_Personen/Technischer_Berater_\303\226l.j2"
index 5b488db5a..2260ee21f 100644
--- "a/symbols/THW_Personen/Technischer_Berater_\303\226l.j2"
+++ "b/symbols/THW_Personen/Technischer_Berater_\303\226l.j2"
@@ -7,7 +7,7 @@
 		</style>
 	</defs>
 	<path d="M69,128 L128,69 L187,128 L128,187 Z" stroke-width="5" stroke="{{ thw.colorSecondary }}" fill="{{ thw.colorPrimary }}" />
-	<path d="M147,88 L108,88" stroke-width="5" stroke="#FFFFFF" />
+	<path d="M147,88 L108,88" stroke-width="5" stroke="{{ thw.colorSecondary }}" />
 	<path d="M64,128 L128,64 L192,128 L128,192 Z" stroke-width="2" stroke="{{ thw.colorStroke }}" fill="none" />
 	<text x="128" y="140" style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 32px;" fill="{{ thw.colorSecondary }}">TeBe</text>
     <text x="90" y="187" style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: end; font-size: 28px;" fill="{{ thw.colorStroke }}">Öl</text>
diff --git "a/symbols/THW_Personen/Truppf\303\274hrer_Log-M.j2" "b/symbols/THW_Personen/Truppf\303\274hrer_Log-M.j2"
index a5f9094e9..2f49d7079 100644
--- "a/symbols/THW_Personen/Truppf\303\274hrer_Log-M.j2"
+++ "b/symbols/THW_Personen/Truppf\303\274hrer_Log-M.j2"
@@ -10,5 +10,5 @@
 	<path d="M128,64 L152,88 L104,88 Z" stroke-width="0" fill="{{ thw.colorSecondary }}" />
 	<ellipse cx="128" cy="44" rx="10" ry="10" fill="{{ thw.colorStroke }}" />
 	<path d="M64,128 L128,64 L192,128 L128,192 Z" stroke-width="2" stroke="{{ thw.colorStroke }}" fill="none" />
-	<text x="128" y="140" style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 28px;" fill="{{ thw.colorSecondary }}">Log-M</text>
+	<text x="128" y="140" style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 26px;" fill="{{ thw.colorSecondary }}">Log-M</text>
 </svg>
\ No newline at end of file
diff --git "a/symbols/THW_Personen/Truppf\303\274hrer_Log-V.j2" "b/symbols/THW_Personen/Truppf\303\274hrer_Log-V.j2"
index fd1006e36..5883070ad 100644
--- "a/symbols/THW_Personen/Truppf\303\274hrer_Log-V.j2"
+++ "b/symbols/THW_Personen/Truppf\303\274hrer_Log-V.j2"
@@ -10,5 +10,5 @@
 	<path d="M128,64 L152,88 L104,88 Z" stroke-width="0" fill="{{ thw.colorSecondary }}" />
 	<ellipse cx="128" cy="44" rx="10" ry="10" fill="{{ thw.colorStroke }}" />
 	<path d="M64,128 L128,64 L192,128 L128,192 Z" stroke-width="2" stroke="{{ thw.colorStroke }}" fill="none" />
-	<text x="128" y="140" style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 28px;" fill="{{ thw.colorSecondary }}">Log-V</text>
+	<text x="128" y="140" style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 26px;" fill="{{ thw.colorSecondary }}">Log-V</text>
 </svg>
\ No newline at end of file
diff --git "a/symbols/THW_Personen/Truppf\303\274hrer_MT.j2" "b/symbols/THW_Personen/Truppf\303\274hrer_MT.j2"
index b1ecc0f4a..5ea6730e1 100644
--- "a/symbols/THW_Personen/Truppf\303\274hrer_MT.j2"
+++ "b/symbols/THW_Personen/Truppf\303\274hrer_MT.j2"
@@ -10,5 +10,5 @@
 	<path d="M128,64 L152,88 L104,88 Z" stroke-width="0" fill="{{ thw.colorSecondary }}" />
 	<ellipse cx="128" cy="44" rx="10" ry="10" fill="{{ thw.colorStroke }}" />
 	<path d="M64,128 L128,64 L192,128 L128,192 Z" stroke-width="2" stroke="{{ thw.colorStroke }}" fill="none" />
-	<text x="128" y="145" style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 48px;" fill="{{ thw.colorSecondary }}">MT</text>
+	<text x="128" y="145" style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 40px;" fill="{{ thw.colorSecondary }}">MT</text>
 </svg>
\ No newline at end of file
diff --git "a/symbols/THW_Personen/Truppf\303\274hrer_TW.j2" "b/symbols/THW_Personen/Truppf\303\274hrer_TW.j2"
index 9bc42cdad..3e2d28dbd 100644
--- "a/symbols/THW_Personen/Truppf\303\274hrer_TW.j2"
+++ "b/symbols/THW_Personen/Truppf\303\274hrer_TW.j2"
@@ -10,5 +10,5 @@
 	<path d="M128,64 L152,88 L104,88 Z" stroke-width="0" fill="{{ thw.colorSecondary }}" />
 	<ellipse cx="128" cy="44" rx="10" ry="10" fill="{{ thw.colorStroke }}" />
 	<path d="M64,128 L128,64 L192,128 L128,192 Z" stroke-width="2" stroke="{{ thw.colorStroke }}" fill="none" />
-	<text x="128" y="150" style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 48px;" fill="{{ thw.colorSecondary }}">TW</text>
+	<text x="128" y="145" style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 40px;" fill="{{ thw.colorSecondary }}">TW</text>
 </svg>
\ No newline at end of file
diff --git "a/symbols/THW_Personen/Truppf\303\274hrer_W.j2" "b/symbols/THW_Personen/Truppf\303\274hrer_W.j2"
index 9660e9264..950ed797d 100644
--- "a/symbols/THW_Personen/Truppf\303\274hrer_W.j2"
+++ "b/symbols/THW_Personen/Truppf\303\274hrer_W.j2"
@@ -10,5 +10,5 @@
 	<path d="M128,64 L152,88 L104,88 Z" stroke-width="0" fill="{{ thw.colorSecondary }}" />
 	<ellipse cx="128" cy="44" rx="10" ry="10" fill="{{ thw.colorStroke }}" />
 	<path d="M64,128 L128,64 L192,128 L128,192 Z" stroke-width="2" stroke="{{ thw.colorStroke }}" fill="none" />
-	<text x="128" y="145" style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 48px;" fill="{{ thw.colorSecondary }}">W</text>
+	<text x="128" y="150" style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 48px;" fill="{{ thw.colorSecondary }}">W</text>
 </svg>
diff --git a/symbols/Zoll_Einheiten/Einheit_des_Zoll.j2 b/symbols/Zoll_Einheiten/Einheit_des_Zoll.j2
index a735ff00a..6a067b6a4 100644
--- a/symbols/Zoll_Einheiten/Einheit_des_Zoll.j2
+++ b/symbols/Zoll_Einheiten/Einheit_des_Zoll.j2
@@ -9,7 +9,7 @@
 			<rect x="10" y="64" width="236" height="128" />
 		</clipPath>
 	</defs>
-	<rect x="10" y="64" width="236" height="128" fill="#13A538" stroke="#000000" stroke-width="10" clip-path="url(#symbol)" />
-	<rect x="10" y="64" width="236" height="128" fill="none" stroke="#000000" stroke-width="1" />
-	<text style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 48px;" fill="#000000" x="128" y="145">Zoll</text>
+	<rect x="10" y="64" width="236" height="128" fill="{{ zoll.colorPrimary }}" stroke="{{ zoll.colorSecondary }}" stroke-width="10" clip-path="url(#symbol)" />
+	<rect x="10" y="64" width="236" height="128" fill="none" stroke="{{ zoll.colorStroke }}" stroke-width="1" />
+	<text style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 48px;" fill="{{ zoll.colorSecondary }}" x="128" y="145">Zoll</text>
 </svg>
\ No newline at end of file
diff --git a/symbols/Zoll_Fahrzeuge/PKW.j2 b/symbols/Zoll_Fahrzeuge/PKW.j2
index 960a04c48..9067ab58b 100644
--- a/symbols/Zoll_Fahrzeuge/PKW.j2
+++ b/symbols/Zoll_Fahrzeuge/PKW.j2
@@ -9,9 +9,9 @@
 			<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" />
 		</clipPath>
 	</defs>
-	<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" fill="#13A538" stroke-width="10" stroke="#FFFFFF" clip-path="url(#symbol)" />
-	<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" fill="none" stroke-width="1" stroke="#000000" />
-	<ellipse cx="40" cy="210" rx="10" ry="10" stroke="#000000" fill="none" stroke-width="5" />
-	<ellipse cx="216" cy="210" rx="10" ry="10" stroke="#000000" fill="none" stroke-width="5" />
-	<text style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: end;" fill="#FFFFFF" x="236" y="180">Zoll</text>
+	<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" fill="{{ zoll.colorPrimary }}" stroke-width="10" stroke="{{ zoll.colorSecondary }}" clip-path="url(#symbol)" />
+	<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" fill="none" stroke-width="1" stroke="{{ zoll.colorStroke }}" />
+	<ellipse cx="40" cy="210" rx="10" ry="10" stroke="{{ zoll.colorStroke }}" fill="none" stroke-width="5" />
+	<ellipse cx="216" cy="210" rx="10" ry="10" stroke="{{ zoll.colorStroke }}" fill="none" stroke-width="5" />
+	<text style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: end;" fill="{{ zoll.colorSecondary }}" x="236" y="180">Zoll</text>
 </svg>
\ No newline at end of file
diff --git a/themes/default.json b/themes/default.json
index 1f1deeadd..c71fbc1d7 100644
--- a/themes/default.json
+++ b/themes/default.json
@@ -14,9 +14,24 @@
         "colorSecondary": "#FFFFFF",
         "colorStroke": "#000000"
     },
+    "katastrophenschutz": {
+        "colorPrimary": "#DF6711",
+        "colorSecondary": "#000000",
+        "colorStroke": "#000000"
+    },
     "kommunal": {
         "colorPrimary": "#E26E0E",
         "colorSecondary": "#000000",
         "colorStroke": "#000000"
+    },
+    "polizei": {
+        "colorPrimary": "#13A538",
+        "colorSecondary": "#FFFFFF",
+        "colorStroke": "#000000"
+    },
+    "zoll": {
+        "colorPrimary": "#13A538",
+        "colorSecondary": "#FFFFFF",
+        "colorStroke": "#000000"
     }
 }
\ No newline at end of file
diff --git a/themes/print.json b/themes/print.json
index 19f8977a9..758a7ecd9 100644
--- a/themes/print.json
+++ b/themes/print.json
@@ -14,9 +14,24 @@
         "colorSecondary": "#996633",
         "colorStroke": "#996633"
     },
+    "katastrophenschutz": {
+        "colorPrimary": "#FFFFFF",
+        "colorSecondary": "#DF6711",
+        "colorStroke": "#DF6711"
+    },
     "kommunal": {
         "colorPrimary": "#FFFFFF",
         "colorSecondary": "#E26E0E",
         "colorStroke": "#E26E0E"
+    },
+    "polizei": {
+        "colorPrimary": "#FFFFFF",
+        "colorSecondary": "#13A538",
+        "colorStroke": "#13A538"
+    },
+    "zoll": {
+        "colorPrimary": "#FFFFFF",
+        "colorSecondary": "#13A538",
+        "colorStroke": "#13A538"
     }
 }
\ No newline at end of file