diff --git "a/symbols/Kommunal_Fahrzeuge/Abrollbeh\303\244lter_Container.j2" "b/symbols/Kommunal_Fahrzeuge/Abrollbeh\303\244lter_Container.j2"
index fc40e3fd..c20fcd1f 100644
--- "a/symbols/Kommunal_Fahrzeuge/Abrollbeh\303\244lter_Container.j2"
+++ "b/symbols/Kommunal_Fahrzeuge/Abrollbeh\303\244lter_Container.j2"
@@ -9,6 +9,6 @@
 			<rect x="0" y="44" width="10" height="148" />
 		</clipPath>
 	</defs>
-	<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" fill="#E26E0E" stroke-width="10" stroke="#000000" clip-path="url(#symbol)" />
-	<ellipse cx="8" cy="80" rx="5" ry="5" stroke="#000000" fill="none" stroke-width="5" clip-path="url(#hook)" />
+	<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" fill="{{ kommunal.colorPrimary }}" stroke-width="10" stroke="{{ kommunal.colorStroke }}" clip-path="url(#symbol)" />
+	<ellipse cx="8" cy="80" rx="5" ry="5" stroke="{{ kommunal.colorStroke }}" fill="none" stroke-width="5" clip-path="url(#hook)" />
 </svg>
\ No newline at end of file
diff --git "a/symbols/Kommunal_Fahrzeuge/Anh\303\244nger.j2" "b/symbols/Kommunal_Fahrzeuge/Anh\303\244nger.j2"
index 3c5cd9e1..08e19fa5 100644
--- "a/symbols/Kommunal_Fahrzeuge/Anh\303\244nger.j2"
+++ "b/symbols/Kommunal_Fahrzeuge/Anh\303\244nger.j2"
@@ -6,6 +6,6 @@
 			<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="#E26E0E" stroke-width="10" stroke="#000000" clip-path="url(#symbol)" />
-	<rect x="0" y="120.5" width="10" height="15" />
+	<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" fill="{{ kommunal.colorPrimary }}" stroke-width="10" stroke="{{ kommunal.colorStroke }}" clip-path="url(#symbol)" />
+	<rect x="0" y="120.5" width="10" height="15" fill="{{ kommunal.colorStroke }}" />
 </svg>
\ No newline at end of file
diff --git a/symbols/Kommunal_Fahrzeuge/Bagger_Kette.j2 b/symbols/Kommunal_Fahrzeuge/Bagger_Kette.j2
index 770162dd..6172422b 100644
--- a/symbols/Kommunal_Fahrzeuge/Bagger_Kette.j2
+++ b/symbols/Kommunal_Fahrzeuge/Bagger_Kette.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>Hägglunds</title>
+	<title>Bagger Kette</title>
 	<defs>
 		<style type="text/css">
 		{% include './fonts/fonts.j2' %}
@@ -9,7 +9,7 @@
 			<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="#E26E0E" stroke-width="10" stroke="#000000" clip-path="url(#symbol)" />
-	<path d="M24,200 l208,0 a10,10 180 0 1 0,20 l-208,0 a10,10 180 0 1 0,-20 Z" stroke="#000000" fill="none" stroke-width="5" />
-	<text style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 48px;" fill="#000000" x="128" y="145">Bagger</text>
+	<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" fill="{{ kommunal.colorPrimary }}" stroke-width="10" stroke="{{ kommunal.colorStroke }}" clip-path="url(#symbol)" />
+	<path d="M24,200 l208,0 a10,10 180 0 1 0,20 l-208,0 a10,10 180 0 1 0,-20 Z" stroke="{{ kommunal.colorStroke }}" fill="none" stroke-width="5" />
+	<text style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 48px;" fill="{{ kommunal.colorSecondary }}" x="128" y="145">Bagger</text>
 </svg>
\ No newline at end of file
diff --git a/symbols/Kommunal_Fahrzeuge/Bagger_Rad.j2 b/symbols/Kommunal_Fahrzeuge/Bagger_Rad.j2
index 0faa103f..b0898ff3 100644
--- a/symbols/Kommunal_Fahrzeuge/Bagger_Rad.j2
+++ b/symbols/Kommunal_Fahrzeuge/Bagger_Rad.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>Kraftfahrzeug</title>
+	<title>Bagger Rad</title>
 	<defs>
 		<style type="text/css">
 		{% include './fonts/fonts.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="#E26E0E" stroke-width="10" stroke="#000000" clip-path="url(#symbol)" />
-	<ellipse cx="40" cy="210" rx="10" ry="10" stroke="#000000" fill="none" stroke-width="5" />
-    <ellipse cx="128" 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: middle; font-size: 48px; " fill="#000000" x="128" y="145">Bagger</text>
+	<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" fill="{{ kommunal.colorPrimary }}" stroke-width="10" stroke="{{ kommunal.colorStroke }}" clip-path="url(#symbol)" />
+	<ellipse cx="40" cy="210" rx="10" ry="10" stroke="{{ kommunal.colorStroke }}" fill="none" stroke-width="5" />
+    <ellipse cx="128" cy="210" rx="10" ry="10" stroke="{{ kommunal.colorStroke }}" fill="none" stroke-width="5" />
+	<ellipse cx="216" cy="210" rx="10" ry="10" stroke="{{ kommunal.colorStroke }}" fill="none" stroke-width="5" />
+	<text style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 48px; " fill="{{ kommunal.colorSecondary }}" x="128" y="145">Bagger</text>
 </svg>
\ No newline at end of file
diff --git a/symbols/Kommunal_Fahrzeuge/Personenkraftfahrzeug.j2 b/symbols/Kommunal_Fahrzeuge/Gabelstapler.j2
similarity index 52%
rename from symbols/Kommunal_Fahrzeuge/Personenkraftfahrzeug.j2
rename to symbols/Kommunal_Fahrzeuge/Gabelstapler.j2
index 9ca45d1f..8cbde3c8 100644
--- a/symbols/Kommunal_Fahrzeuge/Personenkraftfahrzeug.j2
+++ b/symbols/Kommunal_Fahrzeuge/Gabelstapler.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>Kraftfahrzeug</title>
+	<title>Gabelstapler</title>
 	<defs>
 		<style type="text/css">
 		{% include './fonts/fonts.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="#E26E0E" stroke-width="10" stroke="#000000" clip-path="url(#symbol)" />
-	<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: middle; font-size: 48px; " fill="#000000" x="128" y="145">PKW</text>
+	<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" fill="{{ kommunal.colorPrimary }}" stroke-width="10" stroke="{{ kommunal.colorStroke }}" clip-path="url(#symbol)" />
+	<ellipse cx="40" cy="210" rx="10" ry="10" stroke="{{ kommunal.colorStroke }}" fill="none" stroke-width="5" />
+	<ellipse cx="216" cy="210" rx="10" ry="10" stroke="{{ kommunal.colorStroke }}" fill="none" stroke-width="5" />
+	<text style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 48px; " fill="{{ kommunal.colorSecondary }}" x="128" y="145">Stapler</text>
 </svg>
\ No newline at end of file
diff --git "a/symbols/Kommunal_Fahrzeuge/Gabelstapler_gel\303\244ndeg\303\244ngig.j2" "b/symbols/Kommunal_Fahrzeuge/Gabelstapler_gel\303\244ndeg\303\244ngig.j2"
new file mode 100644
index 00000000..337dee78
--- /dev/null
+++ "b/symbols/Kommunal_Fahrzeuge/Gabelstapler_gel\303\244ndeg\303\244ngig.j2"
@@ -0,0 +1,17 @@
+<!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>Gabelstapler (geländegängig)</title>
+	<defs>
+		<style type="text/css">
+		{% include './fonts/fonts.j2' %}
+		</style>
+		<clipPath id="symbol">
+			<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="{{ kommunal.colorPrimary }}" stroke-width="10" stroke="{{ kommunal.colorStroke }}" clip-path="url(#symbol)" />
+	<ellipse cx="40" cy="210" rx="10" ry="10" stroke="{{ kommunal.colorStroke }}" fill="none" stroke-width="5" />
+    <ellipse cx="128" cy="210" rx="10" ry="10" stroke="{{ kommunal.colorStroke }}" fill="none" stroke-width="5" />
+	<ellipse cx="216" cy="210" rx="10" ry="10" stroke="{{ kommunal.colorStroke }}" fill="none" stroke-width="5" />
+	<text style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 48px; " fill="{{ kommunal.colorSecondary }}" x="128" y="145">Stapler</text>
+</svg>
\ No newline at end of file
diff --git "a/symbols/Kommunal_Fahrzeuge/H\303\244gglunds.j2" "b/symbols/Kommunal_Fahrzeuge/H\303\244gglunds.j2"
index cad7fa74..f494c295 100644
--- "a/symbols/Kommunal_Fahrzeuge/H\303\244gglunds.j2"
+++ "b/symbols/Kommunal_Fahrzeuge/H\303\244gglunds.j2"
@@ -9,7 +9,7 @@
 			<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="#E26E0E" stroke-width="10" stroke="#000000" clip-path="url(#symbol)" />
-	<path d="M24,200 l208,0 a10,10 180 0 1 0,20 l-208,0 a10,10 180 0 1 0,-20 Z" stroke="#000000" fill="none" stroke-width="5" />
-	<text style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 48px;" fill="#000000" x="128" y="145">Hägg</text>
+	<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" fill="{{ kommunal.colorPrimary }}" stroke-width="10" stroke="{{ kommunal.colorStroke }}" clip-path="url(#symbol)" />
+	<path d="M24,200 l208,0 a10,10 180 0 1 0,20 l-208,0 a10,10 180 0 1 0,-20 Z" stroke="{{ kommunal.colorStroke }}" fill="none" stroke-width="5" />
+	<text style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 48px;" fill="{{ kommunal.colorSecondary }}" x="128" y="145">Hägg</text>
 </svg>
\ No newline at end of file
diff --git a/symbols/Kommunal_Fahrzeuge/Kettenfahrzeug.j2 b/symbols/Kommunal_Fahrzeuge/Kettenfahrzeug.j2
index 6d0b225c..098ab1de 100644
--- a/symbols/Kommunal_Fahrzeuge/Kettenfahrzeug.j2
+++ b/symbols/Kommunal_Fahrzeuge/Kettenfahrzeug.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>Hägglunds</title>
+	<title>Kettenfahrzeug</title>
 	<defs>
 		<style type="text/css">
 		{% include './fonts/fonts.j2' %}
@@ -9,6 +9,6 @@
 			<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="#E26E0E" stroke-width="10" stroke="#000000" clip-path="url(#symbol)" />
-	<path d="M24,200 l208,0 a10,10 180 0 1 0,20 l-208,0 a10,10 180 0 1 0,-20 Z" stroke="#000000" fill="none" stroke-width="5" />
+	<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" fill="{{ kommunal.colorPrimary }}" stroke-width="10" stroke="{{ kommunal.colorStroke }}" clip-path="url(#symbol)" />
+	<path d="M24,200 l208,0 a10,10 180 0 1 0,20 l-208,0 a10,10 180 0 1 0,-20 Z" stroke="{{ kommunal.colorStroke }}" fill="none" stroke-width="5" />
 </svg>
\ No newline at end of file
diff --git a/symbols/Kommunal_Fahrzeuge/Kraftfahrzeug.j2 b/symbols/Kommunal_Fahrzeuge/Kraftfahrzeug.j2
index eb9c08da..ed777b03 100644
--- a/symbols/Kommunal_Fahrzeuge/Kraftfahrzeug.j2
+++ b/symbols/Kommunal_Fahrzeuge/Kraftfahrzeug.j2
@@ -9,7 +9,7 @@
 			<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="#E26E0E" stroke-width="10" stroke="#000000" clip-path="url(#symbol)" />
-	<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="{{ kommunal.colorPrimary }}" stroke-width="10" stroke="{{ kommunal.colorStroke }}" clip-path="url(#symbol)" />
+	<ellipse cx="40" cy="210" rx="10" ry="10" stroke="{{ kommunal.colorStroke }}" fill="none" stroke-width="5" />
+	<ellipse cx="216" cy="210" rx="10" ry="10" stroke="{{ kommunal.colorStroke }}" fill="none" stroke-width="5" />
 </svg>
\ No newline at end of file
diff --git "a/symbols/Kommunal_Fahrzeuge/Kraftfahrzeug_gel\303\244ndeg\303\244ngig.j2" "b/symbols/Kommunal_Fahrzeuge/Kraftfahrzeug_gel\303\244ndeg\303\244ngig.j2"
index 89f64382..be8b8ee2 100644
--- "a/symbols/Kommunal_Fahrzeuge/Kraftfahrzeug_gel\303\244ndeg\303\244ngig.j2"
+++ "b/symbols/Kommunal_Fahrzeuge/Kraftfahrzeug_gel\303\244ndeg\303\244ngig.j2"
@@ -1,13 +1,13 @@
 <!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>Kraftfahrzeug geländegängig</title>
+	<title>Kraftfahrzeug (geländegängig)</title>
 	<defs>
 		<clipPath id="symbol">
 			<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="#E26E0E" stroke-width="10" stroke="#000000" clip-path="url(#symbol)" />
-	<ellipse cx="40" cy="210" rx="10" ry="10" stroke="#000000" fill="none" stroke-width="5" />
-	<ellipse cx="128" 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="{{ kommunal.colorPrimary }}" stroke-width="10" stroke="{{ kommunal.colorStroke }}" clip-path="url(#symbol)" />
+	<ellipse cx="40" cy="210" rx="10" ry="10" stroke="{{ kommunal.colorStroke }}" fill="none" stroke-width="5" />
+	<ellipse cx="128" cy="210" rx="10" ry="10" stroke="{{ kommunal.colorStroke }}" fill="none" stroke-width="5" />
+	<ellipse cx="216" cy="210" rx="10" ry="10" stroke="{{ kommunal.colorStroke }}" fill="none" stroke-width="5" />
 </svg>
\ No newline at end of file
diff --git a/symbols/Kommunal_Fahrzeuge/MTW.j2 b/symbols/Kommunal_Fahrzeuge/MTW.j2
index 74385a44..c448c8e6 100644
--- a/symbols/Kommunal_Fahrzeuge/MTW.j2
+++ b/symbols/Kommunal_Fahrzeuge/MTW.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="#E26E0E" stroke-width="10" stroke="#000000" clip-path="url(#symbol)" />
-	<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: middle; font-size: 48px; " fill="#000000" x="128" y="145">MTW</text>
+	<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" fill="{{ kommunal.colorPrimary }}" stroke-width="10" stroke="{{ kommunal.colorStroke }}" clip-path="url(#symbol)" />
+	<ellipse cx="40" cy="210" rx="10" ry="10" stroke="{{ kommunal.colorStroke }}" fill="none" stroke-width="5" />
+	<ellipse cx="216" cy="210" rx="10" ry="10" stroke="{{ kommunal.colorStroke }}" fill="none" stroke-width="5" />
+	<text style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 48px;" fill="{{ kommunal.colorSecondary }}" x="128" y="145">MTW</text>
 </svg>
\ No newline at end of file
diff --git a/symbols/Kommunal_Fahrzeuge/Mehrzweckarbeitsboot.j2 b/symbols/Kommunal_Fahrzeuge/Mehrzweckarbeitsboot.j2
index 9ab6ddc4..0c0e57b4 100644
--- a/symbols/Kommunal_Fahrzeuge/Mehrzweckarbeitsboot.j2
+++ b/symbols/Kommunal_Fahrzeuge/Mehrzweckarbeitsboot.j2
@@ -9,6 +9,6 @@
 			<path d="M10,64 l236,0 A118,118 180 0 1 10,64 Z" />
 		</clipPath>
 	</defs>
-	<path d="M10,64 l236,0 A118,118 180 0 1 10,64 Z" stroke="#000000" fill="#E26E0E" stroke-width="10" clip-path="url(#symbol)" />
-	<text style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 48px;" fill="#000000" x="128" y="127">MzAB</text>
+	<path d="M10,64 l236,0 A118,118 180 0 1 10,64 Z" stroke="{{ kommunal.colorStroke }}" fill="{{ kommunal.colorPrimary }}" stroke-width="10" clip-path="url(#symbol)" />
+	<text style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 48px;" fill="{{ kommunal.colorSecondary }}" x="128" y="127">MzAB</text>
 </svg>
diff --git "a/symbols/Kommunal_Fahrzeuge/Personenkraftfahrzeug_gel\303\244ndeg\303\244ngig.j2" b/symbols/Kommunal_Fahrzeuge/PKW.j2
similarity index 52%
rename from "symbols/Kommunal_Fahrzeuge/Personenkraftfahrzeug_gel\303\244ndeg\303\244ngig.j2"
rename to symbols/Kommunal_Fahrzeuge/PKW.j2
index 6cb7485e..f4a38af4 100644
--- "a/symbols/Kommunal_Fahrzeuge/Personenkraftfahrzeug_gel\303\244ndeg\303\244ngig.j2"
+++ b/symbols/Kommunal_Fahrzeuge/PKW.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>Kraftfahrzeug</title>
+	<title>Personenkraftwagen</title>
 	<defs>
 		<style type="text/css">
 		{% include './fonts/fonts.j2' %}
@@ -9,9 +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="#E26E0E" stroke-width="10" stroke="#000000" clip-path="url(#symbol)" />
-	<ellipse cx="40" cy="210" rx="10" ry="10" stroke="#000000" fill="none" stroke-width="5" />
-    <ellipse cx="128" 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: middle; font-size: 48px; " fill="#000000" x="128" y="145">PKW</text>
+	<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" fill="{{ kommunal.colorPrimary }}" stroke-width="10" stroke="{{ kommunal.colorStroke }}" clip-path="url(#symbol)" />
+	<ellipse cx="40" cy="210" rx="10" ry="10" stroke="{{ kommunal.colorStroke }}" fill="none" stroke-width="5" />
+	<ellipse cx="216" cy="210" rx="10" ry="10" stroke="{{ kommunal.colorStroke }}" fill="none" stroke-width="5" />
+	<text style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 48px;" fill="{{ kommunal.colorSecondary }}" x="128" y="145">PKW</text>
 </svg>
\ No newline at end of file
diff --git "a/symbols/Kommunal_Fahrzeuge/PKW_gel\303\244ndeg\303\244ngig.j2" "b/symbols/Kommunal_Fahrzeuge/PKW_gel\303\244ndeg\303\244ngig.j2"
new file mode 100644
index 00000000..343155e4
--- /dev/null
+++ "b/symbols/Kommunal_Fahrzeuge/PKW_gel\303\244ndeg\303\244ngig.j2"
@@ -0,0 +1,17 @@
+<!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>Personenkraftwagen (geländegängig)</title>
+	<defs>
+		<style type="text/css">
+		{% include './fonts/fonts.j2' %}
+		</style>
+		<clipPath id="symbol">
+			<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="{{ kommunal.colorPrimary }}" stroke-width="10" stroke="{{ kommunal.colorStroke }}" clip-path="url(#symbol)" />
+	<ellipse cx="40" cy="210" rx="10" ry="10" stroke="{{ kommunal.colorStroke }}" fill="none" stroke-width="5" />
+    <ellipse cx="128" cy="210" rx="10" ry="10" stroke="{{ kommunal.colorStroke }}" fill="none" stroke-width="5" />
+	<ellipse cx="216" cy="210" rx="10" ry="10" stroke="{{ kommunal.colorStroke }}" fill="none" stroke-width="5" />
+	<text style="font-family: 'Roboto Slab'; font-weight: bold; text-anchor: middle; font-size: 48px;" fill="{{ kommunal.colorSecondary }}" x="128" y="145">PKW</text>
+</svg>
\ No newline at end of file
diff --git a/symbols/Kommunal_Fahrzeuge/Stapler.j2 b/symbols/Kommunal_Fahrzeuge/Stapler.j2
deleted file mode 100644
index a26ab8ee..00000000
--- a/symbols/Kommunal_Fahrzeuge/Stapler.j2
+++ /dev/null
@@ -1,16 +0,0 @@
-<!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>Kraftfahrzeug</title>
-	<defs>
-		<style type="text/css">
-		{% include './fonts/fonts.j2' %}
-		</style>
-		<clipPath id="symbol">
-			<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="#E26E0E" stroke-width="10" stroke="#000000" clip-path="url(#symbol)" />
-	<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: middle; font-size: 48px; " fill="#000000" x="128" y="145">Stapler</text>
-</svg>
\ No newline at end of file
diff --git "a/symbols/Kommunal_Fahrzeuge/Stapler_gel\303\244ndeg\303\244ngig.j2" "b/symbols/Kommunal_Fahrzeuge/Stapler_gel\303\244ndeg\303\244ngig.j2"
deleted file mode 100644
index 953a4d21..00000000
--- "a/symbols/Kommunal_Fahrzeuge/Stapler_gel\303\244ndeg\303\244ngig.j2"
+++ /dev/null
@@ -1,17 +0,0 @@
-<!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>Kraftfahrzeug</title>
-	<defs>
-		<style type="text/css">
-		{% include './fonts/fonts.j2' %}
-		</style>
-		<clipPath id="symbol">
-			<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="#E26E0E" stroke-width="10" stroke="#000000" clip-path="url(#symbol)" />
-	<ellipse cx="40" cy="210" rx="10" ry="10" stroke="#000000" fill="none" stroke-width="5" />
-    <ellipse cx="128" 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: middle; font-size: 48px; " fill="#000000" x="128" y="145">Stapler</text>
-</svg>
\ No newline at end of file
diff --git a/symbols/Kommunal_Fahrzeuge/Wechselladerfahrzeug.j2 b/symbols/Kommunal_Fahrzeuge/Wechselladerfahrzeug.j2
index 644ebdb6..c765ab98 100644
--- a/symbols/Kommunal_Fahrzeuge/Wechselladerfahrzeug.j2
+++ b/symbols/Kommunal_Fahrzeuge/Wechselladerfahrzeug.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="#E26E0E" stroke-width="10" stroke="#000000" clip-path="url(#symbol)" />
-	<path d="M3,63 L3,199 L247,199" fill="none" stroke-width="5" stroke="#000000" />
-	<ellipse cx="40" cy="209" rx="10" ry="10" stroke="#000000" fill="none" stroke-width="5" />
-	<ellipse cx="216" cy="209" 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="{{ kommunal.colorPrimary }}" stroke-width="10" stroke="{{ kommunal.colorStroke }}" clip-path="url(#symbol)" />
+	<path d="M3,63 L3,199 L247,199" fill="none" stroke-width="5" stroke="{{ kommunal.colorStroke }}" />
+	<ellipse cx="40" cy="209" rx="10" ry="10" stroke="{{ kommunal.colorStroke }}" fill="none" stroke-width="5" />
+	<ellipse cx="216" cy="209" rx="10" ry="10" stroke="{{ kommunal.colorStroke }}" fill="none" stroke-width="5"  />
 </svg>
\ No newline at end of file
diff --git "a/symbols/Kommunal_Fahrzeuge/Wechselladerfahrzeug_gel\303\244ndeg\303\244ngig.j2" "b/symbols/Kommunal_Fahrzeuge/Wechselladerfahrzeug_gel\303\244ndeg\303\244ngig.j2"
index 76774f36..0aa7ce3f 100644
--- "a/symbols/Kommunal_Fahrzeuge/Wechselladerfahrzeug_gel\303\244ndeg\303\244ngig.j2"
+++ "b/symbols/Kommunal_Fahrzeuge/Wechselladerfahrzeug_gel\303\244ndeg\303\244ngig.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>Wechselladerfahrzeug</title>
+	<title>Wechselladerfahrzeug (geländegängig)</title>
 	<defs>
 		<style type="text/css">
 		{% include './fonts/fonts.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="#E26E0E" stroke-width="10" stroke="#000000" clip-path="url(#symbol)" />
-	<path d="M3,63 L3,199 L247,199" fill="none" stroke-width="5" stroke="#000000" />
-	<ellipse cx="40" cy="209" rx="10" ry="10" stroke="#000000" fill="none" stroke-width="5" />
-	<ellipse cx="128" cy="209" rx="10" ry="10" stroke="#000000" fill="none" stroke-width="5"  />
-	<ellipse cx="216" cy="209" 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="{{ kommunal.colorPrimary }}" stroke-width="10" stroke="{{ kommunal.colorStroke }}" clip-path="url(#symbol)" />
+	<path d="M3,63 L3,199 L247,199" fill="none" stroke-width="5" stroke="{{ kommunal.colorStroke }}" />
+	<ellipse cx="40" cy="209" rx="10" ry="10" stroke="{{ kommunal.colorStroke }}" fill="none" stroke-width="5" />
+	<ellipse cx="128" cy="209" rx="10" ry="10" stroke="{{ kommunal.colorStroke }}" fill="none" stroke-width="5"  />
+	<ellipse cx="216" cy="209" rx="10" ry="10" stroke="{{ kommunal.colorStroke }}" fill="none" stroke-width="5"  />
 </svg>
\ No newline at end of file
diff --git a/themes/default.json b/themes/default.json
index aba63787..1f1deead 100644
--- a/themes/default.json
+++ b/themes/default.json
@@ -13,5 +13,10 @@
         "colorPrimary": "#996633",
         "colorSecondary": "#FFFFFF",
         "colorStroke": "#000000"
+    },
+    "kommunal": {
+        "colorPrimary": "#E26E0E",
+        "colorSecondary": "#000000",
+        "colorStroke": "#000000"
     }
 }
\ No newline at end of file
diff --git a/themes/print.json b/themes/print.json
index 854173a5..19f8977a 100644
--- a/themes/print.json
+++ b/themes/print.json
@@ -13,5 +13,10 @@
         "colorPrimary": "#FFFFFF",
         "colorSecondary": "#996633",
         "colorStroke": "#996633"
+    },
+    "kommunal": {
+        "colorPrimary": "#FFFFFF",
+        "colorSecondary": "#E26E0E",
+        "colorStroke": "#E26E0E"
     }
 }
\ No newline at end of file