diff --git a/_templates/12months.txt b/_templates/12months.txt
index 1e72076..245a8d6 100644
--- a/_templates/12months.txt
+++ b/_templates/12months.txt
@@ -4,14 +4,14 @@
 <table border="1" rules="all" class="mdl-data-table mdl-js-data-table">
   <thead>
     <tr>
-      <th rowspan="3">Monat</th>
-      <th colspan="7">Temperatur</th>
-      <th colspan="2">Regen</th>
+      <th rowspan="3" class="mdl-data-table__header--sorted-ascending">Monat</th>
+      <th colspan="7" class="mdl-data-table__cell--non-numeric">Temperatur</th>
+      <th colspan="2" class="mdl-data-table__cell--non-numeric">Regen</th>
     </tr>
     <tr>
-      <th colspan="3">Tag max.</th>
+      <th colspan="3" class="mdl-data-table__cell--non-numeric">Tag max.</th>
       <th rowspan="2">Ø</th>
-      <th colspan="3">Nacht min.</th>
+      <th colspan="3" class="mdl-data-table__cell--non-numeric">Nacht min.</th>
       <th rowspan="2">Menge</th>
       <th rowspan="2">Tage</th>
     </tr>
@@ -29,7 +29,7 @@
 #jump -11#
 #loop 12#
     <tr>
-      <td class="right">#calc "data['start']+DAY" "%B %Y"#</td>
+      <td class="mdl-data-table__cell--non-numeric">#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>
diff --git a/_templates/24hrs.txt b/_templates/24hrs.txt
index a995647..7ef6528 100644
--- a/_templates/24hrs.txt
+++ b/_templates/24hrs.txt
@@ -5,10 +5,10 @@
 #daily#
 #jump -1#
 #loop 2#
-<table border="1" rules="all">
+<table border="1" rules="all" class="mdl-data-table mdl-js-data-table">
   <thead>
     <tr>
-      <th colspan="2" class="left">
+      <th colspan="2" class="mdl-data-table__cell--non-numeric">
         #start "Von %H%M %Z am %d %b bis" "letzte 24 Std. bis" "[x, None][loop_count == 2]"#
 #idx " %H%M %Z am %d %b %Y"# 
       </th>
@@ -17,32 +17,32 @@
   </thead>
   <tbody>
     <tr>
-      <th class="right">Tag max. Temperatur</th>
+      <th class="mdl-data-table__cell--non-numeric">Tag max. Temperatur</th>
       <td>#temp_out_max "%.1f ℃"#</td>
       <td>#temp_out_max_t "%Y-%m-%d</td><td>%H%M %Z"#</td>
     </tr>
     <tr>
-      <th class="right">Tag durchschn. Temperatur</th>
+      <th class="mdl-data-table__cell--non-numeric">Tag durchschn. Temperatur</th>
       <td>#temp_out_ave "%.1f ℃"#</td>
       <td colspan="2"></td>
     </tr>
     <tr>
-      <th class="right">Nacht min. Temperatur</th>
+      <th class="mdl-data-table__cell--non-numeric">Nacht min. Temperatur</th>
       <td>#temp_out_min "%.1f ℃"#</td>
       <td>#temp_out_min_t "%Y-%m-%d</td><td>%H%M %Z"#</td>
     </tr>
     <tr>
-      <th class="right">Gesamter Regenfall</th>
+      <th class="mdl-data-table__cell--non-numeric">Gesamter Regenfall</th>
       <td>#rain "%.1f ㎜"#</td>
       <td colspan="2"></td>
     </tr>
     <tr>
-      <th class="right">Durchschn. Windgeschwindigkeit</th>
+      <th class="mdl-data-table__cell--non-numeric">Durchschn. Windgeschwindigkeit</th>
       <td>#wind_ave "%.0f ㎞/h" "-" "wind_kmph(x)"#</td>
       <td colspan="2"></td>
     </tr>
     <tr>
-      <th class="right">Höchste Boe-Geschwindigkeit</th>
+      <th class="mdl-data-table__cell--non-numeric">Höchste Boe-Geschwindigkeit</th>
       <td>#wind_gust "%.0f ㎞/h" "-" "wind_kmph(x)"#</td>
       <td>#wind_gust_t "%Y-%m-%d</td><td>%H%M %Z"#</td>
     </tr>