diff --git a/symbols/Katastrophenschutz_Einheiten/Baugruppe.j2 b/symbols/Katastrophenschutz_Einheiten/Baugruppe.j2
index 1b45dba3..164ca618 100644
--- a/symbols/Katastrophenschutz_Einheiten/Baugruppe.j2
+++ b/symbols/Katastrophenschutz_Einheiten/Baugruppe.j2
@@ -1,26 +1,11 @@
-<!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>Baugruppe</title>
-<<<<<<< HEAD
-	<rect x="10" y="64" width="236" height="128" stroke="none" fill="#000000" />
-	<rect x="15" y="69" width="226" height="118" stroke="none" fill="#DF6711" />
-	<path d="M12 66 l116 94 l0 -64 l116 94" stroke="#000000" stroke-width="5" fill="none" />
-	<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" />
-</svg>
-=======
-	<defs>
-		<clipPath id="symbol">
-			<rect x="10" y="64" width="236" height="128" />
-		</clipPath>
-	</defs>
-	<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>
->>>>>>> master
+{% extends "templates/base.j2t" %}
+{%- block title -%}
+	Baugruppe
+{%- endblock title -%}
+{%- block symbol -%}
+	{%- set Sign.Type = "Unit" -%}
+	{%- set Sign.UnitSize = "Gruppe" -%}
+	{%- set Sign.UnitTasks = ["IuK","Fernsprechbau"] -%}
+	{%- set Sign.Organisation = "katastrophenschutz" -%}
+	{{ super() }}
+{%- endblock symbol -%}
diff --git a/symbols/Katastrophenschutz_Einheiten/Facheinheit_IuK.j2 b/symbols/Katastrophenschutz_Einheiten/Facheinheit_IuK.j2
index 5603130e..bc6e602f 100644
--- a/symbols/Katastrophenschutz_Einheiten/Facheinheit_IuK.j2
+++ b/symbols/Katastrophenschutz_Einheiten/Facheinheit_IuK.j2
@@ -1,24 +1,11 @@
-<!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>Facheinheit Information und Kommunikation</title>
-<<<<<<< HEAD
-	<rect x="10" y="64" width="236" height="128" stroke="none" fill="#000000" />
-	<rect x="15" y="69" width="226" height="118" stroke="none" fill="#DF6711" />
-	<path d="M12 66 l116 94 l0 -64 l116 94" stroke="#000000" stroke-width="5" 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" />
-</svg>
-=======
-	<defs>
-		<clipPath id="symbol">
-			<rect x="10" y="64" width="236" height="128" />
-		</clipPath>
-	</defs>
-	<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>
->>>>>>> master
+{% extends "templates/base.j2t" %}
+{%- block title -%}
+	Facheinheit Information und Kommunikation
+{%- endblock title -%}
+{%- block symbol -%}
+	{%- set Sign.Type = "Unit" -%}
+	{%- set Sign.UnitSize = "Zug" -%}
+	{%- set Sign.UnitTasks = ["IuK"] -%}
+	{%- set Sign.Organisation = "katastrophenschutz" -%}
+	{{ super() }}
+{%- endblock symbol -%}
diff --git a/symbols/Katastrophenschutz_Einheiten/Funkgruppe.j2 b/symbols/Katastrophenschutz_Einheiten/Funkgruppe.j2
index fcf1a69f..88899dd8 100644
--- a/symbols/Katastrophenschutz_Einheiten/Funkgruppe.j2
+++ b/symbols/Katastrophenschutz_Einheiten/Funkgruppe.j2
@@ -1,26 +1,11 @@
-<!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>Funkgruppe</title>
-<<<<<<< HEAD
-	<rect x="10" y="64" width="236" height="128" stroke="none" fill="#000000" />
-	<rect x="15" y="69" width="226" height="118" stroke="none" fill="#DF6711" />
-	<path d="M12 66 l116 94 l0 -64 l116 94" stroke="#000000" stroke-width="5" fill="none" />
-	<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" />
-</svg>
-=======
-	<defs>
-		<clipPath id="symbol">
-			<rect x="10" y="64" width="236" height="128" />
-		</clipPath>
-	</defs>
-	<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>
->>>>>>> master
+{% extends "templates/base.j2t" %}
+{%- block title -%}
+	Funkgruppe
+{%- endblock title -%}
+{%- block symbol -%}
+	{%- set Sign.Type = "Unit" -%}
+	{%- set Sign.UnitSize = "Gruppe" -%}
+	{%- set Sign.UnitTasks = ["IuK","Sprechfunk"] -%}
+	{%- set Sign.Organisation = "katastrophenschutz" -%}
+	{{ super() }}
+{%- endblock symbol -%}
\ 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 024d6f2d..c85d41c3 100644
--- a/symbols/Katastrophenschutz_Einheiten/Schlacht_und_Untersuchungsgruppe.j2
+++ b/symbols/Katastrophenschutz_Einheiten/Schlacht_und_Untersuchungsgruppe.j2
@@ -1,29 +1,11 @@
-<!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>Schlacht- und Untersuchungsgruppe</title>
-<<<<<<< HEAD
-	<rect x="10" y="64" width="236" height="128" stroke="none" fill="#000000" />
-	<rect x="15" y="69" width="226" height="118" stroke="none" fill="#DF6711" />
-	<path d="M59 80 l25 0 L128 176 L172 80 l25 0" stroke-width="5" stroke="#000000" fill="none" />	
-	<ellipse cx="64"  cy="48" rx="10" ry="10" fill="#000000" />
-	<ellipse cx="192" cy="48" rx="10" ry="10" fill="#000000" />
-	<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" />
-</svg>
-=======
-	<defs>
-		<clipPath id="symbol">
-			<rect x="10" y="64" width="236" height="128" />
-		</clipPath>
-	</defs>
-	<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="{{ katastrophenschutz.colorStroke }}" 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 }}" />
-
-	<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>
->>>>>>> master
+{% extends "templates/base.j2t" %}
+{%- block title -%}
+	Schlacht- und Untersuchungsgruppe
+{%- endblock title -%}
+{%- block symbol -%}
+	{%- set Sign.Type = "Unit" -%}
+	{%- set Sign.UnitSize = "Gruppe" -%}
+	{%- set Sign.UnitTasks = ["Veterinär","Schlachten"] -%}
+	{%- set Sign.Organisation = "katastrophenschutz" -%}
+	{{ super() }}
+{%- endblock symbol -%}
\ 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 9740e6dd..33256d5c 100644
--- a/symbols/Katastrophenschutz_Einheiten/Tier_Dekon_und_Transportgruppe.j2
+++ b/symbols/Katastrophenschutz_Einheiten/Tier_Dekon_und_Transportgruppe.j2
@@ -1,31 +1,11 @@
-<!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>Tier Dekontaminierungs- und Transportgruppe</title>
-<<<<<<< HEAD
-	<rect x="10" y="64" width="236" height="128" stroke="none" fill="#000000" />
-	<rect x="15" y="69" width="226" height="118" stroke="none" fill="#DF6711" />	
-	<path d="M59 80 l25 0 L128 176 L172 80 l25 0" stroke-width="5" stroke="#000000" fill="none" />	
-	<ellipse cx="64"  cy="48" rx="10" ry="10" fill="#000000" />
-	<ellipse cx="192" cy="48" rx="10" ry="10" fill="#000000" />
-=======
-	<defs>
-		<clipPath id="symbol">
-			<rect x="10" y="64" width="236" height="128" />
-		</clipPath>
-	</defs>
-	<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="{{ katastrophenschutz.colorStroke }}" 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 }}" />
-
->>>>>>> master
-	<g transform="translate(-50,35) scale(0.8)">
-		<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>
+{% extends "templates/base.j2t" %}
+{%- block title -%}
+	Tier Dekontaminierungs- und Transportgruppe
+{%- endblock title -%}
+{%- block symbol -%}
+	{%- set Sign.Type = "Unit" -%}
+	{%- set Sign.UnitSize = "Gruppe" -%}
+	{%- set Sign.UnitTasks = ["Veterinär","Dekon Veterinär"] -%}
+	{%- set Sign.Organisation = "katastrophenschutz" -%}
+	{{ super() }}
+{%- endblock symbol -%}
\ 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 1fd586e1..c70b3c3b 100644
--- "a/symbols/Katastrophenschutz_Einheiten/Veterin\303\244rzug.j2"
+++ "b/symbols/Katastrophenschutz_Einheiten/Veterin\303\244rzug.j2"
@@ -1,26 +1,11 @@
-<!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>Veterinärzug</title>
-<<<<<<< HEAD
-	<rect x="10" y="64" width="236" height="128" stroke="none" fill="#000000" />
-	<rect x="15" y="69" width="226" height="118" stroke="none" fill="#DF6711" />
-	<path d="M59 80 l25 0 L128 176 L172 80 l25 0" stroke-width="5" stroke="#000000" 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" />
-</svg>
-=======
-	<defs>
-		<clipPath id="symbol">
-			<rect x="10" y="64" width="236" height="128" />
-		</clipPath>
-	</defs>
-	<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="{{ katastrophenschutz.colorStroke }}" fill="none" />
-	
-	<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>
->>>>>>> master
+{% extends "templates/base.j2t" %}
+{%- block title -%}
+	Veterinärzug
+{%- endblock title -%}
+{%- block symbol -%}
+	{%- set Sign.Type = "Unit" -%}
+	{%- set Sign.UnitSize = "Zug" -%}
+	{%- set Sign.UnitTasks = ["Veterinär"] -%}
+	{%- set Sign.Organisation = "katastrophenschutz" -%}
+	{{ super() }}
+{%- endblock symbol -%}
\ No newline at end of file