diff --git a/content/page/club/vorstand/index.md b/content/page/club/vorstand/index.md
index 8ee98acd..a9a63f8d 100644
--- a/content/page/club/vorstand/index.md
+++ b/content/page/club/vorstand/index.md
@@ -12,28 +12,25 @@ Ein jeder Club benötigt einen Vorstand, der die Vereinsführung übernimmt und
 
 {{< tsc/person-list >}}
     {{< tsc/vorstand
-        name="Anja Westerhoff"
+        name="anja-westerhoff"
         role="Abteilungsleiter"
-        img="img/Anja_Westerhoff.jpg"
         mail="clubleiter@tanzsportclub.vfl-sindelfingen.de"
         >}}
     {{< tsc/vorstand
-        name="Klaus Richter"
+        name="klaus-richter"
         role="Schriftfuehrer/TSC-Geschaeftsstelle"
-        img="img/Klaus_Richter.jpg"
         mail="kontakt@tanzsportclub.vfl-sindelfingen.de"
         >}}
 {{< /tsc/person-list >}}
 
 {{< tsc/person-list >}}
     {{< tsc/vorstand
-        name="Frank Westerhoff"
+        name="frank-westerhoff"
         role="Kasse"
-        img="img/Frank_Westerhoff.jpg"
         mail="kasse@tanzsportclub.vfl-sindelfingen.de"
         >}}
     {{< tsc/vorstand
-        name="Uwe Keck"
+        name="uwe-keck"
         role="Zahlungsverkehr"
         img="img/Uwe_Keck.jpg"
         mail="kasse@tanzsportclub.vfl-sindelfingen.de"
@@ -42,34 +39,30 @@ Ein jeder Club benötigt einen Vorstand, der die Vereinsführung übernimmt und
 
 {{< tsc/person-list >}}
     {{< tsc/vorstand
-        name="Klaus Anrdt"
+        name="klaus-arndt"
         role="Mitgliederverwaltung"
-        img="img/Klaus_Arndt.jpg"
         mail="mitgliederverwaltung@tanzsportclub.vfl-sindelfingen.de"
         >}}
     {{< tsc/vorstand
-        name="Anja Vollmer"
+        name="anja-vollmer"
         role="Mitgliederverwaltung"
-        img="img/Anja_Vollmer.jpg"
         mail="mitgliederverwaltung@tanzsportclub.vfl-sindelfingen.de"
         >}}
     {{< tsc/vorstand
-        name="Axel Fedeler"
+        name="axel-fedeler"
         role="Mitgliederverwaltung"
-        img="img/Axel_Fedeler.jpg"
         mail="mitgliederverwaltung@tanzsportclub.vfl-sindelfingen.de"
         >}}
 {{< /tsc/person-list >}}
 
 {{< tsc/person-list >}}
     {{< tsc/vorstand
-        name="Alexander Kieper"
+        name="alexander-kieper"
         role="Sportwart"
-        img="img/Alexander_Kieper.jpg"
         mail="sportwart@tanzsportclub.vfl-sindelfingen.de"
         >}}
     {{< tsc/vorstand
-        name="Christian Wolf"
+        name="christian-wolf"
         role="Stellv. Sportwart"
         img="img/Christian_Wolf.jpg"
         mail="sportwart@tanzsportclub.vfl-sindelfingen.de"
@@ -78,31 +71,28 @@ Ein jeder Club benötigt einen Vorstand, der die Vereinsführung übernimmt und
 
 {{< tsc/person-list >}}
     {{< tsc/vorstand
-        name="Petra Kohler"
+        name="petra-kohler"
         role="Breitensportwartin"
-        img="img/Petra_Kohler.jpg"
         mail="breitensportwart@tanzsportclub.vfl-sindelfingen.de"
         >}}
 {{< /tsc/person-list >}}
 
 {{< tsc/person-list >}}
     {{< tsc/vorstand
-        name="Anna Ceglarski"
+        name="anna-ceglarski"
         role="Veranstaltungen"
-        img="img/Anna_Ceglarski.jpg"
         mail="veranstaltungen@tanzsportclub.vfl-sindelfingen.de"
         >}}
 {{< /tsc/person-list >}}
 
 {{< tsc/person-list >}}
     {{< tsc/vorstand
-        name="Martin Schatke"
+        name="martin-schatke"
         role="Jugendwart"
-        img="img/Martin_Schatke.jpg"
         mail="jugend@tanzsportclub.vfl-sindelfingen.de"
         >}}
     {{< tsc/vorstand
-        name="Olivia Paprotny"
+        name="olivia-paprotny"
         role="Stellv. Jugendwartin"
         img="img/Olivia_Paprotny.jpg"
         >}}
@@ -110,81 +100,69 @@ Ein jeder Club benötigt einen Vorstand, der die Vereinsführung übernimmt und
 
 {{< tsc/person-list >}}
     {{< tsc/vorstand
-        name="Diane Mongellaz"
+        name="diane-mongellaz"
         role="Presse"
-        img="img/Diane_Mongellaz.jpg"
         mail="presse@tanzsportclub.vfl-sindelfingen.de"
         >}}
     {{< tsc/vorstand
-        name="Katharina Pfaffenrot"
+        name="katharina-pfaffenrot"
         role="Presse"
-        img="img/Katharina_Pfaffenrot.jpg"
         mail="presse@tanzsportclub.vfl-sindelfingen.de"
         >}}
     {{< tsc/vorstand
-        name="Nelly Fuchs"
+        name="nelly-fuchs"
         role="Presse"
-        img="img/Nelly_Fuchs.jpeg"
         mail="presse@tanzsportclub.vfl-sindelfingen.de"
         >}}
 {{< /tsc/person-list >}}
 
 {{< tsc/person-list >}}
     {{< tsc/vorstand
-        name="Maren Spengler"
+        name="maren-spengler"
         role="Dancestyles"
-        img="img/Maren_Spengler.jpg"
         mail="dance-styles@tanzsportclub.vfl-sindelfingen.de"
         >}}
     {{< tsc/vorstand
-        name="Britta Sigmund"
+        name="britta-sigmund"
         role="Stellv. Dancestyles"
-        img="img/Britta_Sigmund.jpg"
         mail="dance-styles@tanzsportclub.vfl-sindelfingen.de"
         >}}
     {{< tsc/vorstand
-        name="Kim Wustrack"
+        name="kim-wustrack"
         role="Stellv. Dancestyles"
-        img="img/Kim_Wustrack.jpg"
         mail="dance-styles@tanzsportclub.vfl-sindelfingen.de"
         >}}
     {{< tsc/vorstand
-        name="Franziska Bader"
+        name="franziska-bader"
         role="Stellv. Dancestyles"
-        img="img/Franziska_Bader.jpg"
         >}}
 {{< /tsc/person-list >}}
 
 {{< tsc/person-list >}}
     {{< tsc/vorstand
-        name="Bernd Peter"
+        name="bernd-peter"
         role="Webmaster"
-        img="img/Bernd_Peter.jpg"
         mail="vflwebmaster@bptr.de"
         >}}
     {{< tsc/vorstand
-        name="Christian Wolf"
+        name="christian-wolf"
         role="Stellv. Webmaster"
-        img="img/Christian_Wolf.jpg"
         mail="vizesportwart@tsc-vfl.de"
         >}}
 {{< /tsc/person-list >}}
 
 {{< tsc/person-list >}}
     {{< tsc/vorstand
-        name="Klaus Richter"
+        name="klaus-richter"
         role="Gebaeude"
-        img="img/Klaus_Richter.jpg"
         mail="kontakt@tanzsportclub.vfl-sindelfingen.de"
         >}}
     {{< tsc/vorstand
-        name="Stefan Dietl"
+        name="stefan-dietl"
         role="Gebaeude"
-        img="img/Stefan_Dietl.jpg"
         >}}
     {{< tsc/vorstand
-        name="Joseph Ripp"
+        name="joseph-ripp"
         role="Gebaeude"
-        img="img/male.png"
         >}}
 {{< /tsc/person-list >}}
diff --git a/content/page/club/vorstand/img/Alexander_Kieper.jpg b/content/person/alexander-kieper/Alexander_Kieper.jpg
similarity index 100%
rename from content/page/club/vorstand/img/Alexander_Kieper.jpg
rename to content/person/alexander-kieper/Alexander_Kieper.jpg
diff --git a/content/person/alexander-kieper/index.md b/content/person/alexander-kieper/index.md
new file mode 100644
index 00000000..91bf7064
--- /dev/null
+++ b/content/person/alexander-kieper/index.md
@@ -0,0 +1,6 @@
+---
+title: "Alexander Kieper"
+draft: true
+image: "Alexander_Kieper.jpg"
+headless: true
+---
diff --git a/content/page/club/vorstand/img/Anja_Vollmer.jpg b/content/person/anja-vollmer/Anja_Vollmer.jpg
similarity index 100%
rename from content/page/club/vorstand/img/Anja_Vollmer.jpg
rename to content/person/anja-vollmer/Anja_Vollmer.jpg
diff --git a/content/person/anja-vollmer/index.md b/content/person/anja-vollmer/index.md
new file mode 100644
index 00000000..87853ff4
--- /dev/null
+++ b/content/person/anja-vollmer/index.md
@@ -0,0 +1,6 @@
+---
+title: "Anja Vollmer"
+draft: true
+image: "Anja_Vollmer.jpg"
+headless: true
+---
diff --git a/content/page/club/vorstand/img/Anja_Westerhoff.jpg b/content/person/anja-westerhoff/Anja_Westerhoff.jpg
similarity index 100%
rename from content/page/club/vorstand/img/Anja_Westerhoff.jpg
rename to content/person/anja-westerhoff/Anja_Westerhoff.jpg
diff --git a/content/person/anja-westerhoff/index.md b/content/person/anja-westerhoff/index.md
new file mode 100644
index 00000000..160c107a
--- /dev/null
+++ b/content/person/anja-westerhoff/index.md
@@ -0,0 +1,6 @@
+---
+title: "Anja Westerhoff"
+draft: true
+image: "Anja_Westerhoff.jpg"
+headless: true
+---
diff --git a/content/page/club/vorstand/img/Anna_Ceglarski.jpg b/content/person/anna-ceglarski/Anna_Ceglarski.jpg
similarity index 100%
rename from content/page/club/vorstand/img/Anna_Ceglarski.jpg
rename to content/person/anna-ceglarski/Anna_Ceglarski.jpg
diff --git a/content/person/anna-ceglarski/index.md b/content/person/anna-ceglarski/index.md
new file mode 100644
index 00000000..7c84508e
--- /dev/null
+++ b/content/person/anna-ceglarski/index.md
@@ -0,0 +1,6 @@
+---
+title: "Anna Ceglarski"
+draft: true
+image: "Anna_Ceglarski.jpg"
+headless: true
+---
diff --git a/content/page/club/vorstand/img/Axel_Fedeler.jpg b/content/person/axel-fedeler/Axel_Fedeler.jpg
similarity index 100%
rename from content/page/club/vorstand/img/Axel_Fedeler.jpg
rename to content/person/axel-fedeler/Axel_Fedeler.jpg
diff --git a/content/person/axel-fedeler/index.md b/content/person/axel-fedeler/index.md
new file mode 100644
index 00000000..292753dd
--- /dev/null
+++ b/content/person/axel-fedeler/index.md
@@ -0,0 +1,6 @@
+---
+title: "Axel Fedeler"
+draft: true
+image: "Axel_Fedeler.jpg"
+headless: true
+---
diff --git a/content/page/club/vorstand/img/Bernd_Peter.jpg b/content/person/bernd-peter/Bernd_Peter.jpg
similarity index 100%
rename from content/page/club/vorstand/img/Bernd_Peter.jpg
rename to content/person/bernd-peter/Bernd_Peter.jpg
diff --git a/content/person/bernd-peter/index.md b/content/person/bernd-peter/index.md
new file mode 100644
index 00000000..178de0be
--- /dev/null
+++ b/content/person/bernd-peter/index.md
@@ -0,0 +1,6 @@
+---
+title: "Bernd Peter"
+draft: true
+image: "Bernd_Peter.jpg"
+headless: true
+---
diff --git a/content/page/club/vorstand/img/Britta_Sigmund.jpg b/content/person/britta-sigmund/Britta_Sigmund.jpg
similarity index 100%
rename from content/page/club/vorstand/img/Britta_Sigmund.jpg
rename to content/person/britta-sigmund/Britta_Sigmund.jpg
diff --git a/content/person/britta-sigmund/index.md b/content/person/britta-sigmund/index.md
new file mode 100644
index 00000000..060db385
--- /dev/null
+++ b/content/person/britta-sigmund/index.md
@@ -0,0 +1,6 @@
+---
+title: "Britta Sigmund"
+draft: true
+image: "Britta_Sigmund.jpg"
+headless: true
+---
diff --git a/content/page/club/vorstand/img/Christian_Wolf.jpg b/content/person/christian-wolf/Christian_Wolf.jpg
similarity index 100%
rename from content/page/club/vorstand/img/Christian_Wolf.jpg
rename to content/person/christian-wolf/Christian_Wolf.jpg
diff --git a/content/person/christian-wolf/index.md b/content/person/christian-wolf/index.md
new file mode 100644
index 00000000..2dd40e34
--- /dev/null
+++ b/content/person/christian-wolf/index.md
@@ -0,0 +1,6 @@
+---
+title: "Christian Wolf"
+draft: true
+image: "Christian_Wolf.jpg"
+headless: true
+---
diff --git a/content/page/club/vorstand/img/Diane_Mongellaz.jpg b/content/person/diane-mongellaz/Diane_Mongellaz.jpg
similarity index 100%
rename from content/page/club/vorstand/img/Diane_Mongellaz.jpg
rename to content/person/diane-mongellaz/Diane_Mongellaz.jpg
diff --git a/content/person/diane-mongellaz/index.md b/content/person/diane-mongellaz/index.md
new file mode 100644
index 00000000..b29abeab
--- /dev/null
+++ b/content/person/diane-mongellaz/index.md
@@ -0,0 +1,6 @@
+---
+title: "Diane Mongellaz"
+draft: true
+image: "Diane_Mongellaz.jpg"
+headless: true
+---
diff --git a/content/page/club/vorstand/img/Frank_Westerhoff.jpg b/content/person/frank-westerhoff/Frank_Westerhoff.jpg
similarity index 100%
rename from content/page/club/vorstand/img/Frank_Westerhoff.jpg
rename to content/person/frank-westerhoff/Frank_Westerhoff.jpg
diff --git a/content/person/frank-westerhoff/index.md b/content/person/frank-westerhoff/index.md
new file mode 100644
index 00000000..94a1c9da
--- /dev/null
+++ b/content/person/frank-westerhoff/index.md
@@ -0,0 +1,6 @@
+---
+title: "Frank Westerhoff"
+draft: true
+image: "Frank_Westerhoff.jpg"
+headless: true
+---
diff --git a/content/page/club/vorstand/img/Franziska_Bader.jpg b/content/person/franziska-bader/Franziska_Bader.jpg
similarity index 100%
rename from content/page/club/vorstand/img/Franziska_Bader.jpg
rename to content/person/franziska-bader/Franziska_Bader.jpg
diff --git a/content/person/franziska-bader/index.md b/content/person/franziska-bader/index.md
new file mode 100644
index 00000000..066374d4
--- /dev/null
+++ b/content/person/franziska-bader/index.md
@@ -0,0 +1,6 @@
+---
+title: "Franziska Bade"
+draft: true
+image: "Franziska_Bader.jpg"
+headless: true
+---
diff --git a/content/person/joseph-ripp/index.md b/content/person/joseph-ripp/index.md
new file mode 100644
index 00000000..60517f1a
--- /dev/null
+++ b/content/person/joseph-ripp/index.md
@@ -0,0 +1,6 @@
+---
+title: "Joseph Ripp"
+draft: true
+image: ""
+headless: true
+---
diff --git a/content/page/club/vorstand/img/Katharina_Pfaffenrot.jpg b/content/person/katharina-pfaffenrot/Katharina_Pfaffenrot.jpg
similarity index 100%
rename from content/page/club/vorstand/img/Katharina_Pfaffenrot.jpg
rename to content/person/katharina-pfaffenrot/Katharina_Pfaffenrot.jpg
diff --git a/content/person/katharina-pfaffenrot/index.md b/content/person/katharina-pfaffenrot/index.md
new file mode 100644
index 00000000..0bb5eda0
--- /dev/null
+++ b/content/person/katharina-pfaffenrot/index.md
@@ -0,0 +1,6 @@
+---
+title: "Katarina Pfaffenrot"
+draft: true
+image: "Katharina_Pfaffenrot.jpg"
+headless: true
+---
diff --git a/content/page/club/vorstand/img/Kim_Wustrack.jpg b/content/person/kim-wustrack/Kim_Wustrack.jpg
similarity index 100%
rename from content/page/club/vorstand/img/Kim_Wustrack.jpg
rename to content/person/kim-wustrack/Kim_Wustrack.jpg
diff --git a/content/person/kim-wustrack/index.md b/content/person/kim-wustrack/index.md
new file mode 100644
index 00000000..67fc1689
--- /dev/null
+++ b/content/person/kim-wustrack/index.md
@@ -0,0 +1,6 @@
+---
+title: "Kim Wustrack"
+draft: true
+image: "Kim_Wustrack.jpg"
+headless: true
+---
diff --git a/content/page/club/vorstand/img/Klaus_Arndt.jpg b/content/person/klaus-arndt/Klaus_Arndt.jpg
similarity index 100%
rename from content/page/club/vorstand/img/Klaus_Arndt.jpg
rename to content/person/klaus-arndt/Klaus_Arndt.jpg
diff --git a/content/person/klaus-arndt/index.md b/content/person/klaus-arndt/index.md
new file mode 100644
index 00000000..7952f9a0
--- /dev/null
+++ b/content/person/klaus-arndt/index.md
@@ -0,0 +1,6 @@
+---
+title: "Klaus Arndt"
+draft: true
+image: "Klaus_Arndt.jpg"
+headless: true
+---
diff --git a/content/page/club/vorstand/img/Klaus_Richter.jpg b/content/person/klaus-richter/Klaus_Richter.jpg
similarity index 100%
rename from content/page/club/vorstand/img/Klaus_Richter.jpg
rename to content/person/klaus-richter/Klaus_Richter.jpg
diff --git a/content/person/klaus-richter/index.md b/content/person/klaus-richter/index.md
new file mode 100644
index 00000000..9642bd9c
--- /dev/null
+++ b/content/person/klaus-richter/index.md
@@ -0,0 +1,6 @@
+---
+title: "Klaus Richter"
+draft: true
+image: "Klaus_Richter.jpg"
+headless: true
+---
diff --git a/content/page/club/vorstand/img/Maren_Spengler.jpg b/content/person/maren-spengler/Maren_Spengler.jpg
similarity index 100%
rename from content/page/club/vorstand/img/Maren_Spengler.jpg
rename to content/person/maren-spengler/Maren_Spengler.jpg
diff --git a/content/person/maren-spengler/index.md b/content/person/maren-spengler/index.md
new file mode 100644
index 00000000..82445910
--- /dev/null
+++ b/content/person/maren-spengler/index.md
@@ -0,0 +1,6 @@
+---
+title: "Maren Spengler"
+draft: true
+image: "Maren_Spengler.jpg"
+headless: true
+---
diff --git a/content/page/club/vorstand/img/Martin_Schatke.jpg b/content/person/martin-schatke/Martin_Schatke.jpg
similarity index 100%
rename from content/page/club/vorstand/img/Martin_Schatke.jpg
rename to content/person/martin-schatke/Martin_Schatke.jpg
diff --git a/content/person/martin-schatke/index.md b/content/person/martin-schatke/index.md
new file mode 100644
index 00000000..f236a813
--- /dev/null
+++ b/content/person/martin-schatke/index.md
@@ -0,0 +1,6 @@
+---
+title: "Martin Schatke"
+draft: true
+image: "Martin_Schatke.jpg"
+headless: true
+---
diff --git a/content/page/club/vorstand/img/Nelly_Fuchs.jpeg b/content/person/nelly-fuchs/Nelly_Fuchs.jpeg
similarity index 100%
rename from content/page/club/vorstand/img/Nelly_Fuchs.jpeg
rename to content/person/nelly-fuchs/Nelly_Fuchs.jpeg
diff --git a/content/person/nelly-fuchs/index.md b/content/person/nelly-fuchs/index.md
new file mode 100644
index 00000000..8196ec31
--- /dev/null
+++ b/content/person/nelly-fuchs/index.md
@@ -0,0 +1,6 @@
+---
+title: "Nelly Fuchs"
+draft: true
+image: "Nelly_Fuchs.jpeg"
+headless: true
+---
diff --git a/content/page/club/vorstand/img/Olivia_Paprotny.jpg b/content/person/olivia-paprotny/Olivia_Paprotny.jpg
similarity index 100%
rename from content/page/club/vorstand/img/Olivia_Paprotny.jpg
rename to content/person/olivia-paprotny/Olivia_Paprotny.jpg
diff --git a/content/person/olivia-paprotny/index.md b/content/person/olivia-paprotny/index.md
new file mode 100644
index 00000000..cda7c134
--- /dev/null
+++ b/content/person/olivia-paprotny/index.md
@@ -0,0 +1,6 @@
+---
+title: "Olivia Paprotny"
+draft: true
+image: "Olivia_Paprotny.jpg"
+headless: true
+---
diff --git a/content/page/club/vorstand/img/Petra_Kohler.jpg b/content/person/petra-kohler/Petra_Kohler.jpg
similarity index 100%
rename from content/page/club/vorstand/img/Petra_Kohler.jpg
rename to content/person/petra-kohler/Petra_Kohler.jpg
diff --git a/content/person/petra-kohler/index.md b/content/person/petra-kohler/index.md
new file mode 100644
index 00000000..af4497ff
--- /dev/null
+++ b/content/person/petra-kohler/index.md
@@ -0,0 +1,6 @@
+---
+title: "Petra Kohler"
+draft: true
+image: "Petra_Kohler.jpg"
+headless: true
+---
diff --git a/content/page/club/vorstand/img/Stefan_Dietl.jpg b/content/person/stefan-dietl/Stefan_Dietl.jpg
similarity index 100%
rename from content/page/club/vorstand/img/Stefan_Dietl.jpg
rename to content/person/stefan-dietl/Stefan_Dietl.jpg
diff --git a/content/person/stefan-dietl/index.md b/content/person/stefan-dietl/index.md
new file mode 100644
index 00000000..777c8ede
--- /dev/null
+++ b/content/person/stefan-dietl/index.md
@@ -0,0 +1,6 @@
+---
+title: "Stefan Dietl"
+draft: true
+image: "Stefan_Dietl.jpg"
+headless: true
+---
diff --git a/content/page/club/vorstand/img/Uwe_Keck.jpg b/content/person/uwe-keck/Uwe_Keck.jpg
similarity index 100%
rename from content/page/club/vorstand/img/Uwe_Keck.jpg
rename to content/person/uwe-keck/Uwe_Keck.jpg
diff --git a/content/person/uwe-keck/index.md b/content/person/uwe-keck/index.md
new file mode 100644
index 00000000..9e087391
--- /dev/null
+++ b/content/person/uwe-keck/index.md
@@ -0,0 +1,6 @@
+---
+title: "Uwe Keck"
+draft: true
+image: "Uwe_Keck.jpg"
+headless: true
+---
diff --git a/themes/tsc_vfl/archetypes/person.md b/themes/tsc_vfl/archetypes/person.md
new file mode 100644
index 00000000..e7573315
--- /dev/null
+++ b/themes/tsc_vfl/archetypes/person.md
@@ -0,0 +1,6 @@
+---
+title: "{{ replace .Name "-" " " | title }}"
+draft: true
+image: ""
+headless: true
+---
diff --git a/themes/tsc_vfl/layouts/partials/tsc/start-person.html b/themes/tsc_vfl/layouts/partials/tsc/start-person.html
index df327047..7d3ff576 100644
--- a/themes/tsc_vfl/layouts/partials/tsc/start-person.html
+++ b/themes/tsc_vfl/layouts/partials/tsc/start-person.html
@@ -1,8 +1,8 @@
 <div class="person">
     <div class="image">
-        {{- $person := . -}}
-        {{- with .Get "img" -}}
-            <img src="{{ . }}" {{ with $person.Get "name" }}alt="Bild {{ . }}"{{ end }}>
+        {{- $param := . -}}
+        {{- with .image -}}
+            <img src="{{ .RelPermalink }}" {{ with $param.name }}alt="Bild {{ . }}"{{ end }}>
         {{- end -}}
     </div>
     
diff --git a/themes/tsc_vfl/layouts/shortcodes/tsc/vorstand.html b/themes/tsc_vfl/layouts/shortcodes/tsc/vorstand.html
index 4e21a2bb..dd0f505b 100644
--- a/themes/tsc_vfl/layouts/shortcodes/tsc/vorstand.html
+++ b/themes/tsc_vfl/layouts/shortcodes/tsc/vorstand.html
@@ -1,11 +1,35 @@
-{{ partial "tsc/start-person" . }}
-<div class="content content-vorstand">
-    <div class="role">{{ .Get "role" }}</div>
-    <div class="name">
-        {{ with .Get "mail" }}
-            <a href="mailto:{{ . }}"><img src="/img/mail.jpg" class="mail-icon"></a>
+{{ with .Site.GetPage "person" }}
+    {{/*{{ $person := . }}*/}}
+    {{ with .GetPage ($.Get "name") }}
+        {{ $imageName := .Params.Get "image" }}
+        {{ $image := "" }}
+        {{ with .Resources.GetMatch $imageName}}
+            {{ $image = . }}
+        {{ else }}
+            {{ warnf "Image for %s is not correclty found. Falling back to default." ($.Get "name") }}
+            {{ with .Resources.ByType "image" }}
+                {{ $image = index . 0 }}
+            {{ else }}
+                {{/* $image  */}}
+            {{ end }}
         {{ end }}
-        {{ .Get "name" }}
-    </div>
-</div>
-{{ partial "tsc/end-person" . }}
+        {{ $config := 
+            dict
+            "image" $image 
+            "name" (.Params.Get "title")
+        }}
+        {{ partial "tsc/start-person" $config }}
+        <div class="content content-vorstand">
+            <div class="role">{{ $.Get "role" }}</div>
+            <div class="name">
+                {{ with $.Get "mail" }}
+                    <a href="mailto:{{ . }}"><img src="/img/mail.jpg" class="mail-icon"></a>
+                {{ end }}
+                {{ .Params.Get "title" }}
+            </div>
+        </div>
+        {{ partial "tsc/end-person" . }}
+    {{ else }}
+        {{ errorf "Cannot find person %s." ($.Get "name") }}
+    {{ end }}
+{{ end }}
diff --git a/content/page/club/vorstand/img/male.png b/themes/tsc_vfl/static/img/persons/male.png
similarity index 100%
rename from content/page/club/vorstand/img/male.png
rename to themes/tsc_vfl/static/img/persons/male.png