diff --git a/content/news/23c3-cfp.xml b/content/news/23c3-cfp.xml
index 0c41d3aee..5eea14b5e 100644
--- a/content/news/23c3-cfp.xml
+++ b/content/news/23c3-cfp.xml
@@ -1,7 +1,7 @@
 <?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="23C3 CfP out now!" date="2006-07-17T10:29:50" author="Alien8" category="Allgemein">
+<item title="23C3 CfP out now!" date="2006-07-17T10:29:50" author="Alien8">
   <p>
     Die Galaxie ist <link href="http://events.ccc.de/congress/2006/cfp/">angefragt</link>, die klügsten, kreativsten und wirrsten Lebensformen zu entsenden, den chaotischen Bewohnern dieser beim <link href="http://events.ccc.de/congress/2006/">coolsten Event des Jahres</link> deren Köpfe zum schwingen zu bringen.
   </p>
diff --git a/content/news/c3d2-web-deployed.xml b/content/news/c3d2-web-deployed.xml
index 565c95e34..7863625dd 100644
--- a/content/news/c3d2-web-deployed.xml
+++ b/content/news/c3d2-web-deployed.xml
@@ -1,7 +1,7 @@
 <?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="C3D2-Web deployed" date="2006-07-20T06:06:06" author="Sven" category="C3D2-Web">
+<item title="C3D2-Web deployed" date="2006-07-20T06:06:06" author="Sven">
   <p>
     Seit gestern basiert die Webseite des C3D2 nicht mehr auf Typo 3 sondern auf der selber entwickelten Software <link href="http://wiki.c3d2.de/C3D2-Web">C3D2-Web</link>. Der <link href="http://www.c3d2.de/index.php">alte Content</link> ist weiterhin verfügbar, wird aber in den nächsten Tagen in das neue System migriert werden.
   </p>
diff --git a/content/news/clt05-no-softpat.xml b/content/news/clt05-no-softpat.xml
index 3ec57c28a..14f437b4c 100644
--- a/content/news/clt05-no-softpat.xml
+++ b/content/news/clt05-no-softpat.xml
@@ -1,7 +1,7 @@
 <?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="Unterschriften gegen Softwarepatente" date="2005-03-07T12:00:00" author="riot" category="Aktion">
+<item title="Unterschriften gegen Softwarepatente" date="2005-03-07T12:00:00" author="riot">
     <image title="Flagge">e3618a66e7.png</image>
     <p>Der C3D2 nutzt seinen Stand auf den Chemnitzer Linuxtagen 2005, um Unterschriften gegen Softwarepatente zu sammeln.</p>
     <p>Hier ist der Text der Aktion:</p>
diff --git a/content/news/datenspuren2005-audio-reloaded.xml b/content/news/datenspuren2005-audio-reloaded.xml
index eaaa37276..655e6c68a 100644
--- a/content/news/datenspuren2005-audio-reloaded.xml
+++ b/content/news/datenspuren2005-audio-reloaded.xml
@@ -1,7 +1,7 @@
 <?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 Audio-Tracks 05" date="2006-05-18T10:00:00" author="toidinamai" category="Allgemein">
+<item title="Datenspuren Audio-Tracks 05" date="2006-05-18T10:00:00" author="toidinamai">
   <image title="Bild einer Datenspur">datenspuren.png</image>
   <p>
     Die Audio-Mitschnitte der <link href="http://www.datenspuren.de/2005/">Datenspuren 2005</link> gibt's jetzt auch als
diff --git a/content/news/datenspuren2005-audio.xml b/content/news/datenspuren2005-audio.xml
index 49fedf494..b8d3bb9af 100644
--- a/content/news/datenspuren2005-audio.xml
+++ b/content/news/datenspuren2005-audio.xml
@@ -1,7 +1,7 @@
 <?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 Audio-Tracks 05" date="2005-05-30T23:05:50" author="Fnordic walker" category="Allgemein">
+<item title="Datenspuren Audio-Tracks 05" date="2005-05-30T23:05:50" author="Fnordic walker">
   <image title="Bild einer Datenspur">datenspuren.png</image>
   <p>
     Alle <link href="http://datenspuren.dresden.ccc.de/">Datenspuren</link> Audio-Mitschnitte endlich zum Download. Per ftp über <link>ftp://ftp.skyhub.de/datenspuren/2005/</link>.
diff --git a/content/news/datenspuren2006-audio.xml b/content/news/datenspuren2006-audio.xml
index 6c06aa659..2b8d7f960 100644
--- a/content/news/datenspuren2006-audio.xml
+++ b/content/news/datenspuren2006-audio.xml
@@ -1,7 +1,7 @@
 <?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 Audio-Tracks 06" date="2006-06-08T14:40:00" author="Astro" category="Datenspuren">
+<item title="Datenspuren Audio-Tracks 06" date="2006-06-08T14:40:00" author="Astro">
   <image title="Bild einer Datenspur">datenspuren.png</image>
   <p>
     Die Mitschnitte der diesjährigen <link href="http://www.datenspuren.de/">Datenspuren</link> gibt es nun auf <link>ftp://ftp.skyhub.de/datenspuren/2006/</link>.
diff --git a/content/news/event-20c3.xml b/content/news/event-20c3.xml
index cb1ea7b3c..bbf87818b 100644
--- a/content/news/event-20c3.xml
+++ b/content/news/event-20c3.xml
@@ -1,7 +1,7 @@
 <?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="20C3: Not A Number" date="2003-12-27T12:00:00" author="riot" category="events">
+<item title="20C3: Not A Number" date="2003-12-27T12:00:00" author="riot">
 <image title="Not a Number">nan-0.4_02.jpg</image>
 <event>
   <start>2003-12-27</start>
diff --git a/content/news/event-21c3.xml b/content/news/event-21c3.xml
index 6728a280d..165b4b8af 100644
--- a/content/news/event-21c3.xml
+++ b/content/news/event-21c3.xml
@@ -1,7 +1,7 @@
 <?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="21C3: The Usual Suspects" date="2004-12-27T12:00:00" author="riot" category="events">
+<item title="21C3: The Usual Suspects" date="2004-12-27T12:00:00" author="riot">
     <image title="Logo">21C3-logo-blue.png</image>
 <event>
   <start>2004-12-27</start>
diff --git a/content/news/22c3.xml b/content/news/event-22c3.xml
similarity index 90%
rename from content/news/22c3.xml
rename to content/news/event-22c3.xml
index e029ac4fd..4f57aea29 100644
--- a/content/news/22c3.xml
+++ b/content/news/event-22c3.xml
@@ -1,7 +1,7 @@
 <?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="22C3: Private Investigation is around the corner" date="2005-11-05T23:05:50" author="Fnordic walker" category="events">
+<item title="22C3: Private Investigation is around the corner" date="2005-11-05T23:05:50" author="Fnordic walker">
   <image title="22C3">22c3.png</image>
   <event>
     <start>2005-12-27</start>
diff --git a/content/news/event-clt2004.xml b/content/news/event-clt2004.xml
index 4ee3f1276..eeaff38bc 100644
--- a/content/news/event-clt2004.xml
+++ b/content/news/event-clt2004.xml
@@ -1,7 +1,7 @@
 <?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="Chemnitzer Linux-Tag 2004" date="2004-03-06T12:00:00" author="riot" category="events">
+<item title="Chemnitzer Linux-Tag 2004" date="2004-03-06T12:00:00" author="riot">
     <image title="Stadtinformation">stadtinfo.jpg</image>
   <event>
     <start>2004-03-06T09:00:00</start>
diff --git a/content/news/event-clt2005.xml b/content/news/event-clt2005.xml
index e0cd8795f..73657525f 100644
--- a/content/news/event-clt2005.xml
+++ b/content/news/event-clt2005.xml
@@ -1,7 +1,7 @@
 <?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="Chemnitzer Linux-Tag 2005" date="2005-03-04T12:00:00" author="riot" category="events">
+<item title="Chemnitzer Linux-Tag 2005" date="2005-03-04T12:00:00" author="riot">
     <image title="Picture">../clt2005/7ad6fe1c51.jpg</image>
   <event>
     <start>2005-03-04T09:00:00</start>
diff --git a/content/news/datenschatten-und-buergerrechte.xml b/content/news/event-datenschatten-und-buergerrechte.xml
similarity index 92%
rename from content/news/datenschatten-und-buergerrechte.xml
rename to content/news/event-datenschatten-und-buergerrechte.xml
index 9e1fde492..a1a5e0d26 100644
--- a/content/news/datenschatten-und-buergerrechte.xml
+++ b/content/news/event-datenschatten-und-buergerrechte.xml
@@ -1,7 +1,7 @@
 <?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="Datenschatten - Über Privatsphäre, Bürgerrechte und Datenschutz" date="2006-09-28T16:30:00" author="Astro" category="events">
+<item title="Datenschatten - Über Privatsphäre, Bürgerrechte und Datenschutz" date="2006-09-28T16:30:00" author="Astro">
   <event>
     <start>2006-10-11T18:00:00</start>
     <end>2006-10-11T20:00:00</end>
diff --git a/content/news/datenspuren2006.xml b/content/news/event-datenspuren2006.xml
similarity index 94%
rename from content/news/datenspuren2006.xml
rename to content/news/event-datenspuren2006.xml
index 6f8f525b9..97de5a998 100644
--- a/content/news/datenspuren2006.xml
+++ b/content/news/event-datenspuren2006.xml
@@ -1,7 +1,7 @@
 <?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 2006" date="2005-11-13T23:05:50" author="c3d2 himself!!!" category="events">
+<item title="Datenspuren 2006" date="2005-11-13T23:05:50" author="c3d2 himself!!!">
     <image title="Eine Datenspur">datenspuren.png</image>
     <event>
       <start>2006-05-13</start>
diff --git a/content/news/event-ds2004.xml b/content/news/event-ds2004.xml
index ab7702787..e66ab8b0b 100644
--- a/content/news/event-ds2004.xml
+++ b/content/news/event-ds2004.xml
@@ -1,7 +1,7 @@
 <?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 2004" date="2004-05-08T12:00:00" author="riot" category="events">
+<item title="Datenspuren 2004" date="2004-05-08T12:00:00" author="riot">
   <event>
     <start>2004-05-08T10:00:00</start>
     <end>2004-05-08T19:00:00</end>
diff --git a/content/news/gpn5.xml b/content/news/event-gpn5.xml
similarity index 87%
rename from content/news/gpn5.xml
rename to content/news/event-gpn5.xml
index 96d924cad..f02dd62ca 100644
--- a/content/news/gpn5.xml
+++ b/content/news/event-gpn5.xml
@@ -1,7 +1,7 @@
 <?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="GPN 5" date="2006-06-06T06:06:06" author="Astro" category="events">
+<item title="GPN 5" date="2006-06-06T06:06:06" author="Astro">
   <image title="GPN5: Smack my bit up">gpn5.jpg</image>
   <event>
     <start>2006-06-09</start>
diff --git a/content/news/event-icmp3.xml b/content/news/event-icmp3.xml
index 361f9fc7e..239722a45 100644
--- a/content/news/event-icmp3.xml
+++ b/content/news/event-icmp3.xml
@@ -1,7 +1,7 @@
 <?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="ICMP3" date="2006-08-03T12:00:00" author="riot" category="events">
+<item title="ICMP3" date="2006-08-03T12:00:00" author="riot">
 <image title="Die Freiheit nehm ich mir!">icmp3.png</image>
     <event>
       <start>2006-08-03</start>
diff --git a/content/news/event-inet-night2.xml b/content/news/event-inet-night2.xml
index dc34eb821..b8506ab53 100644
--- a/content/news/event-inet-night2.xml
+++ b/content/news/event-inet-night2.xml
@@ -1,7 +1,7 @@
 <?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="CDU Internet Night 2" date="2006-01-30T15:00:00" author="riot" category="events">
+<item title="CDU Internet Night 2" date="2006-01-30T15:00:00" author="riot">
     <event>
     <start>2006-01-30T15:00:00</start>
     <location>Flughafengelände DD</location>
diff --git a/content/news/linux-info-tag-2005.xml b/content/news/event-linux-info-tag-2005.xml
similarity index 93%
rename from content/news/linux-info-tag-2005.xml
rename to content/news/event-linux-info-tag-2005.xml
index 4ad02386b..99cfb1f30 100644
--- a/content/news/linux-info-tag-2005.xml
+++ b/content/news/event-linux-info-tag-2005.xml
@@ -1,7 +1,7 @@
 <?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="Linux-Info-Tag" date="2005-10-07T00:05:50" author="Fnordic walker" category="events">
+<item title="Linux-Info-Tag" date="2005-10-07T00:05:50" author="Fnordic walker">
   <image title="Dicker Pinguin">tux.png</image>
   <event>
     <start>2005-10-29</start>
diff --git a/content/news/linux-info-tag-2006.xml b/content/news/event-linux-info-tag-2006.xml
similarity index 95%
rename from content/news/linux-info-tag-2006.xml
rename to content/news/event-linux-info-tag-2006.xml
index 60066416b..705bf0aab 100644
--- a/content/news/linux-info-tag-2006.xml
+++ b/content/news/event-linux-info-tag-2006.xml
@@ -1,7 +1,7 @@
 <?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="Linux-Info-Tag" date="2006-09-20T15:50:50" author="Astro" category="events">
+<item title="Linux-Info-Tag" date="2006-09-20T15:50:50" author="Astro">
   <image title="Pygoscelis papua">tux.png</image>
   <event>
     <start>2006-10-08</start>
diff --git a/content/news/event-lit04.xml b/content/news/event-lit04.xml
index 67af04424..93b4423f1 100644
--- a/content/news/event-lit04.xml
+++ b/content/news/event-lit04.xml
@@ -1,7 +1,7 @@
 <?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="Linux Info Tag 2004" date="2004-10-30T12:00:00" author="riot" category="events">
+<item title="Linux Info Tag 2004" date="2004-10-30T12:00:00" author="riot">
     <event>
       <start>2004-10-30</start>
       <location>TU Dresden</location>
diff --git a/content/news/event-wth2005.xml b/content/news/event-wth2005.xml
index ffa1b2f55..4ab577b4e 100644
--- a/content/news/event-wth2005.xml
+++ b/content/news/event-wth2005.xml
@@ -1,7 +1,7 @@
 <?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="What The Hack 2005" date="2005-07-23T12:00:00" author="riot" category="events">
+<item title="What The Hack 2005" date="2005-07-23T12:00:00" author="riot">
     <image title="Picture">../bf6884ee26.jpg</image>
     <event>
       <start>2005-07-28</start>
diff --git a/content/news/mailingliste.xml b/content/news/mailingliste.xml
index 7e5eec7a1..e34658d55 100644
--- a/content/news/mailingliste.xml
+++ b/content/news/mailingliste.xml
@@ -1,7 +1,7 @@
 <?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="Mailingliste" date="2005-08-24T00:05:50" author="Fnordic walker" category="Allgemein">
+<item title="Mailingliste" date="2005-08-24T00:05:50" author="Fnordic walker">
   <image title="Delivered by mailman">mailman.jpg</image>
   <p>
     Achtung! die Mailinglistenadresse hat sich gerade geändert. Bitte nutzt <link href="mailto:c3d2@mail.skyhub.de">c3d2@mail.skyhub.de</link>.
diff --git a/content/news/no-software-patents.xml b/content/news/no-software-patents.xml
index 97d139699..0b4cf9a6a 100644
--- a/content/news/no-software-patents.xml
+++ b/content/news/no-software-patents.xml
@@ -1,7 +1,7 @@
 <?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="Petition gegen Softwarepatente" date="2003-10-15T00:00:01" author="riot" category="Allgemein">
+<item title="Petition gegen Softwarepatente" date="2003-10-15T00:00:01" author="riot">
     <image title="FreeFlag">freeflag.jpg</image>
     <p>Sehr geehrte Abgeordnete des Europäischen Parlamentes,</p>
 
diff --git a/content/news/office-picknick.xml b/content/news/office-picknick.xml
index 4751ed3f6..01585ad1c 100644
--- a/content/news/office-picknick.xml
+++ b/content/news/office-picknick.xml
@@ -1,7 +1,7 @@
 <?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="Office, the next level: Heute Picknick" date="2005-09-13T07:46:03" author="Alien8" category="Hq">
+<item title="Office, the next level: Heute Picknick" date="2005-09-13T07:46:03" author="Alien8">
   <event>
     <start>2005-09-13T19:00:00</start>
     <location>Dresden</location>
diff --git a/content/news/pentabarf-0.2.3.xml b/content/news/pentabarf-0.2.3.xml
index 897d82620..44d3f9f48 100644
--- a/content/news/pentabarf-0.2.3.xml
+++ b/content/news/pentabarf-0.2.3.xml
@@ -1,7 +1,7 @@
 <?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="Pentabarf 0.2.3 released" date="2006-05-23T00:23:05" author="Sven" category="Projekte">
+<item title="Pentabarf 0.2.3 released" date="2006-05-23T00:23:05" author="Sven">
   <image title="Pentabarf Logo">pentabarf.png</image>
   <p>
   Soeben wurde <link href="http://pentabarf.org">Pentabarf</link> 0.2.3 im Repository getagged. Die neue Version hat jetzt ein komplett lokalisiertes Feedback-Interface und einen komplett lokalisierten HTML-Export, außerdem gibt es jetzt auch einen XML-Export des Fahrplans. Den kompletten Changelog findet man im <link href="http://pentabarf.org/Changelog/0.2.3">Pentabarf-Wiki</link>.
diff --git a/content/news/pentabarf-0.2.4.xml b/content/news/pentabarf-0.2.4.xml
index 383baef91..2bd409746 100644
--- a/content/news/pentabarf-0.2.4.xml
+++ b/content/news/pentabarf-0.2.4.xml
@@ -1,7 +1,7 @@
 <?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="Pentabarf 0.2.4 released" date="2006-06-06T23:42:05" author="Sven" category="Projekte">
+<item title="Pentabarf 0.2.4 released" date="2006-06-06T23:42:05" author="Sven">
   <image title="Pentabarf Logo">pentabarf.png</image>
   <p>
   Die Version 0.2.4 ist hauptsächlich ein Bugfix-Release. Es wurde ein Fehler gefixt, der dazu führte das man im HTML-Export nicht mehr zwischen den Referenten navigieren konnte. Außerdem gibt es ein paar kleinere Erweiterungen am XML Fahrplan Export. Den kompletten Changelog findet man im <link href="http://pentabarf.org/Changelog/0.2.4">Pentabarf-Wiki</link>.
diff --git a/content/news/pentabarf-0.2.6.xml b/content/news/pentabarf-0.2.6.xml
index fbd71fac0..5ebfdcc4b 100644
--- a/content/news/pentabarf-0.2.6.xml
+++ b/content/news/pentabarf-0.2.6.xml
@@ -1,7 +1,7 @@
 <?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="Pentabarf 0.2.6 released" date="2006-07-24T15:22:01" author="Sven" category="Projekte">
+<item title="Pentabarf 0.2.6 released" date="2006-07-24T15:22:01" author="Sven">
   <image title="Pentabarf Logo">pentabarf.png</image>
   <p>
   Gestern abend wurde Pentabarf 0.2.6 released. In der neuen Version gibt es mehrere Verbesserungen am Submission-Interface, die Installation von Pentabarf wird durch ein Makefile erleichtert und man kann Events jetzt auch vom Web-Interface aus löschen.
diff --git a/content/news/pentabarf-0.2.7.xml b/content/news/pentabarf-0.2.7.xml
index 7b9b969a4..1cb3efb08 100644
--- a/content/news/pentabarf-0.2.7.xml
+++ b/content/news/pentabarf-0.2.7.xml
@@ -1,7 +1,7 @@
 <?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="Pentabarf 0.2.7 released" date="2006-08-28T13:42:01" author="Sven" category="Projekte">
+<item title="Pentabarf 0.2.7 released" date="2006-08-28T13:42:01" author="Sven">
   <image title="Pentabarf Logo">pentabarf.png</image>
   <p>
   Aufgrund eines <link href="http://dev.rubyonrails.org/ticket/5929">Fehlers in Rails</link> ist Pentabarf anfällig für Cross-Site Scripting. Die gestern veröffentlichte Version 0.2.7 enthält einen Workaround für diesen Bug. Außerdem wurde der Bugfix in alle anderen Versionen des 0.2er Zweigs zurückportiert. In der neuen Version gibt es außerdem weitere Bugfixes und mehrere Verbesserungen an der Lokalisierung. Den kompletten Changelog findet man wie immer im <link href="http://pentabarf.org/Changelog/0.2.7">Pentabarf-Wiki</link>.
diff --git a/content/news/pentaradio24-20060608-mitschnitt.xml b/content/news/pentaradio24-20060608-mitschnitt.xml
index 8c0e1d87e..a4a626efb 100644
--- a/content/news/pentaradio24-20060608-mitschnitt.xml
+++ b/content/news/pentaradio24-20060608-mitschnitt.xml
@@ -1,7 +1,7 @@
 <?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="RadioAbschalten!-Mitschnitt online" date="2006-06-09T14:59:23" author="pentaradio24-studios" category="(((c3d2)))">
+<item title="RadioAbschalten!-Mitschnitt online" date="2006-06-09T14:59:23" author="pentaradio24-studios">
   <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>
diff --git a/content/news/pentaradio24-20060608.xml b/content/news/pentaradio24-20060608.xml
index e45a68305..165ff1391 100644
--- a/content/news/pentaradio24-20060608.xml
+++ b/content/news/pentaradio24-20060608.xml
@@ -1,7 +1,7 @@
 <?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="(((c3d2))) pentaradio24" date="2006-06-08T14:21:23" author="Alien8" category="(((c3d2)))">
+<item title="(((c3d2))) pentaradio24" date="2006-06-08T14:21:23" author="Alien8">
   <p>
     Auf der Frequenz von <link href="http://www.coloradio.org/">Coloradio</link> sendet Pentaradio am 8.6.2006 von 21-22 Uhr. Tune in!
   </p>
diff --git a/content/news/pm-hackertools.xml b/content/news/pm-hackertools.xml
index b07f57df3..c7e76573d 100644
--- a/content/news/pm-hackertools.xml
+++ b/content/news/pm-hackertools.xml
@@ -1,7 +1,7 @@
 <?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="Gesetzentwurf bedroht Wirtschaftsstandort Deutschland" date="2006-09-26T00:00:23" author="Dimitri Puzin" category="Law &amp; Order">
+<item title="Gesetzentwurf bedroht Wirtschaftsstandort Deutschland" date="2006-09-26T00:00:23" author="Dimitri Puzin">
   <p>
     Ein neuer Gesetzentwurf verhindert die Entwicklung des Hightech-Standorts Deutschland und führt die IT-Landschaft zurück in die Informationssteinzeit.
   </p>
diff --git a/content/news/qemud-0.0.2.xml b/content/news/qemud-0.0.2.xml
index 795dc4a6c..42b8685d2 100644
--- a/content/news/qemud-0.0.2.xml
+++ b/content/news/qemud-0.0.2.xml
@@ -1,7 +1,7 @@
 <?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="qemud-0.0.2" date="2006-06-19T23:42:05" author="toidinamai" category="Projekte">
+<item title="qemud-0.0.2" date="2006-06-19T23:42:05" author="toidinamai">
   <p>
     <link href="http://trac.cccv.de/qemud">qemud</link> ist ein Daemon, der als
     Frontend für <link href="http://fabrice.bellard.free.fr/qemu/">qemu</link>,
diff --git a/content/news/ruby-ixp-0.1.xml b/content/news/ruby-ixp-0.1.xml
index 48757f60d..dffd07483 100644
--- a/content/news/ruby-ixp-0.1.xml
+++ b/content/news/ruby-ixp-0.1.xml
@@ -1,7 +1,7 @@
 <?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="Ruby-IXP 0.1 released" date="2006-07-02T20:19:00" author="Astro" category="Projekte">
+<item title="Ruby-IXP 0.1 released" date="2006-07-02T20:19:00" author="Astro">
   <image title="Der Ruby-Rubin">ruby.jpg</image>
   <p>
     <link href="http://home.gna.org/rubyixp/">Ruby-IXP</link> ist eine kleine 9P2000-Implementation um den Windowmanager <link href="http://wmii.de/">WMII</link> zu steuern.
diff --git a/content/news/shop-geoeffnet.xml b/content/news/shop-geoeffnet.xml
index 2505cc771..044479365 100644
--- a/content/news/shop-geoeffnet.xml
+++ b/content/news/shop-geoeffnet.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE item SYSTEM "http://www.c3d2.de/dtd/c3d2web.dtd">
 <?xml-stylesheet type="text/xsl" href="../../xsl/html.xsl" ?>
-<item title="Shop geöffnet" date="2005-07-21T12:42:52" author="Alien8" category="Shop">
+<item title="Shop geöffnet" date="2005-07-21T12:42:52" author="Alien8">
   <p>
 Wir haben jetzt auch einen <link href="shop.html">Einkaufsladen</link> mit Merchandisingartikeln.
   </p>
diff --git a/content/news/silc.xml b/content/news/silc.xml
index ed562b188..45eb9bbbf 100644
--- a/content/news/silc.xml
+++ b/content/news/silc.xml
@@ -1,7 +1,7 @@
 <?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="Silc.dresden.ccc.de" date="2005-04-13T05:23:05" author="Fnordic walker" category="Allgemein">
+<item title="Silc.dresden.ccc.de" date="2005-04-13T05:23:05" author="Fnordic walker">
   <image title="Secure Internet Live Conferencing">silc.png</image>
   <pre>/connect silc.dresden.ccc.de
 /connect -6 silc.dresden.ccc.de
diff --git a/content/news/ta-2k4.xml b/content/news/ta-2k4.xml
index a062ac430..391427870 100644
--- a/content/news/ta-2k4.xml
+++ b/content/news/ta-2k4.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE item SYSTEM "http://www.c3d2.de/dtd/c3d2web.dtd">
 <?xml-stylesheet type="text/xsl" href="../../xsl/html.xsl" ?>
-<item title="TA: Jahresrückblick 2004" date="2005-01-21T19:00:00" author="riot" category="Themenabend">
+<item title="TA: Jahresrückblick 2004" date="2005-01-21T19:00:00" author="riot">
   <event>
     <start>2005-01-21T19:00:00</start>
     <location>7.Stock, Wilsdruffer Straße 3, Ecke Pirnaischer Platz</location>
diff --git a/content/news/ta-biometrics.xml b/content/news/ta-biometrics.xml
index ea48ba698..f201d7d2b 100644
--- a/content/news/ta-biometrics.xml
+++ b/content/news/ta-biometrics.xml
@@ -1,7 +1,7 @@
 <?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="TA: Biometrie - Grundlagen, Nutzen, Probleme" date="2005-02-11T19:00:00" author="riot" category="Themenabend">
+<item title="TA: Biometrie - Grundlagen, Nutzen, Probleme" date="2005-02-11T19:00:00" author="riot">
   <event>
     <start>2005-02-11T19:00:00</start>
     <location>Berufsakademie, Heideparkstr. 8, 01099 Dresden, Raum G3</location>
diff --git a/content/news/ta-cli.xml b/content/news/ta-cli.xml
index a2595fefa..6b7211fda 100644
--- a/content/news/ta-cli.xml
+++ b/content/news/ta-cli.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE item SYSTEM "http://www.c3d2.de/dtd/c3d2web.dtd">
 <?xml-stylesheet type="text/xsl" href="../../xsl/html.xsl" ?>
-<item title="TA: nochmal: Console Tools" date="2005-02-16T19:00:00" author="riot" category="Themenabend">
+<item title="TA: nochmal: Console Tools" date="2005-02-16T19:00:00" author="riot">
   <event>
     <start>2005-02-16T19:00:00</start>
     <location>Berufsakademie, Heideparkstr. 8, 01099 Dresden, Raum G3</location>
diff --git a/content/news/ta-email.xml b/content/news/ta-email.xml
index e61149cfd..7c29bf080 100644
--- a/content/news/ta-email.xml
+++ b/content/news/ta-email.xml
@@ -1,7 +1,7 @@
 <?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="TA: Reisestationen Elektronischer Post" date="2004-10-15T19:00:00" author="riot" category="Themenabend">
+<item title="TA: Reisestationen Elektronischer Post" date="2004-10-15T19:00:00" author="riot">
   <event>
     <start>2004-10-15T19:00:00</start>
     <location>Pentacon</location>
diff --git a/content/news/ta-firewalls.xml b/content/news/ta-firewalls.xml
index 6531675cc..ccc1eb500 100644
--- a/content/news/ta-firewalls.xml
+++ b/content/news/ta-firewalls.xml
@@ -1,7 +1,7 @@
 <?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="TA: Mauerbau: Heute bauen wir uns eine brennende Wand." date="2004-08-13T22:00:00" author="riot" category="Themenabend">
+<item title="TA: Mauerbau: Heute bauen wir uns eine brennende Wand." date="2004-08-13T22:00:00" author="riot">
 <event>
   <start>2004-08-13T19:00:00</start>
   <location>Pentacon, Schandauer Straße 64</location>
diff --git a/content/news/ta-hacktivismus.xml b/content/news/ta-hacktivismus.xml
index f3b20c935..a3e586464 100644
--- a/content/news/ta-hacktivismus.xml
+++ b/content/news/ta-hacktivismus.xml
@@ -1,7 +1,7 @@
 <?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="TA: Hacktivismus" date="2005-07-04T20:00:00" author="Fnordic walker" category="Themenabend">
+<item title="TA: Hacktivismus" date="2005-07-04T20:00:00" author="Fnordic walker">
   <event>
     <start>2005-07-04T20:00:00</start>
     <location>AZ Conni</location>
diff --git a/content/news/ta-linksys.xml b/content/news/ta-linksys.xml
index e8dbe5c9e..063ecc60c 100644
--- a/content/news/ta-linksys.xml
+++ b/content/news/ta-linksys.xml
@@ -1,7 +1,7 @@
 <?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="TA: Linux auf Linksys WRT54G(S)" date="2004-11-19T19:00:00" author="riot" category="Themenabend">
+<item title="TA: Linux auf Linksys WRT54G(S)" date="2004-11-19T19:00:00" author="riot">
   <event>
     <start>2004-11-19T19:00:00</start>
     <location>Pentacon</location>
diff --git a/content/news/ta-muttersprache.xml b/content/news/ta-muttersprache.xml
index 44bda3ef7..a893d65b0 100644
--- a/content/news/ta-muttersprache.xml
+++ b/content/news/ta-muttersprache.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE item SYSTEM "http://www.c3d2.de/dtd/c3d2web.dtd">
 <?xml-stylesheet type="text/xsl" href="../../xsl/html.xsl" ?>
-<item title='TA: Muttersprache zwischen "Klickstartleiste" und "live gecancelten Systemupgrades"' date="2005-07-11T09:46:00" author="Alien8" category="Themenabend">
+<item title='TA: Muttersprache zwischen "Klickstartleiste" und "live gecancelten Systemupgrades"' date="2005-07-11T09:46:00" author="Alien8">
   <event>
     <start>2005-07-15T19:00:00</start>
     <location>Berufsakademie Dresden</location>
diff --git a/content/news/ta-python.xml b/content/news/ta-python.xml
index 394d8decf..54f344ec3 100644
--- a/content/news/ta-python.xml
+++ b/content/news/ta-python.xml
@@ -1,7 +1,7 @@
 <?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="TA: Python und Twisted" date="2006-07-27T15:00:00" author="Astro" category="Themenabend">
+<item title="TA: Python und Twisted" date="2006-07-27T15:00:00" author="Astro">
   <image title="Snakes bite!">python.png</image>
   <event>
     <start>2006-07-28T19:00:00</start>
diff --git a/content/news/ta-raid.xml b/content/news/ta-raid.xml
index 2ef3cd257..2c9d1b9df 100644
--- a/content/news/ta-raid.xml
+++ b/content/news/ta-raid.xml
@@ -1,7 +1,7 @@
 <?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="TA: RAID - zerstückelte Platten" date="2005-03-18T19:00:00" author="riot" category="Themenabend">
+<item title="TA: RAID - zerstückelte Platten" date="2005-03-18T19:00:00" author="riot">
   <event>
     <start>2005-03-08T19:00:00</start>
     <location>Berufsakademie Dresden, Baracke E, Heideparkstr. 8, 01099 Dresden</location>
diff --git a/content/news/ta-ruby.xml b/content/news/ta-ruby.xml
index 63b17fc7b..158c3c38d 100644
--- a/content/news/ta-ruby.xml
+++ b/content/news/ta-ruby.xml
@@ -1,7 +1,7 @@
 <?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="TA: Ruby &amp; Ruby on Rails" date="2006-03-19T19:00:00" author="Astro" category="Themenabend">
+<item title="TA: Ruby &amp; Ruby on Rails" date="2006-03-19T19:00:00" author="Astro">
   <image title="Ruby">ruby.jpg</image>
   <event>
     <start>2006-03-10T19:00:00</start>
diff --git a/content/news/ta-rwx.xml b/content/news/ta-rwx.xml
index d1c4d31c8..8f3bb90d1 100644
--- a/content/news/ta-rwx.xml
+++ b/content/news/ta-rwx.xml
@@ -1,7 +1,7 @@
 <?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="Themenabend: Beyond rwxr-x---" date="2006-06-14T23:05:50" author="Alien8" category="Themenabend">
+<item title="Themenabend: Beyond rwxr-x---" date="2006-06-14T23:05:50" author="Alien8">
   <image title="rwx">rwx.png</image>
   <event>
     <start>2006-06-22T19:00:00</start>
diff --git a/content/news/ta-softwarepatente.xml b/content/news/ta-softwarepatente.xml
index fef146f67..25a8bc4db 100644
--- a/content/news/ta-softwarepatente.xml
+++ b/content/news/ta-softwarepatente.xml
@@ -1,7 +1,7 @@
 <?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="TA: Computerimplementiere Erfindungen" date="2003-12-12T19:00:00" author="riot" category="Themenabend">
+<item title="TA: Computerimplementiere Erfindungen" date="2003-12-12T19:00:00" author="riot">
 
   <event>
     <start>2003-12-12T19:00:00</start>
diff --git a/content/news/ta-suchen_im_netz.xml b/content/news/ta-suchen_im_netz.xml
index 38affa9ec..16f2fc3a5 100644
--- a/content/news/ta-suchen_im_netz.xml
+++ b/content/news/ta-suchen_im_netz.xml
@@ -1,7 +1,7 @@
 <?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="TA: Effektiv suchen im Internet" date="2004-02-13T19:00:00" author="riot" category="Themenabend">
+<item title="TA: Effektiv suchen im Internet" date="2004-02-13T19:00:00" author="riot">
   <event>
     <start>2004-02-13T19:00:00</start>
     <location>Pentacon</location>
diff --git a/content/news/ta-tcpip.xml b/content/news/ta-tcpip.xml
index 4cdcfcb55..ef68de9e6 100644
--- a/content/news/ta-tcpip.xml
+++ b/content/news/ta-tcpip.xml
@@ -1,7 +1,7 @@
 <?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="TA: Grundlagen Internet Protokoll" date="2003-11-14T22:00:00" author="riot" category="Themenabend">
+<item title="TA: Grundlagen Internet Protokoll" date="2003-11-14T22:00:00" author="riot">
   <event>
     <start>2003-11-14T19:00:00</start>
     <location>Pentacon</location>
diff --git a/content/news/ta-unix.xml b/content/news/ta-unix.xml
index c4c403cb0..dd9053940 100644
--- a/content/news/ta-unix.xml
+++ b/content/news/ta-unix.xml
@@ -1,7 +1,7 @@
 <?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="TA: UNIX - Facetten eines OS" date="2004-09-16T19:00:00" author="riot" category="Themenabend">
+<item title="TA: UNIX - Facetten eines OS" date="2004-09-16T19:00:00" author="riot">
   <event>
     <start>2004-09-16T19:00:00</start>
     <location>Pentacon, Schandauer Straße 64</location>
diff --git a/content/news/ta-versionskontrollsysteme.xml b/content/news/ta-versionskontrollsysteme.xml
index 4c76cd454..d9fdd23c2 100644
--- a/content/news/ta-versionskontrollsysteme.xml
+++ b/content/news/ta-versionskontrollsysteme.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE item SYSTEM "http://www.c3d2.de/dtd/c3d2web.dtd">
 <?xml-stylesheet type="text/xsl" href="../../xsl/html.xsl" ?>
-<item title="TA: Ordnung, Kontrolle und Nummerierung!" date="2005-04-12T18:58:01" author="Alien8" category="Themenabend">
+<item title="TA: Ordnung, Kontrolle und Nummerierung!" date="2005-04-12T18:58:01" author="Alien8">
   <event>
     <start>2005-04-22T19:00:00</start>
     <location>Pentacon</location>
diff --git a/content/news/ta-webseiten.xml b/content/news/ta-webseiten.xml
index e68e63937..e90527b54 100644
--- a/content/news/ta-webseiten.xml
+++ b/content/news/ta-webseiten.xml
@@ -1,7 +1,7 @@
 <?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="TA: Webseiten-Sicherheit" date="2004-01-16T19:00:00" author="riot" category="Themenabend">
+<item title="TA: Webseiten-Sicherheit" date="2004-01-16T19:00:00" author="riot">
   <event>
     <start>2004-01-16T19:00:00</start>
     <location>Pentacon</location>
diff --git a/content/news/ta-wlan.xml b/content/news/ta-wlan.xml
index 5b3054016..7453b05b6 100644
--- a/content/news/ta-wlan.xml
+++ b/content/news/ta-wlan.xml
@@ -1,7 +1,7 @@
 <?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="TA: WLAN - Was nicht auf der Verpackung steht" date="2004-03-12T19:00:00" author="riot" category="Themenabend">
+<item title="TA: WLAN - Was nicht auf der Verpackung steht" date="2004-03-12T19:00:00" author="riot">
   <event>
     <start>2004-03-12T19:00:00</start>
     <location>Pentacon, Schandauer Straße 64</location>
diff --git a/content/news/verein-ig.xml b/content/news/verein-ig.xml
index 8fd64ed86..e2c95b64f 100644
--- a/content/news/verein-ig.xml
+++ b/content/news/verein-ig.xml
@@ -1,7 +1,7 @@
 <?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="Verein i.G." date="2005-08-29T12:49:24" author="Alien8" category="Verein">
+<item title="Verein i.G." date="2005-08-29T12:49:24" author="Alien8">
   <event>
     <start>2005-08-30T20:00:00</start>
     <location>Fachschaftscafè des FSR SpraLiKuWi, Zeunerstraße 1C / Zimmer 330, 01069 Dresden</location>
diff --git a/content/pages/events.xml b/content/pages/events.xml
index 735615ae3..983261d03 100644
--- a/content/pages/events.xml
+++ b/content/pages/events.xml
@@ -5,5 +5,5 @@
 <page title="Events">
  <p>Hier haben wir uns im laufe der Zeit rumgetrieben....
  </p>
- <news-list category="events" details="event"/>
+ <news-list prefix="event-" details="event"/>
 </page>
diff --git a/content/pages/themenabende.xml b/content/pages/themenabende.xml
index 8f6844892..591bc8505 100644
--- a/content/pages/themenabende.xml
+++ b/content/pages/themenabende.xml
@@ -6,5 +6,5 @@
  <p>
  Wir veranstalten in zumeist regelmäßigen Abständen Abende zu bestimmten Themen.
  </p>
- <news-list category="Themenabend" details="event"/>
+ <news-list prefix="ta-" details="event"/>
 </page>
diff --git a/dtd/c3d2web.dtd b/dtd/c3d2web.dtd
index 4bcc715f0..f3bfcf512 100644
--- a/dtd/c3d2web.dtd
+++ b/dtd/c3d2web.dtd
@@ -18,7 +18,6 @@
   title     CDATA   #REQUIRED
   date      CDATA   #REQUIRED
   author    CDATA   #REQUIRED
-  category  CDATA   #REQUIRED
   >
 
 <!ELEMENT addendum (%Block;)*>
@@ -33,7 +32,7 @@
 
 <!ELEMENT news-list EMPTY>
 <!ATTLIST news-list
-  category  CDATA   #IMPLIED
+  prefix    CDATA   #IMPLIED
   details   CDATA   #REQUIRED
   >
 
diff --git a/xsl/atom.xsl b/xsl/atom.xsl
index 8b53f8204..5a96fa0dc 100644
--- a/xsl/atom.xsl
+++ b/xsl/atom.xsl
@@ -62,6 +62,13 @@
       <author>
         <name><xsl:value-of select="@author"/></name>
       </author>
+      <category>
+        <xsl:attribute name="term"><xsl:choose>
+          <xsl:when test="starts-with($newsfile, 'content/news/ta-')">Themenabend</xsl:when>
+          <xsl:when test="starts-with($newsfile, 'content/news/event-')">Event</xsl:when>
+          <xsl:otherwise>Misc</xsl:otherwise>
+        </xsl:choose></xsl:attribute>
+      </category>
       <content type="xhtml">
         <div xmlns="http://www.w3.org/1999/xhtml">
           <xsl:apply-templates/>
diff --git a/xsl/ical.xsl b/xsl/ical.xsl
index 587d00f61..57c524af7 100644
--- a/xsl/ical.xsl
+++ b/xsl/ical.xsl
@@ -91,7 +91,17 @@
     <xsl:text>&#13;&#10;</xsl:text>
 
     <xsl:text>CATEGORY:</xsl:text>
-    <xsl:value-of select="@category"/>
+    <xsl:choose>
+      <xsl:when test="starts-with($newsfile, 'content/news/ta-')">
+        <item>Themenabend</item>
+      </xsl:when>
+      <xsl:when test="starts-with($newsfile, 'content/news/event-')">
+        <item>Event</item>
+      </xsl:when>
+      <xsl:otherwise>
+        <item>Misc</item>
+      </xsl:otherwise>
+    </xsl:choose>
     <xsl:text>&#13;&#10;</xsl:text>
 
     <xsl:text>URL:</xsl:text>
diff --git a/xsl/rss.xsl b/xsl/rss.xsl
index 3d235c2f9..9135aae7a 100644
--- a/xsl/rss.xsl
+++ b/xsl/rss.xsl
@@ -14,7 +14,7 @@
   <xsl:template match="news">
     <xsl:element name="rss">
       <xsl:attribute name="version">2.0</xsl:attribute>
-      <xsl:attribute name="xml:lang">de</xsl:attribute>
+      <!--xsl:attribute name="xml:lang">de</xsl:attribute-->
 
       <channel>
         <title>www.c3d2.de Newsfeed</title>
@@ -50,7 +50,19 @@
       <description><xsl:apply-templates mode="escaped"/></description>
       <link><xsl:value-of select="$href"/></link>
       <author><xsl:value-of select="@author"/></author>
-      <category><xsl:value-of select="@category"/></category>
+
+      <xsl:choose>
+        <xsl:when test="starts-with($newsfile, 'content/news/ta-')">
+          <category>Themenabend</category>
+        </xsl:when>
+        <xsl:when test="starts-with($newsfile, 'content/news/event-')">
+          <category>Event</category>
+        </xsl:when>
+        <xsl:otherwise>
+          <category>Misc</category>
+        </xsl:otherwise>
+      </xsl:choose>
+
       <guid isPermaLink="true"><xsl:value-of select="$href"/></guid>
 
       <pubDate>
diff --git a/xsl/xcal.xsl b/xsl/xcal.xsl
index a2193a16e..45cf072b3 100644
--- a/xsl/xcal.xsl
+++ b/xsl/xcal.xsl
@@ -69,7 +69,17 @@
       <location><xsl:value-of select="event/location"/></location>
 
       <categories>
-        <item><xsl:value-of select="@category"/></item>
+        <xsl:choose>
+          <xsl:when test="starts-with($newsfile, 'content/news/ta-')">
+            <item>Themenabend</item>
+          </xsl:when>
+          <xsl:when test="starts-with($newsfile, 'content/news/event-')">
+            <item>Event</item>
+          </xsl:when>
+          <xsl:otherwise>
+            <item>Misc</item>
+          </xsl:otherwise>
+        </xsl:choose>
       </categories>
 
     </vevent>
diff --git a/xsl/xhtml.xsl b/xsl/xhtml.xsl
index bd378a7ad..8069cfb84 100644
--- a/xsl/xhtml.xsl
+++ b/xsl/xhtml.xsl
@@ -310,7 +310,7 @@
   </xsl:template>
 
   <xsl:template match="news-list">
-    <xsl:variable name="category" select="@category"/>
+    <xsl:variable name="prefix" select="@prefix"/>
     <xsl:variable name="details" select="@details"/>
 
 
@@ -319,7 +319,7 @@
       <xsl:variable name="newsfile" select="."/>
 
       <xsl:for-each select="document(concat('../', $newsfile))/item">
-        <xsl:if test="(string-length($category) = 0) or ($category = @category)">
+        <xsl:if test="(string-length($prefix) = 0) or starts-with($newsfile, concat('content/news/', $prefix))">
 
           <div>
             <xsl:if test="($details = 'event') and event">