diff --git a/_graph_templates/24hrs_temp.svg.xml b/_graph_templates/24hrs_temp.svg.xml
index e44ef95..98cffc6 100644
--- a/_graph_templates/24hrs_temp.svg.xml
+++ b/_graph_templates/24hrs_temp.svg.xml
@@ -7,5 +7,5 @@
   <xformat>%H%M</xformat>
   <xlabel></xlabel>
   <dateformat></dateformat>
-  <xi:include href="includes/raw_temp_dew_feel_line.xml" parse="xml" />
+  <xi:include href="includes/raw_temp_feel_dew_line.xml" parse="xml" />
 </graph>
diff --git a/_graph_templates/7days_temp.svg.xml b/_graph_templates/7days_temp.svg.xml
index 04e5244..6e54693 100644
--- a/_graph_templates/7days_temp.svg.xml
+++ b/_graph_templates/7days_temp.svg.xml
@@ -6,5 +6,5 @@
   <xformat>%a %d</xformat>
   <xlabel></xlabel>
   <dateformat></dateformat>
-  <xi:include href="includes/hourly_temp_dew_feel_line.xml" parse="xml" />
+  <xi:include href="includes/hourly_temp_feel_dew_line.xml" parse="xml" />
 </graph>
diff --git a/_graph_templates/includes/hourly_cloud_base_line.xml b/_graph_templates/includes/hourly_cloud_base_line.xml
index d694200..a858902 100644
--- a/_graph_templates/includes/hourly_cloud_base_line.xml
+++ b/_graph_templates/includes/hourly_cloud_base_line.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-  <plot>
-    <title>Konvektionskondensationsniveau (m)</title>
+<plot>
+    <!-- Konvektionskondensationsniveau -->
     <yrange>0, 2500</yrange>
     <grid>ytics</grid>
     <source>hourly</source>
     <subplot>
       <colour>3</colour>
       <ycalc>cloud_base(data['temp_out'], data['hum_out'])</ycalc>
-      <title>Meter über Boden</title>
+      <title>Quellwolkenuntergrenze (m über Boden)</title>
     </subplot>
   </plot>
 
diff --git a/_graph_templates/includes/hourly_temp_dew_feel_line.xml b/_graph_templates/includes/hourly_temp_feel_dew_line.xml
similarity index 79%
rename from _graph_templates/includes/hourly_temp_dew_feel_line.xml
rename to _graph_templates/includes/hourly_temp_feel_dew_line.xml
index db1b6c8..c33b9b7 100644
--- a/_graph_templates/includes/hourly_temp_dew_feel_line.xml
+++ b/_graph_templates/includes/hourly_temp_feel_dew_line.xml
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
   <plot>
+    <title>Temperatur (℃)</title>
     <yrange>-20, 40</yrange>
     <grid>ytics</grid>
     <source>hourly</source>
     <subplot>
       <colour>1</colour>
-      <title>Temperatur (℃)</title>
+      <title>gemessen</title>
       <ycalc>data['temp_out']</ycalc>
     </subplot>
-    <subplot>
-      <colour>3</colour>
-      <ycalc>dew_point(data['temp_out'], data['hum_out'])</ycalc>
-      <title>Taupunkt (℃)</title>
-    </subplot>
     <subplot>
       <colour>4</colour>
       <ycalc>apparent_temp(data['temp_out'], data['hum_out'], data['wind_ave'])</ycalc>
-      <title>Gefühlte Temp. (℃)</title>
+      <title>gefühlt</title>
+    </subplot>
+    <subplot>
+      <colour>3</colour>
+      <ycalc>dew_point(data['temp_out'], data['hum_out'])</ycalc>
+      <title>Taupunkt</title>
     </subplot>
   </plot>
diff --git a/_graph_templates/includes/raw_cloud_base_line.xml b/_graph_templates/includes/raw_cloud_base_line.xml
index 0278cea..79b7777 100644
--- a/_graph_templates/includes/raw_cloud_base_line.xml
+++ b/_graph_templates/includes/raw_cloud_base_line.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
   <plot>
-    <title>Konvektionskondensationsniveau (m)</title>
+    <!-- Konvektionskondensationsniveau -->
     <yrange>0, 2500</yrange>
     <grid>ytics</grid>
     <source>raw</source>
     <subplot>
       <colour>3</colour>
       <ycalc>cloud_base(data['temp_out'], data['hum_out'])</ycalc>
-      <title>Meter über Boden</title>
+      <title>Quellwolkenuntergrenze (m über Boden)</title>
     </subplot>
   </plot>
 
diff --git a/_graph_templates/includes/raw_temp_dew_feel_line.xml b/_graph_templates/includes/raw_temp_feel_dew_line.xml
similarity index 79%
rename from _graph_templates/includes/raw_temp_dew_feel_line.xml
rename to _graph_templates/includes/raw_temp_feel_dew_line.xml
index 8ebcc59..bb2bfdd 100644
--- a/_graph_templates/includes/raw_temp_dew_feel_line.xml
+++ b/_graph_templates/includes/raw_temp_feel_dew_line.xml
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
   <plot>
+    <title>Temperatur (℃)</title>
     <yrange>-20, 40</yrange>
     <grid>ytics</grid>
     <source>raw</source>
     <subplot>
       <colour>1</colour>
-      <title>Temperatur (℃)</title>
+      <title>gemessen</title>
       <ycalc>data['temp_out']</ycalc>
     </subplot>
-    <subplot>
-      <colour>3</colour>
-      <ycalc>dew_point(data['temp_out'], data['hum_out'])</ycalc>
-      <title>Taupunkt (℃)</title>
-    </subplot>
     <subplot>
       <colour>4</colour>
       <ycalc>apparent_temp(data['temp_out'], data['hum_out'], data['wind_ave'])</ycalc>
-      <title>Gefühlte Temp. (℃)</title>
+      <title>gefühlt</title>
+    </subplot>
+    <subplot>
+      <colour>3</colour>
+      <ycalc>dew_point(data['temp_out'], data['hum_out'])</ycalc>
+      <title>Taupunkt</title>
     </subplot>
   </plot>
diff --git a/_graph_templates/tweet.png.xml b/_graph_templates/tweet.png.xml
index 5bbc70b..d464dae 100644
--- a/_graph_templates/tweet.png.xml
+++ b/_graph_templates/tweet.png.xml
@@ -9,6 +9,6 @@
   <xformat>%H%M</xformat>
   <xlabel></xlabel>
   <dateformat></dateformat>
-  <xi:include href="includes/raw_temp_dew_feel_line.xml" parse="xml" />
+  <xi:include href="includes/raw_temp_feel_dew_line.xml" parse="xml" />
   <xi:include href="includes/hourly_rain_sum_dual.xml" parse="xml" />
 </graph>
diff --git a/_templates/6hrs.txt b/_templates/6hrs.txt
index 7928953..53cb78a 100644
--- a/_templates/6hrs.txt
+++ b/_templates/6hrs.txt
@@ -11,7 +11,7 @@
     <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">KKN</a></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>