diff --git a/templates/course.hamlet b/templates/course.hamlet
index 858a48b74..6d929ee3d 100644
--- a/templates/course.hamlet
+++ b/templates/course.hamlet
@@ -1,47 +1,40 @@
 <div .container>
-  <div .scrolltable>
-    <table .table.table--striped.table--hover.table--vertical>
-      $maybe school <- schoolMB
-        <tr .table__row>
-          <th #school .table__th>Fakultät/Institut
-          <td .table__td>
-            <div.table__td-content>
-              #{schoolName school}
-      $maybe descr <- courseDescription course
-        <tr .table__row>
-          <th #description .table__th>Beschreibung
-          <td .table__td>
-            <div.table__td-content>
-              #{descr}
-      $maybe link <- courseLinkExternal course
-        <tr .table__row>
-          <th #website .table__th>Website
-          <td .table__td>
-            <div.table__td-content>
-              <a href=#{link} target="_blank" rel="noopener" title="Website des Kurses">#{link}
-      <tr .table__row>
-        <th #participants .table__th>Teilnehmer
-        <td .table__td>
-          <div.table__td-content>
-            #{participants}
-            $maybe capacity <- courseCapacity course
-              \ von #{capacity}
-      $maybe regFrom <- courseRegisterFrom course
-        <tr .table__row>
-          <th #registration .table__th>Anmeldezeitraum
-          <td .table__td>
-            <div.table__td-content>
-              Ab #{formatTimeGerWD regFrom}
-              $maybe regTo   <- courseRegisterTo   course
-                \ bis #{formatTimeGerWD regTo}
-      $if registrationOpen
-        <tr .table__row>
-          <th .table__th>
-          <td .table__td>
-            <div .table__td-content.course__registration.container>
-              <form method=post action=@{CourseR tid csh CRegisterR} enctype=#{regEnctype}>
-                $# regWidget is defined through templates/widgets/registerForm
-                ^{regWidget}
+  <dl .deflist>
+    $maybe school <- schoolMB
+      <dt .deflist__dt>Fakultät/Institut
+      <dd .deflist__dd>
+        <div>
+          #{schoolName school}
+    $maybe descr <- courseDescription course
+      <dt .deflist__dt>Beschreibung
+      <dd .deflist__dd>
+        <div>
+          #{descr}
+    $maybe link <- courseLinkExternal course
+      <dt .deflist__dt>Website
+      <dd .deflist__dd>
+        <div>
+          <a href=#{link} target="_blank" rel="noopener" title="Website des Kurses">#{link}
+    <dt .deflist__dt>Teilnehmer
+    <dd .deflist__dd>
+      <div>
+        #{participants}
+        $maybe capacity <- courseCapacity course
+          \ von #{capacity}
+    $maybe regFrom <- courseRegisterFrom course
+      <dt .deflist__dt>Anmeldezeitraum
+      <dd .deflist__dd>
+        <div>
+          Ab #{formatTimeGerWD regFrom}
+          $maybe regTo   <- courseRegisterTo   course
+            \ bis #{formatTimeGerWD regTo}
+    $if registrationOpen
+      <dt .deflist__dt>
+      <dd .deflist__dd>
+        <div .course__registration>
+          <form method=post action=@{CourseR tid csh CRegisterR} enctype=#{regEnctype}>
+            $# regWidget is defined through templates/widgets/registerForm
+            ^{regWidget}
 
 $# <div .container>
 $#   <div .tab-group>