diff --git a/_config.yml b/_config.yml
index 25ceba3..6babf1b 100644
--- a/_config.yml
+++ b/_config.yml
@@ -20,3 +20,61 @@ url: "http://clojurebridge-berlin.github.io" # the base hostname & protocol for
 
 # Build settings
 markdown: kramdown
+
+team:
+  - name: Ben
+    image: ben.png
+    url: https://twitter.com/socksy
+  - name: Franka
+    image: franka.jpg
+    url: http://franka.tech
+  - name: Danielle
+    image: dani.jpg
+    url: https://twitter.com/dantoml
+  - name: Dave
+    image: dave.png
+    url: http://daveliepmann.com
+  - name: Johanna
+    image: johanna.jpg
+    url: https://twitter.com/JohanannC
+  - name: Julia
+    image: julia.jpg
+    url: https://twitter.com/anderspree
+  - name: Lisa
+    image: lislis.png
+    url: http://lislis.de
+  - name: Nils
+    image: nils.png
+    url: http://nils-blum-oeste.net
+  - name: Saskia
+    image: saskia.jpg
+    url: http://saskialindner.com
+  - name: Tibor
+    image: tibor.jpg
+    url: http://codebeige.net
+  - name: Anna
+    image: anna.jpg
+    url:
+  - name: daiyi
+    image: daiyi.jpg
+    url: https://twitter.com/daiyitastic
+
+team-alumni:
+  - name: Arne
+    url: https://twitter.com/plexus
+    image:
+  - name: Bettina
+    url: https://twitter.com/thatbettina
+    image:
+  - name: Jelle
+    url: https://twitter.com/jellea
+    image:
+  - name: Malwine
+    url: https://twitter.com/malweene
+    image:
+  - name: Martin
+    url: https://twitter.com/martinklepsch
+    image:
+  - name: Nicola
+    url: https://twitter.com/nicsnet
+    image:
diff --git a/_includes/team-alumni.html b/_includes/team-alumni.html
new file mode 100644
index 0000000..6793ffa
--- /dev/null
+++ b/_includes/team-alumni.html
@@ -0,0 +1,10 @@
+{% for person in include.people %}
+  <a href={{ person.url }}>{{ person.name }}</a>
+{% endfor %}
+
+<script>
+  var team = document.querySelector('.team-alumni');
+  for (var i = team.children.length; i >= 0; i--) {
+    team.appendChild(team.children[Math.random() * i | 0]);
+  }
+</script>
diff --git a/_includes/team.html b/_includes/team.html
new file mode 100644
index 0000000..fb272aa
--- /dev/null
+++ b/_includes/team.html
@@ -0,0 +1,13 @@
+{% for person in include.people %}
+  <div class="col-md-4 col-sm-2 col-xs-4 team-member">
+    <img src="/images/headshots/{{ person.image }}">
+    <a href={{ person.url }}>{{ person.name }}</a>
+  </div>
+{% endfor %}
+
+<script>
+  var team = document.querySelector('.team');
+  for (var i = team.children.length; i >= 0; i--) {
+    team.appendChild(team.children[Math.random() * i | 0]);
+  }
+</script>
diff --git a/assets/stylesheet.css b/assets/stylesheet.css
index 51deb8f..9d840fd 100644
--- a/assets/stylesheet.css
+++ b/assets/stylesheet.css
@@ -40,11 +40,18 @@ section.module.content {
   text-align: center;
 }
 
-.team {
-  margin-left: 15%;
+.team-member {
+  margin-bottom: 25px
+}
+
+.team-member img {
   border-radius: 50%;
-  width: 70%;
-  margin-bottom: 10%;
+  width: 100%;
+  margin-bottom: 5px;
+}
+
+.team-alumni a:not(:last-child)::after {
+  content: ", "
 }
 
 .arrow {
diff --git a/images/headshots/anna.jpg b/images/headshots/anna.jpg
new file mode 100644
index 0000000..18000a1
Binary files /dev/null and b/images/headshots/anna.jpg differ
diff --git a/images/headshots/ben.png b/images/headshots/ben.png
new file mode 100644
index 0000000..ce80ec7
Binary files /dev/null and b/images/headshots/ben.png differ
diff --git a/images/headshots/daiyi.jpg b/images/headshots/daiyi.jpg
new file mode 100644
index 0000000..6077413
Binary files /dev/null and b/images/headshots/daiyi.jpg differ
diff --git a/images/headshots/dani.jpg b/images/headshots/dani.jpg
new file mode 100644
index 0000000..0f8752f
Binary files /dev/null and b/images/headshots/dani.jpg differ
diff --git a/images/headshots/dave.png b/images/headshots/dave.png
new file mode 100644
index 0000000..13566b4
Binary files /dev/null and b/images/headshots/dave.png differ
diff --git a/images/headshots/franka.jpg b/images/headshots/franka.jpg
new file mode 100644
index 0000000..017b54b
Binary files /dev/null and b/images/headshots/franka.jpg differ
diff --git a/images/headshots/johanna.jpg b/images/headshots/johanna.jpg
new file mode 100644
index 0000000..d95ccff
Binary files /dev/null and b/images/headshots/johanna.jpg differ
diff --git a/images/headshots/julia.jpg b/images/headshots/julia.jpg
new file mode 100644
index 0000000..5475b1b
Binary files /dev/null and b/images/headshots/julia.jpg differ
diff --git a/images/headshots/lislis.png b/images/headshots/lislis.png
new file mode 100644
index 0000000..994b529
Binary files /dev/null and b/images/headshots/lislis.png differ
diff --git a/images/headshots/nils.png b/images/headshots/nils.png
new file mode 100644
index 0000000..fd0fc3e
Binary files /dev/null and b/images/headshots/nils.png differ
diff --git a/images/headshots/saskia.jpg b/images/headshots/saskia.jpg
new file mode 100644
index 0000000..ea06d24
Binary files /dev/null and b/images/headshots/saskia.jpg differ
diff --git a/images/headshots/tibor.jpg b/images/headshots/tibor.jpg
new file mode 100644
index 0000000..62a221d
Binary files /dev/null and b/images/headshots/tibor.jpg differ
diff --git a/index.html b/index.html
index 5dcdf3e..fea1684 100644
--- a/index.html
+++ b/index.html
@@ -247,27 +247,15 @@ <h1></h1>
   <div class="container">
     <h2>About us</h2>
     <div class="row">
-      <div class="col-md-6">
-        <img class="team" src="/images/team2015.jpg">
-        <p><b>The Team:</b></p>
-        <p>
-          <a href="https://twitter.com/plexus">Arne</a>,
-          <a href="https://twitter.com/socksy">Ben</a>,
-          <a href="https://twitter.com/thatbettina">Bettina</a>,
-          <a href="https://twitter.com/franschm">Franziska</a>,
-          <a href="https://twitter.com/jellea">Jelle</a>,
-          <a href="https://twitter.com/anderspree">Julia</a>,
-          <a href="http://lislis.de/">Lisa</a>,
-          <a href="https://twitter.com/malweene">Malwine</a>,
-          <a href="https://twitter.com/martinklepsch">Martin</a> &
-          <a href="https://twitter.com/nicsnet">Nicola</a>.
-        </p>
-
-        <a href="https://github.com/clojurebridge-berlin/organization/wiki">
-          <button type="button" class="btn btn-primary">Join us!</button>
-        </a>
+      <div class="col-md-6 bottom-space">
+        <div class="col-md-12 centered team ">
+          {% include team.html people=site.team %}
+        </div>
+        <div class="col-md-12 centered team-alumni">
+          venerated alumni ♡ {% include team-alumni.html people=site.team-alumni %}
+        </div>
       </div>
-      <div class="col-md-6">
+      <div class="col-md-6 bottom-space">
         <p>ClojureBridge Berlin is organized with a lot of love by volunteers. We try our best to make the workshop a memorable event and bring more people into programming.</p>
         <p><i>ClojureBridge Berlin wird mit ganz viel Liebe von Freiwilligen organisiert. Wir versuchen unser Bestes, aus dem Workshop ein unvergessliches Event zu machen und mehr Menschen zum Programmieren anzuregen.</i></p>
         <p><b>Twitter: </b><a href="https://twitter.com/ClojureBridgede">@ClojureBridgeDE</a></p>
@@ -276,6 +264,11 @@ <h2>About us</h2>
         <p><b>Mail:</b> clojurebridge.berlin@gmail.com</p>
         <p>For all kinds of questions mail us. We speak English and German.</p>
         <p><i>Bitte schreibe uns gerne ein Mail, wenn du Fragen oder Anregungen hast. Wir sprechen Deutsch und Englisch.</i></p>
+        <p>
+          <a href="https://github.com/clojurebridge-berlin/organization/wiki">
+            <button type="button" class="btn btn-primary">Join us!</button>
+          </a>
+        </p>
       </div>
     </div>