diff --git a/content/events/2015-chicago/conduct.md b/content/events/2015-chicago/conduct.md
index 1a9449b9675..c29ff168c6f 100644
--- a/content/events/2015-chicago/conduct.md
+++ b/content/events/2015-chicago/conduct.md
@@ -1,6 +1,6 @@
 +++
 Description = ""
-event = "chicago2015"
+event = "2015chicago"
 date = "2015-11-09T17:40:56-06:00"
 title = "conduct"
 City = "Chicago"
diff --git a/content/events/2015-chicago/contact.md b/content/events/2015-chicago/contact.md
index acfb99f57be..af6222fd852 100644
--- a/content/events/2015-chicago/contact.md
+++ b/content/events/2015-chicago/contact.md
@@ -1,6 +1,6 @@
 +++
 Description = ""
-event = "chicago2015"
+event = "2015chicago"
 date = "2015-11-09T17:40:56-06:00"
 title = "contact"
 City = "Chicago"
diff --git a/content/events/2015-chicago/location.md b/content/events/2015-chicago/location.md
index b559c54a00d..df9feb3c52e 100644
--- a/content/events/2015-chicago/location.md
+++ b/content/events/2015-chicago/location.md
@@ -1,6 +1,6 @@
 +++
 Description = ""
-event = "chicago2015"
+event = "2015chicago"
 date = "2015-11-09T17:40:56-06:00"
 title = "location"
 City = "Chicago"
diff --git a/content/events/2015-chicago/program.md b/content/events/2015-chicago/program.md
index 715b008a432..6a5c69ff135 100644
--- a/content/events/2015-chicago/program.md
+++ b/content/events/2015-chicago/program.md
@@ -1,6 +1,6 @@
 +++
 Description = ""
-event = "chicago2015"
+event = "2015chicago"
 date = "2015-11-09T17:40:56-06:00"
 title = "program"
 City = "Chicago"
diff --git a/content/events/2015-chicago/sponsor.md b/content/events/2015-chicago/sponsor.md
index f61d6d6f7f7..c6e4e89e7cd 100644
--- a/content/events/2015-chicago/sponsor.md
+++ b/content/events/2015-chicago/sponsor.md
@@ -1,6 +1,6 @@
 +++
 Description = ""
-event = "chicago2015"
+event = "2015chicago"
 date = "2015-11-09T17:40:56-06:00"
 title = "sponsor"
 City = "Chicago"
diff --git a/content/events/2015-chicago/welcome.md b/content/events/2015-chicago/welcome.md
index f15d92b9545..e3745aa1dbb 100644
--- a/content/events/2015-chicago/welcome.md
+++ b/content/events/2015-chicago/welcome.md
@@ -1,6 +1,6 @@
 +++
 Description = ""
-event = "chicago2015"
+event = "2015chicago"
 date = "2015-11-09T17:40:56-06:00"
 title = "welcome"
 City = "Chicago"
diff --git a/content/events/2016-kiel/conduct.md b/content/events/2016-kiel/conduct.md
index f4e3ce8bf6b..b7ac49fd49c 100644
--- a/content/events/2016-kiel/conduct.md
+++ b/content/events/2016-kiel/conduct.md
@@ -3,7 +3,7 @@ City = "Kiel"
 Description = ""
 Year = "2016"
 date = "2015-11-19T23:29:49-06:00"
-event = "kiel2016"
+event = "2016kiel"
 title = "conduct"
 type = "event"
 
diff --git a/content/events/2016-kiel/contact.md b/content/events/2016-kiel/contact.md
index 06260bf9835..db6c7755c06 100644
--- a/content/events/2016-kiel/contact.md
+++ b/content/events/2016-kiel/contact.md
@@ -3,7 +3,7 @@ City = "Kiel"
 Description = ""
 Year = "2016"
 date = "2015-11-19T23:29:49-06:00"
-event = "kiel2016"
+event = "2016kiel"
 title = "contact"
 type = "event"
 
diff --git a/content/events/2016-kiel/location.md b/content/events/2016-kiel/location.md
index 27428273cfd..5425a19e5c7 100644
--- a/content/events/2016-kiel/location.md
+++ b/content/events/2016-kiel/location.md
@@ -3,7 +3,7 @@ City = "Kiel"
 Description = ""
 Year = "2016"
 date = "2015-11-19T23:29:49-06:00"
-event = "kiel2016"
+event = "2016kiel"
 title = "location"
 type = "event"
 
diff --git a/content/events/2016-kiel/propose.md b/content/events/2016-kiel/propose.md
index a2733d929ca..9dfdc47ea74 100644
--- a/content/events/2016-kiel/propose.md
+++ b/content/events/2016-kiel/propose.md
@@ -3,7 +3,7 @@ City = "Kiel"
 Description = ""
 Year = "2016"
 date = "2015-11-19T23:29:49-06:00"
-event = "kiel2016"
+event = "2016kiel"
 title = "propose"
 type = "event"
 
diff --git a/content/events/2016-kiel/registration.md b/content/events/2016-kiel/registration.md
index 429a187863c..fc2eac641fa 100644
--- a/content/events/2016-kiel/registration.md
+++ b/content/events/2016-kiel/registration.md
@@ -3,7 +3,7 @@ City = "Kiel"
 Description = ""
 Year = "2016"
 date = "2015-11-19T23:29:49-06:00"
-event = "kiel2016"
+event = "2016kiel"
 title = "registration"
 type = "event"
 
diff --git a/content/events/2016-kiel/sponsor.md b/content/events/2016-kiel/sponsor.md
index 8ef382775ba..3abb12c4ae9 100644
--- a/content/events/2016-kiel/sponsor.md
+++ b/content/events/2016-kiel/sponsor.md
@@ -3,7 +3,7 @@ City = "Kiel"
 Description = ""
 Year = "2016"
 date = "2015-11-19T23:29:49-06:00"
-event = "kiel2016"
+event = "2016kiel"
 title = "sponsor"
 type = "event"
 
diff --git a/content/events/2016-kiel/welcome.md b/content/events/2016-kiel/welcome.md
index 0b640364afa..0de2e3d842e 100644
--- a/content/events/2016-kiel/welcome.md
+++ b/content/events/2016-kiel/welcome.md
@@ -3,7 +3,7 @@ City = "Kiel"
 Description = ""
 Year = "2016"
 date = "2015-11-19T23:29:49-06:00"
-event = "kiel2016"
+event = "2016kiel"
 title = "welcome"
 type = "event"
 aliases = ["/events/2016-kiel"]
diff --git a/data/events/2015chicago.yml b/data/events/2015chicago.yml
new file mode 100644
index 00000000000..550f12175a6
--- /dev/null
+++ b/data/events/2015chicago.yml
@@ -0,0 +1,28 @@
+name: 2015chicago
+year: "2015"
+city: "Chicago"
+friendly: "2015-chicago"
+status: "past"
+startdate: 2015-08-25
+enddate: 2015-08-26
+coordinates: "47.609895, -122.330259"
+navigationelements: ["welcome", "contact","location", "conduct","sponsor"]
+sponsors:
+  - id: chef
+    level: platinum
+  - id: datadog
+    level: gold
+  - id: arresteddevops
+    level: media
+
+sponsor_levels:
+  - id: platinum
+    label: Platinum
+  - id: gold
+    label: Gold
+  - id: silver
+    label: Silver
+  - id: bronze
+    label: Bronze
+  - id: media
+    label: Media
diff --git a/data/events/2015warsaw.yml b/data/events/2015warsaw.yml
new file mode 100644
index 00000000000..f48a5d29061
--- /dev/null
+++ b/data/events/2015warsaw.yml
@@ -0,0 +1,26 @@
+name: 2015warsaw
+year: "2015"
+city: "Warsaw"
+friendly: "2015-warsaw"
+status: "current"
+startdate: 2015-11-24
+enddate: 2015-11-25
+coordinates: "47.609895, -122.330259"
+navigationelements: ["welcome", "location", "register", "program", "ignites", "partners", "contact", "conduct"]
+sponsors:
+  - id: allegro
+    level: main
+  - id: uniteam
+    level: platinum
+  - id: kainos
+    level: gold
+  - id: connectis
+    level: regeneration-zone
+  - id: codersmill
+    level: sponsor
+  - id: eventory
+    level: partners
+  - id: kamea
+    level: partners
+  - id: teetbee
+    level: partners
diff --git a/data/events/2016kiel.yml b/data/events/2016kiel.yml
new file mode 100644
index 00000000000..82b3f1a82ba
--- /dev/null
+++ b/data/events/2016kiel.yml
@@ -0,0 +1,30 @@
+name: 2016kiel
+year: "2016"
+city: "Kiel"
+friendly: "2016-kiel"
+status: "current"
+startdate: 2016-05-12
+enddate: 2016-05-13
+coordinates: "47.609895, -122.330259"
+navigationelements: ["welcome", "propose", "location", "registration", "sponsor", "contact", "conduct"]
+sponsors:
+  - id: kiwi
+    level: host
+  - id: wobe
+    level: special
+    override:
+      url: www.microsoft.co.il
+  - id: puppet
+    level: special
+
+sponsor_levels:
+  - id: gold
+    label: Gold
+  - id: host
+    label: Host
+  - id: special
+    label: Special
+  - id: silver
+    label: Silver
+  - id: media
+    label: Media
diff --git a/data/events/chicago2015.toml b/data/events/chicago2015.toml
deleted file mode 100644
index 69948af87fa..00000000000
--- a/data/events/chicago2015.toml
+++ /dev/null
@@ -1,16 +0,0 @@
-name = "chicago2015"
-year = "2015"
-city = "Chicago"
-friendly = "2015-chicago"
-status = "past"
-startdate = 2015-08-25T23:29:49Z
-enddate = 2015-08-26T23:29:49Z
-coordinates = "47.609895, -122.330259"
-t1sponsortitle = "Platinum"
-t2sponsortitle = "Gold"
-t3sponsortitle = "Silver"
-t4sponsortitle = "Bronze"
-t5sponsortitle = "Media"
-t1sponsors = ["chef", "datadog"]
-t5sponsors = ["arresteddevops"]
-navigationelements = ["welcome", "contact","location", "conduct","sponsor"]
diff --git a/data/events/kiel2016.toml b/data/events/kiel2016.toml
deleted file mode 100644
index 853b0a66b38..00000000000
--- a/data/events/kiel2016.toml
+++ /dev/null
@@ -1,16 +0,0 @@
-name = "kiel2016"
-year = "2016"
-city = "Kiel"
-friendly = "2016-kiel"
-status = "current"
-startdate = 2016-05-12T23:29:49Z
-enddate = 2016-05-13T23:29:49Z
-coordinates = "47.609895, -122.330259"
-t1sponsortitle = "Gold"
-t2sponsortitle = "Host"
-t3sponsortitle = "Special"
-t4sponsortitle = "Silver"
-t5sponsortitle = "Media"
-t2sponsors = ["kiwi"]
-t3sponsors = ["wobe"]
-navigationelements = ["welcome", "propose", "location", "registration", "sponsor", "contact", "conduct"]
diff --git a/data/events/warsaw.toml b/data/events/warsaw.toml
deleted file mode 100644
index 6b7f6c58af0..00000000000
--- a/data/events/warsaw.toml
+++ /dev/null
@@ -1,21 +0,0 @@
-name = "warsaw2015"
-year = "2015"
-city = "Warsaw"
-friendly = "2015-warsaw"
-status = "current"
-startdate = 2015-11-24T23:29:49Z
-enddate = 2015-11-25T23:29:49Z
-coordinates = "47.609895, -122.330259"
-t1sponsortitle = "Main"
-t2sponsortitle = "Platinum"
-t3sponsortitle = "Gold"
-t4sponsortitle = "Regeneration Zone"
-t5sponsortitle = "Sponsor"
-t6sponsortitle = "Partners"
-t1sponsors = ["allegro"]
-t2sponsors = ["uniteam"]
-t3sponsors = ["kainos"]
-t4sponsors = ["connectis"]
-t5sponsors = ["codersmill"]
-t6sponsors = ["eventory", "kamea", "teetbee"]
-navigationelements = ["welcome", "location", "register", "program", "ignites", "partners", "contact", "conduct"]
diff --git a/themes/devopsdays/layouts/event/single.html b/themes/devopsdays/layouts/event/single.html
index 79eda5314dd..318daa932a1 100644
--- a/themes/devopsdays/layouts/event/single.html
+++ b/themes/devopsdays/layouts/event/single.html
@@ -16,42 +16,20 @@ <h1> {{ $e.city }} - {{ title .Title }} </h1>
       {{ .Content }}
     </div>
     <div class="col-md-4">
-      {{ range $sponsor := $e.t1sponsors }}
-        {{ if isset $.Site.Data.sponsors $sponsor }}
-          <h2>{{ $e.t1sponsortitle }} Sponsors</h2>
-          {{ $s :=  (index $.Site.Data.sponsors $sponsor) }}
-          <a href = "{{ $s.url }}"><img alt = "{{ $sponsor }}" src = "/img/sponsors/{{ $sponsor }}.png" class="img-responsive"></a>
-        {{ end }}
-      {{ end }}
-      {{ range $sponsor := $e.t2sponsors }}
-        {{ if isset $.Site.Data.sponsors $sponsor }}
-          <h2>{{ $e.t2sponsortitle }} Sponsors</h2>
-          {{ $s :=  (index $.Site.Data.sponsors $sponsor) }}
-          <a href = "{{ $s.url }}"><img alt = "{{ $sponsor }}" src = "/img/sponsors/{{ $sponsor }}.png" class="img-responsive"></a>
-        {{ end }}
-      {{ end }}
-      {{ range $sponsor := $e.t3sponsors }}
-        {{ if isset $.Site.Data.sponsors $sponsor }}
-          <h2>{{ $e.t3sponsortitle }} Sponsors</h2>
-          {{ $s :=  (index $.Site.Data.sponsors $sponsor) }}
-          <a href = "{{ $s.url }}"><img alt = "{{ $sponsor }}" src = "/img/sponsors/{{ $sponsor }}.png" class="img-responsive"></a>
-        {{ end }}
-      {{ end }}
-      {{ range $sponsor := $e.t4sponsors }}
-        {{ if isset $.Site.Data.sponsors $sponsor }}
-          <h2>{{ $e.t4sponsortitle }} Sponsors</h2>
-          {{ $s :=  (index $.Site.Data.sponsors $sponsor) }}
-          <a href = "{{ $s.url }}"><img alt = "{{ $sponsor }}" src = "/img/sponsors/{{ $sponsor }}.png" class="img-responsive"></a>
-        {{ end }}
-      {{ end }}
-      {{ range $sponsor := $e.t5sponsors }}
-        {{ if isset $.Site.Data.sponsors $sponsor }}
-          <h2>{{ $e.t5sponsortitle }} Sponsors</h2>
-          {{ $s :=  (index $.Site.Data.sponsors $sponsor) }}
-          <a href = "{{ $s.url }}"><img alt = "{{ $sponsor }}" src = "/img/sponsors/{{ $sponsor }}.png" class="img-responsive"></a>
+    <!-- sponsor code begin -->
+    {{ $sponsors := $e.sponsors }}
+    {{ range $e.sponsor_levels }}
+    <h2>{{ .label }} Sponsors</h2>
+      {{ range where $sponsors "level" .id }}
+        {{ $s :=  (index $.Site.Data.sponsors .id) }}
+        {{ if isset $.Site.Data.sponsors .id }}
+          <a href = "{{ $s.url }}"><img alt = "{{ .id }}" src = "/img/sponsors/{{ .id }}.png" class="img-responsive"></a>
         {{ end }}
       {{ end }}
+      <a href = "/events/{{ $e.friendly }}/sponsor">Become a {{ .label }} Sponsor!</a>
+    {{ end }}
 
+    <!-- sponsor code end -->
     </div>
   </div>