diff --git a/Makefile b/Makefile
index 13aa36a1e..4e140f0dc 100644
--- a/Makefile
+++ b/Makefile
@@ -95,7 +95,7 @@ $(NEWSINDEX): $(NEWSITEMS) Makefile
 www/datenspuren/%.html: content/datenspuren/%.xml $(DS_STYLE)
         # -- MNE-20060421: Lt. Astro geht Validierung noch nicht mit dem Fahrplan,
         #                  daher fuer Datenspuren auskommentiert
-	# $(VALIDATOR) $(VFLAGS) $<
+	$(VALIDATOR) $(VFLAGS) $<
 	$(PROCESSOR) $(PFLAGS) -o $@ $(DS_STYLE) $<
 
 www/%.html: content/%.xml $(STYLE) $(NAVIGATION) $(WWW_CCC_DE_UPDATES)
diff --git a/content/datenspuren/schedule.xml b/content/datenspuren/schedule.xml
index 9a6481222..3509245e5 100644
--- a/content/datenspuren/schedule.xml
+++ b/content/datenspuren/schedule.xml
@@ -1,32 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
     <meta name="generator" content="Pentabarf"/>
-    <title>DS2005: Day 1</title>
+    <title>DS2006: Schedule Overview</title>
     <link rel="shortcut icon" href="/favicon.ico" />
-    <link href="/schedule/DS2005/stylesheet.css" rel="Stylesheet" media="screen, print" type="text/css" />
+    <link href="/~sven/schedule/DS2006/stylesheet.css" rel="Stylesheet" media="screen, print" type="text/css" />
   </head>
   <body>
     <div id="menu">
   <ul>
-    <li><a href="/schedule/DS2005/index"><span class="normal">Index</span></a></li>
+    <li><a href="/~sven/schedule/DS2006"><span class="normal">Index</span></a></li>
     
-      <li><a href="/schedule/DS2005/day/1"><span class="normal">Day 1</span></a></li>
+      <li><a href="/~sven/schedule/DS2006/day/1"><span class="normal">Day 1</span></a></li>
     
-    <li><a href="/schedule/DS2005/speakers"><span class="normal">Speakers</span></a></li>
-    <li><a href="/schedule/DS2005/events"><span class="normal">Events</span></a></li>
+      <li><a href="/~sven/schedule/DS2006/day/2"><span class="normal">Day 2</span></a></li>
+    
+    <li><a href="/~sven/schedule/DS2006/speakers"><span class="normal">Speakers</span></a></li>
+    <li><a href="/~sven/schedule/DS2006/events"><span class="normal">Events</span></a></li>
   </ul>
 </div>
 
 
     <div id="content">
-      <p class="release">DS2005 </p>
-      <p class="intro"><strong>Datenspuren 2005</strong><br/><em>Day 1</em></p>
+      <p class="release">DS2006 </p>
+      <p class="intro"><strong>Datenspuren 2006</strong><br/><em>Privatsphäre war gestern</em></p>
       <div id="schedule" class="section">
-
-  <h1>Overview Day 1</h1>
   
+  
+  
+  
+  <h1>Overview Day 1</h1>
 
   <table>
     <thead>
@@ -42,99 +47,6 @@
     </thead>
     <tbody>
       
-      <tr>
-        <td class="time">10:30</td>
-        
-          
-          
-            
-            <td class="room event " rowspan="1">
-              <p class="title"><a href="/schedule/DS2005/event/341">Keynote: Mit Siebenmeilenstiefeln zur Informationsgesellschaft</a></p> 
-              <p class="subtitle"><a href="/schedule/DS2005/event/341"></a></p> 
-              <ul class="speakers">
-                
-                  <li><a href="/schedule/DS2005/speaker/299">Reinhard Wobst</a></li>
-                
-              </ul>
-              <p class="info">
-                <a href="/schedule/DS2005/event/341">
-                  Language: <span class="language">german</span><br/>
-                  Type: <span class="type">Lecture</span><br/>
-                  Track: <span class="track"></span><br/>
-                </a>
-              </p>
-            </td>
-          
-        
-          
-          
-            <td class="room empty"/>
-          
-        
-        </tr>
-      
-      <tr>
-        <td class="time">11:00</td>
-        
-          
-          
-            
-            <td class="room event " rowspan="1">
-              <p class="title"><a href="/schedule/DS2005/event/338">Aktueller Sachstand zur TK-Überwachung aus Sicht der Internetwirtschaft</a></p> 
-              <p class="subtitle"><a href="/schedule/DS2005/event/338"></a></p> 
-              <ul class="speakers">
-                
-                  <li><a href="/schedule/DS2005/speaker/505">Hannah Seiffert</a></li>
-                
-              </ul>
-              <p class="info">
-                <a href="/schedule/DS2005/event/338">
-                  Language: <span class="language">german</span><br/>
-                  Type: <span class="type">Lecture</span><br/>
-                  Track: <span class="track"></span><br/>
-                </a>
-              </p>
-            </td>
-          
-        
-          
-          
-            <td class="room empty"/>
-          
-        
-        </tr>
-      
-      <tr>
-        <td class="time">11:30</td>
-        
-          
-          
-            
-            <td class="room event " rowspan="1">
-              <p class="title"><a href="/schedule/DS2005/event/348">Vorratsdatenspeicherung</a></p> 
-              <p class="subtitle"><a href="/schedule/DS2005/event/348"></a></p> 
-              <ul class="speakers">
-                
-                  <li><a href="/schedule/DS2005/speaker/505">Hannah Seiffert</a></li>
-                
-              </ul>
-              <p class="info">
-                <a href="/schedule/DS2005/event/348">
-                  Language: <span class="language">german</span><br/>
-                  Type: <span class="type">Lecture</span><br/>
-                  Track: <span class="track"></span><br/>
-                </a>
-              </p>
-            </td>
-          
-        
-          
-          
-            <td class="room empty"/>
-          
-        
-        </tr>
-      
       <tr>
         <td class="time">12:00</td>
         
@@ -142,15 +54,15 @@
           
             
             <td class="room event " rowspan="2">
-              <p class="title"><a href="/schedule/DS2005/event/339">Biometrie in Ausweisdokumenten: Technische Probleme und die politischen Auswirkungen</a></p> 
-              <p class="subtitle"><a href="/schedule/DS2005/event/339"></a></p> 
+              <p class="title"><a href="/~sven/schedule/DS2006/event/1258">Biometrie und ePass</a></p> 
+              <p class="subtitle"><a href="/~sven/schedule/DS2006/event/1258"></a></p> 
               <ul class="speakers">
                 
-                  <li><a href="/schedule/DS2005/speaker/63">starbug</a></li>
+                  <li><a href="/~sven/schedule/DS2006/speaker/63">starbug</a></li>
                 
               </ul>
               <p class="info">
-                <a href="/schedule/DS2005/event/339">
+                <a href="/~sven/schedule/DS2006/event/1258">
                   Language: <span class="language">german</span><br/>
                   Type: <span class="type">Lecture</span><br/>
                   Track: <span class="track"></span><br/>
@@ -214,15 +126,15 @@
           
             
             <td class="room event " rowspan="2">
-              <p class="title"><a href="/schedule/DS2005/event/340">Strukturen des gesichtslosen Blicks</a></p> 
-              <p class="subtitle"><a href="/schedule/DS2005/event/340"></a></p> 
+              <p class="title"><a href="/~sven/schedule/DS2006/event/1275">Informationsfreiheitsgesetz</a></p> 
+              <p class="subtitle"><a href="/~sven/schedule/DS2006/event/1275"></a></p> 
               <ul class="speakers">
                 
-                  <li><a href="/schedule/DS2005/speaker/210">Peter Bittner</a></li>
+                  <li><a href="/~sven/schedule/DS2006/speaker/833">Jörg Tauss</a></li>
                 
               </ul>
               <p class="info">
-                <a href="/schedule/DS2005/event/340">
+                <a href="/~sven/schedule/DS2006/event/1275">
                   Language: <span class="language">german</span><br/>
                   Type: <span class="type">Lecture</span><br/>
                   Track: <span class="track"></span><br/>
@@ -235,15 +147,15 @@
           
             
             <td class="room event " rowspan="3">
-              <p class="title"><a href="/schedule/DS2005/event/349">Überwindung biometrischer Systeme</a></p> 
-              <p class="subtitle"><a href="/schedule/DS2005/event/349"></a></p> 
+              <p class="title"><a href="/~sven/schedule/DS2006/event/1259">Biometrie überwinden</a></p> 
+              <p class="subtitle"><a href="/~sven/schedule/DS2006/event/1259"></a></p> 
               <ul class="speakers">
                 
-                  <li><a href="/schedule/DS2005/speaker/63">starbug</a></li>
+                  <li><a href="/~sven/schedule/DS2006/speaker/63">starbug</a></li>
                 
               </ul>
               <p class="info">
-                <a href="/schedule/DS2005/event/349">
+                <a href="/~sven/schedule/DS2006/event/1259">
                   Language: <span class="language">german</span><br/>
                   Type: <span class="type">Workshop</span><br/>
                   Track: <span class="track"></span><br/>
@@ -268,15 +180,15 @@
           
             
             <td class="room event " rowspan="2">
-              <p class="title"><a href="/schedule/DS2005/event/350">Arbeit, Argumentationen und Strategien gegen Videoüberwachung</a></p> 
-              <p class="subtitle"><a href="/schedule/DS2005/event/350"></a></p> 
+              <p class="title"><a href="/~sven/schedule/DS2006/event/1304">Vorratsdatenspeicherung</a></p> 
+              <p class="subtitle"><a href="/~sven/schedule/DS2006/event/1304"></a></p> 
               <ul class="speakers">
                 
-                  <li><a href="/schedule/DS2005/speaker/184">padeluun</a></li>
+                  <li><a href="/~sven/schedule/DS2006/speaker/7">Andreas Lehner</a></li>
                 
               </ul>
               <p class="info">
-                <a href="/schedule/DS2005/event/350">
+                <a href="/~sven/schedule/DS2006/event/1304">
                   Language: <span class="language">german</span><br/>
                   Type: <span class="type">Lecture</span><br/>
                   Track: <span class="track"></span><br/>
@@ -294,7 +206,23 @@
           
           
           
-            <td class="room empty"/>
+            
+            <td class="room event " rowspan="3">
+              <p class="title"><a href="/~sven/schedule/DS2006/event/1260">Einrichtung von Tor</a></p> 
+              <p class="subtitle"><a href="/~sven/schedule/DS2006/event/1260">Wie man Tor Client, Server und versteckten Service nutzen kann</a></p> 
+              <ul class="speakers">
+                
+                  <li><a href="/~sven/schedule/DS2006/speaker/204">Jens Kubieziel</a></li>
+                
+              </ul>
+              <p class="info">
+                <a href="/~sven/schedule/DS2006/event/1260">
+                  Language: <span class="language">german</span><br/>
+                  Type: <span class="type">Workshop</span><br/>
+                  Track: <span class="track"></span><br/>
+                </a>
+              </p>
+            </td>
           
         
         </tr>
@@ -306,15 +234,15 @@
           
             
             <td class="room event " rowspan="2">
-              <p class="title"><a href="/schedule/DS2005/event/343">AN.ON  - Anonymes Surfen</a></p> 
-              <p class="subtitle"><a href="/schedule/DS2005/event/343"></a></p> 
+              <p class="title"><a href="/~sven/schedule/DS2006/event/1277">Daten-Dammbrüche</a></p> 
+              <p class="subtitle"><a href="/~sven/schedule/DS2006/event/1277">Lust auf Mehr, Lust am Ertrinken</a></p> 
               <ul class="speakers">
                 
-                  <li><a href="/schedule/DS2005/speaker/517">Stefan Köpsell</a></li>
+                  <li><a href="/~sven/schedule/DS2006/speaker/506">Roland Hefendehl</a></li>
                 
               </ul>
               <p class="info">
-                <a href="/schedule/DS2005/event/343">
+                <a href="/~sven/schedule/DS2006/event/1277">
                   Language: <span class="language">german</span><br/>
                   Type: <span class="type">Lecture</span><br/>
                   Track: <span class="track"></span><br/>
@@ -324,26 +252,6 @@
           
         
           
-          
-            
-            <td class="room event " rowspan="2">
-              <p class="title"><a href="/schedule/DS2005/event/351">Mixmaster &amp; Co.</a></p> 
-              <p class="subtitle"><a href="/schedule/DS2005/event/351"></a></p> 
-              <ul class="speakers">
-                
-                  <li><a href="/schedule/DS2005/speaker/204">Jens Kubieziel</a></li>
-                
-              </ul>
-              <p class="info">
-                <a href="/schedule/DS2005/event/351">
-                  Language: <span class="language">german</span><br/>
-                  Type: <span class="type">Lecture</span><br/>
-                  Track: <span class="track"></span><br/>
-                </a>
-              </p>
-            </td>
-          
-        
         </tr>
       
       <tr>
@@ -358,23 +266,7 @@
         
           
           
-            
-            <td class="room event " rowspan="2">
-              <p class="title"><a href="/schedule/DS2005/event/347">Identitätsmanagement - Der zukünftige Datenschutz für Jedermann?</a></p> 
-              <p class="subtitle"><a href="/schedule/DS2005/event/347"></a></p> 
-              <ul class="speakers">
-                
-                  <li><a href="/schedule/DS2005/speaker/518">Henry Krasemann</a></li>
-                
-              </ul>
-              <p class="info">
-                <a href="/schedule/DS2005/event/347">
-                  Language: <span class="language">german</span><br/>
-                  Type: <span class="type">Lecture</span><br/>
-                  Track: <span class="track"></span><br/>
-                </a>
-              </p>
-            </td>
+            <td class="room empty"/>
           
         
           
@@ -389,6 +281,10 @@
         
           
           
+            <td class="room empty"/>
+          
+        
+          
           
             <td class="room empty"/>
           
@@ -402,15 +298,15 @@
           
             
             <td class="room event " rowspan="2">
-              <p class="title"><a href="/schedule/DS2005/event/346">Toll Collect - Verpeilen im industriellen Maßstab</a></p> 
-              <p class="subtitle"><a href="/schedule/DS2005/event/346"></a></p> 
+              <p class="title"><a href="/~sven/schedule/DS2006/event/1250">Netzzensur am Beispiel China</a></p> 
+              <p class="subtitle"><a href="/~sven/schedule/DS2006/event/1250"></a></p> 
               <ul class="speakers">
                 
-                  <li><a href="/schedule/DS2005/speaker/77">Volker Birk</a></li>
+                  <li><a href="/~sven/schedule/DS2006/speaker/13">Jens Ohlig</a></li>
                 
               </ul>
               <p class="info">
-                <a href="/schedule/DS2005/event/346">
+                <a href="/~sven/schedule/DS2006/event/1250">
                   Language: <span class="language">german</span><br/>
                   Type: <span class="type">Lecture</span><br/>
                   Track: <span class="track"></span><br/>
@@ -444,15 +340,17 @@
           
             
             <td class="room event " rowspan="2">
-              <p class="title"><a href="/schedule/DS2005/event/342">RFID - Zwischen Euphorie und Paranoia</a></p> 
-              <p class="subtitle"><a href="/schedule/DS2005/event/342"></a></p> 
+              <p class="title"><a href="/~sven/schedule/DS2006/event/1251">We lost the war - revisited</a></p> 
+              <p class="subtitle"><a href="/~sven/schedule/DS2006/event/1251"></a></p> 
               <ul class="speakers">
                 
-                  <li><a href="/schedule/DS2005/speaker/216">Frank Rosengart</a></li>
+                  <li><a href="/~sven/schedule/DS2006/speaker/9">Frank Rieger</a></li>
+                
+                  <li><a href="/~sven/schedule/DS2006/speaker/235">Rop Gonggrijp</a></li>
                 
               </ul>
               <p class="info">
-                <a href="/schedule/DS2005/event/342">
+                <a href="/~sven/schedule/DS2006/event/1251">
                   Language: <span class="language">german</span><br/>
                   Type: <span class="type">Lecture</span><br/>
                   Track: <span class="track"></span><br/>
@@ -486,17 +384,17 @@
           
             
             <td class="room event " rowspan="2">
-              <p class="title"><a href="/schedule/DS2005/event/337">Lokalisieren und Abhören in Mobiltelefonnetzen</a></p> 
-              <p class="subtitle"><a href="/schedule/DS2005/event/337"></a></p> 
+              <p class="title"><a href="/~sven/schedule/DS2006/event/1274">Biometrics in Science Fiction</a></p> 
+              <p class="subtitle"><a href="/~sven/schedule/DS2006/event/1274"></a></p> 
               <ul class="speakers">
                 
-                  <li><a href="/schedule/DS2005/speaker/9">Frank Rieger</a></li>
+                  <li><a href="/~sven/schedule/DS2006/speaker/381">Constanze Kurz</a></li>
                 
               </ul>
               <p class="info">
-                <a href="/schedule/DS2005/event/337">
+                <a href="/~sven/schedule/DS2006/event/1274">
                   Language: <span class="language">german</span><br/>
-                  Type: <span class="type">Lecture</span><br/>
+                  Type: <span class="type">Other</span><br/>
                   Track: <span class="track"></span><br/>
                 </a>
               </p>
@@ -521,32 +419,45 @@
         
         </tr>
       
+    </tbody>    
+  </table>
+  
+  
+  
+  <h1>Overview Day 2</h1>
+
+  <table>
+    <thead>
+      <tr class="odd">
+        <th class="time"/>
+
+        
+        <th><strong>Saal</strong></th>
+        
+        <th><strong>Workshopraum</strong></th>
+        
+      </tr>
+    </thead>
+    <tbody>
+      
       <tr>
-        <td class="time">21:00</td>
+        <td class="time">12:00</td>
         
           
           
             
-            <td class="room event " rowspan="1">
-              <p class="title"><a href="/schedule/DS2005/event/352">Podiumsdiskussion</a></p> 
-              <p class="subtitle"><a href="/schedule/DS2005/event/352"></a></p> 
+            <td class="room event " rowspan="2">
+              <p class="title"><a href="/~sven/schedule/DS2006/event/1273">Chancen und Risiken von DNSSEC</a></p> 
+              <p class="subtitle"><a href="/~sven/schedule/DS2006/event/1273"></a></p> 
               <ul class="speakers">
                 
-                  <li><a href="/schedule/DS2005/speaker/184">padeluun</a></li>
-                
-                  <li><a href="/schedule/DS2005/speaker/146">Markus Beckedahl</a></li>
-                
-                  <li><a href="/schedule/DS2005/speaker/194">Johnny Haeusler</a></li>
-                
-                  <li><a href="/schedule/DS2005/speaker/45">Andy Müller-Maguhn</a></li>
-                
-                  <li><a href="/schedule/DS2005/speaker/294">Matthias Hannich</a></li>
+                  <li><a href="/~sven/schedule/DS2006/speaker/913">Lutz Donnerhacke</a></li>
                 
               </ul>
               <p class="info">
-                <a href="/schedule/DS2005/event/352">
+                <a href="/~sven/schedule/DS2006/event/1273">
                   Language: <span class="language">german</span><br/>
-                  Type: <span class="type">Podium</span><br/>
+                  Type: <span class="type">Lecture</span><br/>
                   Track: <span class="track"></span><br/>
                 </a>
               </p>
@@ -555,6 +466,199 @@
         
           
           
+            <td class="room empty"/>
+          
+        
+        </tr>
+      
+      <tr>
+        <td class="time">12:30</td>
+        
+          
+          
+          
+            <td class="room empty"/>
+          
+        
+        </tr>
+      
+      <tr>
+        <td class="time">13:00</td>
+        
+          
+          
+            
+            <td class="room event " rowspan="2">
+              <p class="title"><a href="/~sven/schedule/DS2006/event/1294">Der Wert von Aufenthaltsinformationen</a></p> 
+              <p class="subtitle"><a href="/~sven/schedule/DS2006/event/1294">Der Versuch einer Antwort an Hand von Umfragen</a></p> 
+              <ul class="speakers">
+                
+                  <li><a href="/~sven/schedule/DS2006/speaker/517">Stefan Köpsell</a></li>
+                
+              </ul>
+              <p class="info">
+                <a href="/~sven/schedule/DS2006/event/1294">
+                  Language: <span class="language">german</span><br/>
+                  Type: <span class="type">Lecture</span><br/>
+                  Track: <span class="track"></span><br/>
+                </a>
+              </p>
+            </td>
+          
+        
+          
+          
+            <td class="room empty"/>
+          
+        
+        </tr>
+      
+      <tr>
+        <td class="time">13:30</td>
+        
+          
+          
+          
+            <td class="room empty"/>
+          
+        
+        </tr>
+      
+      <tr>
+        <td class="time">14:00</td>
+        
+          
+          
+            <td class="room empty"/>
+          
+        
+          
+          
+            <td class="room empty"/>
+          
+        
+        </tr>
+      
+      <tr>
+        <td class="time">14:30</td>
+        
+          
+          
+            <td class="room empty"/>
+          
+        
+          
+          
+            <td class="room empty"/>
+          
+        
+        </tr>
+      
+      <tr>
+        <td class="time">15:00</td>
+        
+          
+          
+            
+            <td class="room event " rowspan="4">
+              <p class="title"><a href="/~sven/schedule/DS2006/event/1272">Elektronische Gesundheitskarte und Gesundheitstelematik - 1984 reloaded?</a></p> 
+              <p class="subtitle"><a href="/~sven/schedule/DS2006/event/1272"></a></p> 
+              <ul class="speakers">
+                
+                  <li><a href="/~sven/schedule/DS2006/speaker/470">ThoMaus</a></li>
+                
+              </ul>
+              <p class="info">
+                <a href="/~sven/schedule/DS2006/event/1272">
+                  Language: <span class="language">german</span><br/>
+                  Type: <span class="type">Lecture</span><br/>
+                  Track: <span class="track"></span><br/>
+                </a>
+              </p>
+            </td>
+          
+        
+          
+          
+            
+            <td class="room event " rowspan="4">
+              <p class="title"><a href="/~sven/schedule/DS2006/event/1306">Telemediengesetz 2</a></p> 
+              <p class="subtitle"><a href="/~sven/schedule/DS2006/event/1306"></a></p> 
+              <ul class="speakers">
+                
+                  <li><a href="/~sven/schedule/DS2006/speaker/784">Alvar C.H. Freude</a></li>
+                
+              </ul>
+              <p class="info">
+                <a href="/~sven/schedule/DS2006/event/1306">
+                  Language: <span class="language">german</span><br/>
+                  Type: <span class="type">Workshop</span><br/>
+                  Track: <span class="track"></span><br/>
+                </a>
+              </p>
+            </td>
+          
+        
+        </tr>
+      
+      <tr>
+        <td class="time">15:30</td>
+        
+          
+          
+        </tr>
+      
+      <tr>
+        <td class="time">16:00</td>
+        
+          
+          
+        </tr>
+      
+      <tr>
+        <td class="time">16:30</td>
+        
+          
+          
+        </tr>
+      
+      <tr>
+        <td class="time">17:00</td>
+        
+          
+          
+            
+            <td class="room event " rowspan="2">
+              <p class="title"><a href="/~sven/schedule/DS2006/event/1299">Die digitale Zukunft verspielen</a></p> 
+              <p class="subtitle"><a href="/~sven/schedule/DS2006/event/1299">Mit dem Urheberrecht zurück ins Industriezeitalter</a></p> 
+              <ul class="speakers">
+                
+                  <li><a href="/~sven/schedule/DS2006/speaker/146">Markus Beckedahl</a></li>
+                
+              </ul>
+              <p class="info">
+                <a href="/~sven/schedule/DS2006/event/1299">
+                  Language: <span class="language">german</span><br/>
+                  Type: <span class="type">Lecture</span><br/>
+                  Track: <span class="track"></span><br/>
+                </a>
+              </p>
+            </td>
+          
+        
+          
+          
+            <td class="room empty"/>
+          
+        
+        </tr>
+      
+      <tr>
+        <td class="time">17:30</td>
+        
+          
+          
+          
             <td class="room empty"/>
           
         
@@ -562,9 +666,11 @@
       
     </tbody>    
   </table>
+  
 
 </div>
 
+
     </div>
   </body>
 </html>
diff --git a/www/datenspuren/style/style.css b/www/datenspuren/style/style.css
index e2b6c9337..238898893 100644
--- a/www/datenspuren/style/style.css
+++ b/www/datenspuren/style/style.css
@@ -308,3 +308,30 @@ h1, .rightSideBar
 
 acronym
  { border-color: #cc9662; }
+
+/* ###### Schedule ###### */
+.schedule {
+  table-layout: fixed;
+}
+.scheduledate {
+  font-size: large;
+  font-weight: bold;
+}
+.schedulehead {
+  text-align: center;
+}
+.scheduletime {
+  color: #606060;
+}
+.scheduleempty {
+  background-color: #ffeede;
+}
+.scheduleevent {
+  text-align: left;
+  width: 32em;
+  background-color: #ffeede;
+  border: 2px solid #D4B08E;
+}
+.scheduleevent ul {
+  margin: 0px;
+}
diff --git a/xsl/datenspuren/xhtml.xsl b/xsl/datenspuren/xhtml.xsl
index 6e1781144..70eec23f2 100644
--- a/xsl/datenspuren/xhtml.xsl
+++ b/xsl/datenspuren/xhtml.xsl
@@ -3,7 +3,6 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
   exclude-result-prefixes="xsl">
 
-<!-- <xsl:variable name="css_classprefix">schedule</xsl:variable>-->
 <xsl:include href="../common.xsl" />
 
 <xsl:output method="xml" 
@@ -47,7 +46,18 @@
   </xsl:template>
 
   <!-- Parse XHTML schedule generated by Pentabarf[tm] -->
-  <xsl:template match="/html">
+
+  <!-- Da ich hier nicht lange frickeln wollte, wird xhtml nochmal als
+  extra NS behandelt, also jegliche Elemente in XPath mit xhtml:
+  prefixen
+
+  Weiterhin ist Pentabarf-Output XHTML und kein schicker XML-Dialekt.
+  Dafür haben wir da drin aber schon eine schicke Tabellenstruktur. Für
+  die <td/>s usw. extra Templates anzulegen war mir zu unsauber, deshalb
+  wird hier überall manuell durchiteriert.
+
+  Vorgehensweise klar? -~~~~ -->
+  <xsl:template xmlns:xhtml="http://www.w3.org/1999/xhtml" match="/xhtml:html">
     <xsl:variable name="title">Programm</xsl:variable>
     <html xmlns="http://www.w3.org/1999/xhtml" lang="de" xml:lang="de">
       <xsl:call-template name="htmlhead">
@@ -57,110 +67,78 @@
         <xsl:call-template name="heading">
           <xsl:with-param name="title" select="$title"/>
         </xsl:call-template>
+
         <div id="bodyText">
-          <xsl:for-each select="body/div/div/table">
-            <table class="schedule">
-              <xsl:apply-templates/>
-            </table>
-          </xsl:for-each>
+          <table cellpadding="4" cellspacing="6" class="schedule">
+            <xsl:for-each select="xhtml:body/xhtml:div/xhtml:div/xhtml:table">
+              <thead><tr>
+                <td align="center" colspan="3" class="scheduledate">
+                  <xsl:choose>
+                    <xsl:when test="position()=1">13. Mai</xsl:when>
+                    <xsl:when test="position()=2">14. Mai</xsl:when>
+                  </xsl:choose>
+                </td>
+              </tr></thead>
+
+              <thead><tr>
+                <xsl:for-each select="xhtml:thead/xhtml:tr/xhtml:th">
+                  <th>
+                    <xsl:if test="xhtml:strong">
+                      <xsl:attribute name="class">schedulehead</xsl:attribute>
+                      <xsl:value-of select="."/>
+                    </xsl:if>
+                  </th>
+                </xsl:for-each>
+              </tr></thead>
+
+              <tbody>
+                <xsl:for-each select="xhtml:tbody/xhtml:tr">
+                  <tr>
+                    <xsl:for-each select="xhtml:td">
+                      <xsl:if test="@class">
+                        <td>
+                          <xsl:attribute name="class">
+                            <xsl:choose>
+                              <xsl:when test="@class='time'">scheduletime</xsl:when>
+                              <xsl:when test="@class='room event '">scheduleevent</xsl:when>
+                              <xsl:otherwise>scheduleempty</xsl:otherwise>
+                            </xsl:choose>
+                          </xsl:attribute>
+                          <xsl:attribute name="rowspan">
+                            <xsl:value-of select="@rowspan"/>
+                          </xsl:attribute>
+
+                          <xsl:choose>
+                            <xsl:when test='count(*)=0'>
+                              <!-- Zeit oder leer -->
+                              <xsl:value-of select="."/>
+                            </xsl:when>
+                            <xsl:otherwise>
+                              <!-- Event -->
+                              <xsl:value-of select="xhtml:p[@class='title']"/>
+                              <ul>
+                                <xsl:for-each select="xhtml:ul[@class='speakers']/xhtml:li/xhtml:a">
+                                  <li><xsl:value-of select="."/></li>
+                                </xsl:for-each>
+                              </ul>
+                            </xsl:otherwise>
+                          </xsl:choose>
+                        </td>
+                      </xsl:if>
+                    </xsl:for-each>
+                  </tr>
+                </xsl:for-each>
+              </tbody>
+
+            </xsl:for-each>
+          </table>
         </div>
+
         <xsl:call-template name="ending"/>
       </body>
     </html>
   </xsl:template>
 
-  <xsl:template match="table">
-    <xsl:element name="table">
-      <xsl:attribute name="class">
-        <!--<xsl:value-of select="$css_classprefix"/>--><xsl:value-of select="@class"/>
-      </xsl:attribute>
-      <xsl:apply-templates/>
-    </xsl:element>
-  </xsl:template>
-  <xsl:template match="thead">
-    <xsl:element name="thead">
-      <xsl:attribute name="class">
-        <!--<xsl:value-of select="$css_classprefix"/>--><xsl:value-of select="@class"/>
-      </xsl:attribute>
-      <xsl:apply-templates/>
-    </xsl:element>
-  </xsl:template>
-  <xsl:template match="tr">
-    <xsl:element name="tr">
-      <xsl:attribute name="class">
-        <!--xsl:value-of select="$css_classprefix"--><xsl:value-of select="@class"/>
-      </xsl:attribute>
-      <xsl:apply-templates/>
-    </xsl:element>
-  </xsl:template>
-  <xsl:template match="th">
-    <xsl:element name="th">
-      <xsl:attribute name="class">
-        <!--xsl:value-of select="$css_classprefix"--><xsl:value-of select="@class"/>
-      </xsl:attribute>
-      <xsl:apply-templates/>
-    </xsl:element>
-  </xsl:template>
-  <xsl:template match="td">
-    <xsl:element name="td">
-      <xsl:attribute name="class">
-        <!--xsl:value-of select="$css_classprefix"--><xsl:value-of select="@class"/>
-      </xsl:attribute>
-      <xsl:apply-templates/>
-    </xsl:element>
-  </xsl:template>
-<xsl:template match="td">
-          <xsl:comment>
-            Count: <xsl:value-of select="count(../td[@class='room empty'])"/>
-            Position: <xsl:value-of select="position()"/>
-          </xsl:comment>
-      <xsl:choose>
-        <xsl:when test="(count(../td[@class='room empty'])=2 or count(../td)=2) and position()=4">
-          <td class="scheduleempty" colspan="2">
-            <xsl:text> </xsl:text>
-          </td>
-        </xsl:when>
-        <xsl:when test="count(../td[@class='room empty'])=2 and position()=6"/>
-        <xsl:otherwise>
-          <xsl:element name="td">
-            <xsl:attribute name="class">
-              <xsl:choose>
-                <xsl:when test="@class='time'">scheduletime</xsl:when>
-                <xsl:when test="@class='room empty'">scheduleempty</xsl:when>
-                <xsl:otherwise>scheduleroom</xsl:otherwise>
-              </xsl:choose>
-            </xsl:attribute>
-            <xsl:choose>
-              <xsl:when test="@class='time'"><xsl:value-of select="."/></xsl:when>
-              <xsl:when test="@class='room empty'"><xsl:text> </xsl:text></xsl:when>
-              <xsl:otherwise>
-                <a class="scheduletitle">
-                  <xsl:attribute name="href">http://www.pentabarf.org/ds2006<xsl:value-of select="p[@class='title']/a/@href"/></xsl:attribute>
-                  <xsl:value-of select="p[@class='title']/a"/>
-                </a>
-                <span class="schedulespeakers">
-                  <xsl:value-of select="ul/li/a"/>
-                </span>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:element>
-        </xsl:otherwise>
-      </xsl:choose>
-  </xsl:template>
-  <xsl:template match="tbody">
-    <xsl:element name="tbody">
-      <xsl:attribute name="class">
-        <!--xsl:value-of select="$css_classprefix"--><xsl:value-of select="@class"/>
-      </xsl:attribute>
-      <xsl:apply-templates/>
-    </xsl:element>
-  </xsl:template>
-  <xsl:template match="ul">
-    <xsl:apply-templates/>
-  </xsl:template>
-
-
-
   <xsl:template name="htmlhead">
     <xsl:param name="title"/>
     <head>
diff --git a/xsl/xhtml.xsl b/xsl/xhtml.xsl
index 809e36723..55271b0e5 100644
--- a/xsl/xhtml.xsl
+++ b/xsl/xhtml.xsl
@@ -6,7 +6,6 @@
   xmlns:date="http://exslt.org/dates-and-times"
   exclude-result-prefixes="xsl rss rdf">
 
-<!-- <xsl:variable name="css_classprefix"></xsl:variable>--> 
 
 <xsl:include href="common.xsl" />
 <xsl:include href="date.xsl" />

+ + +	Saal	Workshopraum
21:00	12:00	- Podiumsdiskussion - +	+ Chancen und Risiken von DNSSEC + - padeluun - - Markus Beckedahl - - Johnny Haeusler - - Andy Müller-Maguhn - - Matthias Hannich + Lutz Donnerhacke - + Language: german - Type: Podium + Type: Lecture Track: @@ -555,6 +466,199 @@ +	+ + +
12:30	+ + +
13:00	+ Der Wert von Aufenthaltsinformationen + Der Versuch einer Antwort an Hand von Umfragen + + + Stefan Köpsell + + + + + Language: german + Type: Lecture + Track: + + +	+ + +
13:30		+ + +
14:00	+ + + + +	+ + +
14:30	+ + + + +	+ + +
15:00	+ Elektronische Gesundheitskarte und Gesundheitstelematik - 1984 reloaded? + + + + ThoMaus + + + + + Language: german + Type: Lecture + Track: + + +	+ Telemediengesetz 2 + + + + Alvar C.H. Freude + + + + + Language: german + Type: Workshop + Track: + + +
15:30
16:00
16:30
17:00	+ Die digitale Zukunft verspielen + Mit dem Urheberrecht zurück ins Industriezeitalter + + + Markus Beckedahl + + + + + Language: german + Type: Lecture + Track: + + +	+ + +
17:30		@@ -562,9 +666,11 @@
+ + schedulehead + + +
+ + 13. Mai + 14. Mai + +
+ + + scheduletime + scheduleevent + scheduleempty + + + + + + + + + + + + + + + + + + + + + +