diff --git a/_templates/12months.txt b/_templates/12months.txt
index fc25186..0d27d9c 100644
--- a/_templates/12months.txt
+++ b/_templates/12months.txt
@@ -2,41 +2,45 @@
 #locale True#
 #timezone local#
 <table border="1" rules="all">
-  <tr>
-    <th rowspan="3">Monat</th>
-    <th colspan="7">Temperatur</th>
-    <th colspan="2">Regen</th>
-  </tr>
-  <tr>
-    <th colspan="3">Tag max.</th>
-    <th rowspan="2">Ø</th>
-    <th colspan="3">Nacht min.</th>
-    <th rowspan="2">Menge</th>
-    <th rowspan="2">Tage</th>
-  </tr>
-  <tr>
-    <th>höchste</th>
-    <th>durchschn.</th>
-    <th>tiefste</th>
-    <th>höchste</th>
-    <th>durchschn.</th>
-    <th>tiefste</th>
-  </tr>
+  <thead>
+    <tr>
+      <th rowspan="3">Monat</th>
+      <th colspan="7">Temperatur</th>
+      <th colspan="2">Regen</th>
+    </tr>
+    <tr>
+      <th colspan="3">Tag max.</th>
+      <th rowspan="2">Ø</th>
+      <th colspan="3">Nacht min.</th>
+      <th rowspan="2">Menge</th>
+      <th rowspan="2">Tage</th>
+    </tr>
+    <tr>
+      <th>höchste</th>
+      <th>durchschn.</th>
+      <th>tiefste</th>
+      <th>höchste</th>
+      <th>durchschn.</th>
+      <th>tiefste</th>
+    </tr>
+  </thead>
+  <tbody>
 #monthly#
 #jump -11#
 #loop 12#
-  <tr>
-    <td class="right">#calc "data['start']+DAY" "%B %Y"#</td>
-    <td>#temp_out_max_hi "%.1f ℃"#</td>
-    <td>#temp_out_max_ave "%.1f ℃"#</td>
-    <td>#temp_out_max_lo "%.1f ℃"#</td>
-    <td>#temp_out_ave "%.1f ℃"#</td>
-    <td>#temp_out_min_hi "%.1f ℃"#</td>
-    <td>#temp_out_min_ave "%.1f ℃"#</td>
-    <td>#temp_out_min_lo "%.1f ℃"#</td>
-    <td>#rain "%0.1f ㎜"#</td>
-    <td>#rain_days "%d"#</td>
-  </tr>
+    <tr>
+      <td class="right">#calc "data['start']+DAY" "%B %Y"#</td>
+      <td>#temp_out_max_hi "%.1f ℃"#</td>
+      <td>#temp_out_max_ave "%.1f ℃"#</td>
+      <td>#temp_out_max_lo "%.1f ℃"#</td>
+      <td>#temp_out_ave "%.1f ℃"#</td>
+      <td>#temp_out_min_hi "%.1f ℃"#</td>
+      <td>#temp_out_min_ave "%.1f ℃"#</td>
+      <td>#temp_out_min_lo "%.1f ℃"#</td>
+      <td>#rain "%0.1f ㎜"#</td>
+      <td>#rain_days "%d"#</td>
+    </tr>
 #jump 1#
 #endloop#
+  </tbody>
 </table>
diff --git a/_templates/6hrs.txt b/_templates/6hrs.txt
index 53cb78a..0138526 100644
--- a/_templates/6hrs.txt
+++ b/_templates/6hrs.txt
@@ -2,40 +2,47 @@
 #locale True#
 #timezone local#
 #roundtime True#
-<table border="1" rules="all">
-  <tr>
-    <th colspan="2" rowspan="2">Datum &amp; Zeit</th>
-    <th rowspan="2">Temp</th>
-    <th rowspan="2">Gefühlt</th>
-    <th rowspan="2">Feuchte</th>
-    <th colspan="3">Wind</th>
-    <th rowspan="2">Regen</th>
-    <th rowspan="2">Luftdruck</th>
-    <th rowspan="2"><a href="https://de.wikipedia.org/wiki/Kondensationsniveau##Konvektionskondensationsniveau" title="Quellwolkenuntergrenze">KKN</a></th>
-    <th rowspan="2">Vorhersage</th>
-  </tr>
-  <tr>
-    <th>Ri</th>
-    <th>Ø</th>
-    <th>Boe</th>
-  </tr>
+<table border="1" rules="all" class="mdl-data-table mdl-js-data-table">
+  <thead>
+    <tr>
+      <th class="mdl-data-table__cell--non-numeric mdl-data-table__header--sorted-ascending" colspan="2" rowspan="2">Datum &amp; Zeit</th>
+      <th class="mdl-data-table__cell--non-numeric" rowspan="2">Temp</th>
+      <th class="mdl-data-table__cell--non-numeric" rowspan="2">Gefühlt</th>
+      <th class="mdl-data-table__cell--non-numeric" rowspan="2">Feuchte</th>
+      <th class="mdl-data-table__cell--non-numeric" colspan="3">Wind</th>
+      <th class="mdl-data-table__cell--non-numeric" rowspan="2">Regen</th>
+      <th class="mdl-data-table__cell--non-numeric" colspan="2">Luftdruck</th>
+      <th class="mdl-data-table__cell--non-numeric" rowspan="2"><a href="https://de.wikipedia.org/wiki/Kondensationsniveau##Konvektionskondensationsniveau" title="Quellwolkenuntergrenze">KKN</a></th>
+      <th class="mdl-data-table__cell--non-numeric" rowspan="2">Vorhersage</th>
+    </tr>
+    <tr>
+      <th class="mdl-data-table__cell--non-numeric">Ri</th>
+      <th class="mdl-data-table__cell--non-numeric">Ø</th>
+      <th class="mdl-data-table__cell--non-numeric">Boe</th>
+      <th class="mdl-data-table__cell--non-numeric">Druck</th>
+      <th class="mdl-data-table__cell--non-numeric">Tendenz</th>
+    </tr>
+  </thead>
+  <tbody>
 #hourly#
 #jump -6#
 #loop 7#
-  <tr>
-    <td>#idx "%Y-%m-%d" "" "[None, x][x.hour == 0 or loop_count == 7]"#</td>
-    <td>#idx "%H%M %Z"#</td>
-    <td>#temp_out "%.1f ℃"#</td>
-    <td>#calc "apparent_temp(data['temp_out'], data['hum_out'], data['wind_ave'])" "%.1f ℃"#</td>
-    <td>#hum_out "%d%%"#</td>
-    <td>#wind_dir "%s" "-" "winddir_text(x)"#</td>
-    <td>#wind_ave "%.0f ㎞/h" "" "wind_kmph(x)"#</td>
-    <td>#wind_gust "%.0f ㎞/h" "" "wind_kmph(x)"#</td>
-    <td>#rain "%0.1f ㎜"#</td>
-    <td>#rel_pressure "%.0f ㍱"#, #pressure_trend "%s" "" "pressure_trend_text(x)"#</td>
-    <td>#calc "cloud_base(data['temp_out'], data['hum_out'])" "%.0f m"#</td>
-    <td>#calc "Zambretti(params, data)"#</td>
-  </tr>
+    <tr>
+      <td>#idx "%Y-%m-%d" "" "[None, x][x.hour == 0 or loop_count == 7]"#</td>
+      <td>#idx "%H%M %Z"#</td>
+      <td>#temp_out "%.1f ℃"#</td>
+      <td>#calc "apparent_temp(data['temp_out'], data['hum_out'], data['wind_ave'])" "%.1f ℃"#</td>
+      <td>#hum_out "%d%%"#</td>
+      <td class="mdl-data-table__cell--non-numeric">#wind_dir "%s" "-" "winddir_text(x)"#</td>
+      <td>#wind_ave "%.0f ㎞/h" "" "wind_kmph(x)"#</td>
+      <td>#wind_gust "%.0f ㎞/h" "" "wind_kmph(x)"#</td>
+      <td>#rain "%0.1f ㎜"#</td>
+      <td>#rel_pressure "%.0f ㍱"#</td>
+      <td class="mdl-data-table__cell--non-numeric">#pressure_trend "%s" "" "pressure_trend_text(x)"#</td>
+      <td>#calc "cloud_base(data['temp_out'], data['hum_out'])" "%.0f m"#</td>
+      <td class="mdl-data-table__cell--non-numeric">#calc "Zambretti(params, data)"#</td>
+    </tr>
 #jump 1#
 #endloop#
+  </tbody>
 </table>
diff --git a/_templates/7days.txt b/_templates/7days.txt
index bcf2e5a..88cd707 100644
--- a/_templates/7days.txt
+++ b/_templates/7days.txt
@@ -2,33 +2,37 @@
 #locale True#
 #timezone local#
 <table border="1" rules="all">
-  <tr>
-    <th rowspan="2">letzte 24 Std. bis</th>
-    <th colspan="3">Temperatur</th>
-    <th colspan="3">Wind</th>
-    <th rowspan="2">Regenfall</th>
-  </tr>
-  <tr>
-    <th>Tag max.</th>
-    <th>Ø</th>
-    <th>Nacht min.</th>
-    <th>Ri</th>
-    <th>durchschn.</th>
-    <th>max. Boe</th>
-  </tr>
+  <thead>
+    <tr>
+      <th rowspan="2">letzte 24 Std. bis</th>
+      <th colspan="3">Temperatur</th>
+      <th colspan="3">Wind</th>
+      <th rowspan="2">Regenfall</th>
+    </tr>
+    <tr>
+      <th>Tag max.</th>
+      <th>Ø</th>
+      <th>Nacht min.</th>
+      <th>Ri</th>
+      <th>durchschn.</th>
+      <th>max. Boe</th>
+    </tr>
+  </thead>
+  <tbody>
 #daily#
 #jump -7#
 #loop 7#
-  <tr>
-    <td>#idx "%Y-%m-%d %H:%M %Z"#</td>
-    <td>#temp_out_max "%.1f ℃"#</td>
-    <td>#temp_out_ave "%.1f ℃"#</td>
-    <td>#temp_out_min "%.1f ℃"#</td>
-    <td>#wind_dir "%s" "-" "winddir_text(x)"#</td>
-    <td>#wind_ave "%.0f ㎞/h" "" "wind_kmph(x)"#</td>
-    <td>#wind_gust "%.0f ㎞/h" "" "wind_kmph(x)"#</td>
-    <td>#rain "%0.1f ㎜"#</td>
-  </tr>
+    <tr>
+      <td>#idx "%Y-%m-%d %H:%M %Z"#</td>
+      <td>#temp_out_max "%.1f ℃"#</td>
+      <td>#temp_out_ave "%.1f ℃"#</td>
+      <td>#temp_out_min "%.1f ℃"#</td>
+      <td>#wind_dir "%s" "-" "winddir_text(x)"#</td>
+      <td>#wind_ave "%.0f ㎞/h" "" "wind_kmph(x)"#</td>
+      <td>#wind_gust "%.0f ㎞/h" "" "wind_kmph(x)"#</td>
+      <td>#rain "%0.1f ㎜"#</td>
+    </tr>
 #jump 1#
 #endloop#
+  </tbody>
 </table>
diff --git a/_templates/allmonths.txt b/_templates/allmonths.txt
index b5afc3d..91c9b3f 100644
--- a/_templates/allmonths.txt
+++ b/_templates/allmonths.txt
@@ -2,40 +2,44 @@
 #locale True#
 #timezone local#
 <table border="1" rules="all">
-  <tr>
-    <th rowspan="3">Monat</th>
-    <th colspan="7">Temperatur</th>
-    <th colspan="2">Regen</th>
-  </tr>
-  <tr>
-    <th colspan="3">Tag max.</th>
-    <th rowspan="2">Ø</th>
-    <th colspan="3">Nacht min.</th>
-    <th rowspan="2">Menge</th>
-    <th rowspan="2">Tage</th>
-  </tr>
-  <tr>
-    <th>höchstes</th>
-    <th>durchschn.</th>
-    <th>tiefstes</th>
-    <th>höchstes</th>
-    <th>durchschn.</th>
-    <th>tiefstes</th>
-  </tr>
+  <thead>
+    <tr>
+      <th rowspan="3">Monat</th>
+      <th colspan="7">Temperatur</th>
+      <th colspan="2">Regen</th>
+    </tr>
+    <tr>
+      <th colspan="3">Tag max.</th>
+      <th rowspan="2">Ø</th>
+      <th colspan="3">Nacht min.</th>
+      <th rowspan="2">Menge</th>
+      <th rowspan="2">Tage</th>
+    </tr>
+    <tr>
+      <th>höchstes</th>
+      <th>durchschn.</th>
+      <th>tiefstes</th>
+      <th>höchstes</th>
+      <th>durchschn.</th>
+      <th>tiefstes</th>
+    </tr>
+  </thead>
+  <tbody>
 #monthly#
 #loop 10000#
-  <tr>
-    <td class="right">#idx "%B %Y"#</td>
-    <td>#temp_out_max_hi "%.1f ℃"#</td>
-    <td>#temp_out_max_ave "%.1f ℃"#</td>
-    <td>#temp_out_max_lo "%.1f ℃"#</td>
-    <td>#temp_out_ave "%.1f ℃"#</td>
-    <td>#temp_out_min_hi "%.1f ℃"#</td>
-    <td>#temp_out_min_ave "%.1f ℃"#</td>
-    <td>#temp_out_min_lo "%.1f ℃"#</td>
-    <td>#rain "%0.1f ㎜"#</td>
-    <td>#rain_days "%d"#</td>
-  </tr>
+    <tr>
+      <td class="right">#idx "%B %Y"#</td>
+      <td>#temp_out_max_hi "%.1f ℃"#</td>
+      <td>#temp_out_max_ave "%.1f ℃"#</td>
+      <td>#temp_out_max_lo "%.1f ℃"#</td>
+      <td>#temp_out_ave "%.1f ℃"#</td>
+      <td>#temp_out_min_hi "%.1f ℃"#</td>
+      <td>#temp_out_min_ave "%.1f ℃"#</td>
+      <td>#temp_out_min_lo "%.1f ℃"#</td>
+      <td>#rain "%0.1f ㎜"#</td>
+      <td>#rain_days "%d"#</td>
+    </tr>
 #jump -1#
 #endloop#
+  </tbody>
 </table>