diff --git a/_templates/12months.txt b/_templates/12months.txt
index 5e85758..25e7166 100644
--- a/_templates/12months.txt
+++ b/_templates/12months.txt
@@ -1,13 +1,16 @@
+#encoding html#
 <table border="1" rules="all">
   <tr>
     <th rowspan="3">Monat</th>
     <th colspan="7">Temperatur</th>
-    <th rowspan="3">Regenfall</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>
@@ -22,7 +25,7 @@
 #jump -11#
 #loop 12#
   <tr>
-    <td class="right">#idx "%B %Y"#</td>
+    <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>
@@ -31,6 +34,7 @@
     <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#
diff --git a/_templates/24hrs.txt b/_templates/24hrs.txt
index 9d85a6f..7a2c2af 100644
--- a/_templates/24hrs.txt
+++ b/_templates/24hrs.txt
@@ -1,5 +1,7 @@
+#encoding html#
 #daily#
 #timezone local#
+#roundtime True#
 <table border="1" rules="all">
 #jump -1#
 #loop 2#
diff --git a/_templates/6hrs.txt b/_templates/6hrs.txt
index 1b72aa8..44dc0e4 100644
--- a/_templates/6hrs.txt
+++ b/_templates/6hrs.txt
@@ -1,3 +1,4 @@
+#encoding html#
 <table border="1" rules="all">
   <tr>
     <th colspan="2" rowspan="2">Datum &amp; Zeit</th>
@@ -16,6 +17,7 @@
     <th>Boe</th>
   </tr>
 #timezone local#
+#roundtime True#
 #hourly#
 #jump -6#
 #loop 7#
diff --git a/_templates/allmonths.txt b/_templates/allmonths.txt
index 0a111a7..373f710 100644
--- a/_templates/allmonths.txt
+++ b/_templates/allmonths.txt
@@ -1,13 +1,16 @@
+#encoding html#
 <table border="1" rules="all">
   <tr>
     <th rowspan="3">Monat</th>
     <th colspan="7">Temperatur</th>
-    <th rowspan="3">Regenfall</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>
@@ -30,6 +33,7 @@
     <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#