diff --git a/_graph_templates/24hrs.png.xml b/_graph_templates/24hrs.png.xml
index d332553..d6a694d 100644
--- a/_graph_templates/24hrs.png.xml
+++ b/_graph_templates/24hrs.png.xml
@@ -6,53 +6,8 @@
   <xtics>2</xtics>
   <xformat>%H%M</xformat>
   <dateformat></dateformat>
-  <plot>
-    <yrange>-20, 40</yrange>
-    <source>raw</source>
-    <subplot>
-      <colour>1</colour>
-      <title>Temperatur (℃)</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>
-  </plot>
-  <plot>
-    <title>Windgeschwindigkeit (km/h)</title>
-    <yrange>0, 30</yrange>
-    <source>raw</source>
-    <subplot>
-      <colour>4</colour>
-      <ycalc>data['wind_gust'] * 3.6</ycalc>
-      <title>Boe</title>
-    </subplot>
-    <subplot>
-      <colour>3</colour>
-      <ycalc>data['wind_ave'] * 3.6</ycalc>
-      <title>durchschn.</title>
-    </subplot>
-  </plot>
-  <plot>
-    <yrange>0, 5</yrange>
-    <source>hourly</source>
-    <subplot>
-      <colour>5</colour>
-      <style>box</style>
-      <xcalc>data['idx'].replace(minute=30, second=0)</xcalc>
-      <ycalc>data['rain']</ycalc>
-      <title>Tägl. Regenfall (mm)</title>
-    </subplot>
-  </plot>
-  <plot>
-    <source>hourly</source>
-    <subplot>
-      <colour>2</colour>
-      <ycalc>data['rel_pressure']</ycalc>
-      <title>Luftdruck (hPa)</title>
-    </subplot>
-    <yrange>960, 1050</yrange>
-  </plot>
+  <xi:include href="includes/raw_temp_dew_line.xml" parse="xml" />
+  <xi:include href="includes/raw_wind_gust_line.xml" parse="xml" />
+  <xi:include href="includes/hourly_rain_bar.xml" parse="xml" />
+  <xi:include href="includes/hourly_press_line.xml" parse="xml" />
 </graph>
diff --git a/_graph_templates/24hrs.svg.xml b/_graph_templates/24hrs.svg.xml
index 07c2fee..c4a380b 100644
--- a/_graph_templates/24hrs.svg.xml
+++ b/_graph_templates/24hrs.svg.xml
@@ -6,54 +6,8 @@
   <xtics>2</xtics>
   <xformat>%H%M</xformat>
   <dateformat></dateformat>
-  <plot>
-    <yrange>-20, 40</yrange>
-    <grid>ytics</grid>
-    <source>raw</source>
-    <subplot>
-      <colour>1</colour>
-      <title>Temperatur (℃)</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>
-  </plot>
-  <plot>
-    <title>Windgeschwindigkeit (km/h)</title>
-    <yrange>0, 30</yrange>
-    <source>raw</source>
-    <subplot>
-      <colour>4</colour>
-      <ycalc>data['wind_gust'] * 3.6</ycalc>
-      <title>Boe</title>
-    </subplot>
-    <subplot>
-      <colour>3</colour>
-      <ycalc>data['wind_ave'] * 3.6</ycalc>
-      <title>durchschn.</title>
-    </subplot>
-  </plot>
-  <plot>
-    <yrange>0, 5</yrange>
-    <source>hourly</source>
-    <subplot>
-      <colour>rgb "#2196F3"</colour>
-      <style>box</style>
-      <xcalc>data['idx'].replace(minute=30, second=0)</xcalc>
-      <ycalc>data['rain']</ycalc>
-      <title>Tägl. Regenfall (mm)</title>
-    </subplot>
-  </plot>
-  <plot>
-    <source>hourly</source>
-    <subplot>
-      <colour>2</colour>
-      <ycalc>data['rel_pressure']</ycalc>
-      <title>Luftdruck (hPa)</title>
-    </subplot>
-    <yrange>960, 1050</yrange>
-  </plot>
+  <xi:include href="includes/raw_temp_dew_line.xml" parse="xml" />
+  <xi:include href="includes/raw_wind_gust_line.xml" parse="xml" />
+  <xi:include href="includes/hourly_rain_bar.xml" parse="xml" />
+  <xi:include href="includes/hourly_press_line.xml" parse="xml" />
 </graph>
diff --git a/_graph_templates/includes/hourly_press_line.xml b/_graph_templates/includes/hourly_press_line.xml
new file mode 100644
index 0000000..607e93b
--- /dev/null
+++ b/_graph_templates/includes/hourly_press_line.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+  <plot>
+    <source>hourly</source>
+    <subplot>
+      <colour>2</colour>
+      <ycalc>data['rel_pressure']</ycalc>
+      <title>Luftdruck (hPa)</title>
+    </subplot>
+    <yrange>960, 1050</yrange>
+  </plot>
diff --git a/_graph_templates/includes/hourly_rain_bar.xml b/_graph_templates/includes/hourly_rain_bar.xml
new file mode 100644
index 0000000..5e7ab9c
--- /dev/null
+++ b/_graph_templates/includes/hourly_rain_bar.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+  <plot>
+    <yrange>0, 5</yrange>
+    <source>hourly</source>
+    <subplot>
+      <colour>rgb "#2196F3"</colour>
+      <style>box</style>
+      <xcalc>data['idx'].replace(minute=30, second=0)</xcalc>
+      <ycalc>data['rain']</ycalc>
+      <title>Tägl. Regenfall (mm)</title>
+    </subplot>
+  </plot>
diff --git a/_graph_templates/includes/raw_temp_dew_line.xml b/_graph_templates/includes/raw_temp_dew_line.xml
new file mode 100644
index 0000000..d34083a
--- /dev/null
+++ b/_graph_templates/includes/raw_temp_dew_line.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+  <plot>
+    <yrange>-20, 40</yrange>
+    <grid>ytics</grid>
+    <source>raw</source>
+    <subplot>
+      <colour>1</colour>
+      <title>Temperatur (℃)</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>
+  </plot>
diff --git a/_graph_templates/includes/raw_wind_gust_line.xml b/_graph_templates/includes/raw_wind_gust_line.xml
new file mode 100644
index 0000000..276e078
--- /dev/null
+++ b/_graph_templates/includes/raw_wind_gust_line.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+  <plot>
+    <title>Windgeschwindigkeit (km/h)</title>
+    <yrange>0, 30</yrange>
+    <source>raw</source>
+    <subplot>
+      <colour>4</colour>
+      <ycalc>data['wind_gust'] * 3.6</ycalc>
+      <title>Boe</title>
+    </subplot>
+    <subplot>
+      <colour>3</colour>
+      <ycalc>data['wind_ave'] * 3.6</ycalc>
+      <title>durchschn.</title>
+    </subplot>
+  </plot>