diff --git a/Makefile b/Makefile
index 8953bb21e..1a39fa863 100644
--- a/Makefile
+++ b/Makefile
@@ -30,8 +30,8 @@ DESTDIR?=www-export
 
 ### Ressourcen ###
 # XSLT-Stylesheets:
-STYLE=xsl/xhtml.xsl
-DS_STYLE=xsl/datenspuren/xhtml.xsl
+STYLE=xsl/xhtml5.xsl
+DS_STYLE=xsl/datenspuren/xhtml5.xsl
 # Document-Type-Definition:
 DTD:=dtd/c3d2web.dtd
 # XML-Katalog (Pfad zu den DTDs) - wird benötigt vom Validator
@@ -72,21 +72,26 @@ SEARCH_TMPL:=build/cgi-bin/search.html
 NEWSITEMS:=$(wildcard content/news/*.xml)
 CLEAN=$(CONTENT) $(NEWSFILES) $(WWW_CCC_DE_UPDATES) $(CALENDAR_SUMMARY) $(DS_PAGES)
 
-NOVALID_IGNORE:=false
+NOVALID:=false
 
 define xml_process
 	$(VALIDATOR) $(VFLAGS_IN) $<
 	$(PROCESSOR) $(PFLAGS) -o $@ $(STYLE) $<
-	$(VALIDATOR) $(VFLAGS_OUT) $@ || $(NOVALID_IGNORE) || \
+	$(NOVALID) || $(VALIDATOR) $(VFLAGS_OUT) $@ || \
 		{ touch -m -t 197001010000 Makefile $@ ; exit 1 ; }
 endef
 
-
 ### Defaults ###
 
 .PHONY: www
 www: $(XML_CATALOG) $(CONTENT)
 	$(RSYNC) $(RSYNC_FLAGS) --exclude=".stamp-*" content/static/ content/old-site/ build/ $@
+	@echo
+	@echo
+	@echo 'Great!'
+	@echo
+	@echo 'You may now run `make -j3 xhtml5-validate` to make sure everything fits.'
+	@echo
 
 .PHONY: export
 export: www
@@ -98,32 +103,32 @@ $(DATESTAMP):
 
 ### Regeln für den XSLT-Prozess ###
 
-build/%.html : VFLAGS_OUT=$(VFLAGS) --schema xsd/xhtml1-strict.xsd
+build/%.html : NOVALID:=true
 build/news.html: $(WWW_CCC_DE_UPDATES) $(CALENDAR_SUMMARY) $(DATESTAMP)
 build/news-rss.xml : STYLE=xsl/rss.xsl
-build/news-rss.xml : NOVALID_IGNORE:=true
+build/news-rss.xml : NOVALID:=true
 build/news-rss.xml : PFLAGS+=--stringparam prefix ""
 build/news-rss.xml : VFLAGS_OUT=$(VFLAGS) --schema xsd/rss20.xsd
 build/news-atom.xml : STYLE=xsl/atom.xsl
-build/news-atom.xml : NOVALID_IGNORE:=true
+build/news-atom.xml : NOVALID:=true
 build/news-atom.xml : PFLAGS+=--stringparam prefix ""
 build/news-atom.xml : VFLAGS_OUT=$(VFLAGS) --relaxng xsd/atom.rng
 build/podcast.xml : STYLE=xsl/podcast.xsl
-build/podcast.xml : NOVALID_IGNORE:=true
+build/podcast.xml : NOVALID:=true
 build/podcast.xml : VFLAGS_OUT=$(VFLAGS) --schema xsd/rss20.xsd
 build/podcast.xml: xsl/podcast.xsl # Does not work with $(STYLE) - why?
 build/pentaradio.xml : STYLE=xsl/podcast.xsl
-build/pentaradio.xml : NOVALID_IGNORE:=true
+build/pentaradio.xml : NOVALID:=true
 build/pentaradio.xml : VFLAGS_OUT=$(VFLAGS) --schema xsd/rss20.xsd
 build/pentaradio.xml : PFLAGS+=--stringparam selection pentaradio
 build/pentaradio.xml: xsl/podcast.xsl # Does not work with $(STYLE) - why?
 build/pentacast.xml : STYLE=xsl/podcast.xsl
-build/pentacast.xml : NOVALID_IGNORE:=true
+build/pentacast.xml : NOVALID:=true
 build/pentacast.xml : VFLAGS_OUT=$(VFLAGS) --schema xsd/rss20.xsd
 build/pentacast.xml : PFLAGS+=--stringparam selection pentacast
 build/pentacast.xml: xsl/podcast.xsl # Does not work with $(STYLE) - why?
 build/pentamusic.xml : STYLE=xsl/podcast.xsl
-build/pentamusic.xml : NOVALID_IGNORE:=true
+build/pentamusic.xml : NOVALID:=true
 build/pentamusic.xml : VFLAGS_OUT=$(VFLAGS) --schema xsd/rss20.xsd
 build/pentamusic.xml : PFLAGS+=--stringparam selection pentamusic
 build/pentamusic.xml: xsl/podcast.xsl # Does not work with $(STYLE) - why?
@@ -137,7 +142,7 @@ $(NEWSFILES): news.xml $(NAVIGATION) $(STYLE)
 
 # Calendar
 $(CALENDAR_SUMMARY) : STYLE=xsl/calendar-summary.xsl
-$(CALENDAR_SUMMARY) : NOVALID_IGNORE:=true
+$(CALENDAR_SUMMARY) : NOVALID:=true
 $(CALENDAR_SUMMARY) : VFLAGS_IN=$(VFLAGS)
 $(CALENDAR_SUMMARY): content/events.xml news.xml
 	$(call xml_process)
@@ -154,7 +159,7 @@ build/xcal.xml: $(CALENDAR_SUMMARY) $(STYLE)
 
 # iCal
 build/ical.ics : STYLE=xsl/ical.xsl
-build/ical.ics : NOVALID_IGNORE:=true
+build/ical.ics : NOVALID:=true
 build/ical.ics : VFLAGS_IN=$(VFLAGS)
 build/ical.ics : VFLAGS_OUT=$(VFLAGS)
 build/ical.ics: $(CALENDAR_SUMMARY) $(STYLE)
@@ -162,7 +167,7 @@ build/ical.ics: $(CALENDAR_SUMMARY) $(STYLE)
 
 # Remind
 build/reminders : STYLE=xsl/remind.xsl
-build/reminders : NOVALID_IGNORE:=true
+build/reminders : NOVALID:=true
 build/reminders : VFLAGS_IN=$(VFLAGS)
 build/reminders : VFLAGS_OUT=$(VFLAGS)
 build/reminders: $(CALENDAR_SUMMARY) $(STYLE)
@@ -170,8 +175,8 @@ build/reminders: $(CALENDAR_SUMMARY) $(STYLE)
 
 # Playlists
 build/%.xspf : VFLAGS_OUT=$(VFLAGS) --relaxng xsd/xspf-1_0.5.rng
-build/%.m3u : NOVALID_IGNORE:=true
-build/%.pls : NOVALID_IGNORE:=true
+build/%.m3u : NOVALID:=true
+build/%.pls : NOVALID:=true
 
 # Pages:
 build/%.html: content/pages/%.xml $(STYLE) $(NAVIGATION) $(WWW_CCC_DE_UPDATES) $(CALENDAR_SUMMARY) $(DATESTAMP) news.xml
@@ -194,14 +199,20 @@ build/datenspuren/%.html: content/datenspuren/%.xml $(DS_STYLE) news.xml $(DS_SC
 build/datenspuren/schedule.html : content/static/datenspuren/fahrplan/index.de.html
 
 build/datenspuren/news-rss.xml : STYLE=xsl/rss.xsl
-build/datenspuren/news-rss.xml : NOVALID_IGNORE:=true
+build/datenspuren/news-rss.xml : NOVALID:=true
 build/datenspuren/news-rss.xml : PFLAGS+=--stringparam prefix ds09-
 build/datenspuren/news-rss.xml : VFLAGS_OUT=$(VFLAGS) --schema xsd/rss20.xsd
 build/datenspuren/news-atom.xml : STYLE=xsl/atom.xsl
-build/datenspuren/news-atom.xml : NOVALID_IGNORE:=true
+build/datenspuren/news-atom.xml : NOVALID:=true
 build/datenspuren/news-atom.xml : PFLAGS+=--stringparam prefix ds09-
 build/datenspuren/news-atom.xml : VFLAGS_OUT=$(VFLAGS) --relaxng xsd/atom.rng
 
+xhtml5-validate: $(patsubst build/%.html, build/%.html.xhtml5-validate, $(CONTENT))
+build/%.html.xhtml5-validate: build/%.html
+	./scripts/validate_xhtml5.sh $<
+
+
+
 ### Die neuesten Chaosupdates holen ###
 $(WWW_CCC_DE_UPDATES).orig: $(DATESTAMP)
 	$(RM) $@
diff --git a/content/news/datenspuren2005-audio.xml b/content/news/datenspuren2005-audio.xml
index 8d11bf9c5..2cc30ada5 100644
--- a/content/news/datenspuren2005-audio.xml
+++ b/content/news/datenspuren2005-audio.xml
@@ -7,18 +7,18 @@
     Alle <link href="http://datenspuren.dresden.ccc.de/">Datenspuren</link> Audio-Mitschnitte endlich zum Download. Per ftp über <link>http://ftp.c3d2.de/datenspuren/2005/</link>.
   </p>
 
-  <resource hide="yes" title="050508 datenspuren 01 Keynote Reinhard Wobst.ogg" size="17651000" type="application/ogg" url="http://ftp.c3d2.de/datenspuren/2005/050508%20datenspuren%2001%20Keynote%20Reinhard%20Wobst.ogg"/>
-  <resource hide="yes" title="050508 datenspuren 02 TKÜV Hannah Seiffert.ogg" size="14730176" type="application/ogg" url="http://ftp.c3d2.de/datenspuren/2005/050508%20datenspuren%2002%20TK%dcV%20Hannah%20Seiffert.ogg"/>
-  <resource hide="yes" title="050508 datenspuren 03 Vorratsdatenspeicherung Hannah Seiffert.ogg" size="8910305" type="application/ogg" url="http://ftp.c3d2.de/datenspuren/2005/050508%20datenspuren%2003%20Vorratsdatenspeicherung%20Hannah%20Seiffert.ogg"/>
-  <resource hide="yes" title="050508 datenspuren 04 Biometrie Technik starbug.ogg" size="8429893" type="application/ogg" url="http://ftp.c3d2.de/datenspuren/2005/050508%20datenspuren%2004%20Biometrie%20Technik%20starbug.ogg"/>
-  <resource hide="yes" title="050508 datenspuren 05 Biometrie Politik starbug.ogg" size="19115597" type="application/ogg" url="http://ftp.c3d2.de/datenspuren/2005/050508%20datenspuren%2005%20Biometrie%20Politik%20starbug.ogg"/>
-  <resource hide="yes" title="050508 datenspuren 06 Überwachungskameras Peter Bittner.ogg" size="24321063" type="application/ogg" url="http://ftp.c3d2.de/datenspuren/2005/050508%20datenspuren%2006%20%dcberwachungskameras%20Peter%20Bittner.ogg"/>
-  <resource hide="yes" title="050508 datenspuren 07 Überwachungskameras Padeluun.ogg" size="18617513" type="application/ogg" url="http://ftp.c3d2.de/datenspuren/2005/050508%20datenspuren%2007%20%dcberwachungskameras%20Padeluun.ogg"/>
-  <resource hide="yes" title="050508 datenspuren 08 AnOn Stefan Köpsell.ogg" size="29948158" type="application/ogg" url="http://ftp.c3d2.de/datenspuren/2005/050508%20datenspuren%2008%20AnOn%20Stefan%20K%f6psell.ogg"/>
-  <resource hide="yes" title="050508 datenspuren 09 Identitätsmanagement Henry Krasemann.ogg" size="20936154" type="application/ogg" url="http://ftp.c3d2.de/datenspuren/2005/050508%20datenspuren%2009%20Identit%e4tsmanagement%20Henry%20Krasemann.ogg"/>
-  <resource hide="yes" title="050508 datenspuren 10 Toll Collect Volker Birk.ogg" size="23891188" type="application/ogg" url="http://ftp.c3d2.de/datenspuren/2005/050508%20datenspuren%2010%20Toll%20Collect%20Volker%20Birk.ogg"/>
-  <resource hide="yes" title="050508 datenspuren 11 RFID Frank Rosengart.ogg" size="22516888" type="application/ogg" url="http://ftp.c3d2.de/datenspuren/2005/050508%20datenspuren%2011%20RFID%20Frank%20Rosengart.ogg"/>
-  <resource hide="yes" title="050508 datenspuren 12 mobilfunk abhören - lokalisieren Frank Rieger.ogg" size="31418886" type="application/ogg" url="http://ftp.c3d2.de/datenspuren/2005/050508%20datenspuren%2012%20mobilfunk%20abh%f6ren%20-%20lokalisieren%20Frank%20Rieger.ogg"/>
-  <resource hide="yes" title="050508 datenspuren 13 Podium.ogg" size="30693292" type="application/ogg" url="http://ftp.c3d2.de/datenspuren/2005/050508%20datenspuren%2013%20Podium.ogg"/>
-  <resource hide="yes" title="050508 datenspurn anonymizer-workshop.ogg" size="39940823" type="application/ogg" url="http://ftp.c3d2.de/datenspuren/2005/050508%20datenspurn%20anonymizer-workshop.ogg"/>
+  <resource hide="yes" title="050508 datenspuren 01 Keynote Reinhard Wobst.ogg" size="17651000" type="audio/ogg" url="http://ftp.c3d2.de/datenspuren/2005/050508%20datenspuren%2001%20Keynote%20Reinhard%20Wobst.ogg"/>
+  <resource hide="yes" title="050508 datenspuren 02 TKÜV Hannah Seiffert.ogg" size="14730176" type="audio/ogg" url="http://ftp.c3d2.de/datenspuren/2005/050508%20datenspuren%2002%20TK%dcV%20Hannah%20Seiffert.ogg"/>
+  <resource hide="yes" title="050508 datenspuren 03 Vorratsdatenspeicherung Hannah Seiffert.ogg" size="8910305" type="audio/ogg" url="http://ftp.c3d2.de/datenspuren/2005/050508%20datenspuren%2003%20Vorratsdatenspeicherung%20Hannah%20Seiffert.ogg"/>
+  <resource hide="yes" title="050508 datenspuren 04 Biometrie Technik starbug.ogg" size="8429893" type="audio/ogg" url="http://ftp.c3d2.de/datenspuren/2005/050508%20datenspuren%2004%20Biometrie%20Technik%20starbug.ogg"/>
+  <resource hide="yes" title="050508 datenspuren 05 Biometrie Politik starbug.ogg" size="19115597" type="audio/ogg" url="http://ftp.c3d2.de/datenspuren/2005/050508%20datenspuren%2005%20Biometrie%20Politik%20starbug.ogg"/>
+  <resource hide="yes" title="050508 datenspuren 06 Überwachungskameras Peter Bittner.ogg" size="24321063" type="audio/ogg" url="http://ftp.c3d2.de/datenspuren/2005/050508%20datenspuren%2006%20%dcberwachungskameras%20Peter%20Bittner.ogg"/>
+  <resource hide="yes" title="050508 datenspuren 07 Überwachungskameras Padeluun.ogg" size="18617513" type="audio/ogg" url="http://ftp.c3d2.de/datenspuren/2005/050508%20datenspuren%2007%20%dcberwachungskameras%20Padeluun.ogg"/>
+  <resource hide="yes" title="050508 datenspuren 08 AnOn Stefan Köpsell.ogg" size="29948158" type="audio/ogg" url="http://ftp.c3d2.de/datenspuren/2005/050508%20datenspuren%2008%20AnOn%20Stefan%20K%f6psell.ogg"/>
+  <resource hide="yes" title="050508 datenspuren 09 Identitätsmanagement Henry Krasemann.ogg" size="20936154" type="audio/ogg" url="http://ftp.c3d2.de/datenspuren/2005/050508%20datenspuren%2009%20Identit%e4tsmanagement%20Henry%20Krasemann.ogg"/>
+  <resource hide="yes" title="050508 datenspuren 10 Toll Collect Volker Birk.ogg" size="23891188" type="audio/ogg" url="http://ftp.c3d2.de/datenspuren/2005/050508%20datenspuren%2010%20Toll%20Collect%20Volker%20Birk.ogg"/>
+  <resource hide="yes" title="050508 datenspuren 11 RFID Frank Rosengart.ogg" size="22516888" type="audio/ogg" url="http://ftp.c3d2.de/datenspuren/2005/050508%20datenspuren%2011%20RFID%20Frank%20Rosengart.ogg"/>
+  <resource hide="yes" title="050508 datenspuren 12 mobilfunk abhören - lokalisieren Frank Rieger.ogg" size="31418886" type="audio/ogg" url="http://ftp.c3d2.de/datenspuren/2005/050508%20datenspuren%2012%20mobilfunk%20abh%f6ren%20-%20lokalisieren%20Frank%20Rieger.ogg"/>
+  <resource hide="yes" title="050508 datenspuren 13 Podium.ogg" size="30693292" type="audio/ogg" url="http://ftp.c3d2.de/datenspuren/2005/050508%20datenspuren%2013%20Podium.ogg"/>
+  <resource hide="yes" title="050508 datenspurn anonymizer-workshop.ogg" size="39940823" type="audio/ogg" url="http://ftp.c3d2.de/datenspuren/2005/050508%20datenspurn%20anonymizer-workshop.ogg"/>
 </item>
diff --git a/content/news/datenspuren2006-audio.xml b/content/news/datenspuren2006-audio.xml
index 9951762ab..ffa4f7f99 100644
--- a/content/news/datenspuren2006-audio.xml
+++ b/content/news/datenspuren2006-audio.xml
@@ -17,17 +17,17 @@
     </p>
   </addendum>
 
-  <resource hide="yes" title="c3d2 060513 Tauss informationsfreiheitsgesetz Debatte.ogg" size="7965260" type="application/ogg" url="http://ftp.c3d2.de/datenspuren/2006/c3d2%20060513%20Tauss%20informationsfreiheitsgesetz%20Debatte.ogg"/>
-  <resource hide="yes" title="c3d2 060513 hefendehl datendammbrueche.ogg" size="17410548" type="application/ogg" url="http://ftp.c3d2.de/datenspuren/2006/c3d2%20060513%20hefendehl%20datendammbrueche.ogg"/>
-  <resource hide="yes" title="c3d2 060513 ohlig zensur in china - debatte.ogg" size="3687197" type="application/ogg" url="http://ftp.c3d2.de/datenspuren/2006/c3d2%20060513%20ohlig%20zensur%20in%20china%20-%20debatte.ogg"/>
-  <resource hide="yes" title="c3d2 060513 ohlig zensur in china.ogg" size="16712397" type="application/ogg" url="http://ftp.c3d2.de/datenspuren/2006/c3d2%20060513%20ohlig%20zensur%20in%20china.ogg"/>
-  <resource hide="yes" title="c3d2 060513 rieger+gonggrijp lost the war.ogg" size="31054136" type="application/ogg" url="http://ftp.c3d2.de/datenspuren/2006/c3d2%20060513%20rieger+gonggrijp%20lost%20the%20war.ogg"/>
-  <resource hide="yes" title="c3d2 060513 tauss Zwischenruf zur Vorratsdatenspeicherung.ogg" size="1250586" type="application/ogg" url="http://ftp.c3d2.de/datenspuren/2006/c3d2%20060513%20tauss%20Zwischenruf%20zur%20Vorratsdatenspeicherung.ogg"/>
-  <resource hide="yes" title="c3d2 060513 tauss informationsfreiheitsgesetz.ogg" size="12198052" type="application/ogg" url="http://ftp.c3d2.de/datenspuren/2006/c3d2%20060513%20tauss%20informationsfreiheitsgesetz.ogg"/>
-  <resource hide="yes" title="c3d2 060514 ThoMaus Gesundheitskarte08.ogg" size="59629363" type="application/ogg" url="http://ftp.c3d2.de/datenspuren/2006/c3d2%20060514%20ThoMaus%20Gesundheitskarte08.ogg"/>
-  <resource hide="yes" title="c3d2 060514 abschlussreden.ogg" size="2897652" type="application/ogg" url="http://ftp.c3d2.de/datenspuren/2006/c3d2%20060514%20abschlussreden.ogg"/>
-  <resource hide="yes" title="c3d2 060514 donnerhacke dns.ogg" size="28467873" type="application/ogg" url="http://ftp.c3d2.de/datenspuren/2006/c3d2%20060514%20donnerhacke%20dns.ogg"/>
-  <resource hide="yes" title="c3d2 060514 freude telemediengesetz.ogg" size="23567280" type="application/ogg" url="http://ftp.c3d2.de/datenspuren/2006/c3d2%20060514%20freude%20telemediengesetz.ogg"/>
-  <resource hide="yes" title="c3d2 060514 koepsel aufenthaltsdaten.ogg" size="24822234" type="application/ogg" url="http://ftp.c3d2.de/datenspuren/2006/c3d2%20060514%20koepsel%20aufenthaltsdaten.ogg"/>
-  <resource hide="yes" title="c3d2 060514 rieger vorratsdatenspeicherung.ogg" size="18744992" type="application/ogg" url="http://ftp.c3d2.de/datenspuren/2006/c3d2%20060514%20rieger%20vorratsdatenspeicherung.ogg"/>
+  <resource hide="yes" title="c3d2 060513 Tauss informationsfreiheitsgesetz Debatte.ogg" size="7965260" type="audio/ogg" url="http://ftp.c3d2.de/datenspuren/2006/c3d2%20060513%20Tauss%20informationsfreiheitsgesetz%20Debatte.ogg"/>
+  <resource hide="yes" title="c3d2 060513 hefendehl datendammbrueche.ogg" size="17410548" type="audio/ogg" url="http://ftp.c3d2.de/datenspuren/2006/c3d2%20060513%20hefendehl%20datendammbrueche.ogg"/>
+  <resource hide="yes" title="c3d2 060513 ohlig zensur in china - debatte.ogg" size="3687197" type="audio/ogg" url="http://ftp.c3d2.de/datenspuren/2006/c3d2%20060513%20ohlig%20zensur%20in%20china%20-%20debatte.ogg"/>
+  <resource hide="yes" title="c3d2 060513 ohlig zensur in china.ogg" size="16712397" type="audio/ogg" url="http://ftp.c3d2.de/datenspuren/2006/c3d2%20060513%20ohlig%20zensur%20in%20china.ogg"/>
+  <resource hide="yes" title="c3d2 060513 rieger+gonggrijp lost the war.ogg" size="31054136" type="audio/ogg" url="http://ftp.c3d2.de/datenspuren/2006/c3d2%20060513%20rieger+gonggrijp%20lost%20the%20war.ogg"/>
+  <resource hide="yes" title="c3d2 060513 tauss Zwischenruf zur Vorratsdatenspeicherung.ogg" size="1250586" type="audio/ogg" url="http://ftp.c3d2.de/datenspuren/2006/c3d2%20060513%20tauss%20Zwischenruf%20zur%20Vorratsdatenspeicherung.ogg"/>
+  <resource hide="yes" title="c3d2 060513 tauss informationsfreiheitsgesetz.ogg" size="12198052" type="audio/ogg" url="http://ftp.c3d2.de/datenspuren/2006/c3d2%20060513%20tauss%20informationsfreiheitsgesetz.ogg"/>
+  <resource hide="yes" title="c3d2 060514 ThoMaus Gesundheitskarte08.ogg" size="59629363" type="audio/ogg" url="http://ftp.c3d2.de/datenspuren/2006/c3d2%20060514%20ThoMaus%20Gesundheitskarte08.ogg"/>
+  <resource hide="yes" title="c3d2 060514 abschlussreden.ogg" size="2897652" type="audio/ogg" url="http://ftp.c3d2.de/datenspuren/2006/c3d2%20060514%20abschlussreden.ogg"/>
+  <resource hide="yes" title="c3d2 060514 donnerhacke dns.ogg" size="28467873" type="audio/ogg" url="http://ftp.c3d2.de/datenspuren/2006/c3d2%20060514%20donnerhacke%20dns.ogg"/>
+  <resource hide="yes" title="c3d2 060514 freude telemediengesetz.ogg" size="23567280" type="audio/ogg" url="http://ftp.c3d2.de/datenspuren/2006/c3d2%20060514%20freude%20telemediengesetz.ogg"/>
+  <resource hide="yes" title="c3d2 060514 koepsel aufenthaltsdaten.ogg" size="24822234" type="audio/ogg" url="http://ftp.c3d2.de/datenspuren/2006/c3d2%20060514%20koepsel%20aufenthaltsdaten.ogg"/>
+  <resource hide="yes" title="c3d2 060514 rieger vorratsdatenspeicherung.ogg" size="18744992" type="audio/ogg" url="http://ftp.c3d2.de/datenspuren/2006/c3d2%20060514%20rieger%20vorratsdatenspeicherung.ogg"/>
 </item>
diff --git a/content/news/datenspuren2007-audio-slides.xml b/content/news/datenspuren2007-audio-slides.xml
index 8b10716c9..228dfee63 100644
--- a/content/news/datenspuren2007-audio-slides.xml
+++ b/content/news/datenspuren2007-audio-slides.xml
@@ -12,10 +12,10 @@
 
   <addendum/>
 
-  <resource hide="yes" title="Keynote" size="11223395" type="application/ogg"
+  <resource hide="yes" title="Keynote" size="11223395" type="audio/ogg"
             url="http://ftp.c3d2.de/datenspuren/2007/01_keynote.ogg"/>
   <resource hide="yes" title="Videoüberwachung in der Dresdner
-                              Neustadt" size="30293300" type="application/ogg"
+                              Neustadt" size="30293300" type="audio/ogg"
             url="http://ftp.c3d2.de/datenspuren/2007/02_videoueberwachung_neustadt.ogg"/>
   <resource hide="yes" title="Videoüberwachung in der Dresdner
                               Neustadt" size="279622" type="application/pdf"
@@ -24,52 +24,52 @@
             size="517066" type="application/pdf"
             url="http://www.datenspuren.de/2007/fahrplan/attachments/1272-gnupg.pdf"/>
   <resource hide="yes" title="Informationsfreiheit in der Praxis"
-            size="27042867" type="application/ogg"
+            size="27042867" type="audio/ogg"
             url="http://ftp.c3d2.de/datenspuren/2007/03_informationsfreiheit_in_der_praxis.ogg"/>
   <resource hide="yes" title="Videoüberwachung im Öffentlichen Raum
                               und ÖPNV" size="5594985" type="application/pdf"
             url="http://www.datenspuren.de/2007/fahrplan/attachments/1277-CCTV_im_oeffentlichen_Raum.pdf"/>
   <resource hide="yes" title="Informationsfreiheit in Sachsen" size="10860923"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/datenspuren/2007/05_informationsfreiheit_in_sachsen.ogg"/>
   <resource hide="yes" title="Was schert uns Verschlüsselung?" size="21874921"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/datenspuren/2007/06_was_schert_uns_verschluesselung.ogg"/>
   <resource hide="yes" title="Was schert uns Verschlüsselung?" size="353750"
             type="application/pdf"
             url="http://www.datenspuren.de/2007/fahrplan/attachments/1273-schert_verschl.pdf"/>
   <resource hide="yes" title="Wahlcomputer" size="25732667"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/datenspuren/2007/07_wahlcomputer.ogg"/>
   <resource hide="yes" title="Wahlcomputer" size="10731191"
             type="application/pdf"
             url="http://www.datenspuren.de/2007/fahrplan/attachments/1283-wahlcomputerDD.pdf"/>
   <resource hide="yes" title="Biometrics in Science Fiction" size="30450368"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/datenspuren/2007/08_biometrics_in_science_fiction.ogg"/>
   <resource hide="yes" title="CCC-Sputnik" size="24433674"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/datenspuren/2007/09_ccc-sputnik.ogg"/>
   <resource hide="yes" title="CCC-Sputnik" size="2885740"
             type="application/pdf"
             url="http://www.datenspuren.de/2007/fahrplan/attachments/1278-datenspuren.pdf"/>
   <resource hide="yes" title="Wer überwacht die Verschwörer?" size="25861693"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/datenspuren/2007/10_entschwoerungstheorien.ogg"/>
   <resource hide="yes" title="Informationspflicht bei Datenpannen"
-            size="18423083" type="application/ogg"
+            size="18423083" type="audio/ogg"
             url="http://ftp.c3d2.de/datenspuren/2007/11_informationspflicht_bei_datenpannen.ogg"/>
   <resource hide="yes" title="Informationspflicht bei Datenpannen"
             size="51201" type="application/pdf"
             url="http://www.datenspuren.de/2007/fahrplan/attachments/1279-ds07-datenpannen.pdf"/>
   <resource hide="yes" title="Vorratsdatenspeicherung" size="25754991"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/datenspuren/2007/12_vorratsdatenspeicherung.ogg"/>
   <resource hide="yes" title="Vorratsdatenspeicherung" size="1492129"
             type="application/pdf"
             url="http://www.datenspuren.de/2007/fahrplan/attachments/1276-praesentationvorratsdatenspeicherung.pdf"/>
   <!--resource hide="yes" title="Dear Observer. Innerhalb des Sichtfeldes
-                              der Überwachung." size="" type="application/ogg"
+                              der Überwachung." size="" type="audio/ogg"
             url="http://ftp.c3d2.de/datenspuren/2007/13_dear_observer.ogg"/-->
 
 </item>
diff --git a/content/news/ds09-pentaradio.xml b/content/news/ds09-pentaradio.xml
index 23fe96ad5..9f9b4724c 100644
--- a/content/news/ds09-pentaradio.xml
+++ b/content/news/ds09-pentaradio.xml
@@ -22,7 +22,7 @@ Viel Spaß!
 <resource title="Vertretung Musiksendung Rap'n'Roll (Ogg &amp; MP3)" size="124669956"
           type="application/x-bittorrent" url="media/pentaradio-rapnroll-2009-09-22.torrent"/>
 <resource title="pentaradio24 vom 22. September 2009" size="109863566"
-          type="application/ogg"
+          type="audio/ogg"
           url="http://ftp.c3d2.de/pentaradio/pentaradio-2009-09-22.ogg">
   <alternative size="103022384" type="audio/mpeg"
                url="http://ftp.c3d2.de/pentaradio/pentaradio-2009-09-22.mp3"/>
diff --git a/content/news/ds09-radio-frei-interview.xml b/content/news/ds09-radio-frei-interview.xml
index 8686cd9b1..e0e6f422c 100644
--- a/content/news/ds09-radio-frei-interview.xml
+++ b/content/news/ds09-radio-frei-interview.xml
@@ -9,7 +9,7 @@
 <link href="http://www.radio-frei.de">Radio F.R.E.I.</link> aus Erfurt machen ein Interview mit uns über die Datenspuren 2009. Das ganze läuft am Dienstag, 4.8.09 um ca. 8:20 Uhr auf Radio F.R.E.I., hier zu empfangen per <link href="http://www.radio-frei.de/player/flash/flplayer.html">Live-Stream</link>.  
 </p>
 <resource title="Pre-Datenspureninterview auf Radio F.R.E.I." size="7126671"
-type="application/ogg"
+type="audio/ogg"
             url="http://ftp.c3d2.de/datenspuren/2009/pre/interviews/ds-interview-radio-frei.ogg">
     <alternative size="9683024" type="audio/mpeg"
                  url="http://ftp.c3d2.de/datenspuren/2009/pre/interviews/ds-interview-radio-frei.mp3"/>
diff --git a/content/news/ds10-videomitschnitte-online.xml b/content/news/ds10-videomitschnitte-online.xml
new file mode 100644
index 000000000..726b692c2
--- /dev/null
+++ b/content/news/ds10-videomitschnitte-online.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE item SYSTEM "http://www.c3d2.de/dtd/c3d2web.dtd">
+<?xml-stylesheet type="text/xsl" href="../../xsl/html.xsl" ?>
+<item title="Datenspuren 2010: Video-Mitschnitte online (β)"
+      date="2023-05-23T23:05:42"
+      author="Astro">
+  <image title="Datenspuren 2010">datenspuren.png</image>
+  <p>
+    Die erste Portion, probehalber.
+  </p>
+
+  <resource title="DS2010: Her mit den Daten!" size="456080984" type="video/mp4" url="http://ftp.c3d2.de/datenspuren/2010/ds2010_3929.mp4" preview="http://ftp.c3d2.de/datenspuren/2010/ds2010_3929.gif" poster="http://ftp.c3d2.de/datenspuren/2010/ds2010_3929.jpg" hide="yes">
+    <alternative size="254926606" type="video/webm" url="http://ftp.c3d2.de/datenspuren/2010/ds2010_3929.webm"/>
+    <alternative size="208319596" type="video/ogg" url="http://ftp.c3d2.de/datenspuren/2010/ds2010_3929.ogv"/>
+    <alternative size="253865868" type="video/x-flv" url="http://ftp.c3d2.de/datenspuren/2010/ds2010_3929.flv"/>
+  </resource>
+  <resource title="DS2010: Der &#xDC;berwachungsstaat" size="363074323" type="video/mp4" url="http://ftp.c3d2.de/datenspuren/2010/ds2010_3992.mp4" preview="http://ftp.c3d2.de/datenspuren/2010/ds2010_3992.gif" poster="http://ftp.c3d2.de/datenspuren/2010/ds2010_3992.jpg" hide="yes">
+    <alternative size="233619364" type="video/webm" url="http://ftp.c3d2.de/datenspuren/2010/ds2010_3992.webm"/>
+    <alternative size="191707753" type="video/ogg" url="http://ftp.c3d2.de/datenspuren/2010/ds2010_3992.ogv"/>
+    <alternative size="239679988" type="video/x-flv" url="http://ftp.c3d2.de/datenspuren/2010/ds2010_3992.flv"/>
+  </resource>
+  <resource title="DS2010: Die Volksz&#xE4;hlung 2011 in Sachsen und dar&#xFC;ber hinaus" size="546729590" type="video/mp4" url="http://ftp.c3d2.de/datenspuren/2010/ds2010_3980.mp4" preview="http://ftp.c3d2.de/datenspuren/2010/ds2010_3980.gif" poster="http://ftp.c3d2.de/datenspuren/2010/ds2010_3980.jpg" hide="yes">
+    <alternative size="299792802" type="video/webm" url="http://ftp.c3d2.de/datenspuren/2010/ds2010_3980.webm"/>
+    <alternative size="223550011" type="video/ogg" url="http://ftp.c3d2.de/datenspuren/2010/ds2010_3980.ogv"/>
+    <alternative size="304324108" type="video/x-flv" url="http://ftp.c3d2.de/datenspuren/2010/ds2010_3980.flv"/>
+  </resource>
+  <resource title="DS2010: Communities verbinden!" size="219093976" type="video/mp4" url="http://ftp.c3d2.de/datenspuren/2010/ds2010_4022.mp4" preview="http://ftp.c3d2.de/datenspuren/2010/ds2010_4022.gif" poster="http://ftp.c3d2.de/datenspuren/2010/ds2010_4022.jpg" hide="yes">
+    <alternative size="114169933" type="video/webm" url="http://ftp.c3d2.de/datenspuren/2010/ds2010_4022.webm"/>
+    <alternative size="81847305" type="video/ogg" url="http://ftp.c3d2.de/datenspuren/2010/ds2010_4022.ogv"/>
+    <alternative size="121971526" type="video/x-flv" url="http://ftp.c3d2.de/datenspuren/2010/ds2010_4022.flv"/>
+  </resource>
+  <resource title="DS2010: E-Voting Crashkurs" size="385143008" type="video/mp4" url="http://ftp.c3d2.de/datenspuren/2010/ds2010_3940.mp4" preview="http://ftp.c3d2.de/datenspuren/2010/ds2010_3940.gif" poster="http://ftp.c3d2.de/datenspuren/2010/ds2010_3940.jpg" hide="yes">
+    <alternative size="204853533" type="video/webm" url="http://ftp.c3d2.de/datenspuren/2010/ds2010_3940.webm"/>
+    <alternative size="160468734" type="video/ogg" url="http://ftp.c3d2.de/datenspuren/2010/ds2010_3940.ogv"/>
+    <alternative size="214372989" type="video/x-flv" url="http://ftp.c3d2.de/datenspuren/2010/ds2010_3940.flv"/>
+  </resource>
+  <resource title="DS2010: Wir wissen was du letzte Nacht getan hast" size="176937200" type="video/webm" url="http://ftp.c3d2.de/datenspuren/2010/ds2010_4050.webm" preview="http://ftp.c3d2.de/datenspuren/2010/ds2010_4050.gif" poster="http://ftp.c3d2.de/datenspuren/2010/ds2010_4050.jpg" hide="yes">
+    <alternative size="151828479" type="video/ogg" url="http://ftp.c3d2.de/datenspuren/2010/ds2010_4050.ogv"/>
+    <alternative size="185810995" type="video/x-flv" url="http://ftp.c3d2.de/datenspuren/2010/ds2010_4050.flv"/>
+  </resource>
+  <resource title="DS2010: Privatsph&#xE4;re im Informationszeitalter" size="454238057" type="video/mp4" url="http://ftp.c3d2.de/datenspuren/2010/ds2010_4014.mp4" preview="http://ftp.c3d2.de/datenspuren/2010/ds2010_4014.gif" poster="http://ftp.c3d2.de/datenspuren/2010/ds2010_4014.jpg" hide="yes">
+    <alternative size="309203480" type="video/webm" url="http://ftp.c3d2.de/datenspuren/2010/ds2010_4014.webm"/>
+    <alternative size="291792611" type="video/ogg" url="http://ftp.c3d2.de/datenspuren/2010/ds2010_4014.ogv"/>
+    <alternative size="321021196" type="video/x-flv" url="http://ftp.c3d2.de/datenspuren/2010/ds2010_4014.flv"/>
+  </resource>
+  <resource title="DS2010: Privacy-Kompetenz - ein Arbeitspsychologischer Ansatz zu einer Didaktik des Datenschutz." size="180868783" type="video/webm" url="http://ftp.c3d2.de/datenspuren/2010/ds2010_4040.webm" preview="http://ftp.c3d2.de/datenspuren/2010/ds2010_4040.gif" poster="http://ftp.c3d2.de/datenspuren/2010/ds2010_4040.jpg" hide="yes">
+    <alternative size="145584346" type="video/ogg" url="http://ftp.c3d2.de/datenspuren/2010/ds2010_4040.ogv"/>
+    <alternative size="191851311" type="video/x-flv" url="http://ftp.c3d2.de/datenspuren/2010/ds2010_4040.flv"/>
+  </resource>
+  <resource title="DS2010: ACTA und INDECT" size="451611653" type="video/mp4" url="http://ftp.c3d2.de/datenspuren/2010/ds2010_4075.mp4" preview="http://ftp.c3d2.de/datenspuren/2010/ds2010_4075.gif" poster="http://ftp.c3d2.de/datenspuren/2010/ds2010_4075.jpg" hide="yes">
+    <alternative size="239798306" type="video/webm" url="http://ftp.c3d2.de/datenspuren/2010/ds2010_4075.webm"/>
+    <alternative size="194289848" type="video/ogg" url="http://ftp.c3d2.de/datenspuren/2010/ds2010_4075.ogv"/>
+    <alternative size="251407296" type="video/x-flv" url="http://ftp.c3d2.de/datenspuren/2010/ds2010_4075.flv"/>
+  </resource>
+  <resource title="DS2010: Meldedaten" size="359004443" type="video/mp4" url="http://ftp.c3d2.de/datenspuren/2010/ds2010_4045.mp4" preview="http://ftp.c3d2.de/datenspuren/2010/ds2010_4045.gif" poster="http://ftp.c3d2.de/datenspuren/2010/ds2010_4045.jpg" hide="yes">
+    <alternative size="197527460" type="video/webm" url="http://ftp.c3d2.de/datenspuren/2010/ds2010_4045.webm"/>
+    <alternative size="179038262" type="video/ogg" url="http://ftp.c3d2.de/datenspuren/2010/ds2010_4045.ogv"/>
+    <alternative size="199852278" type="video/x-flv" url="http://ftp.c3d2.de/datenspuren/2010/ds2010_4045.flv"/>
+  </resource>
+  <resource title="DS2010: Ich und 23" size="337673158" type="video/mp4" url="http://ftp.c3d2.de/datenspuren/2010/ds2010_4047.mp4" preview="http://ftp.c3d2.de/datenspuren/2010/ds2010_4047.gif" poster="http://ftp.c3d2.de/datenspuren/2010/ds2010_4047.jpg" hide="yes">
+    <alternative size="180085278" type="video/webm" url="http://ftp.c3d2.de/datenspuren/2010/ds2010_4047.webm"/>
+    <alternative size="132647250" type="video/ogg" url="http://ftp.c3d2.de/datenspuren/2010/ds2010_4047.ogv"/>
+    <alternative size="187928290" type="video/x-flv" url="http://ftp.c3d2.de/datenspuren/2010/ds2010_4047.flv"/>
+  </resource>
+  <resource title="DS2010: Wikipedia &amp; OpenStreetMap" size="219370278" type="video/mp4" url="http://ftp.c3d2.de/datenspuren/2010/ds2010_4034.mp4" preview="http://ftp.c3d2.de/datenspuren/2010/ds2010_4034.gif" poster="http://ftp.c3d2.de/datenspuren/2010/ds2010_4034.jpg" hide="yes">
+    <alternative size="116493888" type="video/webm" url="http://ftp.c3d2.de/datenspuren/2010/ds2010_4034.webm"/>
+    <alternative size="87423982" type="video/ogg" url="http://ftp.c3d2.de/datenspuren/2010/ds2010_4034.ogv"/>
+    <alternative size="122076906" type="video/x-flv" url="http://ftp.c3d2.de/datenspuren/2010/ds2010_4034.flv"/>
+  </resource>
+  <resource title="DS2010: Abschlu&#xDF;veranstaltung" size="84356155" type="video/mp4" url="http://ftp.c3d2.de/datenspuren/2010/ds2010_4102.mp4" preview="http://ftp.c3d2.de/datenspuren/2010/ds2010_4102.gif" poster="http://ftp.c3d2.de/datenspuren/2010/ds2010_4102.jpg">
+    <alternative size="43952637" type="video/webm" url="http://ftp.c3d2.de/datenspuren/2010/ds2010_4102.webm"/>
+    <alternative size="30572069" type="video/ogg" url="http://ftp.c3d2.de/datenspuren/2010/ds2010_4102.ogv"/>
+    <alternative size="46937316" type="video/x-flv" url="http://ftp.c3d2.de/datenspuren/2010/ds2010_4102.flv"/>
+  </resource>
+
+</item>
diff --git a/content/news/event-clt2005.xml b/content/news/event-clt2005.xml
index 89d747b67..61b2ac657 100644
--- a/content/news/event-clt2005.xml
+++ b/content/news/event-clt2005.xml
@@ -41,6 +41,7 @@
        </li>
    </ul>
    <dl>
+     <dt>Impressions</dt>
        <dd>
            <image title="Impressions">../images/clt2005/03e3dd91a1.jpg</image>
            <image title="Impressions">../images/clt2005/10dfb4e12b.jpg</image>
diff --git a/content/news/event-inet-night2.xml b/content/news/event-inet-night2.xml
index b6e2787f6..86b04483f 100644
--- a/content/news/event-inet-night2.xml
+++ b/content/news/event-inet-night2.xml
@@ -48,6 +48,7 @@
     </ul>
     <p title="Visuell"/>
     <dl>
+      <dt>Impressions</dt>
         <dd>
             <image title="Impressions">../images/inight2/039004608b.jpg</image>
             <image title="Impressions">../images/inight2/040ae5cac2.jpg</image>
diff --git a/content/news/event-landtagskandidatencheck.xml b/content/news/event-landtagskandidatencheck.xml
index 0c32f6fc0..fe7fed1bb 100644
--- a/content/news/event-landtagskandidatencheck.xml
+++ b/content/news/event-landtagskandidatencheck.xml
@@ -74,77 +74,77 @@ Das Video ist über Torrent downloadbar: <link href="http://thepiratebay.org/tor
           type="application/pdf" size="256415"/>
 
 <resource title="Einführung" size="9026284"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/misc_events/2009_landtagskandidatencheck/01_c3d2_wahl09_scheune_einfuehrung.ogg">
     <alternative size="17006239" type="audio/mpeg"
         url="http://ftp.c3d2.de/misc_events/2009_landtagskandidatencheck/01_c3d2_wahl09_scheune_einfuehrung.mp3"/>
 </resource>
 
 <resource title="Vorstellung Steffen Hintze (FDP)" size="7536142"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/misc_events/2009_landtagskandidatencheck/02_c3d2_wahl09_scheune_vorstellung_hintze.ogg">
     <alternative size="14198807" type="audio/mpeg"
         url="http://ftp.c3d2.de/misc_events/2009_landtagskandidatencheck/02_c3d2_wahl09_scheune_vorstellung_hintze.mp3"/>
 </resource>
 
 <resource title="Vorstellung Sabine Friedel (SPD)" size="3326935"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/misc_events/2009_landtagskandidatencheck/03_c3d2_wahl09_scheune_vorstellung_friedel.ogg">
     <alternative size="6265524" type="audio/mpeg"
         url="http://ftp.c3d2.de/misc_events/2009_landtagskandidatencheck/03_c3d2_wahl09_scheune_vorstellung_friedel.mp3"/>
 </resource>
 
 <resource title="Vorstellung Julia Bonk (LINKE)" size="7584394"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/misc_events/2009_landtagskandidatencheck/04_c3d2_wahl09_scheune_vorstellung_bonk.ogg">
     <alternative size="14248962" type="audio/mpeg"
         url="http://ftp.c3d2.de/misc_events/2009_landtagskandidatencheck/04_c3d2_wahl09_scheune_vorstellung_bonk.mp3"/>
 </resource>
 
 <resource title="Vorstellung Johannes Lichdi (GRÜNE)" size="6095287"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/misc_events/2009_landtagskandidatencheck/05_c3d2_wahl09_scheune_vorstellung_lichdi.ogg">
     <alternative size="11502343" type="audio/mpeg"
         url="http://ftp.c3d2.de/misc_events/2009_landtagskandidatencheck/05_c3d2_wahl09_scheune_vorstellung_lichdi.mp3"/>
 </resource>
 
 <resource title="Vorstellung Mirco da Silva (PIRATEN)" size="1364624"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/misc_events/2009_landtagskandidatencheck/06_c3d2_wahl09_scheune_vorstellung_silva.ogg">
     <alternative size="2549031" type="audio/mpeg"
         url="http://ftp.c3d2.de/misc_events/2009_landtagskandidatencheck/06_c3d2_wahl09_scheune_vorstellung_silva.mp3"/>
 </resource>
 
 <resource title="Fragerunde 1" size="9391789"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/misc_events/2009_landtagskandidatencheck/07_c3d2_wahl09_scheune_fragerunde_1.ogg">
     <alternative size="17574872" type="audio/mpeg"
         url="http://ftp.c3d2.de/misc_events/2009_landtagskandidatencheck/07_c3d2_wahl09_scheune_fragerunde_1.mp3"/>
 </resource>
 
 <resource title="Fragerunde 2" size="21030579"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/misc_events/2009_landtagskandidatencheck/08_c3d2_wahl09_scheune_fragerunde_2.ogg">
     <alternative size="39504564" type="audio/mpeg"
         url="http://ftp.c3d2.de/misc_events/2009_landtagskandidatencheck/08_c3d2_wahl09_scheune_fragerunde_2.mp3"/>
 </resource>
 
 <resource title="Fragerunde 3" size="18470134"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/misc_events/2009_landtagskandidatencheck/09_c3d2_wahl09_scheune_fragerunde_3.ogg">
     <alternative size="34550494" type="audio/mpeg"
         url="http://ftp.c3d2.de/misc_events/2009_landtagskandidatencheck/09_c3d2_wahl09_scheune_fragerunde_3.mp3"/>
 </resource>
 
 <resource title="Fragerunde 4" size="17300525"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/misc_events/2009_landtagskandidatencheck/10_c3d2_wahl09_scheune_fragerunde_4.ogg">
     <alternative size="32581279" type="audio/mpeg"
         url="http://ftp.c3d2.de/misc_events/2009_landtagskandidatencheck/10_c3d2_wahl09_scheune_fragerunde_4.mp3"/>
 </resource>
 
 <resource title="Fragerunde 5" size="27549130"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/misc_events/2009_landtagskandidatencheck/11_c3d2_wahl09_scheune_fragerunde_5.ogg">
     <alternative size="51707927" type="audio/mpeg"
         url="http://ftp.c3d2.de/misc_events/2009_landtagskandidatencheck/11_c3d2_wahl09_scheune_fragerunde_5.mp3"/>
diff --git a/content/news/pentacast-1-jabber.xml b/content/news/pentacast-1-jabber.xml
index 23f407cb2..fd0f6a05a 100644
--- a/content/news/pentacast-1-jabber.xml
+++ b/content/news/pentacast-1-jabber.xml
@@ -156,7 +156,7 @@
   </addendum>
 
   <resource title="Pentacast 1: Jabber" size="86753325"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/pentacast/pentacast-1-jabber.ogg">
   <alternative size="138608244"
                type="audio/mpeg"
diff --git a/content/news/pentacast-10-rechtsstaat.xml b/content/news/pentacast-10-rechtsstaat.xml
index f7e310f76..2947ed4d5 100644
--- a/content/news/pentacast-10-rechtsstaat.xml
+++ b/content/news/pentacast-10-rechtsstaat.xml
@@ -21,7 +21,7 @@
   </addendum>
 
   <resource title="Pentacast 10: Rechtsstaat" size="98690403"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/pentacast/pentacast-10-rechtsstaat.ogg">
     <alternative size="200072361"
                  type="audio/mpeg"
diff --git a/content/news/pentacast-11-microkernel.xml b/content/news/pentacast-11-microkernel.xml
index 117e57911..bbe37df5c 100644
--- a/content/news/pentacast-11-microkernel.xml
+++ b/content/news/pentacast-11-microkernel.xml
@@ -51,7 +51,7 @@
   </addendum>
 
   <resource title="Pentacast 11: Microkernel" size="58844907"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/pentacast/pentacast-11-microkernel.ogg">
     <alternative size="105644134"
                  type="audio/mpeg"
diff --git a/content/news/pentacast-12-blender.xml b/content/news/pentacast-12-blender.xml
index 913addf6e..88fd0022e 100644
--- a/content/news/pentacast-12-blender.xml
+++ b/content/news/pentacast-12-blender.xml
@@ -43,7 +43,7 @@
   </addendum>
 
   <resource title="Pentacast 12: Blender" size="58685999"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/pentacast/pentacast-12-blender.ogg">
     <alternative size="89179274"
                  type="audio/mpeg"
diff --git a/content/news/pentacast-13-bittorrent.xml b/content/news/pentacast-13-bittorrent.xml
index e24c5da9f..f7853dd3e 100644
--- a/content/news/pentacast-13-bittorrent.xml
+++ b/content/news/pentacast-13-bittorrent.xml
@@ -79,7 +79,7 @@
   </addendum>
 
   <resource title="Pentacast 13: BitTorrent" size="158097668"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/pentacast/pentacast-13-bittorrent.ogg">
     <alternative size="120910731"
                  type="audio/mpeg"
diff --git a/content/news/pentacast-14-programmiersprachen.xml b/content/news/pentacast-14-programmiersprachen.xml
index 84f76df4a..26405e067 100644
--- a/content/news/pentacast-14-programmiersprachen.xml
+++ b/content/news/pentacast-14-programmiersprachen.xml
@@ -73,7 +73,7 @@
   </addendum>
 
   <resource title="Pentacast 14: Programmiersprachen" size="156579063"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/pentacast/pentacast-14-programmiersprachen.ogg">
     <alternative size="146937965"
                  type="audio/mpeg"
diff --git a/content/news/pentacast-15-amateurfunk.xml b/content/news/pentacast-15-amateurfunk.xml
index 7d18f1027..3850af310 100644
--- a/content/news/pentacast-15-amateurfunk.xml
+++ b/content/news/pentacast-15-amateurfunk.xml
@@ -67,7 +67,7 @@ Wir lassen die Funken fliegen!
   </addendum>
 
   <resource title="Pentacast 15: Amateurfunk" size="62579720"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/pentacast/pentacast-15-amateurfunk.ogg">
     <alternative size="85166713"
                  type="audio/mpeg"
diff --git a/content/news/pentacast-16-demoszene.xml b/content/news/pentacast-16-demoszene.xml
index ac92d81d8..978ef4ba3 100644
--- a/content/news/pentacast-16-demoszene.xml
+++ b/content/news/pentacast-16-demoszene.xml
@@ -39,7 +39,7 @@
   </addendum>
 
   <resource title="Pentacast 16: Demoszene" size="109140354"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/pentacast/pentacast-16-demoszene.ogg">
     <alternative size="83961325"
                  type="audio/mpeg"
diff --git a/content/news/pentacast-17-halbleiter.xml b/content/news/pentacast-17-halbleiter.xml
index c92d3c279..c605f7060 100644
--- a/content/news/pentacast-17-halbleiter.xml
+++ b/content/news/pentacast-17-halbleiter.xml
@@ -66,7 +66,7 @@ Halbleiter - das Wunder aus dem Computer sind. Johannes ist zu Gast im Pentacast
   </addendum>
 
   <resource title="Pentacast 17: Halbleiter" size="65261407"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/pentacast/pentacast-17-halbleiter.ogg">
     <alternative size="109339563"
                  type="audio/mpeg"
diff --git a/content/news/pentacast-18-digitalfunk.xml b/content/news/pentacast-18-digitalfunk.xml
index 5c3c039f0..ec0a8d658 100644
--- a/content/news/pentacast-18-digitalfunk.xml
+++ b/content/news/pentacast-18-digitalfunk.xml
@@ -45,7 +45,7 @@
  </addendum>
 
  <resource title="Pentacast 18: Digitalfunk" size="102660561"
-	   type="application/ogg"
+	   type="audio/ogg"
 	   url="http://ftp.c3d2.de/pentacast/pentacast-18-digitalfunk.ogg">
    <alternative size="87777247"
 		type="audio/mpeg"
diff --git a/content/news/pentacast-19-zensus.xml b/content/news/pentacast-19-zensus.xml
index 7d9bd91d1..55e2eeb0c 100644
--- a/content/news/pentacast-19-zensus.xml
+++ b/content/news/pentacast-19-zensus.xml
@@ -31,7 +31,7 @@
  </ul>
 </addendum>
 <resource title="pentacast 19: Zensus2011" size="45712370"
-           type="application/ogg"
+           type="audio/ogg"
            url="http://ftp.c3d2.de/pentacast/pentacast-19-zensus.ogg">
    <alternative size="061091659" type="audio/mpeg"
         url="http://ftp.c3d2.de/pentacast/pentacast-19-zensus.mp3"/>
diff --git a/content/news/pentacast-2-ip.xml b/content/news/pentacast-2-ip.xml
index 2061ce45d..324f09210 100644
--- a/content/news/pentacast-2-ip.xml
+++ b/content/news/pentacast-2-ip.xml
@@ -136,7 +136,7 @@
   </addendum>
 
   <resource title="Pentacast 2: IP" size="119018425"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/pentacast/pentacast-2-ip.ogg">
   <alternative size="164321408"
                type="audio/mpeg"
diff --git a/content/news/pentacast-20-evolution.xml b/content/news/pentacast-20-evolution.xml
index d2d93d965..5d3beebb4 100644
--- a/content/news/pentacast-20-evolution.xml
+++ b/content/news/pentacast-20-evolution.xml
@@ -48,7 +48,7 @@
 
 </addendum>
 <resource title="pentacast 20: Evolution" size="116768851"
-           type="application/ogg"
+           type="audio/ogg"
            url="http://ftp.c3d2.de/pentacast/pentacast-20-evolution.ogg">
    <alternative size="112666885" type="audio/mpeg"
         url="http://ftp.c3d2.de/pentacast/pentacast-20-evolution.mp3"/>
diff --git a/content/news/pentacast-21-responsible-drug-usage.xml b/content/news/pentacast-21-responsible-drug-usage.xml
index ca623b7d3..fc671eb46 100644
--- a/content/news/pentacast-21-responsible-drug-usage.xml
+++ b/content/news/pentacast-21-responsible-drug-usage.xml
@@ -25,7 +25,7 @@
 </p>
 <addendum>
         <ul>
-                <li><link href="http://">Speaker</link></li>
+                <!--li><link href="http://">Speaker</link></li-->
                 <li><link href="http://en.wikipedia.org/wiki/Drugs">WP: Drugs</link></li>
                 <li><link href="http://en.wikipedia.org/wiki/Alcohol">WP: Alcohol</link></li>
                 <li><link href="http://en.wikipedia.org/wiki/MDMA">WP: MDMA</link></li>
@@ -56,7 +56,7 @@
 </ul>
  </addendum>
 <resource title="pentacast 21: Responsible Drug Usage" size="65362339"
-           type="application/ogg"
+           type="audio/ogg"
            url="http://ftp.c3d2.de/pentacast/pentacast-21-responsible-drug-usage.ogg">
    <alternative size="94361359" type="audio/mpeg"
         url="http://ftp.c3d2.de/pentacast/pentacast-21-responsible-drug-usage.mp3"/>
diff --git a/content/news/pentacast-3-osm.xml b/content/news/pentacast-3-osm.xml
index af6165674..b50d268ac 100644
--- a/content/news/pentacast-3-osm.xml
+++ b/content/news/pentacast-3-osm.xml
@@ -82,7 +82,7 @@ Teilnehmende: koeart, kolossos, christoph und constantin.
 </ul>
 </addendum>
   <resource title="Pentacast 3: OSM" size="55079729"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/pentacast/pentacast-3_osm.ogg">
 <alternative size="57180"
 type="audio/mpeg"
@@ -90,7 +90,7 @@ url="http://ftp.c3d2.de/pentacast/pentacast-3_osm.mp3"/>
 
   </resource>
 <resource title="Pentacast 3: OSM Nachtrag" size="17790630"
-type="application/ogg"
+type="audio/ogg"
 url="http://ftp.c3d2.de/pentacast/pentacast-3_osmnachtrag.ogg">
 <alternative size="18692"
 type="audio/mpeg"
diff --git a/content/news/pentacast-4-oss.xml b/content/news/pentacast-4-oss.xml
index 8a6767271..809b1b392 100644
--- a/content/news/pentacast-4-oss.xml
+++ b/content/news/pentacast-4-oss.xml
@@ -115,7 +115,7 @@
   </addendum>
 
   <resource title="Pentacast 4: Open Source Software Development" size="82502687"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/pentacast/pentacast-4-oss-1.ogg">
     <alternative size="103392259"
                  type="audio/mpeg"
diff --git a/content/news/pentacast-5-sql-injection.xml b/content/news/pentacast-5-sql-injection.xml
index 858d21bb8..363837909 100644
--- a/content/news/pentacast-5-sql-injection.xml
+++ b/content/news/pentacast-5-sql-injection.xml
@@ -20,7 +20,7 @@
   </addendum>
 
   <resource title="Pentacast 5: SQL-Injection" size="46078821"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/pentacast/pentacast-5-sql-injection.ogg">
     <alternative size="64916375"
                  type="audio/mpeg"
diff --git a/content/news/pentacast-7-noc.xml b/content/news/pentacast-7-noc.xml
index 3ffeecf07..d6b093b6a 100644
--- a/content/news/pentacast-7-noc.xml
+++ b/content/news/pentacast-7-noc.xml
@@ -81,7 +81,7 @@
   </addendum>
 
   <resource title="Pentacast 7: NOC" size="84181452"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/pentacast/pentacast-7-noc.ogg">
     <alternative size="103049501"
                  type="audio/mpeg"
diff --git a/content/news/pentacast-8-compilerbau.xml b/content/news/pentacast-8-compilerbau.xml
index 945f058a2..1175ed092 100644
--- a/content/news/pentacast-8-compilerbau.xml
+++ b/content/news/pentacast-8-compilerbau.xml
@@ -83,7 +83,7 @@
   </addendum>
 
   <resource title="Pentacast 8: Compilerbau" size="110993461"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/pentacast/pentacast-8-compilerbau.ogg">
     <alternative size="72596206"
                  type="audio/mpeg"
diff --git a/content/news/pentacast-9-rtaudio.xml b/content/news/pentacast-9-rtaudio.xml
index ddac8a0b9..6d3b06991 100644
--- a/content/news/pentacast-9-rtaudio.xml
+++ b/content/news/pentacast-9-rtaudio.xml
@@ -36,7 +36,7 @@
   </addendum>
 
   <resource title="Pentacast 9: Echtzeit-Audio" size="65618658"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/pentacast/pentacast-9-rtaudio.ogg">
     <alternative size="129518354"
                  type="audio/mpeg"
diff --git a/content/news/pentamusic-0x001.xml b/content/news/pentamusic-0x001.xml
index 3973bfc87..d696b26d1 100644
--- a/content/news/pentamusic-0x001.xml
+++ b/content/news/pentamusic-0x001.xml
@@ -63,7 +63,7 @@ Links zur Sendung
 </ul>
 </addendum>
 <resource title="pentaMusic0x001" size="70138490"
-          type="application/ogg"
+          type="audio/ogg"
           url="http://ftp.c3d2.de/pentacast/pentamusic0x001.ogg">
   <alternative size="89714740" type="audio/mpeg"
                url="http://ftp.c3d2.de/pentacast/pentamusic0x001.mp3"/>
diff --git a/content/news/pentamusic-0x002.xml b/content/news/pentamusic-0x002.xml
index 8dda1f024..ee473ce5d 100644
--- a/content/news/pentamusic-0x002.xml
+++ b/content/news/pentamusic-0x002.xml
@@ -65,7 +65,7 @@ Links zur Sendung
 </ul>
 </addendum>
 <resource title="pentaMusic0x002" size="125344035"
-          type="application/ogg"
+          type="audio/ogg"
           url="http://ftp.c3d2.de/pentacast/pentamusic0x002.ogg">
 <alternative size="128699439" type="audio/mpeg"
           url="http://ftp.c3d2.de/pentacast/pentamusic0x002.mp3"/>
diff --git a/content/news/pentamusic-0x003.xml b/content/news/pentamusic-0x003.xml
index 0fa83b3e5..af43bc4d8 100644
--- a/content/news/pentamusic-0x003.xml
+++ b/content/news/pentamusic-0x003.xml
@@ -49,7 +49,7 @@ Links zur Sendung:
 </ul>
 </addendum>
 <resource title="pentaMusic0x003" size="71548953"
-          type="application/ogg"
+          type="audio/ogg"
           url="http://ftp.c3d2.de/pentacast/pentamusic0x003.ogg">
 <alternative size="96111973" type="audio/mpeg"
           url="http://ftp.c3d2.de/pentacast/pentamusic0x003.mp3"/>
diff --git a/content/news/pentamusic-20100608.xml b/content/news/pentamusic-20100608.xml
index f5b8e2ba4..15dc787b6 100644
--- a/content/news/pentamusic-20100608.xml
+++ b/content/news/pentamusic-20100608.xml
@@ -56,7 +56,7 @@ Links zur Sendung:
 </ul>
 </addendum>
 <resource title="pentaMusic-20100608" size="68885073"
-          type="application/ogg"
+          type="audio/ogg"
           url="http://ftp.c3d2.de/pentacast/pentamusic-20100608.ogg">
   <alternative size="91040746" type="audio/mpeg"
                url="http://ftp.c3d2.de/pentacast/pentamusic-20100608.mp3"/>
diff --git a/content/news/pentamusic-20100621.xml b/content/news/pentamusic-20100621.xml
index d0764cfad..a1361ba5a 100644
--- a/content/news/pentamusic-20100621.xml
+++ b/content/news/pentamusic-20100621.xml
@@ -51,7 +51,7 @@
   </ul>
   </addendum>
 <resource title="pentaMusic-20100622" size="75018500"
-          type="application/ogg"
+          type="audio/ogg"
           url="http://ftp.c3d2.de/pentacast/pentamusic-20100621.ogg">
   <alternative size="105631055" type="audio/mpeg"
                url="http://ftp.c3d2.de/pentacast/pentamusic-20100621.mp3"/>
diff --git a/content/news/pentamusic-20100713.xml b/content/news/pentamusic-20100713.xml
index b82dd5537..25e90abb1 100644
--- a/content/news/pentamusic-20100713.xml
+++ b/content/news/pentamusic-20100713.xml
@@ -56,7 +56,7 @@ pentaMusic Radio Show: Live, direkt, ungeschnitten: Heute Abend, 13. Juli, 21:30
   </ul>
   </addendum>
 <resource title="pentaMusic-20100713" size="72054287"
-          type="application/ogg"
+          type="audio/ogg"
           url="http://ftp.c3d2.de/pentacast/pentamusic-20100713.ogg">
   <alternative size="92788248" type="audio/mpeg"
                url="http://ftp.c3d2.de/pentacast/pentamusic-20100713.mp3"/>
diff --git a/content/news/pentamusic-20100726.xml b/content/news/pentamusic-20100726.xml
index 6481fe4f5..33464dea0 100644
--- a/content/news/pentamusic-20100726.xml
+++ b/content/news/pentamusic-20100726.xml
@@ -56,7 +56,7 @@
 </ul>
 </addendum>
 <resource title="pentaMusic-20100726" size="72493778"
-          type="application/ogg"
+          type="audio/ogg"
           url="http://ftp.c3d2.de/pentacast/pentamusic-20100726.ogg">
   <alternative size="102544128" type="audio/mpeg"
                url="http://ftp.c3d2.de/pentacast/pentamusic-20100726.mp3"/>
diff --git a/content/news/pentamusic-20100810.xml b/content/news/pentamusic-20100810.xml
index 140539fc5..0fa61f122 100644
--- a/content/news/pentamusic-20100810.xml
+++ b/content/news/pentamusic-20100810.xml
@@ -47,7 +47,7 @@ Für Song-der-Sendung Vorschläge meldet euch bei: pentamusic at c3d2 punkt de.
 </ul>
 </addendum>
 <resource title="pentaMusic-20100810" size="71925638"
-          type="application/ogg"
+          type="audio/ogg"
           url="http://ftp.c3d2.de/pentacast/pentamusic-20100810.ogg">
   <alternative size="93630204" type="audio/mpeg"
                url="http://ftp.c3d2.de/pentacast/pentamusic-20100810.mp3"/>
diff --git a/content/news/pentamusic-20100914.xml b/content/news/pentamusic-20100914.xml
index ab1126c0b..cfe3768c5 100644
--- a/content/news/pentamusic-20100914.xml
+++ b/content/news/pentamusic-20100914.xml
@@ -56,7 +56,7 @@ Für Song-der-Sendung Vorschläge meldet euch bei: pentamusic at c3d2 punkt de.
 
 </addendum>
      <resource title="pentaMusic-20100914" size="94369774"
-          type="application/ogg"
+          type="audio/ogg"
           url="http://ftp.c3d2.de/pentacast/pentamusic-20100914.ogg">
   <alternative size="82611010" type="audio/mpeg"
                url="http://ftp.c3d2.de/pentacast/pentamusic-20100914.mp3"/>
diff --git a/content/news/pentamusic-20101012.xml b/content/news/pentamusic-20101012.xml
index f590a10be..444a6f97f 100644
--- a/content/news/pentamusic-20101012.xml
+++ b/content/news/pentamusic-20101012.xml
@@ -43,7 +43,7 @@ Für Song-der-Sendung Vorschläge meldet euch bei: pentamusic at c3d2 punkt de.
         </ul>
 </addendum>
      <resource title="pentaMusic-20101012" size="95411177"
-          type="application/ogg"
+          type="audio/ogg"
           url="http://ftp.c3d2.de/pentacast/pentamusic-20101012.ogg">
   <alternative size="84720512" type="audio/mpeg"
                url="http://ftp.c3d2.de/pentacast/pentamusic-20101012.mp3"/>
diff --git a/content/news/pentamusic-20101025.xml b/content/news/pentamusic-20101025.xml
index ab46ccff7..567f03bfb 100644
--- a/content/news/pentamusic-20101025.xml
+++ b/content/news/pentamusic-20101025.xml
@@ -15,7 +15,7 @@
           Mitmachen könnt ihr wie immer indem ihr in unseren <link href="http://c3d2.de/muc.html">Chat</link> kommt oder per Anruf (0351 32054711) oder per Skype (pentaradio24).
   </p>
 <resource title="pentaMusic-20101025" size="97365359"
-          type="application/ogg"
+          type="audio/ogg"
           url="http://ftp.c3d2.de/pentacast/pentamusic-20101025.ogg">
   <alternative size="97385500" type="audio/mpeg"
                url="http://ftp.c3d2.de/pentacast/pentamusic-20101025.mp3"/>
diff --git a/content/news/pentamusic-20101109.xml b/content/news/pentamusic-20101109.xml
index 7a7cd8909..34e20cb83 100644
--- a/content/news/pentamusic-20101109.xml
+++ b/content/news/pentamusic-20101109.xml
@@ -68,7 +68,7 @@ Für Song-der-Sendung Vorschläge meldet euch bei: pentamusic at c3d2 punkt de.
         </ul>
 </addendum>
 <resource title="pentaMusic-20101109" size="76742392"
-          type="application/ogg"
+          type="audio/ogg"
           url="http://ftp.c3d2.de/pentacast/pentamusic-20101109.ogg">
   <alternative size="85866542" type="audio/mpeg"
                url="http://ftp.c3d2.de/pentacast/pentamusic-20101109.mp3"/>
diff --git a/content/news/pentaradio24-20060608-mitschnitt.xml b/content/news/pentaradio24-20060608-mitschnitt.xml
index daf403de6..d4b711ef8 100644
--- a/content/news/pentaradio24-20060608-mitschnitt.xml
+++ b/content/news/pentaradio24-20060608-mitschnitt.xml
@@ -6,7 +6,7 @@
   <p>
     Der Mitschnitt vom gestrigen RadioAbschalten!, produced by pentaradio24-studios, findet sich jetzt online. Viel Spass beim Zuhören und ab August gibt es uns dann vorraussichtlich monatlich drei Stunden.
   </p>
-  <resource title="Pentaradio24 vom 8. Juni 2006" size="40602357" type="application/ogg" url="http://ftp.c3d2.de/pentaradio/1_Pentaradio24_2006-06-08_high.ogg">
+  <resource title="Pentaradio24 vom 8. Juni 2006" size="40602357" type="audio/ogg" url="http://ftp.c3d2.de/pentaradio/1_Pentaradio24_2006-06-08_high.ogg">
     <alternative size="26742912" type="audio/mpeg" url="http://ftp.c3d2.de/pentaradio/1_Pentaradio24_2006-06-08_low.mp3"/>
   </resource>
 </item>
diff --git a/content/news/pentaradio24-20070313.xml b/content/news/pentaradio24-20070313.xml
index 66fc4c5c7..8ccdbc221 100644
--- a/content/news/pentaradio24-20070313.xml
+++ b/content/news/pentaradio24-20070313.xml
@@ -6,7 +6,7 @@
   <p>
     Heute abend, am 13. März, gibts auf der Frequenz von <link href="http://www.coloradio.org/">Coloradio</link> wieder <em>Pentaradio24</em>, dieses Mal mit dem Thema <em>"Anonym durchs Internet"</em>.
   </p>
-  <resource title="pentaradio24 vom 13. März 2007" size="48550347" type="application/ogg" url="http://ftp.c3d2.de/pentaradio/pentaradio24-20070313.ogg">
+  <resource title="pentaradio24 vom 13. März 2007" size="48550347" type="audio/ogg" url="http://ftp.c3d2.de/pentaradio/pentaradio24-20070313.ogg">
     <alternative size="28932224" type="audio/mpeg" url="http://ftp.c3d2.de/pentaradio/pentaradio24-20070313.mp3"/>
   </resource>
 </item>
diff --git a/content/news/pentaradio24-20070403.xml b/content/news/pentaradio24-20070403.xml
index c7c22a520..a7a92d9bb 100644
--- a/content/news/pentaradio24-20070403.xml
+++ b/content/news/pentaradio24-20070403.xml
@@ -6,7 +6,7 @@
   <p>
     Heute gibts wieder Pentaradio auf <link href="http://www.coloradio.org/">Coloradio</link>. Thema: <link href="http://www.datenspuren.de/">Datenspuren 2007</link>!
   </p>
-  <resource title="pentaradio24 vom 3. April 2007" size="80883654" type="application/ogg" url="http://ftp.c3d2.de/pentaradio/pentaradio-2007-04-03.ogg">
+  <resource title="pentaradio24 vom 3. April 2007" size="80883654" type="audio/ogg" url="http://ftp.c3d2.de/pentaradio/pentaradio-2007-04-03.ogg">
     <alternative size="41195648" type="audio/mpeg" url="http://ftp.c3d2.de/pentaradio/pentaradio-2007-04-03.mp3"/>
   </resource>
 </item>
diff --git a/content/news/pentaradio24-20070522.xml b/content/news/pentaradio24-20070522.xml
index 6825ac365..d442b4c8b 100644
--- a/content/news/pentaradio24-20070522.xml
+++ b/content/news/pentaradio24-20070522.xml
@@ -9,7 +9,7 @@
     reden wir über das Thema <em>Advocacy</em>.
   </p>
   <resource title="pentaradio24 vom 22. Mai 2007" size="64884693"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/pentaradio/pentaradio_May_22_2007.ogg">
     <alternative size="84476032" type="audio/mpeg"
                  url="http://ftp.c3d2.de/pentaradio/pentaradio_May_22_2007.mp3"/>
diff --git a/content/news/pentaradio24-20070626.xml b/content/news/pentaradio24-20070626.xml
index 730fd95d9..e2ab32581 100644
--- a/content/news/pentaradio24-20070626.xml
+++ b/content/news/pentaradio24-20070626.xml
@@ -13,7 +13,7 @@
     Wir wünschen uns viele Live-Zuhörer (per <link href="http://www.coloradio.org/">Stream &amp; UKW</link>) und noch mehr Mitmacher (via <link href="silc.html">SILC</link> und Telefon).
   </p>
   <resource title="pentaradio24 vom 26. Juni 2007" size="97756674"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/pentaradio/pentaradio-2007-06-26.ogg">
     <alternative size="81981568" type="audio/mpeg"
                  url="http://ftp.c3d2.de/pentaradio/pentaradio-2007-06-26.mp3"/>
diff --git a/content/news/pentaradio24-20070724.xml b/content/news/pentaradio24-20070724.xml
index 583af23ab..8e1e862a8 100644
--- a/content/news/pentaradio24-20070724.xml
+++ b/content/news/pentaradio24-20070724.xml
@@ -11,7 +11,7 @@
     Fokus auf der <link href="http://www.wikipedia.org/">Wikipedia</link>.
   </p>
   <resource title="pentaradio24 vom 24. Juli 2007" size="70881939"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/pentaradio/pentaradio-2007-07-24.ogg">
     <alternative size="86041083" type="audio/mpeg"
                  url="http://ftp.c3d2.de/pentaradio/pentaradio-2007-07-24.mp3"/>
diff --git a/content/news/pentaradio24-20070828.xml b/content/news/pentaradio24-20070828.xml
index dbc2c349b..1be3fb0ae 100644
--- a/content/news/pentaradio24-20070828.xml
+++ b/content/news/pentaradio24-20070828.xml
@@ -12,7 +12,7 @@
     (<link href="http://217.172.183.184:8000/coloradio.ogg.m3u">Stream</link>).
   </p>
   <resource title="pentaradio24 vom 28. August 2007" size="70650250"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/pentaradio/pentaradio-2007-08-28.ogg">
     <alternative size="64424703" type="audio/mpeg"
                  url="http://ftp.c3d2.de/pentaradio/pentaradio-2007-08-28.mp3"/>
diff --git a/content/news/pentaradio24-20070925.xml b/content/news/pentaradio24-20070925.xml
index 48f63f3fc..62b833d8b 100644
--- a/content/news/pentaradio24-20070925.xml
+++ b/content/news/pentaradio24-20070925.xml
@@ -18,7 +18,7 @@
   </p>
 
   <resource title="pentaradio24 vom 25. September 2007" size="65050201"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/pentaradio/pentaradio-2007-09-25.ogg">
     <alternative size="79497124" type="audio/mpeg"
                  url="http://ftp.c3d2.de/pentaradio/pentaradio-2007-09-25.mp3"/>
diff --git a/content/news/pentaradio24-20071023.xml b/content/news/pentaradio24-20071023.xml
index 9c1be3d14..7d41752a9 100644
--- a/content/news/pentaradio24-20071023.xml
+++ b/content/news/pentaradio24-20071023.xml
@@ -14,7 +14,7 @@
   </p>
 
   <resource title="pentaradio24 vom 23. Oktober 2007" size="83863129"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/pentaradio/pentaradio-2007-10-23.ogg">
     <alternative size="83510781" type="audio/mpeg"
                  url="http://ftp.c3d2.de/pentaradio/pentaradio-2007-10-23.mp3"/>
diff --git a/content/news/pentaradio24-20071127.xml b/content/news/pentaradio24-20071127.xml
index 411340a1c..4a9aa4b20 100644
--- a/content/news/pentaradio24-20071127.xml
+++ b/content/news/pentaradio24-20071127.xml
@@ -21,7 +21,7 @@
   </p>
 
   <resource title="pentaradio24 vom 27. November 2007" size="65628644"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/pentaradio/pentaradio-2007-11-27.ogg">
     <alternative size="67956266" type="audio/mpeg"
                  url="http://ftp.c3d2.de/pentaradio/pentaradio-2007-11-27.mp3"/>
diff --git a/content/news/pentaradio24-20071225.xml b/content/news/pentaradio24-20071225.xml
index 3c527b182..da1454274 100644
--- a/content/news/pentaradio24-20071225.xml
+++ b/content/news/pentaradio24-20071225.xml
@@ -19,7 +19,7 @@
   </p>
 
   <resource title="pentaradio24 vom 25. Dezember 2007" size="96804148"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/pentaradio/pentaradio-2007-12-25.ogg">
     <alternative size="86430876" type="audio/mpeg"
                  url="http://ftp.c3d2.de/pentaradio/pentaradio-2007-12-25.mp3"/>
diff --git a/content/news/pentaradio24-20080226.xml b/content/news/pentaradio24-20080226.xml
index ef12a3247..56e329b04 100644
--- a/content/news/pentaradio24-20080226.xml
+++ b/content/news/pentaradio24-20080226.xml
@@ -19,7 +19,7 @@
         </p>
 
   <resource title="pentaradio24 vom 26. Februar 2008" size="85052803"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/pentaradio/pentaradio-2008-02-26.ogg">
     <alternative size="94666880" type="audio/mpeg"
                  url="http://ftp.c3d2.de/pentaradio/pentaradio-2008-02-26.mp3"/>
diff --git a/content/news/pentaradio24-20080325.xml b/content/news/pentaradio24-20080325.xml
index 8b2b84478..d36fae06f 100644
--- a/content/news/pentaradio24-20080325.xml
+++ b/content/news/pentaradio24-20080325.xml
@@ -20,7 +20,7 @@
         </p>
 
   <resource title="pentaradio24 vom 25. März 2008" size="67356189"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/pentaradio/pentaradio-2008-03-25.ogg">
     <alternative size="88441943" type="audio/mpeg"
                  url="http://ftp.c3d2.de/pentaradio/pentaradio-2008-03-25.mp3"/>
diff --git a/content/news/pentaradio24-20080422.xml b/content/news/pentaradio24-20080422.xml
index fa9f064f6..98aec87bd 100644
--- a/content/news/pentaradio24-20080422.xml
+++ b/content/news/pentaradio24-20080422.xml
@@ -23,7 +23,7 @@
   </p>
 
   <resource title="pentaradio24 vom 22. April 2008" size="72027729"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/pentaradio/pentaradio-2008-04-22.ogg">
     <alternative size="83904829" type="audio/mpeg"
                  url="http://ftp.c3d2.de/pentaradio/pentaradio-2008-04-22.mp3"/>
diff --git a/content/news/pentaradio24-20080527.xml b/content/news/pentaradio24-20080527.xml
index 95fbd134e..b86392aab 100644
--- a/content/news/pentaradio24-20080527.xml
+++ b/content/news/pentaradio24-20080527.xml
@@ -17,7 +17,7 @@
   </p>
 
   <resource title="pentaradio24 vom 27. Mai 2008" size="91141752"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/pentaradio/pentaradio-2008-05-27.ogg">
     <alternative size="81599380" type="audio/mpeg"
                  url="http://ftp.c3d2.de/pentaradio/pentaradio-2008-05-27.mp3"/>
diff --git a/content/news/pentaradio24-20080624.xml b/content/news/pentaradio24-20080624.xml
index a1890afc9..51bd25c03 100644
--- a/content/news/pentaradio24-20080624.xml
+++ b/content/news/pentaradio24-20080624.xml
@@ -19,7 +19,7 @@
   </p>
 
   <resource title="pentaradio24 vom 24. Juni 2008" size="91053216"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/pentaradio/pentaradio-2008-06-24.ogg">
     <alternative size="103675969" type="audio/mpeg"
                  url="http://ftp.c3d2.de/pentaradio/pentaradio-2008-06-24.mp3"/>
diff --git a/content/news/pentaradio24-20080722.xml b/content/news/pentaradio24-20080722.xml
index 69a079826..eb8ae64d4 100644
--- a/content/news/pentaradio24-20080722.xml
+++ b/content/news/pentaradio24-20080722.xml
@@ -20,7 +20,7 @@
   </p>
 
   <resource title="pentaradio24 vom 22. Juli 2008" size="64864015"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/pentaradio/pentaradio-2008-07-22.ogg">
     <alternative size="78564156" type="audio/mpeg"
                  url="http://ftp.c3d2.de/pentaradio/pentaradio-2008-07-22.mp3"/>
diff --git a/content/news/pentaradio24-20080826.xml b/content/news/pentaradio24-20080826.xml
index e41a9e75d..7f2c45fe2 100644
--- a/content/news/pentaradio24-20080826.xml
+++ b/content/news/pentaradio24-20080826.xml
@@ -27,7 +27,7 @@
   </p>
 
     <resource title="pentaradio24 vom 26. August 2008" size="69540791"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/pentaradio/pentaradio-2008-08-26.ogg">
     <alternative size="83239136" type="audio/mpeg"
                  url="http://ftp.c3d2.de/pentaradio/pentaradio-2008-08-26.mp3"/>
diff --git a/content/news/pentaradio24-20080923.xml b/content/news/pentaradio24-20080923.xml
index c9508aaca..78281bc9d 100644
--- a/content/news/pentaradio24-20080923.xml
+++ b/content/news/pentaradio24-20080923.xml
@@ -23,7 +23,7 @@
 
 
   <resource title="pentaradio24 vom 23. September 2008" size="70633550"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/pentaradio/pentaradio-2008-09-23.ogg">
     <alternative size="84745990" type="audio/mpeg"
                  url="http://ftp.c3d2.de/pentaradio/pentaradio-2008-09-23.mp3"/>
diff --git a/content/news/pentaradio24-20081028.xml b/content/news/pentaradio24-20081028.xml
index e6a704b52..585326c60 100644
--- a/content/news/pentaradio24-20081028.xml
+++ b/content/news/pentaradio24-20081028.xml
@@ -27,7 +27,7 @@ Vortrag über <link href="http://www.datenspuren.de/fahrplan/events/2535.de.html
   </p>
 
   <resource title="pentaradio24 vom 28. Oktober 2008" size="69330648"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/pentaradio/pentaradio-2008-10-28.ogg">
     <alternative size="85543630" type="audio/mpeg"
                  url="http://ftp.c3d2.de/pentaradio/pentaradio-2008-10-28.mp3"/>
diff --git a/content/news/pentaradio24-20081125.xml b/content/news/pentaradio24-20081125.xml
index 1ed14b7b9..b47c2d8d1 100644
--- a/content/news/pentaradio24-20081125.xml
+++ b/content/news/pentaradio24-20081125.xml
@@ -28,7 +28,7 @@
   </addendum>
 
   <resource title="pentaradio24 vom 25. November 2008" size="82067909"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/pentaradio/pentaradio-2008-11-25.ogg">
     <alternative size="78401570" type="audio/mpeg"
                  url="http://ftp.c3d2.de/pentaradio/pentaradio-2008-11-25.mp3"/>
diff --git a/content/news/pentaradio24-20081223.xml b/content/news/pentaradio24-20081223.xml
index 4f4bf8f98..9c11f7d00 100644
--- a/content/news/pentaradio24-20081223.xml
+++ b/content/news/pentaradio24-20081223.xml
@@ -18,7 +18,7 @@
   </p>
 
   <resource title="pentaradio24 vom 23. Dezember 2008" size="64022674"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/pentaradio/pentaradio-2008-12-23.ogg">
     <alternative size="84853590" type="audio/mpeg"
                  url="http://ftp.c3d2.de/pentaradio/pentaradio-2008-12-23.mp3"/>
diff --git a/content/news/pentaradio24-20090127.xml b/content/news/pentaradio24-20090127.xml
index aac1bd585..7b494ab22 100644
--- a/content/news/pentaradio24-20090127.xml
+++ b/content/news/pentaradio24-20090127.xml
@@ -28,7 +28,7 @@
   </p>
 
   <resource title="pentaradio24 vom 27. Januar 2009" size="114454000"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/pentaradio/pentaradio-2009-01-27.ogg">
     <alternative size="85661540" type="audio/mpeg"
                  url="http://ftp.c3d2.de/pentaradio/pentaradio-2009-01-27.mp3"/>
diff --git a/content/news/pentaradio24-20090224.xml b/content/news/pentaradio24-20090224.xml
index 92d9cf081..73838a816 100644
--- a/content/news/pentaradio24-20090224.xml
+++ b/content/news/pentaradio24-20090224.xml
@@ -27,7 +27,7 @@
   </p>
 
   <resource title="pentaradio24 vom 24. Februar 2009" size="70285973"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/pentaradio/pentaradio-2009-02-24.ogg">
     <alternative size="81912299" type="audio/mpeg"
                  url="http://ftp.c3d2.de/pentaradio/pentaradio-2009-02-24.mp3"/>
diff --git a/content/news/pentaradio24-20090324.xml b/content/news/pentaradio24-20090324.xml
index 5a1eea59b..70457eb43 100644
--- a/content/news/pentaradio24-20090324.xml
+++ b/content/news/pentaradio24-20090324.xml
@@ -22,7 +22,7 @@
      schicken, oder ruft einfach in der Sendung an: 0351/32 05 47 11 oder skypt mit "coloradio"
   </p>
   <resource title="pentaradio24 vom 24. März 2009" size="110041017"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/pentaradio/pentaradio-2009-03-24.ogg">
     <alternative size="85229757" type="audio/mpeg"
                  url="http://ftp.c3d2.de/pentaradio/pentaradio-2009-03-24.mp3"/>
diff --git a/content/news/pentaradio24-20090428.xml b/content/news/pentaradio24-20090428.xml
index 57c65b381..b6d41fc42 100644
--- a/content/news/pentaradio24-20090428.xml
+++ b/content/news/pentaradio24-20090428.xml
@@ -28,7 +28,7 @@
   </p>
 
   <resource title="pentaradio24 vom 28. April 2009" size="92596153"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/pentaradio/pentaradio-2009-04-28.ogg">
     <alternative size="91563887" type="audio/mpeg"
                  url="http://ftp.c3d2.de/pentaradio/pentaradio-2009-04-28.mp3"/>
diff --git a/content/news/pentaradio24-20090526.xml b/content/news/pentaradio24-20090526.xml
index 90378f59d..8ce7d8951 100644
--- a/content/news/pentaradio24-20090526.xml
+++ b/content/news/pentaradio24-20090526.xml
@@ -22,7 +22,7 @@ We also have something to announce: <link href="http://www.hackerspace.net">The
       Die Sendung wurde aus Zeitgründen Montag voraufgezeichnet; aus Kommunikationsgründen natürlich auf Englisch.
   </p>
   <resource title="pentaradio24 vom 26. Mai 2009" size="71719903"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/pentaradio/pentaradio-2009-05-26.ogg">
     <alternative size="88047596" type="audio/mpeg"
                  url="http://ftp.c3d2.de/pentaradio/pentaradio-2009-05-26.mp3"/>
diff --git a/content/news/pentaradio24-20090623.xml b/content/news/pentaradio24-20090623.xml
index 1e092ba2c..b5f11a466 100644
--- a/content/news/pentaradio24-20090623.xml
+++ b/content/news/pentaradio24-20090623.xml
@@ -35,7 +35,7 @@
       ThePirateBay</link> dahin.
   </p>
   <resource title="pentaradio24 vom 23. Juni 2009" size="78791746"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/pentaradio/pentaradio-2009-06-23.ogg">
     <alternative size="101003635" type="audio/mpeg"
                  url="http://ftp.c3d2.de/pentaradio/pentaradio-2009-06-23.mp3"/>
diff --git a/content/news/pentaradio24-20090728.xml b/content/news/pentaradio24-20090728.xml
index 1c28b0082..5cbf2c78b 100644
--- a/content/news/pentaradio24-20090728.xml
+++ b/content/news/pentaradio24-20090728.xml
@@ -29,7 +29,7 @@ Links zum Thema:
 </ul>
 </addendum>
   <resource title="pentaradio24 vom 29. Juli 2009" size="102862466"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/pentaradio/pentaradio-2009-07-28.ogg">
     <alternative size="81822503" type="audio/mpeg"
                  url="http://ftp.c3d2.de/pentaradio/pentaradio-2009-07-28.mp3"/>
diff --git a/content/news/pentaradio24-20090825.xml b/content/news/pentaradio24-20090825.xml
index 837275b2b..75ac073ff 100644
--- a/content/news/pentaradio24-20090825.xml
+++ b/content/news/pentaradio24-20090825.xml
@@ -15,7 +15,7 @@ Mitmachen könnt Ihr via 0351/32054711, <link href="muc.html">Chat</link> oder S
 Den Livestream gibts <link href="http://streaming.fueralle.org:8000/coloradio.ogg.m3u">hier</link>
 </p>
   <resource title="pentaradio24 vom 25. August 2009" size="93604365"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/pentaradio/pentaradio-2009-08-25.ogg">
     <alternative size="76684966" type="audio/mpeg"
                  url="http://ftp.c3d2.de/pentaradio/pentaradio-2009-08-25.mp3"/>
diff --git a/content/news/pentaradio24-20090922.xml b/content/news/pentaradio24-20090922.xml
index 9e07ada45..6187e1bff 100644
--- a/content/news/pentaradio24-20090922.xml
+++ b/content/news/pentaradio24-20090922.xml
@@ -20,7 +20,7 @@ Viel Spaß! #ds09 #datenspuren09
 <resource title="Vertretung Musiksendung Rap'n'Roll (Ogg &amp; MP3)" size="124669956"
           type="application/x-bittorrent" url="media/pentaradio-rapnroll-2009-09-22.torrent"/>
 <resource title="pentaradio24 vom 22. September 2009" size="109863566"
-          type="application/ogg"
+          type="audio/ogg"
           url="http://ftp.c3d2.de/pentaradio/pentaradio-2009-09-22.ogg">
   <alternative size="103022384" type="audio/mpeg"
                url="http://ftp.c3d2.de/pentaradio/pentaradio-2009-09-22.mp3"/>
diff --git a/content/news/pentaradio24-20091027.xml b/content/news/pentaradio24-20091027.xml
index 166ec1863..5693abd83 100644
--- a/content/news/pentaradio24-20091027.xml
+++ b/content/news/pentaradio24-20091027.xml
@@ -30,7 +30,7 @@ Viel Spaß! <link href="http://search.twitter.com/search?q=pentaradio">#pentarad
 </p>
   </addendum>
 <resource title="pentaradio24 vom 27. Oktober 2009" size="128172802"
-          type="application/ogg"
+          type="audio/ogg"
           url="http://ftp.c3d2.de/pentaradio/pentaradio-2009-10-27.ogg">
   <alternative size="103425238" type="audio/mpeg"
                url="http://ftp.c3d2.de/pentaradio/pentaradio-2009-10-27.mp3"/>
diff --git a/content/news/pentaradio24-20091124.xml b/content/news/pentaradio24-20091124.xml
index b4cae4346..af01d65a4 100644
--- a/content/news/pentaradio24-20091124.xml
+++ b/content/news/pentaradio24-20091124.xml
@@ -24,7 +24,7 @@ Viel Spaß! <link href="http://search.twitter.com/search?q=pentaradio">#pentarad
 </p>
 </addendum>
 <resource title="pentaradio24 vom 24. November 2009" size="112903028"
-          type="application/ogg"
+          type="audio/ogg"
           url="http://ftp.c3d2.de/pentaradio/pentaradio-2009-11-24.ogg">
   <alternative size="81844695" type="audio/mpeg"
                url="http://ftp.c3d2.de/pentaradio/pentaradio-2009-11-24.mp3"/>
diff --git a/content/news/pentaradio24-20091222.xml b/content/news/pentaradio24-20091222.xml
index c0455afbe..ceb2a9b81 100644
--- a/content/news/pentaradio24-20091222.xml
+++ b/content/news/pentaradio24-20091222.xml
@@ -12,7 +12,7 @@
     zusammenfassenden Rückblick auf drei Jahre Pentaradio.
   </p>
 <resource title="pentaradio24 vom 22. Dezember 2009" size="112121916"
-          type="application/ogg"
+          type="audio/ogg"
           url="http://ftp.c3d2.de/pentaradio/pentaradio-2009-12-22.ogg">
   <alternative size="76836269" type="audio/mpeg"
                url="http://ftp.c3d2.de/pentaradio/pentaradio-2009-12-22.mp3"/>
diff --git a/content/news/pentaradio24-20100126.xml b/content/news/pentaradio24-20100126.xml
index 04b1f98ba..6f2ce3f3d 100644
--- a/content/news/pentaradio24-20100126.xml
+++ b/content/news/pentaradio24-20100126.xml
@@ -45,7 +45,7 @@ Viel Spaß! <link href="http://search.twitter.com/search?q=pentaradio">#pentarad
   wir bitten um [http://http://twitter.com/pentaradio Feedback</p>
 </addendum>
 <resource title="pentaradio24 vom 26. Januar 2010" size="113436923"
-          type="application/ogg"
+          type="audio/ogg"
           url="http://ftp.c3d2.de/pentaradio/pentaradio-2010-01-26.ogg">
   <alternative size="83027062" type="audio/mpeg"
                url="http://ftp.c3d2.de/pentaradio/pentaradio-2010-01-26.mp3"/>
diff --git a/content/news/pentaradio24-20100223.xml b/content/news/pentaradio24-20100223.xml
index c7fefb40a..04553573d 100644
--- a/content/news/pentaradio24-20100223.xml
+++ b/content/news/pentaradio24-20100223.xml
@@ -30,7 +30,7 @@ Viel Spaß! <link href="http://search.twitter.com/search?q=pentaradio">#pentarad
  wir bitten um <link href="http://twitter.com/pentaradio">Feedback</link></p>
 </addendum>
 <resource title="pentaradio24 vom 23. Februar 2010" size="105635125"
- type="application/ogg"
+ type="audio/ogg"
  url="http://ftp.c3d2.de/pentaradio/pentaradio-2010-02-23.ogg">
  <alternative size="99415100" type="audio/mpeg"
  url="http://ftp.c3d2.de/pentaradio/pentaradio-2010-02-23.mp3"/>
diff --git a/content/news/pentaradio24-20100323.xml b/content/news/pentaradio24-20100323.xml
index 7abccbda7..f13faf7d7 100644
--- a/content/news/pentaradio24-20100323.xml
+++ b/content/news/pentaradio24-20100323.xml
@@ -39,7 +39,7 @@ Viel Spaß! <link href="http://search.twitter.com/search?q=pentaradio">#pentarad
 </p>
 </addendum>
 <resource title="pentaradio24 vom 23. März 2010" size="116638209"
-          type="application/ogg"
+          type="audio/ogg"
           url="http://ftp.c3d2.de/pentaradio/pentaradio-2010-03-23.ogg">
   <alternative size="99528500" type="audio/mpeg"
                url="http://ftp.c3d2.de/pentaradio/pentaradio-2010-03-23.mp3"/>
diff --git a/content/news/pentaradio24-20100427.xml b/content/news/pentaradio24-20100427.xml
index a72d2dc14..89195add1 100644
--- a/content/news/pentaradio24-20100427.xml
+++ b/content/news/pentaradio24-20100427.xml
@@ -23,19 +23,19 @@
  </p>
  </addendum>
  <resource title="pentaradio24 vom 27. April 2010" size="115654085"
-           type="application/ogg"
+           type="audio/ogg"
            url="http://ftp.c3d2.de/pentaradio/pentaradio-2010-04-27.ogg">
    <alternative size="77807862" type="audio/mpeg"
 		url="http://ftp.c3d2.de/pentaradio/pentaradio-2010-04-27.mp3"/>
  </resource>
  <resource title="Nur News" size="47641177"
-           type="application/ogg"
+           type="audio/ogg"
            url="http://ftp.c3d2.de/pentaradio/pentaradio-2010-04-27-news.ogg">
    <alternative size="30909092" type="audio/mpeg"
 		url="http://ftp.c3d2.de/pentaradio/pentaradio-2010-04-27-news.mp3"/>
  </resource>
  <resource title="Nur Ranting" size="68162979"
-           type="application/ogg"
+           type="audio/ogg"
            url="http://ftp.c3d2.de/pentaradio/pentaradio-2010-04-27-ranting.ogg">
    <alternative size="46916094" type="audio/mpeg"
 		url="http://ftp.c3d2.de/pentaradio/pentaradio-2010-04-27-ranting.mp3"/>
diff --git a/content/news/pentaradio24-20100525.xml b/content/news/pentaradio24-20100525.xml
index 00926f7e3..aa010387e 100644
--- a/content/news/pentaradio24-20100525.xml
+++ b/content/news/pentaradio24-20100525.xml
@@ -44,7 +44,7 @@
  </ul>
 </addendum>
  <resource title="pentaradio24 vom 25. Mai 2010" size="120338617"
-           type="application/ogg"
+           type="audio/ogg"
            url="http://ftp.c3d2.de/pentaradio/pentaradio-2010-05-25.ogg">
    <alternative size="107700613" type="audio/mpeg"
 		url="http://ftp.c3d2.de/pentaradio/pentaradio-2010-05-25.mp3"/>
diff --git a/content/news/pentaradio24-20100622.xml b/content/news/pentaradio24-20100622.xml
index 5760858bc..9126c0dd6 100644
--- a/content/news/pentaradio24-20100622.xml
+++ b/content/news/pentaradio24-20100622.xml
@@ -42,7 +42,7 @@
 
 </addendum>
 <resource title="pentaradio24 vom 22. Juni 2010" size="75018500"
-           type="application/ogg"
+           type="audio/ogg"
            url="http://ftp.c3d2.de/pentaradio/pentaradio-2010-06-22.ogg">
    <alternative size="105631055" type="audio/mpeg"
 		url="http://ftp.c3d2.de/pentaradio/pentaradio-2010-06-22.mp3"/>
diff --git a/content/news/pentaradio24-20100727.xml b/content/news/pentaradio24-20100727.xml
index 2c7492503..f09df50f4 100644
--- a/content/news/pentaradio24-20100727.xml
+++ b/content/news/pentaradio24-20100727.xml
@@ -66,7 +66,7 @@
  </ul>
 </addendum>
 <resource title="pentaradio24 vom 27. Juli 2010" size="70099358"
-           type="application/ogg"
+           type="audio/ogg"
            url="http://ftp.c3d2.de/pentaradio/pentaradio-2010-07-27.ogg">
    <alternative size="093077174" type="audio/mpeg"
         url="http://ftp.c3d2.de/pentaradio/pentaradio-2010-07-27.mp3"/>
diff --git a/content/news/pentaradio24-20100824.xml b/content/news/pentaradio24-20100824.xml
index 1709a7f8d..dfaab2746 100644
--- a/content/news/pentaradio24-20100824.xml
+++ b/content/news/pentaradio24-20100824.xml
@@ -33,7 +33,7 @@
  </p>
  </addendum>
  <resource title="pentaradio24 vom 24. August 2010" size="127402970"
-           type="application/ogg"
+           type="audio/ogg"
            url="http://ftp.c3d2.de/pentaradio/pentaradio-2010-08-24.ogg">
    <alternative size="109120120" type="audio/mpeg"
 		url="http://ftp.c3d2.de/pentaradio/pentaradio-2010-08-24.mp3"/>
diff --git a/content/news/pentaradio24-20100928.xml b/content/news/pentaradio24-20100928.xml
index 7f46e8879..a1c02948f 100644
--- a/content/news/pentaradio24-20100928.xml
+++ b/content/news/pentaradio24-20100928.xml
@@ -33,7 +33,7 @@
  </p>
  </addendum>-->
  <resource title="pentaradio24 vom 28. September 2010" size="97387396"
-           type="application/ogg"
+           type="audio/ogg"
            url="http://ftp.c3d2.de/pentaradio/pentaradio-2010-09-28.ogg">
    <alternative size="86364730" type="audio/mpeg"
 		url="http://ftp.c3d2.de/pentaradio/pentaradio-2010-09-28.mp3"/>
diff --git a/content/news/pentaradio24-20101026.xml b/content/news/pentaradio24-20101026.xml
index 708534aa1..326a52906 100644
--- a/content/news/pentaradio24-20101026.xml
+++ b/content/news/pentaradio24-20101026.xml
@@ -18,7 +18,7 @@ Wir bringen etwas Licht in den Jungle der Java Versionen und Technologien,
 zu hören wie immer 21:30 bis 23:00 Uhr auf <link href="http://coloradio.org/">coloRadio</link> (<link href="http://streaming.fueralle.org:8000/coloradio.ogg.m3u">Stream</link>).
  </p>
  <resource title="pentaradio24 vom 26. Oktober 2010" size="124880454"
-           type="application/ogg"
+           type="audio/ogg"
            url="http://ftp.c3d2.de/pentaradio/pentaradio-2010-10-26.ogg">
    <alternative size="107389757" type="audio/mpeg"
 		url="http://ftp.c3d2.de/pentaradio/pentaradio-2010-10-26.mp3"/>
diff --git a/content/news/pentaradio24-magazin-20080129.xml b/content/news/pentaradio24-magazin-20080129.xml
index aa5ccc6ae..b429e9254 100644
--- a/content/news/pentaradio24-magazin-20080129.xml
+++ b/content/news/pentaradio24-magazin-20080129.xml
@@ -34,7 +34,7 @@
   </addendum>
 
   <resource title="Magazin vom 29. Januar 2008" size="53691055"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/pentaradio/pentaradio24-magazin-2008-01-29.ogg">
     <alternative size="64341324" type="audio/mpeg"
                  url="http://ftp.c3d2.de/pentaradio/pentaradio24-magazin-2008-01-29.mp3"/>
diff --git a/content/news/pentaradio24-magazin-20080212.xml b/content/news/pentaradio24-magazin-20080212.xml
index 0a8923304..82ba87ad5 100644
--- a/content/news/pentaradio24-magazin-20080212.xml
+++ b/content/news/pentaradio24-magazin-20080212.xml
@@ -21,7 +21,7 @@
   </addendum>
 
   <resource title="Magazin vom 12. Februar 2008" size="41045814"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/pentaradio/pentaradio24-magazin-2008-02-12.ogg">
     <alternative size="47304971" type="audio/mpeg"
                  url="http://ftp.c3d2.de/pentaradio/pentaradio24-magazin-2008-02-12.mp3"/>
diff --git a/content/news/ta-amd64.xml b/content/news/ta-amd64.xml
index 34d40e0b4..18eea2e32 100644
--- a/content/news/ta-amd64.xml
+++ b/content/news/ta-amd64.xml
@@ -56,7 +56,7 @@
             type="application/pdf"
             url="http://ftp.c3d2.de/ta/x86-64/64bitLinux.pdf"/>
   <resource title="Videomitschnitt" size="700441000"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/ta/x86-64/ta-amd64-theora.ogg">
     <alternative size="684769548"
                  type="video/x-msvideo"
diff --git a/content/news/ta-virtualisierung.xml b/content/news/ta-virtualisierung.xml
index a42135380..927bc7f77 100644
--- a/content/news/ta-virtualisierung.xml
+++ b/content/news/ta-virtualisierung.xml
@@ -47,7 +47,7 @@
   </addendum>
 
   <resource title="Teaser" size="15187791"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/ta/virtualisierung/virtualisierung_ta_teaser.ogg">
     <alternative size="17219953" type="audio/mpeg"
             url="http://ftp.c3d2.de/ta/virtualisierung/virtualisierung_ta_teaser.mp3"/>
@@ -60,7 +60,7 @@
             type="application/pdf"
             url="media/ta-virtualisierung/Virtualization_CCC.pdf"/>
 <!--  <resource title="Videomitschnitt" size="700441000"
-            type="application/ogg"
+            type="audio/ogg"
             url="http://ftp.c3d2.de/ta/x86-64/ta-amd64-theora.ogg">
     <alternative size="684769548"
                  type="video/x-msvideo"
diff --git a/content/static/images/top-left.png b/content/static/images/top-left.png
deleted file mode 100644
index 3c8802c65..000000000
Binary files a/content/static/images/top-left.png and /dev/null differ
diff --git a/content/static/images/top-right.png b/content/static/images/top-right.png
deleted file mode 100644
index da5a034ff..000000000
Binary files a/content/static/images/top-right.png and /dev/null differ
diff --git a/content/static/script/flowplayer-3.2.4.min.js b/content/static/script/flowplayer-3.2.4.min.js
new file mode 100644
index 000000000..f05586d24
--- /dev/null
+++ b/content/static/script/flowplayer-3.2.4.min.js
@@ -0,0 +1,24 @@
+/* 
+ * flowplayer.js 3.2.4. The Flowplayer API
+ * 
+ * Copyright 2009 Flowplayer Oy
+ * 
+ * This file is part of Flowplayer.
+ * 
+ * Flowplayer is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Flowplayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Flowplayer.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Date: 2010-08-25 12:48:46 +0000 (Wed, 25 Aug 2010)
+ * Revision: 551 
+ */
+(function(){function g(o){console.log("$f.fireEvent",[].slice.call(o))}function k(q){if(!q||typeof q!="object"){return q}var o=new q.constructor();for(var p in q){if(q.hasOwnProperty(p)){o[p]=k(q[p])}}return o}function m(t,q){if(!t){return}var o,p=0,r=t.length;if(r===undefined){for(o in t){if(q.call(t[o],o,t[o])===false){break}}}else{for(var s=t[0];p<r&&q.call(s,p,s)!==false;s=t[++p]){}}return t}function c(o){return document.getElementById(o)}function i(q,p,o){if(typeof p!="object"){return q}if(q&&p){m(p,function(r,s){if(!o||typeof s!="function"){q[r]=s}})}return q}function n(s){var q=s.indexOf(".");if(q!=-1){var p=s.slice(0,q)||"*";var o=s.slice(q+1,s.length);var r=[];m(document.getElementsByTagName(p),function(){if(this.className&&this.className.indexOf(o)!=-1){r.push(this)}});return r}}function f(o){o=o||window.event;if(o.preventDefault){o.stopPropagation();o.preventDefault()}else{o.returnValue=false;o.cancelBubble=true}return false}function j(q,o,p){q[o]=q[o]||[];q[o].push(p)}function e(){return"_"+(""+Math.random()).slice(2,10)}var h=function(t,r,s){var q=this,p={},u={};q.index=r;if(typeof t=="string"){t={url:t}}i(this,t,true);m(("Begin*,Start,Pause*,Resume*,Seek*,Stop*,Finish*,LastSecond,Update,BufferFull,BufferEmpty,BufferStop").split(","),function(){var v="on"+this;if(v.indexOf("*")!=-1){v=v.slice(0,v.length-1);var w="onBefore"+v.slice(2);q[w]=function(x){j(u,w,x);return q}}q[v]=function(x){j(u,v,x);return q};if(r==-1){if(q[w]){s[w]=q[w]}if(q[v]){s[v]=q[v]}}});i(this,{onCuepoint:function(x,w){if(arguments.length==1){p.embedded=[null,x];return q}if(typeof x=="number"){x=[x]}var v=e();p[v]=[x,w];if(s.isLoaded()){s._api().fp_addCuepoints(x,r,v)}return q},update:function(w){i(q,w);if(s.isLoaded()){s._api().fp_updateClip(w,r)}var v=s.getConfig();var x=(r==-1)?v.clip:v.playlist[r];i(x,w,true)},_fireEvent:function(v,y,w,A){if(v=="onLoad"){m(p,function(B,C){if(C[0]){s._api().fp_addCuepoints(C[0],r,B)}});return false}A=A||q;if(v=="onCuepoint"){var z=p[y];if(z){return z[1].call(s,A,w)}}if(y&&"onBeforeBegin,onMetaData,onStart,onUpdate,onResume".indexOf(v)!=-1){i(A,y);if(y.metaData){if(!A.duration){A.duration=y.metaData.duration}else{A.fullDuration=y.metaData.duration}}}var x=true;m(u[v],function(){x=this.call(s,A,y,w)});return x}});if(t.onCuepoint){var o=t.onCuepoint;q.onCuepoint.apply(q,typeof o=="function"?[o]:o);delete t.onCuepoint}m(t,function(v,w){if(typeof w=="function"){j(u,v,w);delete t[v]}});if(r==-1){s.onCuepoint=this.onCuepoint}};var l=function(p,r,q,t){var o=this,s={},u=false;if(t){i(s,t)}m(r,function(v,w){if(typeof w=="function"){s[v]=w;delete r[v]}});i(this,{animate:function(y,z,x){if(!y){return o}if(typeof z=="function"){x=z;z=500}if(typeof y=="string"){var w=y;y={};y[w]=z;z=500}if(x){var v=e();s[v]=x}if(z===undefined){z=500}r=q._api().fp_animate(p,y,z,v);return o},css:function(w,x){if(x!==undefined){var v={};v[w]=x;w=v}r=q._api().fp_css(p,w);i(o,r);return o},show:function(){this.display="block";q._api().fp_showPlugin(p);return o},hide:function(){this.display="none";q._api().fp_hidePlugin(p);return o},toggle:function(){this.display=q._api().fp_togglePlugin(p);return o},fadeTo:function(y,x,w){if(typeof x=="function"){w=x;x=500}if(w){var v=e();s[v]=w}this.display=q._api().fp_fadeTo(p,y,x,v);this.opacity=y;return o},fadeIn:function(w,v){return o.fadeTo(1,w,v)},fadeOut:function(w,v){return o.fadeTo(0,w,v)},getName:function(){return p},getPlayer:function(){return q},_fireEvent:function(w,v,x){if(w=="onUpdate"){var z=q._api().fp_getPlugin(p);if(!z){return}i(o,z);delete o.methods;if(!u){m(z.methods,function(){var B=""+this;o[B]=function(){var C=[].slice.call(arguments);var D=q._api().fp_invoke(p,B,C);return D==="undefined"||D===undefined?o:D}});u=true}}var A=s[w];if(A){var y=A.apply(o,v);if(w.slice(0,1)=="_"){delete s[w]}return y}return o}})};function b(q,G,t){var w=this,v=null,D=false,u,s,F=[],y={},x={},E,r,p,C,o,A;i(w,{id:function(){return E},isLoaded:function(){return(v!==null&&v.fp_play!==undefined&&!D)},getParent:function(){return q},hide:function(H){if(H){q.style.height="0px"}if(w.isLoaded()){v.style.height="0px"}return w},show:function(){q.style.height=A+"px";if(w.isLoaded()){v.style.height=o+"px"}return w},isHidden:function(){return w.isLoaded()&&parseInt(v.style.height,10)===0},load:function(J){if(!w.isLoaded()&&w._fireEvent("onBeforeLoad")!==false){var H=function(){u=q.innerHTML;if(u&&!flashembed.isSupported(G.version)){q.innerHTML=""}if(J){J.cached=true;j(x,"onLoad",J)}flashembed(q,G,{config:t})};var I=0;m(a,function(){this.unload(function(K){if(++I==a.length){H()}})})}return w},unload:function(J){if(this.isFullscreen()&&/WebKit/i.test(navigator.userAgent)){if(J){J(false)}return w}if(u.replace(/\s/g,"")!==""){if(w._fireEvent("onBeforeUnload")===false){if(J){J(false)}return w}D=true;try{if(v){v.fp_close();w._fireEvent("onUnload")}}catch(H){}var I=function(){v=null;q.innerHTML=u;D=false;if(J){J(true)}};setTimeout(I,50)}else{if(J){J(false)}}return w},getClip:function(H){if(H===undefined){H=C}return F[H]},getCommonClip:function(){return s},getPlaylist:function(){return F},getPlugin:function(H){var J=y[H];if(!J&&w.isLoaded()){var I=w._api().fp_getPlugin(H);if(I){J=new l(H,I,w);y[H]=J}}return J},getScreen:function(){return w.getPlugin("screen")},getControls:function(){return w.getPlugin("controls")._fireEvent("onUpdate")},getLogo:function(){try{return w.getPlugin("logo")._fireEvent("onUpdate")}catch(H){}},getPlay:function(){return w.getPlugin("play")._fireEvent("onUpdate")},getConfig:function(H){return H?k(t):t},getFlashParams:function(){return G},loadPlugin:function(K,J,M,L){if(typeof M=="function"){L=M;M={}}var I=L?e():"_";w._api().fp_loadPlugin(K,J,M,I);var H={};H[I]=L;var N=new l(K,null,w,H);y[K]=N;return N},getState:function(){return w.isLoaded()?v.fp_getState():-1},play:function(I,H){var J=function(){if(I!==undefined){w._api().fp_play(I,H)}else{w._api().fp_play()}};if(w.isLoaded()){J()}else{if(D){setTimeout(function(){w.play(I,H)},50)}else{w.load(function(){J()})}}return w},getVersion:function(){var I="flowplayer.js 3.2.4";if(w.isLoaded()){var H=v.fp_getVersion();H.push(I);return H}return I},_api:function(){if(!w.isLoaded()){throw"Flowplayer "+w.id()+" not loaded when calling an API method"}return v},setClip:function(H){w.setPlaylist([H]);return w},getIndex:function(){return p},_swfHeight:function(){return v.clientHeight}});m(("Click*,Load*,Unload*,Keypress*,Volume*,Mute*,Unmute*,PlaylistReplace,ClipAdd,Fullscreen*,FullscreenExit,Error,MouseOver,MouseOut").split(","),function(){var H="on"+this;if(H.indexOf("*")!=-1){H=H.slice(0,H.length-1);var I="onBefore"+H.slice(2);w[I]=function(J){j(x,I,J);return w}}w[H]=function(J){j(x,H,J);return w}});m(("pause,resume,mute,unmute,stop,toggle,seek,getStatus,getVolume,setVolume,getTime,isPaused,isPlaying,startBuffering,stopBuffering,isFullscreen,toggleFullscreen,reset,close,setPlaylist,addClip,playFeed,setKeyboardShortcutsEnabled,isKeyboardShortcutsEnabled").split(","),function(){var H=this;w[H]=function(J,I){if(!w.isLoaded()){return w}var K=null;if(J!==undefined&&I!==undefined){K=v["fp_"+H](J,I)}else{K=(J===undefined)?v["fp_"+H]():v["fp_"+H](J)}return K==="undefined"||K===undefined?w:K}});w._fireEvent=function(Q){if(typeof Q=="string"){Q=[Q]}var R=Q[0],O=Q[1],M=Q[2],L=Q[3],K=0;if(t.debug){g(Q)}if(!w.isLoaded()&&R=="onLoad"&&O=="player"){v=v||c(r);o=w._swfHeight();m(F,function(){this._fireEvent("onLoad")});m(y,function(S,T){T._fireEvent("onUpdate")});s._fireEvent("onLoad")}if(R=="onLoad"&&O!="player"){return}if(R=="onError"){if(typeof O=="string"||(typeof O=="number"&&typeof M=="number")){O=M;M=L}}if(R=="onContextMenu"){m(t.contextMenu[O],function(S,T){T.call(w)});return}if(R=="onPluginEvent"||R=="onBeforePluginEvent"){var H=O.name||O;var I=y[H];if(I){I._fireEvent("onUpdate",O);return I._fireEvent(M,Q.slice(3))}return}if(R=="onPlaylistReplace"){F=[];var N=0;m(O,function(){F.push(new h(this,N++,w))})}if(R=="onClipAdd"){if(O.isInStream){return}O=new h(O,M,w);F.splice(M,0,O);for(K=M+1;K<F.length;K++){F[K].index++}}var P=true;if(typeof O=="number"&&O<F.length){C=O;var J=F[O];if(J){P=J._fireEvent(R,M,L)}if(!J||P!==false){P=s._fireEvent(R,M,L,J)}}m(x[R],function(){P=this.call(w,O,M);if(this.cached){x[R].splice(K,1)}if(P===false){return false}K++});return P};function B(){if($f(q)){$f(q).getParent().innerHTML="";p=$f(q).getIndex();a[p]=w}else{a.push(w);p=a.length-1}A=parseInt(q.style.height,10)||q.clientHeight;E=q.id||"fp"+e();r=G.id||E+"_api";G.id=r;t.playerId=E;if(typeof t=="string"){t={clip:{url:t}}}if(typeof t.clip=="string"){t.clip={url:t.clip}}t.clip=t.clip||{};if(q.getAttribute("href",2)&&!t.clip.url){t.clip.url=q.getAttribute("href",2)}s=new h(t.clip,-1,w);t.playlist=t.playlist||[t.clip];var I=0;m(t.playlist,function(){var K=this;if(typeof K=="object"&&K.length){K={url:""+K}}m(t.clip,function(L,M){if(M!==undefined&&K[L]===undefined&&typeof M!="function"){K[L]=M}});t.playlist[I]=K;K=new h(K,I,w);F.push(K);I++});m(t,function(K,L){if(typeof L=="function"){if(s[K]){s[K](L)}else{j(x,K,L)}delete t[K]}});m(t.plugins,function(K,L){if(L){y[K]=new l(K,L,w)}});if(!t.plugins||t.plugins.controls===undefined){y.controls=new l("controls",null,w)}y.canvas=new l("canvas",null,w);u=q.innerHTML;function J(L){var K=w.hasiPadSupport&&w.hasiPadSupport();if(/iPad|iPhone|iPod/i.test(navigator.userAgent)&&!/.flv$/i.test(F[0].url)&&!K){return true}if(!w.isLoaded()&&w._fireEvent("onBeforeClick")!==false){w.load()}return f(L)}function H(){if(u.replace(/\s/g,"")!==""){if(q.addEventListener){q.addEventListener("click",J,false)}else{if(q.attachEvent){q.attachEvent("onclick",J)}}}else{if(q.addEventListener){q.addEventListener("click",f,false)}w.load()}}setTimeout(H,0)}if(typeof q=="string"){var z=c(q);if(!z){throw"Flowplayer cannot access element: "+q}q=z;B()}else{B()}}var a=[];function d(o){this.length=o.length;this.each=function(p){m(o,p)};this.size=function(){return o.length}}window.flowplayer=window.$f=function(){var p=null;var o=arguments[0];if(!arguments.length){m(a,function(){if(this.isLoaded()){p=this;return false}});return p||a[0]}if(arguments.length==1){if(typeof o=="number"){return a[o]}else{if(o=="*"){return new d(a)}m(a,function(){if(this.id()==o.id||this.id()==o||this.getParent()==o){p=this;return false}});return p}}if(arguments.length>1){var t=arguments[1],q=(arguments.length==3)?arguments[2]:{};if(typeof t=="string"){t={src:t}}t=i({bgcolor:"#000000",version:[9,0],expressInstall:"http://static.flowplayer.org/swf/expressinstall.swf",cachebusting:true},t);if(typeof o=="string"){if(o.indexOf(".")!=-1){var s=[];m(n(o),function(){s.push(new b(this,k(t),k(q)))});return new d(s)}else{var r=c(o);return new b(r!==null?r:o,t,q)}}else{if(o){return new b(o,t,q)}}}return null};i(window.$f,{fireEvent:function(){var o=[].slice.call(arguments);var q=$f(o[0]);return q?q._fireEvent(o.slice(1)):null},addPlugin:function(o,p){b.prototype[o]=p;return $f},each:m,extend:i});if(typeof jQuery=="function"){jQuery.fn.flowplayer=function(q,p){if(!arguments.length||typeof arguments[0]=="number"){var o=[];this.each(function(){var r=$f(this);if(r){o.push(r)}});return arguments.length?o[arguments[0]]:new d(o)}return this.each(function(){$f(this,k(q),p?k(p):{})})}}})();(function(){var h=document.all,j="http://www.adobe.com/go/getflashplayer",c=typeof jQuery=="function",e=/(\d+)[^\d]+(\d+)[^\d]*(\d*)/,b={width:"100%",height:"100%",id:"_"+(""+Math.random()).slice(9),allowfullscreen:true,allowscriptaccess:"always",quality:"high",version:[3,0],onFail:null,expressInstall:null,w3c:false,cachebusting:false};if(window.attachEvent){window.attachEvent("onbeforeunload",function(){__flash_unloadHandler=function(){};__flash_savedUnloadHandler=function(){}})}function i(m,l){if(l){for(var f in l){if(l.hasOwnProperty(f)){m[f]=l[f]}}}return m}function a(f,n){var m=[];for(var l in f){if(f.hasOwnProperty(l)){m[l]=n(f[l])}}return m}window.flashembed=function(f,m,l){if(typeof f=="string"){f=document.getElementById(f.replace("#",""))}if(!f){return}if(typeof m=="string"){m={src:m}}return new d(f,i(i({},b),m),l)};var g=i(window.flashembed,{conf:b,getVersion:function(){var m,f;try{f=navigator.plugins["Shockwave Flash"].description.slice(16)}catch(o){try{m=new ActiveXObject("ShockwaveFlash.ShockwaveFlash.7");f=m&&m.GetVariable("$version")}catch(n){try{m=new ActiveXObject("ShockwaveFlash.ShockwaveFlash.6");f=m&&m.GetVariable("$version")}catch(l){}}}f=e.exec(f);return f?[f[1],f[3]]:[0,0]},asString:function(l){if(l===null||l===undefined){return null}var f=typeof l;if(f=="object"&&l.push){f="array"}switch(f){case"string":l=l.replace(new RegExp('(["\\\\])',"g"),"\\$1");l=l.replace(/^\s?(\d+\.?\d+)%/,"$1pct");return'"'+l+'"';case"array":return"["+a(l,function(o){return g.asString(o)}).join(",")+"]";case"function":return'"function()"';case"object":var m=[];for(var n in l){if(l.hasOwnProperty(n)){m.push('"'+n+'":'+g.asString(l[n]))}}return"{"+m.join(",")+"}"}return String(l).replace(/\s/g," ").replace(/\'/g,'"')},getHTML:function(o,l){o=i({},o);var n='<object width="'+o.width+'" height="'+o.height+'" id="'+o.id+'" name="'+o.id+'"';if(o.cachebusting){o.src+=((o.src.indexOf("?")!=-1?"&":"?")+Math.random())}if(o.w3c||!h){n+=' data="'+o.src+'" type="application/x-shockwave-flash"'}else{n+=' classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"'}n+=">";if(o.w3c||h){n+='<param name="movie" value="'+o.src+'" />'}o.width=o.height=o.id=o.w3c=o.src=null;o.onFail=o.version=o.expressInstall=null;for(var m in o){if(o[m]){n+='<param name="'+m+'" value="'+o[m]+'" />'}}var p="";if(l){for(var f in l){if(l[f]){var q=l[f];p+=f+"="+(/function|object/.test(typeof q)?g.asString(q):q)+"&"}}p=p.slice(0,-1);n+='<param name="flashvars" value=\''+p+"' />"}n+="</object>";return n},isSupported:function(f){return k[0]>f[0]||k[0]==f[0]&&k[1]>=f[1]}});var k=g.getVersion();function d(f,n,m){if(g.isSupported(n.version)){f.innerHTML=g.getHTML(n,m)}else{if(n.expressInstall&&g.isSupported([6,65])){f.innerHTML=g.getHTML(i(n,{src:n.expressInstall}),{MMredirectURL:location.href,MMplayerType:"PlugIn",MMdoctitle:document.title})}else{if(!f.innerHTML.replace(/\s/g,"")){f.innerHTML="<h2>Flash version "+n.version+" or greater is required</h2><h3>"+(k[0]>0?"Your version is "+k:"You have no flash plugin installed")+"</h3>"+(f.tagName=="A"?"<p>Click here to download latest version</p>":"<p>Download latest version from <a href='"+j+"'>here</a></p>");if(f.tagName=="A"){f.onclick=function(){location.href=j}}}if(n.onFail){var l=n.onFail.call(this);if(typeof l=="string"){f.innerHTML=l}}}}if(h){window[n.id]=document.getElementById(n.id)}i(this,{getRoot:function(){return f},getOptions:function(){return n},getConf:function(){return m},getApi:function(){return f.firstChild}})}if(c){jQuery.tools=jQuery.tools||{version:"3.2.4"};jQuery.tools.flashembed={conf:b};jQuery.fn.flashembed=function(l,f){return this.each(function(){$(this).data("flashembed",flashembed(this,l,f))})}}})();
\ No newline at end of file
diff --git a/content/static/script/flowplayer-3.2.5.swf b/content/static/script/flowplayer-3.2.5.swf
new file mode 100644
index 000000000..c9ff79a7d
Binary files /dev/null and b/content/static/script/flowplayer-3.2.5.swf differ
diff --git a/content/static/script/flowplayer.controls-3.2.3.swf b/content/static/script/flowplayer.controls-3.2.3.swf
new file mode 100644
index 000000000..190b5bea7
Binary files /dev/null and b/content/static/script/flowplayer.controls-3.2.3.swf differ
diff --git a/content/static/script/ie-html5.js b/content/static/script/ie-html5.js
new file mode 100644
index 000000000..3587bf734
--- /dev/null
+++ b/content/static/script/ie-html5.js
@@ -0,0 +1,6 @@
+// html5shiv MIT @rem remysharp.com/html5-enabling-script
+// iepp v1.6.2 MIT @jon_neal iecss.com/print-protector
+/*@cc_on(function(m,c){var z="abbr|article|aside|audio|canvas|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video";function n(d){for(var a=-1;++a<o;)d.createElement(i[a])}function p(d,a){for(var e=-1,b=d.length,j,q=[];++e<b;){j=d[e];if((a=j.media||a)!="screen")q.push(p(j.imports,a),j.cssText)}return q.join("")}var g=c.createElement("div");g.innerHTML="<z>i</z>";if(g.childNodes.length!==1){var i=z.split("|"),o=i.length,s=RegExp("(^|\\s)("+z+")",
+"gi"),t=RegExp("<(/*)("+z+")","gi"),u=RegExp("(^|[^\\n]*?\\s)("+z+")([^\\n]*)({[\\n\\w\\W]*?})","gi"),r=c.createDocumentFragment(),k=c.documentElement;g=k.firstChild;var h=c.createElement("body"),l=c.createElement("style"),f;n(c);n(r);g.insertBefore(l,
+g.firstChild);l.media="print";m.attachEvent("onbeforeprint",function(){var d=-1,a=p(c.styleSheets,"all"),e=[],b;for(f=f||c.body;(b=u.exec(a))!=null;)e.push((b[1]+b[2]+b[3]).replace(s,"$1.iepp_$2")+b[4]);for(l.styleSheet.cssText=e.join("\n");++d<o;){a=c.getElementsByTagName(i[d]);e=a.length;for(b=-1;++b<e;)if(a[b].className.indexOf("iepp_")<0)a[b].className+=" iepp_"+i[d]}r.appendChild(f);k.appendChild(h);h.className=f.className;h.innerHTML=f.innerHTML.replace(t,"<$1font")});m.attachEvent("onafterprint",
+function(){h.innerHTML="";k.removeChild(h);k.appendChild(f);l.styleSheet.cssText=""})}})(this,document);@*/
\ No newline at end of file
diff --git a/content/static/script/jquery.dataset.js b/content/static/script/jquery.dataset.js
new file mode 100644
index 000000000..7b87359de
--- /dev/null
+++ b/content/static/script/jquery.dataset.js
@@ -0,0 +1,167 @@
+/// jquery.dataset v0.1.0 -- HTML5 dataset jQuery plugin
+/// http://orangesoda.net/jquery.dataset.html
+
+/// Copyright (c) 2009, Ben Weaver.  All rights reserved.
+/// This software is issued "as is" under a BSD license
+/// <http://orangesoda.net/license.html>.  All warrenties disclaimed.
+
+///  The HTML5 specification allows elements to have custom data
+///  attributes that are prefixed with `data-'.  They may be
+///  conveniently accessed through an element's `dataset' property.
+///  This plugin provides similar functionality.
+///
+///  The methods in the plugin are designed to be similar to the
+///  built-in `attr' and `data' methods.  All names are without the
+///  `data-' prefix.
+//
+///  These methods are defined:
+///
+///    dataset()
+///      Return an object with all custom attribute (name, value) items.
+///
+///    dataset(name)
+///      Return the value of the attribute `data-NAME'.
+///
+///    dataset(name, value)
+///      Set the value of attribtue `data-NAME' to VALUE.
+///
+///    dataset({...})
+///      Set many custom attributes at once.
+///
+///    removeDataset(name)
+///      Remove the attribute `data-NAME'.
+///
+///    removeDataset([n1, n2, ...])
+///      Remove the attributes `data-N1', `data-N2', ...
+
+(function($) {
+     var PREFIX = 'data-',
+	 PATTERN = /^data\-(.*)$/;
+
+     function dataset(name, value) {
+	 if (value !== undefined) {
+	     // dataset(name, value): set the NAME attribute to VALUE.
+	     return this.attr(PREFIX + name, value);
+	 }
+
+	 switch (typeof name) {
+	 case 'string':
+	     // dataset(name): get the value of the NAME attribute.
+	     return this.attr(PREFIX + name);
+
+	 case 'object':
+	     // dataset(items): set the values of all (name, value) items.
+	     return set_items.call(this, name);
+
+	 case 'undefined':
+	     // dataset(): return a mapping of (name, value) items for the
+	     // first element.
+	     return get_items.call(this);
+
+	 default:
+	     throw 'dataset: invalid argument ' + name;
+	 }
+     }
+
+     function get_items() {
+	 return this.foldAttr(function(index, attr, result) {
+	     var match = PATTERN.exec(this.name);
+	     if (match) result[match[1]] = this.value;
+	 });
+     }
+
+     function set_items(items) {
+	 for (var key in items) {
+	     this.attr(PREFIX + key, items[key]);
+	 }
+	 return this;
+     }
+
+     function remove(name) {
+	 if (typeof name == 'string') {
+	     // Remove a single attribute;
+	     return this.removeAttr(PREFIX + name);
+	 }
+	 return remove_names(name);
+     }
+
+     function remove_names(obj) {
+	 var idx, length = obj && obj.length;
+
+	 // For any object, remove attributes named by the keys.
+	 if (length === undefined) {
+	     for (idx in obj) {
+		 this.removeAttr(PREFIX + idx);
+	     }
+	 }
+	 // For an array, remove attributes named by the values.
+	 else {
+	     for (idx = 0; idx < length; idx++) {
+		 this.removeAttr(PREFIX + obj[idx]);
+	     }
+	 }
+
+	 return this;
+     }
+
+     $.fn.dataset = dataset;
+     $.fn.removeDataset = remove_names;
+
+})(jQuery);
+
+(function($) {
+
+     function each_attr(proc) {
+	 if (this.length > 0) {
+	     $.each(this[0].attributes, proc);
+	 }
+	 return this;
+     }
+
+     function fold_attr(proc, acc) {
+	 return fold((this.length > 0) && this[0].attributes, proc, acc);
+     }
+
+     /*
+      * A left-fold operator. The behavior is the same as $.each(),
+      * but the callback is called with the accumulator as the third
+      * argument.  The default accumulator is an empty object.
+      */
+     function fold(object, proc, acc) {
+	 var length = object && object.length;
+
+	 // The default accumulator is an empty object.
+	 if (acc === undefined) acc = {};
+
+	 // Returning an empty accumulator when OBJECT is "false"
+	 // makes FOLD more composable.
+	 if (!object) return acc;
+
+	 // Check to see if OBJECT is an array.
+	 if (length !== undefined) {
+	     for (var i = 0, value = object[i];
+		  (i < length) && (proc.call(value, i, value, acc) !== false);
+		  value = object[++i])
+	     { }
+	 }
+	 // Object is a map of (name, value) items.
+	 else {
+	     for (var name in object) {
+		 if (proc.call(object[name], name, object[name], acc) === false) break;
+	     }
+	 }
+
+	 return acc;
+     }
+
+     function fold_jquery(proc, acc) {
+	 if (acc === undefined) acc = [];
+	 return fold(this, proc, acc);
+     }
+
+     $.fn.eachAttr = each_attr;
+     $.fn.foldAttr = fold_attr;
+     $.fn.fold = fold_jquery;
+     $.fold = fold;
+
+})(jQuery);
diff --git a/content/static/script/play-resources.js b/content/static/script/play-resources.js
new file mode 100644
index 000000000..bedff055d
--- /dev/null
+++ b/content/static/script/play-resources.js
@@ -0,0 +1,176 @@
+function addButton(container, res) {
+    var button = $('<a class="play" title="Abspielen"></a>');
+    if (res.poster) {
+	var img = $('<img class="poster"/>');
+	img.attr('src', res.poster);
+	if (res.preview) {
+	    button.mouseover(function() {
+		img.attr('src', res.preview);
+	    });
+	    button.mouseout(function() {
+		img.attr('src', res.poster);
+	    });
+	}
+	button.append(img);
+    } else {
+	/* No poster */
+	button.text('▶ Play');
+    }
+
+    button.click(function() {
+	button.remove();
+
+	addPlayer(container, res);
+    });
+    container.append(button);
+}
+
+function addPlayer(container, res) {
+    var types = res.map(function(res) {
+			    return res.type;
+			});
+    /* Can we have <audio> or <video> please?
+     *
+     * Video must be prefered over audio because <audio> can play
+     * videos too.
+     */
+    var html5player;
+    if (types.some(canPlayVideo)) {
+	html5player = $('<video controls="controls" autoplay="autoplay"></video>');
+    } else if (types.some(canPlayAudio)) {
+	html5player = $('<audio controls="controls" autoplay="autoplay"></audio>');
+    }
+    /* ...install sources */
+    if (html5player) {
+	res.forEach(function(r) {
+	    var src = $('<source/>');
+	    src.attr('src', r.href);
+	    src.attr('type', r.type);
+	    html5player.append(src);
+	});
+    }
+
+    /* Anything else than HTML5? */
+    var fallback;
+    res.forEach(function(r) {
+	if (fallback)  /* Got one already */
+	    return;
+
+	if (r.type === 'audio/mpeg') {
+	    var movie = '/script/dewplayer-mini.swf?showtime=1&amp;autostart=1&amp;mp3=' + r.href;
+	    fallback = $('<object type="application/x-shockwave-flash" width="150" height="20">' +
+		'<param name="wmode" value="transparent"/>' +
+		'<param name="allowScriptAccess" value="always"/>' +
+		'<param name="movie"/>' +
+		'</object>');
+	    fallback.attr('data', movie);
+	    fallback.find('param[name="movie"]').attr('value', movie);
+	} else if (r.type === 'video/x-flv') {
+	    /* Create unique id for multiple containers on one page */
+	    var containerId = 'flowplayer' + Math.round(Math.random() * 9999);
+	    fallback = $('<div>Moment bitte</div>');
+	    fallback.attr('id', containerId);
+	    /* Defer loading because fallback needs to be appended first, and we want that .js on demand anyway */
+	    window.setTimeout(function() {
+		loadFlowplayer(function() {
+		    fallback.text('');
+		    flowplayer(containerId, { src: '/script/flowplayer-3.2.5.swf' },
+			       { clip: r.href });
+		});
+	    }, 1);
+	}
+    });
+
+    /* Add stuff to page */
+    if (html5player) {
+	if (fallback)
+	    html5player.append(fallback);
+	container.append(html5player);
+    } else if (fallback) {
+	container.append(fallback);
+    } else {
+	container.append('<p>Upps, das musst du wohl erstmal herunterladen</p>');
+    }
+}
+
+$(document).ready(function() {
+    /* Iterate over all resources in HTML output */
+    $('.resource').each(function() {
+	var resource = { href: $(this).find('a').attr('href'),
+			 type: $(this).find('a').attr('type') };
+	var poster = $(this).dataset('poster');
+	var preview = $(this).dataset('preview');
+
+	/* Get all associated alternatives */
+	var alternativeEls = $(this).nextUntil('.resource');
+	var alternatives = alternativeEls.find('a').
+	    map(function() {
+		    return { href: $(this).attr('href'),
+			     type: $(this).attr('type') };
+		}).
+	    toArray();
+
+	var res = [resource].concat(alternatives);
+	if (poster)
+	    res.poster = poster;
+	if (preview)
+	    res.preview = preview;
+
+	/* Check playability */
+	if (res.map(function(r) {
+			return r.type;
+		    }).some(canPlay)) {
+	    var liEl = $('<li></li>');
+	    $(this).before(liEl);
+	    var player = addButton(liEl, res);
+	}
+    });
+});
+
+function canPlay(type) {
+    return canPlayAudio(type) ||
+	canPlayVideo(type) ||
+	canFallback(type);
+}
+
+/**
+ * From http://diveintohtml5.org/everything.html
+ */
+function canPlayAudio(type) {
+    var a = document.createElement('audio');
+    return !!(a.canPlayType &&
+	      a.canPlayType(type).replace(/no/, ''));
+}
+
+/**
+ * Partially from http://diveintohtml5.org/everything.html
+ *
+ * But we don't want audio/* as <video>
+ */
+function canPlayVideo(type) {
+    var v = document.createElement('video');
+    return !!(v.canPlayType &&
+	      v.canPlayType(type).replace(/no/, '') &&
+	      !(/^audio\//.test(type)));
+}
+
+function canFallback(type) {
+    return type === 'audio/mpeg' ||
+	type === 'video/x-flv';
+}
+
+function loadFlowplayer(cb) {
+    if (window.flowplayer)
+	cb();
+    else {
+	var playerScript = $('<script type="text/javascript" src="/script/flowplayer-3.2.4.min.js"></script>');
+	$(document).append(playerScript);
+	/* Cannot use load event because it won't work if when cached */
+	var interval = window.setInterval(function() {
+	    if (window.flowplayer) {
+		window.clearInterval(interval);
+		cb();
+	    }
+	}, 100);
+    }
+}
diff --git a/content/static/style/default.css b/content/static/style/default.css
index 4be34c4d1..6e7ed2b4e 100644
--- a/content/static/style/default.css
+++ b/content/static/style/default.css
@@ -15,12 +15,10 @@ pre {
 
 /* -- Logo -- */
 #logo::before {
-  background: transparent url(../images/top-right.png) scroll no-repeat top right;
   margin-bottom: -20px;
   height: 30px;
   display: block;
   border: none;
-  content: url(../images/top-left.png);
   padding: 0;
   line-height: 0.1em;
   font-size: 1px;
@@ -31,24 +29,33 @@ pre {
   height: 150px;
   background: url(../images/c3d2_blue.jpg);
   text-align: left;
+  border-top-left-radius: 30px;
+  -moz-border-radius-topleft: 30px;
+  -webkit-border-top-left-radius: 30px;
+  border-top-right-radius: 30px;
+  -moz-border-radius-topright: 30px;
+  -webkit-border-top-right-radius: 30px;
 }
 
 #logo h1 {
   position: relative;
-  top: 23px;
+  top: 47px;
   left: 23px;
   padding: 65px 0 0 0;
   overflow: hidden;
   background-image: url(../images/logo.png);
   background-repeat: no-repeat;
   height: 0px !important;
-  height /**/:65px;
 }
 
 /* -- Body -- */
 #body {
   display: block;
-  float: left;
+  border: thin solid #ccc;
+  border-top: none;
+  background-color: white;
+  margin: 0 2em 0 2em;
+  background: #fff url(../images/background_bottom.png) no-repeat left bottom;
 }
 
 /* -- Navigation -- */
@@ -56,9 +63,9 @@ pre {
 #navigation {
   float: left;
   text-align: left; 
-  width: 12%;
-  margin-left: 2em; 
-  padding: 1em;
+  width: 14em;
+  margin: 0;
+  padding: 0 1em;
   padding-top: 100px;
   background: url(../images/ck.png) top center no-repeat;
 }
@@ -99,13 +106,13 @@ pre {
 /* -- Content -- */
 #content {
   text-align: left;
-  float: left;
-  width: 50%;
   border-left: #ccc 1.1px dashed; 
   border-right: #ccc 1.1px dashed; 
   line-height: 1.3em;
   padding: 2em;
-  min-height: 200px;
+  min-height: 300px;
+  min-width: 30em;
+  margin: 0 24em 0 16em;
 }
 
 #content p {
@@ -158,7 +165,7 @@ pre {
 
 #content hr.news {
   visibility: hidden;
-  clear: both;
+  /*clear: both;*/
 }
 
 #content div.news {
@@ -210,17 +217,21 @@ pre {
   padding-right: 4px;
 }
 
+/* -- Sidebar right -- */
+#rsidebar {
+  width: 24em;
+  float: right;
+  margin: 0;
+  padding: 0;
+  font-size: small;
+  text-align: left;
+}
+
 /* -- News -- */
 #news {
-  text-align: left;
-  float: right;
-  margin-right: 1em;
-  margin-left: -5%;
-  width: 19%;
   background: url(../images/pesthoernchen.png) top center no-repeat;
   padding: 2em;
   padding-top: 90px;
-  font-size: small;
 }
 
 #news h2 {
@@ -254,13 +265,7 @@ pre {
 
 /* -- Upcoming -- */
 #upcoming {
-  text-align: left;
-  float: right;
-  margin-right: 1em;
-  margin-left: -5%;
-  width: 19%;
-  padding: 2em;
-  font-size: small;
+  padding: 1.5em;
 }
 
 #upcoming h2 {
@@ -273,7 +278,6 @@ pre {
   list-style-type: none;
   font-size: small;
   margin-left: -1em;
-  max-width: 10em !important;
 }
 
 #upcoming ul li {
@@ -302,12 +306,9 @@ pre {
 
 /* -- footer -- */
 #footer {
-  margin: 0 2em 2em 2em;
+  margin: 0 2em;
   text-align: center;
   font-size: small;
-  border: #ccc 1px solid;
-  border-top: none;
-  background: #fff url(../images/background_bottom.png) no-repeat left bottom;
 }
 
 #footer ul, #footer li {
@@ -520,6 +521,15 @@ a[href$=".mkv"].mime:before {
 a[href$=".m4v"].mime:before {
   content: url(../images/mime/video.png);
 }
+a[href$=".ogv"].mime:before {
+  content: url(../images/mime/video.png);
+}
+a[href$=".webm"].mime:before {
+  content: url(../images/mime/video.png);
+}
+a[href$=".flv"].mime:before {
+  content: url(../images/mime/video.png);
+}
 a[href$=".tar"].mime:before {
   content: url(../images/mime/pkg.png);
 }
@@ -576,6 +586,19 @@ a[href$="calendar.html"]:before {
   padding-right: 0.3em;
 }
 
+li audio, li video, li .poster {
+  max-width: 100%;
+  margin: 0;
+  padding: 0;
+  color: #333;
+  background-color: white;
+}
+
+.play {
+    cursor: pointer;
+    font-weight: bold;
+}
+
 /* -- Search Engine -- */
 div.search div.estform {
   margin: 0.8em 1.0em; padding: 0em 1.0em;
@@ -746,6 +769,8 @@ p.blockquote {
         background-color: #fafafa;
 }
 
+/* -- Flattr button -- */
+
 a.flattr {
     content: url(../images/flattrthis.png);
     opacity: 0.8;
@@ -757,3 +782,9 @@ a.flattr:hover {
     text-decoration: none;    
     border-bottom: none;
 }
+
+/* CSS reset for deficient HTML5 support */
+article,aside,details,figcaption,figure,
+footer,header,hgroup,menu,nav,section {
+    display: block;
+}
\ No newline at end of file
diff --git a/dtd/c3d2web.dtd b/dtd/c3d2web.dtd
index 7baaa3b90..98dae6eb9 100644
--- a/dtd/c3d2web.dtd
+++ b/dtd/c3d2web.dtd
@@ -29,6 +29,8 @@
   hide      (yes|no)  #IMPLIED
   title     CDATA   #IMPLIED
   url       %URI;   #REQUIRED
+  poster    %URI;   #IMPLIED
+  preview   %URI;   #IMPLIED
   >
 
 <!ELEMENT alternative EMPTY>
diff --git a/scripts/ds2010-resources.js b/scripts/ds2010-resources.js
new file mode 100644
index 000000000..2ad6a5855
--- /dev/null
+++ b/scripts/ds2010-resources.js
@@ -0,0 +1,95 @@
+var ltx = require('ltx');
+var http = require('http');
+var fs = require('fs');
+var url = require('url');
+
+
+var running = 0, queue = [];
+
+function resolveSizes(urls, cb) {
+    if (running > 0) {
+	queue.push(function() {
+	    resolveSizes(urls, cb);
+	});
+	return;
+    }
+    running++;
+
+    urls = urls.map(url.parse);
+    var cl = http.createClient(urls[0].port || 80, urls[0].hostname);
+
+    var pending = 0, results = [],
+	done = function() {
+	    if (pending < 1) {
+		cb(results);
+
+		running--;
+		var f = queue.shift();
+		f && f();
+	    }
+	};
+
+    urls.forEach(function(u) {
+	var req = cl.request('HEAD', u.pathname, { Host: u.host });
+	req.end();
+	req.on('response', function(res) {
+	    if (res.statusCode === 200)
+		results.push({ url: url.format(u),
+			       size: res.headers['content-length'] });
+	    pending--;
+	    done();
+	});
+	pending++;
+    });
+    done();
+}
+
+function mimeByExt(url) {
+    var ext = url.split('.').pop();
+    var type = ({ mp4: 'video/mp4',
+		  webm: 'video/webm',
+		  ogv: 'video/ogg',
+		  flv: 'video/x-flv' })[ext];
+    return type || 'application/octet-stream';
+}
+
+var scheduleFile = fs.readFileSync('content/static/datenspuren/fahrplan/schedule.xml');
+var schedule = ltx.parse(scheduleFile);
+schedule.getChildren('day').forEach(function(dayEl) {
+    dayEl.getChildren('room').forEach(function(roomEl) {
+	roomEl.getChildren('event').forEach(function(eventEl) {
+	    var id = eventEl.attrs.id;
+	    var title = eventEl.getChildText('title');
+
+	    var base = 'http://ftp.c3d2.de/datenspuren/2010/ds2010_' + id + '.';
+	    /*var base = 'http://ftp.ccc.de/regional/dresden/datenspuren/2010/ds2010_' + id + '.';*/
+	    var urls = ['mp4', 'webm', 'ogv', 'flv'].map(function(fmt) {
+		return base + fmt;
+	    });
+	    resolveSizes(urls, function(infos) {
+		infos = infos.filter(function(i) {
+		    return i.size !== undefined;
+		});
+
+		if (infos.length < 1)
+		    return;
+
+		var res = new ltx.Element('resource',
+					  { title: 'DS2010: ' + title,
+					    size: infos[0].size,
+					    type: mimeByExt(infos[0].url),
+					    url: infos[0].url,
+					    preview: base + 'gif',
+					    poster: base + 'jpg',
+					    hide: 'yes' });
+		infos.slice(1).forEach(function(info) {
+		    res.c('alternative', { size: info.size,
+					   type: mimeByExt(info.url),
+					   url: info.url });
+		});
+		console.info(res.toString());
+	    });
+	});
+    });
+});
+
diff --git a/scripts/encode_gif.sh b/scripts/encode_gif.sh
new file mode 100755
index 000000000..08d798912
--- /dev/null
+++ b/scripts/encode_gif.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+if=$1
+of=`basename "$if"|sed -e 's/\..\+//'`
+
+#~/ffmpeg/
+ffmpeg -i "$if" -ss 10 -r 0.004 -b 100k -bt 100000k -s 360x202 "$of.%05d.jpg" && \
+convert -delay 50 -loop 0 "$of.?????.jpg" "$of.gif" && \
+mv "$of.00001.jpg" "$of.jpg" && \
+rm "$of".?????.jpg
diff --git a/scripts/encode_mp4.sh b/scripts/encode_mp4.sh
new file mode 100755
index 000000000..e58a7b813
--- /dev/null
+++ b/scripts/encode_mp4.sh
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+if=$1
+of=`basename "$1"|sed -e 's/.avi/.mp4/'`
+
+schedtool -De \
+        ~/ffmpeg/ffmpeg -i "$if" \
+        -threads 2 \
+        -f mp4 \
+        -an \
+        -vcodec libx264 \
+        -vpre slower_firstpass \
+        -b 800k \
+        -bt 800k \
+        -s 720x406 \
+        -pass 1 \
+        -passlogfile "$of.ffmpeg2pass" \
+        -y \
+        /dev/null && \
+schedtool -De \
+        ~/ffmpeg/ffmpeg -i "$if" \
+        -threads 2 \
+        -f mp4 \
+        -acodec libmp3lame \
+        -ab 160k \
+        -vcodec libx264 \
+        -vpre slower \
+        -b 800k \
+        -bt 800k \
+        -s 720x406 \
+        -pass 2 \
+        -passlogfile "$of.ffmpeg2pass" \
+        -y \
+        "$of"
+
diff --git a/scripts/encode_webm.sh b/scripts/encode_webm.sh
new file mode 100755
index 000000000..a221cba35
--- /dev/null
+++ b/scripts/encode_webm.sh
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+if=$1
+of=`basename "$1"|sed -e 's/.avi/.webm/'`
+
+if [ ! -f "$of.ffmpeg2pass" ]; then
+	schedtool -De \
+		~/ffmpeg/ffmpeg -i "$if" \
+		-threads 4 \
+		-f webm \
+		-an \
+		-vcodec libvpx \
+		-b 400k \
+		-bt 400k \
+		-s 720x405 \
+		-pass 1 \
+		-passlogfile "$of.ffmpeg2pass" \
+		-y \
+		/dev/null || exit 1
+fi
+schedtool -De \
+        ~/ffmpeg/ffmpeg -i "$if" \
+        -threads 4 \
+        -f webm \
+        -acodec libvorbis \
+        -ab 160k \
+        -vcodec libvpx \
+        -b 400k \
+        -bt 400k \
+        -s 720x405 \
+        -pass 2 \
+        -passlogfile "$of.ffmpeg2pass" \
+        -y \
+        "$of" || exit 1
+
diff --git a/scripts/validate_xhtml5.sh b/scripts/validate_xhtml5.sh
new file mode 100755
index 000000000..6d0e6abda
--- /dev/null
+++ b/scripts/validate_xhtml5.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+text=$(curl -s -d @$1 -H "Content-Type: application/xhtml+xml; charset=UTF-8" 'http://validator.nu/?out=text&preset=http://s.validator.nu/xhtml5-aria-rdf-svg-mathml.rnc+http://s.validator.nu/html5/assertions.sch+http://c.validator.nu/all/')
+
+if [ -n "$(echo "$text"|grep "The document validates according to the specified schema(s).")" ]; then
+    exit 0
+else
+    echo "=== $1 ==="
+    echo "$text"
+    exit 1
+fi
+
diff --git a/xsd/c3d2web.xsd b/xsd/c3d2web.xsd
index d3e9f52e2..95efd86ef 100644
--- a/xsd/c3d2web.xsd
+++ b/xsd/c3d2web.xsd
@@ -64,6 +64,8 @@
       <xs:attribute name="hide" type="xs:string" use="optional"/>
       <xs:attribute name="title" type="xs:string" use="optional"/>
       <xs:attribute name="url" type="xs:anyURI" use="required"/>
+      <xs:attribute name="poster" type="xs:anyURI" use="optional"/>
+      <xs:attribute name="preview" type="xs:anyURI" use="optional"/>
     </xs:complexType>
   </xs:element>
   <xs:element name="alternative">
diff --git a/xsl/calendar.xsl b/xsl/calendar.xsl
index e8aa93ad9..ebaeb6f94 100644
--- a/xsl/calendar.xsl
+++ b/xsl/calendar.xsl
@@ -9,7 +9,7 @@
 <xsl:include href="ddate.xsl" />
 
 <xsl:template match="/page/calendar-summary">
-  <table border="0" class="calendar">
+  <table class="calendar">
     <tr>
       <th>Montag</th>
       <th>Dienstag</th>
diff --git a/xsl/common.xsl b/xsl/common.xsl
index 1cbc9c828..b64261532 100644
--- a/xsl/common.xsl
+++ b/xsl/common.xsl
@@ -53,8 +53,16 @@
   </xsl:template>
 
   <xsl:template match="image">
+    <xsl:variable name="path">
+      <xsl:call-template name="normalize-path">
+	<xsl:with-param name="path">
+	  <xsl:value-of select="string(.)"/>
+	</xsl:with-param>
+      </xsl:call-template>
+    </xsl:variable>
+
     <img
-      src="{.}"
+      src="{$path}"
       title="{@title}"
       alt="{@title}"
       class="{@class}"/>
@@ -312,6 +320,8 @@
       <xsl:when test="$mime = 'video/ogg'">Ogg Media Video</xsl:when>
       <xsl:when test="$mime = 'video/x-matroska'">Matroska Video</xsl:when>
       <xsl:when test="$mime = 'video/x-m4v'">iTunes Video File</xsl:when>
+      <xsl:when test="$mime = 'video/webm'">WebM Video</xsl:when>
+      <xsl:when test="$mime = 'video/x-flv'">Flash Video</xsl:when>
       <xsl:when test="$mime = 'application/x-gtar'">Komprimierter Tarball</xsl:when>
       <xsl:when test="$mime = 'application/x-tar'">Tarball</xsl:when>
       <xsl:when test="$mime = 'application/x-bittorrent'">BitTorrent-Metainformationen</xsl:when>
@@ -321,4 +331,37 @@
     </xsl:choose>
   </xsl:template>
 
+  <xsl:template name="normalize-path">
+    <xsl:param name="path"/>
+
+    <xsl:choose>
+      <xsl:when test="contains($path, '/')">
+	<xsl:variable name="dir1" select="substring-before($path, '/')"/>
+	<xsl:variable name="dir2" select="substring-after($path, '/')"/>
+	<xsl:choose>
+	  <xsl:when test="starts-with($dir2, '../')">
+	    <!-- recurse with xxx/../ removed -->
+	    <xsl:call-template name="normalize-path">
+	      <xsl:with-param name="path">
+		<xsl:value-of select="substring-after($dir2, '../')"/>
+	      </xsl:with-param>
+	    </xsl:call-template>
+	  </xsl:when>
+	  <xsl:otherwise>
+	    <!-- spit out and recurse with tail -->
+	    <xsl:value-of select="$dir1"/><xsl:text>/</xsl:text><xsl:call-template name="normalize-path">
+	      <xsl:with-param name="path">
+		<xsl:value-of select="$dir2"/>
+	      </xsl:with-param>
+	    </xsl:call-template>
+	  </xsl:otherwise>
+	</xsl:choose>
+      </xsl:when>
+      <xsl:otherwise>
+	<!-- just a filename with no / -->
+	<xsl:value-of select="$path"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
 </xsl:stylesheet>
diff --git a/xsl/datenspuren/xhtml.xsl b/xsl/datenspuren/xhtml5.xsl
similarity index 97%
rename from xsl/datenspuren/xhtml.xsl
rename to xsl/datenspuren/xhtml5.xsl
index 748eb9517..b476205d3 100644
--- a/xsl/datenspuren/xhtml.xsl
+++ b/xsl/datenspuren/xhtml5.xsl
@@ -10,12 +10,12 @@
   <xsl:output method="xml" 
               version="1.0" 
               encoding="utf-8" 
-              doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
-              doctype-system="DTD/xhtml1-strict.dtd"
               indent="yes"/>
   <xsl:strip-space elements="p ul td"/> 
 
   <xsl:template match="/page">
+    <xsl:text disable-output-escaping="yes">&lt;!DOCTYPE html&gt;
+</xsl:text>
 
     <xsl:variable name="title">
       <xsl:choose>
@@ -65,7 +65,7 @@
         <xsl:value-of select="x:h1"/>
       </h2>
 
-      <table cellpadding="4" cellspacing="6" class="schedule">
+      <table class="schedule">
         <tr>
           <xsl:for-each select="x:table/x:thead/x:tr/x:th">
             <th>
@@ -142,7 +142,7 @@
   <xsl:template name="htmlhead">
     <xsl:param name="title"/>
     <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+      <meta charset="utf-8" />
       <meta name="description" content="Symposium Datenspuren - Privatsphäre war gestern, 2010, Kulturzentrum Scheune, veranstaltet vom Chaos Computer Club Dresden" />
       <meta name="keywords" content="Symposium Datenspuren,c3d2,Chaos Computer Club,CCC,Dresden,Datenschutz,Privatsphäre,Anonymität,informationelle Selbstbestimmung,Überwachung,Data Mining,ETSI,RFID,Mautsystem,Remailer,TCPA,TCG,Bundestrojaner,Vorratsdatenspeicherung,Biometrie" />
       <meta name="robots" content="index,follow" />
diff --git a/xsl/footer.xsl b/xsl/footer.xsl
index 52eaa07bc..b08867c4e 100644
--- a/xsl/footer.xsl
+++ b/xsl/footer.xsl
@@ -7,44 +7,54 @@
   xmlns:date="http://exslt.org/dates-and-times"                                               exclude-result-prefixes="xsl rss rdf">
 
   <xsl:template name="footer">
-  <ul>
-    <li><a href="{$baseurl}impressum.html">Impressum</a></li>
-    <li>
-    <!-- Creative Commons License -->
+    <footer id="footer">
+      <!-- ### Footer ### -->
       <xsl:comment>
-        <xsl:text> Creative Commons License </xsl:text>
+	<xsl:text> ### Footer ### </xsl:text>
       </xsl:comment>
-      <a rel="license" href="http://creativecommons.org/licenses/by-sa/2.0/de/deed.de">
-        <img alt="Creative Commons License" src="{$baseurl}images/footer/cc-somerights20.png" title="Creative Commons Attribution-ShareAlike 2.0 Germany License" />
-      </a>
-      <xsl:comment>
-        <xsl:text>
-          &lt;rdf:RDF xmlns="http://web.resource.org/cc/"
-            xmlns:dc="http://purl.org/dc/elements/1.1/"
-            xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"&gt;
-            &lt;Work rdf:about=""&gt;
+      <ul>
+	<li><a href="{$baseurl}impressum.html">Impressum</a></li>
+	<li>
+	  <!-- Creative Commons License -->
+	  <xsl:comment>
+	    <xsl:text> Creative Commons License </xsl:text>
+	  </xsl:comment>
+	  <a rel="license" href="http://creativecommons.org/licenses/by-sa/2.0/de/deed.de">
+	    <img alt="Creative Commons License" src="{$baseurl}images/footer/cc-somerights20.png" title="Creative Commons Attribution-ShareAlike 2.0 Germany License" />
+	  </a>
+	  <xsl:comment>
+	    <xsl:text>
+	      &lt;rdf:RDF xmlns="http://web.resource.org/cc/"
+	      xmlns:dc="http://purl.org/dc/elements/1.1/"
+	      xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"&gt;
+	      &lt;Work rdf:about=""&gt;
               &lt;dc:type rdf:resource="http://purl.org/dc/dcmitype/Interactive" /&gt;
               &lt;license rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/de/" /&gt;
-            &lt;/Work&gt;
+	      &lt;/Work&gt;
 
-            &lt;License rdf:about="http://creativecommons.org/licenses/by-sa/2.0/de/"&gt;
+	      &lt;License rdf:about="http://creativecommons.org/licenses/by-sa/2.0/de/"&gt;
               &lt;permits rdf:resource="http://web.resource.org/cc/Reproduction" /&gt;
               &lt;permits rdf:resource="http://web.resource.org/cc/Distribution" /&gt;
               &lt;requires rdf:resource="http://web.resource.org/cc/Notice" /&gt;
               &lt;requires rdf:resource="http://web.resource.org/cc/Attribution" /&gt;
               &lt;permits rdf:resource="http://web.resource.org/cc/DerivativeWorks" /&gt;
               &lt;requires rdf:resource="http://web.resource.org/cc/ShareAlike" /&gt;
-            &lt;/License&gt;
-          &lt;/rdf:RDF&gt;
-        </xsl:text>
-      </xsl:comment>
-    </li>
-    <li>
-      <a href="http://validator.w3.org/check?uri=referer">
-        <img src="{$baseurl}images/footer/valid-xhtml10.png" alt="Valid XHTML 1.0 Strict" />
-      </a>
-    </li>
-  </ul>
+	      &lt;/License&gt;
+	      &lt;/rdf:RDF&gt;
+	    </xsl:text>
+	  </xsl:comment>
+	</li>
+	<li>
+	  <a href="http://validator.w3.org/check?uri=referer">
+	    <img src="{$baseurl}images/footer/valid-xhtml10.png" alt="Valid XHTML 1.0 Strict" />
+	  </a>
+	</li>
+      </ul>
+
+      <small class="hidden">
+	Cover, Concealment, Camouflage, Denial and Deception
+      </small>
+    </footer>
   </xsl:template>
 
 </xsl:stylesheet>
diff --git a/xsl/header.xsl b/xsl/header.xsl
index cd0208037..124df212d 100644
--- a/xsl/header.xsl
+++ b/xsl/header.xsl
@@ -16,7 +16,7 @@
   </xsl:template>
   
   <xsl:template name="header">
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+  <meta charset="utf-8" />
   <meta name="description" content="&lt;&lt;&lt;/&gt;&gt; c3d2, der Erfahrungsaustauschkreis aus dem sächsischen Dresden" />
   <meta name="keywords" content="c3d2 ccc dresden sachsen hacker" />
   <meta name="robots" content="index,follow" />
@@ -37,18 +37,37 @@
 
   <xsl:call-template name="links" />
 
+  <xsl:comment>[if lt IE 9]&gt;
+      &lt;script src="<xsl:value-of select="$baseurl"/>script/ie-html5.js" type="text/javascript"&gt;&lt;/script&gt;
+  &lt;![endif]</xsl:comment>
   <xsl:if test="/page/calendar-summary">
-    <script src="{$baseurl}script/calendar.js"
-            type="text/javascript">
-    </script>
+    <xsl:call-template name="make-script-tag">
+      <xsl:with-param name="name" select="'calendar'"/>
+    </xsl:call-template>
   </xsl:if>
-  <script src="{$baseurl}script/jquery-1.4.2.min.js"
-          type="text/javascript">
-  </script>
-  <script src="{$baseurl}script/pentamedia-comments.js"
-          type="text/javascript">
-  </script>
+  <xsl:call-template name="make-script-tag">
+    <xsl:with-param name="name" select="'jquery-1.4.2.min'"/>
+  </xsl:call-template>
+  <xsl:call-template name="make-script-tag">
+    <xsl:with-param name="name" select="'jquery.dataset'"/>
+  </xsl:call-template>
+  <xsl:call-template name="make-script-tag">
+    <xsl:with-param name="name" select="'pentamedia-comments'"/>
+  </xsl:call-template>
+  <xsl:call-template name="make-script-tag">
+    <xsl:with-param name="name" select="'play-resources'"/>
+  </xsl:call-template>
   
   </xsl:template>
 
+  <xsl:template name="make-script-tag">
+    <xsl:param name="name"/>
+
+    <script src="{$baseurl}script/{$name}.js"
+	    type="text/javascript" defer="defer">
+      <xsl:text>
+</xsl:text>
+    </script>
+  </xsl:template>
+
 </xsl:stylesheet>
diff --git a/xsl/xhtml.xsl b/xsl/xhtml5.xsl
similarity index 70%
rename from xsl/xhtml.xsl
rename to xsl/xhtml5.xsl
index edd1f1abd..a636defbf 100644
--- a/xsl/xhtml.xsl
+++ b/xsl/xhtml5.xsl
@@ -12,13 +12,14 @@
 <xsl:include href="calendar.xsl" />
 
 <xsl:output method="xml"
-            version="1.0"
+	    version="1.0"
             encoding="utf-8"
-            doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
-            doctype-system="DTD/xhtml1-strict.dtd"
             indent="yes"/>
 
   <xsl:template match="/page">
+    <xsl:text disable-output-escaping="yes">&lt;!DOCTYPE html&gt;
+</xsl:text>
+
     <xsl:variable name="title">
       <xsl:choose>
         <xsl:when test="/page/@pagetitle">
@@ -79,30 +80,42 @@
 
           <div id="body">
 
-          <!-- ### Navigation ### -->
-          <xsl:comment>
-            <xsl:text> ### Navigation ### </xsl:text>
-          </xsl:comment>
-          <div id="navigation">
+	    <!-- ### Navigation ### -->
+	    <xsl:comment>
+	      <xsl:text> ### Navigation ### </xsl:text>
+	    </xsl:comment>
+	    <nav id="navigation">
 
-          <xsl:if test="not($issearchpage)">
-            <!-- ### Search ### -->
-            <xsl:comment>
-              <xsl:text> ### Search ### </xsl:text>
-            </xsl:comment>
+	      <xsl:if test="not($issearchpage)">
+		<!-- ### Search ### -->
+		<xsl:comment>
+		  <xsl:text> ### Search ### </xsl:text>
+		</xsl:comment>
 
-            <form action="/cgi-bin/estseek.cgi" method="get">
-              <p>
-                <input type="text" name="phrase" size="20" value="c3d2" />
-                <input type="submit" name="submit" value="Suchen!" />
-                <a href="{$baseurl}cgi-bin/estseek.cgi"><small>Hilfe</small></a>
-              </p>
-            </form>
-          </xsl:if>
+		<form action="/cgi-bin/estseek.cgi" method="get">
+		  <p>
+		    <input type="text" name="phrase" size="20" value="c3d2" />
+		    <input type="submit" name="submit" value="Suchen!" />
+		    <a href="{$baseurl}cgi-bin/estseek.cgi"><small>Hilfe</small></a>
+		  </p>
+		</form>
+	      </xsl:if>
 
-          <xsl:call-template name="navitems" />
+	      <xsl:call-template name="navitems" />
 
-          </div> <!-- id="navigation" -->
+	    </nav>
+
+
+	    <!-- ### News ### -->
+	    <xsl:comment>
+	      <xsl:text> ### News ### </xsl:text>
+	    </xsl:comment>
+
+	    <aside id="rsidebar">
+	      <xsl:call-template name="calendar-events" />
+
+	      <xsl:call-template name="chaosupdates" />
+	    </aside>
 
           <!-- ### Content ### -->
           <xsl:comment>
@@ -111,15 +124,17 @@
 
           <xsl:choose>
             <xsl:when test="$issearchpage">
-              <div id="content" class="search">
+              <section id="content" class="search">
                 <h2>Suche</h2>
                 <xsl:comment>ESTFORM</xsl:comment>
                 <xsl:comment>ESTRESULT</xsl:comment>
                 <xsl:comment>ESTINFO</xsl:comment>
-              </div> <!-- id="search" -->
+		
+		<xsl:call-template name="footer" />
+              </section> <!-- class="search" -->
             </xsl:when>
             <xsl:otherwise> <!-- normale Seite -->
-              <div id="content">
+              <section id="content">
                 <xsl:if test="event">
                   <xsl:attribute name="class">vevent</xsl:attribute>
                 </xsl:if>
@@ -144,35 +159,13 @@
                 <xsl:call-template name="include-resources">
                   <xsl:with-param name="include-hidden">yes</xsl:with-param>
                 </xsl:call-template>
-              </div> <!-- id="content" -->
-
-              <!-- ### News ### -->
-              <xsl:comment>
-                <xsl:text> ### News ### </xsl:text>
-              </xsl:comment>
-
-              <xsl:call-template name="calendar-events" />
-
-              <xsl:call-template name="chaosupdates" />
+              </section> <!-- id="content" -->
 
+	      <xsl:call-template name="footer" />
             </xsl:otherwise>
           </xsl:choose>
 
           </div> <!-- id="body" -->
-
-        <!-- ### Footer ### -->
-          <xsl:comment>
-            <xsl:text> ### Footer ### </xsl:text>
-          </xsl:comment>
-          <div id="footer">
-            <xsl:call-template name="footer" />
-<!--          <p id="update">
-              <strong>last update:</strong> 02/08/2005 15:15 CEST
-            </p> -->
-          </div> <!-- id="footer" -->
-          <small class="hidden">
-            Cover, Concealment, Camouflage, Denial and Deception
-          </small>
         </div> <!-- id="page" -->
       </xsl:element> <!-- name="body" -->
     </xsl:element> <!-- name="html" -->
@@ -187,7 +180,7 @@
       Veranstaltungen
       im <a href="{$baseurl}ical.ics">iCal-</a>, <a href="{$baseurl}xcal.xml">XCal-</a>
       und <a href="{$baseurl}reminders">remind-Format</a> abrufbar.
-      Alle News gibts im <a href="{$baseurl}news-archiv.html">Archiv</a>.
+      Alle News gibts im <a href="{$baseurl}news-archiv.html" rel="archives">Archiv</a>.
     </p>
 
     <xsl:for-each select="newsfile">
@@ -199,40 +192,42 @@
   
         <xsl:for-each select="document(concat('../', $newsfile))/item">
 
-            <div>
+            <article><div>
               <xsl:if test="event">
                 <xsl:attribute name="class">vevent</xsl:attribute>
               </xsl:if>
 
-              <h3 class="news summary">
-                <a href="{substring-before(substring-after($newsfile, 'content/'), '.xml')}.html" class="url">
-                  <xsl:value-of select="@title"/>
-                </a>
-              </h3>
+	      <header>
+		<h3 class="news summary">
+		  <a href="{substring-before(substring-after($newsfile, 'content/'), '.xml')}.html" class="url">
+		    <xsl:value-of select="@title"/>
+		  </a>
+		</h3>
       
-              <xsl:call-template name="news-meta"/>
+		<xsl:call-template name="news-meta"/>
+	      </header>
       
-                <div class="news">
-                  <xsl:apply-templates>
-                    <xsl:with-param name="itemposition" select="$itemposition"/>
-                  </xsl:apply-templates>
-        
-                  <xsl:call-template name="include-resources">
-                    <xsl:with-param name="include-hidden">no</xsl:with-param>
-                  </xsl:call-template>
-        
-		  <p class="more">
-                    <xsl:if test="//addendum">
-                      <a href="{substring-before(substring-after($newsfile, 'content/'), '.xml')}.html">
-			Weiterlesen...
-                      </a>
-                    </xsl:if>
-		  </p>
-                </div>
-      
-                <hr class="news"/>
+	      <div class="news">
+		<xsl:apply-templates>
+		  <xsl:with-param name="itemposition" select="$itemposition"/>
+		</xsl:apply-templates>
+		
+		<xsl:call-template name="include-resources">
+		  <xsl:with-param name="include-hidden">no</xsl:with-param>
+		</xsl:call-template>
+		
+		<xsl:if test="//addendum or //resource[@hide='yes']">
+		  <footer><p class="more">
+		    <a href="{substring-before(substring-after($newsfile, 'content/'), '.xml')}.html">
+		      Weiterlesen…
+		    </a>
+		  </p></footer>
+		</xsl:if>
+	      </div>
+	      
+	      <hr class="news"/>
 
-            </div>
+            </div></article>
   
         </xsl:for-each>
       </xsl:if>
@@ -246,9 +241,11 @@
 
     <small class="news_date">
       @
-      <xsl:call-template name="get-datestring">
-        <xsl:with-param name="date" select="@date" />
-      </xsl:call-template>
+      <time datetime="{@date}" pubdate="pubdate">
+	<xsl:call-template name="get-datestring">
+	  <xsl:with-param name="date" select="@date" />
+	</xsl:call-template>
+      </time>
     </small>
   </xsl:template>
 
@@ -276,14 +273,20 @@
     <xsl:param name="itemposition"/>
 
     <img>
-      <xsl:choose>
-        <xsl:when test="contains(., '://')">
-          <xsl:attribute name="src"><xsl:value-of select="."/></xsl:attribute>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:attribute name="src"><xsl:value-of select="concat($baseurl, 'images/news/', .)"/></xsl:attribute>
-        </xsl:otherwise>
-      </xsl:choose>
+      <xsl:attribute name="src">
+	<xsl:call-template name="normalize-path">
+	  <xsl:with-param name="path">
+	    <xsl:choose>
+	      <xsl:when test="contains(., '://')">
+		<xsl:value-of select="."/>
+	      </xsl:when>
+	      <xsl:otherwise>
+		<xsl:value-of select="concat($baseurl, 'images/news/', .)"/>
+	      </xsl:otherwise>
+	    </xsl:choose>
+	  </xsl:with-param>
+	</xsl:call-template>
+      </xsl:attribute>
 
       <xsl:attribute name="title"><xsl:value-of select="@title"/></xsl:attribute>
       <xsl:attribute name="alt"><xsl:value-of select="@title"/></xsl:attribute>
@@ -384,8 +387,21 @@
       </xsl:call-template>
     </xsl:variable>
 
-    <li>
-      <!-- MIME-Type ist nützlich z.B. für ftp:// URLs -->
+    <!-- @class = "resource" | "alternative" -->
+    <li class="{name(.)}">
+      <!-- HTML5 dataset hints for play-resources.js poster -->
+      <xsl:if test="@poster">
+	<xsl:attribute name="data-poster">
+	  <xsl:value-of select="@poster"/>
+	</xsl:attribute>
+      </xsl:if>
+      <xsl:if test="@preview">
+	<xsl:attribute name="data-preview">
+	  <xsl:value-of select="@preview"/>
+	</xsl:attribute>
+      </xsl:if>
+
+      <!-- MIME type hinting works even in the browser -->
       <a href="{$href}" type="{@type}" class="mime" rel="enclosure">
         <xsl:choose>
           <xsl:when test="string-length(string($title))"><xsl:value-of select="$title"/></xsl:when>
@@ -398,19 +414,6 @@
         </xsl:call-template>, <xsl:call-template name="format-filesize">
          <xsl:with-param name="value" select="@size"/>
       </xsl:call-template>)
-
-      <!-- Why only http://ftp.c3d2.de/? Because Flash needs a crossdomain.xml there. -->
-      <xsl:if test="@type='audio/mpeg' and starts-with($href, 'http://ftp.c3d2.de/')">
-        <br/>
-        <object type="application/x-shockwave-flash"
-                data="{$baseurl}script/dewplayer-mini.swf?mp3={$href}&amp;showtime=1"
-                width="150" height="20">
-          <param name="wmode" value="transparent"/>
-          <param name="allowScriptAccess" value="always"/>
-          <param name="movie"
-                 value="{$baseurl}script/dewplayer-mini.swf?mp3={$href}&amp;showtime=1"/>
-        </object>
-      </xsl:if>
     </li>
   </xsl:template>