diff --git a/content/autotopia/index.xml b/content/autotopia/index.xml
index 0e3279f88..279cd13cf 100644
--- a/content/autotopia/index.xml
+++ b/content/autotopia/index.xml
@@ -4,13 +4,13 @@
 <page pagetitle="Start" title="Autotopia">
   <image class="vertical-header" title="Autotopia, Vertical Header" alt="Autotopia, Vertical Header">autotopia_vertical_header.svg</image>
   <div class="a-content">
-    <p class="a-content-item lang-en">
+    <p class="a-content-item" lang="en">
 	  The website is still under construction. For further information please visit our <link href="https://wiki.c3d2.de/GesellschaftMachtTechnik">Wiki</link>
     </p >
-    <p class="a-content-item lang-de">
+    <p class="a-content-item" lang="de-DE">
 	  Die Website ist zur Zeit im Aufbau. Nähere Infos im <link href="https://wiki.c3d2.de/GesellschaftMachtTechnik">Wiki</link>
     </p >
-    <div class="a-content-item lang-en">
+    <div class="a-content-item" lang="en">
       <p> Beginning with the industrial revolution, and the massive impact it had far into the 20th century, we can see again and again how advances in automation provoke social upheaval. By means of technological progress, fueled by a globally connected economy, disruptive technologies impact our lives and communities more and more frequently.
       </p>
       <p> The discussion on so-called ’future trends’ often appears too simplified and shortsighted. In debates artificial intelligence, predictive policing/mass surveillance, Industry 4.0, high-frequency trading, automated warfare, etc. are often framed by marketing campaigns as an ’obvious necessity’.
@@ -36,28 +36,28 @@ in the next couple of weeks. We are planning to do talks, workshops, readings, f
 and discussions. Is there someone you know, who we should absolutely ask?
       </p>
     </div>
-    <p class="a-content-item lang-en">
+    <p class="a-content-item" lang="en">
     <h2>news</h2>
     <news-list prefix="autotopia-en" details="all"/>
     </p>
-    <p class="a-content-item lang-de">
+    <p class="a-content-item" lang="de-DE">
     <h2>neuigkeiten</h2>
     <news-list prefix="autotopia-de" details="all"/>
     </p>
   </div>
   <div class="a-content-panel">
-    <p class="a-content-item lang-en">
+    <p class="a-content-item" lang="en">
       deutsch
     </p>
-    <p class="a-content-item lang-de">
+    <p class="a-content-item" lang="de-DE">
       english
     </p>
     <div class="a-content-item">
-      <h2 class="lang-en">contact</h2>
-      <h2 class="lang-de">kontakt</h2>
+      <p lang="en">contact</p>
+      <p lang="de-DE">kontakt</p>
       <p>
         <link href="https://wiki.c3d2.de/GesellschaftMachtTechnik">Wiki</link>
-        
+        &nbsp;  
         <link href="https://hackmd.c3d2.de/Autotopia">Pad</link>
       </p>
       <p>
@@ -73,16 +73,19 @@ and discussions. Is there someone you know, who we should absolutely ask?
         twitter: <link href="https://twitter.com/hashtag/AutotopiaDD?src=hash">#AutotopiaDD</link> via <link href="https://twitter.com/AutotopiaDD">@AutotopiaDD</link>
       </p>
     </div>
-    <div class="a-content-item lang-en">
-      <h2>events</h2>
+    <div class="a-content-item">
+      <p lang="en">events</p>
+      <p lang="de-DE">veranstaltungen</p>
       <table>
-      
+        <tr lang="en">
+          <th>a</th><th>b</th>
+        </tr>
+        <tr>
+          <td>c</td><td>d</td>
+        </tr>
       </table>
     </div>
-    <div class="a-content-item lang-de" lang="de">
-      <h2>veranstaltungen</h2>
-      <table>
-      </table>
+    <div class="a-content-item lang-de">
     </div>
   </div>
 </page>
diff --git a/content/static/autotopia/autotopia.css b/content/static/autotopia/autotopia.css
index 042fb2bb0..4deaf9d7f 100644
--- a/content/static/autotopia/autotopia.css
+++ b/content/static/autotopia/autotopia.css
@@ -56,7 +56,7 @@ background-color: rgba(240,240,250,0.6);
 text-align: justify;
 }
 
-.lang-de{
+:lang(de-DE) {
 visibility: hidden;
 display:none;
 }
diff --git a/xsl/autotopia/xhtml5.xsl b/xsl/autotopia/xhtml5.xsl
index 392da8cbd..a6e2cdf4d 100644
--- a/xsl/autotopia/xhtml5.xsl
+++ b/xsl/autotopia/xhtml5.xsl
@@ -117,5 +117,9 @@
   <xsl:template match="item/image">
     <!-- Nix Bilder in den Autotopia-News -->
   </xsl:template>
+  
+  <xsl:template match="table">
+    <xsl:copy-of select="."/>
+  </xsl:template>
 
 </xsl:stylesheet>