diff --git a/data/schedule.yaml b/data/schedule.yaml
index 4db97cb..f8719c8 100644
--- a/data/schedule.yaml
+++ b/data/schedule.yaml
@@ -5,97 +5,80 @@ calendars:
     schedule:
       - title: DS-Kids 6
         day: Mon
-        start: '17:15'
-        age: ''
-        extern: false
+        start: '17:00'
+        age: '2017 - 2019'
         duration: 60
       - title: DS Adults 5
         day: Mon
         start: '18:15'
-        age: ''
-        extern: false
+        age: 'ab 18'
         duration: 60
       - title: DS Contest Gruppe
         day: Mon
         start: '19:15'
-        age: ''
-        extern: false
+        age: 'auf Anfrage'
         duration: 90
 
       - title: DS Kids 4
         day: Tue
         start: '16:30'
-        age: ''
-        extern: false
+        age: '2015 - 2017'
         duration: 60
       - title: DS Kids 0
         day: Tue
         start: '17:45'
-        age: ''
-        extern: false
+        age: '2011 - 2013'
         duration: 60
       - title: DS Adults 1
         day: Tue
         start: '18:45'
-        age: ''
-        extern: false
+        age: 'ab 18'
         duration: 90
 
       - title: DS Kids 2
         day: Wed
         start: '17:00'
-        age: ''
-        extern: false
+        age: '2010 - 2012'
         duration: 60
       - title: DS Teens 0
         day: Wed
         start: '18:00'
-        age: ''
+        age: '2008 - 2010'
         extern: false
         duration: 60
       - title: Turnieraufbau Std
         day: Wed
         start: '20:30'
-        age: ''
-        extern: false
         duration: 90
 
       - title: DS Kids 5
         day: Thu
         start: '17:00'
-        age: ''
-        extern: false
+        age: '2010 - 2013'
         duration: 60
       - title: DS Kids 1
         day: Thu
         start: '18:30'
-        age: ''
-        extern: false
+        age: '2012 - 2014'
         duration: 60
       - title: DS Adults 3
         day: Thu
         start: '19:30'
-        age: ''
-        extern: false
+        age: 'ab 18'
         duration: 60
 
       - title: DS Minis 0
         day: Fri
         start: '16:30'
-        age: ''
-        extern: false
+        age: '2019 - 2020'
         duration: 60
       - title: Tanzkreis 0
         day: Fri
         start: '19:00'
-        age: ''
-        extern: false
         duration: 90
       - title: Discofox
         day: Fri
         start: '20:30'
-        age: ''
-        extern: false
         duration: 60
 
   mitte:
@@ -105,79 +88,61 @@ calendars:
       - title: DS Teens 2
         day: Mon
         start: '17:30'
-        age: ''
-        extern: false
+        age: '2006 - 09'
         duration: 60
       - title: Ballet
         day: Mon
         start: '18:30'
         age: ''
-        extern: false
+        extern: true
         duration: 90
       - title: Tanzkreis 1
         day: Mon
         start: '20:00'
-        age: ''
-        extern: false
         duration: 90
 
       - title: Tanzkreis 2
         day: Tue
         start: '20:00'
-        age: ''
-        extern: false
         duration: 120
 
       - title: DS Kids 7
         day: Wed
         start: '18:00'
-        age: ''
-        extern: false
+        age: '2012 - 2015'
         duration: 60
       - title: Tanzkreis 3
         day: Wed
         start: '19:00'
-        age: ''
-        extern: false
         duration: 90
       - title: Tanzkreis 4
         day: Wed
         start: '20:30'
-        age: ''
-        extern: false
         duration: 90
 
       - title: DS Minis 1
         day: Thu
         start: '16:45'
-        age: ''
-        extern: false
+        age: '2020 - 2021'
         duration: 60
       - title: Tanzkreis 5
         day: Thu
         start: '19:30'
-        age: ''
-        extern: false
         duration: 90
 
       - title: Tanzkreis 6 - Einsteiger
         day: Fri
         start: '18:30'
-        age: ''
-        extern: false
         duration: 30
       - title: Tanzkreis 6
         day: Fri
         start: '19:00'
-        age: ''
-        extern: false
         duration: 90
       - title: Tanzkreis 9
         day: Fri
         start: '20:30'
-        age: ''
-        extern: false
         duration: 90
+
   hinten:
     id: test3
     ignore: false
@@ -192,14 +157,10 @@ calendars:
       - title: Turnier Latein
         day: Tue
         start: '19:00'
-        age: ''
-        extern: false
         duration: 60
       - title: Turnier Standard
         day: Tue
         start: '20:00'
-        age: ''
-        extern: false
         duration: 120
 
       - title: Ballet
@@ -211,50 +172,40 @@ calendars:
       - title: DS Kids 3
         day: Wed
         start: '16:45'
-        age: ''
-        extern: false
+        age: '2014 - 2016'
         duration: 60
       - title: DS Teens 1
         day: Wed
         start: '18:00'
-        age: ''
-        extern: false
+        age: '2004 - 07'
         duration: 60
       - title: DS Adults 0
         day: Wed
         start: '19:00'
-        age: ''
-        extern: false
+        age: 'ab 18'
         duration: 60
       - title: Breitensport
         day: Wed
         start: '20:00'
-        age: ''
-        extern: false
         duration: 90
 
       - title: Kindertanz 8 (Turnieraufbau)
         day: Thu
         start: '18:00'
-        age: ''
-        extern: false
         duration: 90
 
       - title: Kindertanz 0
         day: Fri
         start: '14:30'
-        age: ''
-        extern: false
+        age: '2018 - 2020'
         duration: 60
       - title: Kindertanz 1
         day: Fri
         start: '15:30'
-        age: ''
-        extern: false
+        age: '2016 - 18'
         duration: 60
       - title: Kindertanz 2 (Turnieraufbau)
         day: Fri
         start: '16:30'
         age: ''
-        extern: false
         duration: 150