diff --git a/website/agenda/templates/coloradio/event.rss.xml b/website/agenda/templates/coloradio/event.rss.xml
index f48b5ad..a0cb0b1 100644
--- a/website/agenda/templates/coloradio/event.rss.xml
+++ b/website/agenda/templates/coloradio/event.rss.xml
@@ -27,7 +27,7 @@ Content-type:application/rss+xml; charset=UTF-8
 		<guid>http:<TMPL_VAR base_domain><TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html</guid>
 		<pubDate><TMPL_VAR modified_at></pubDate>
 		<comments>http:<TMPL_VAR base_domain><TMPL_VAR cache_base_domain>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#comments</comments>
-		<media:content url="http:<TMPL_VAR base_domain><TMPL_VAR image>" medium="image">
+		<media:content url="http:<TMPL_VAR base_domain><TMPL_VAR image_url>" medium="image">
 			<media:title type="html"><TMPL_VAR full_title></media:title>
 		</media:content>
 
diff --git a/website/agenda/templates/coloradio/event_details.html b/website/agenda/templates/coloradio/event_details.html
index 04e8679..b0605bc 100644
--- a/website/agenda/templates/coloradio/event_details.html
+++ b/website/agenda/templates/coloradio/event_details.html
@@ -46,8 +46,8 @@ Content-type:text/html; charset=utf-8;
                 <!--
                     <TMPL_IF no_image_in_text>
                         <p>
-                            <a href="<TMPL_VAR image>">
-                                <img alt="<TMPL_VAR series_name>" src="<TMPL_VAR thumb>">
+                            <a href="<TMPL_VAR image_url>">
+                                <img alt="<TMPL_VAR series_name>" src="<TMPL_VAR thumb_url>">
                             </a>
                         </p>
                     </TMPL_IF>
@@ -63,7 +63,7 @@ Content-type:text/html; charset=utf-8;
                                 <!-- ICAL EVENT -->
 
                                 <div class="ical_event">
-                                    <a href="<TMPL_VAR .controllers.domain><TMPL_VAR .controllers.ical>/<TMPL_VAR event_id>/<TMPL_IF series_name><TMPL_VAR series_name escape=url>-</TMPL_IF><TMPL_VAR title  escape=url>.ics" title="Termin merken"><!--<img width="16" height="16"  alt="ICalendar" src="<TMPL_VAR static_files_url>image/ical.png" />-->im Kalender speichern</a>
+                                    <a href="<TMPL_VAR .controllers.domain><TMPL_VAR .controllers.ical>/<TMPL_VAR event_id>/<TMPL_IF series_name><TMPL_VAR series_name escape=url>-</TMPL_IF><TMPL_VAR title  escape=url>.ics" title="Termin merken"><!--<img width="16" height="16"  alt="ICalendar" src="<TMPL_VAR static_files_url>images/ical.png" />-->im Kalender speichern</a>
                                 </div>
                         </div>
                     </TMPL_IF>
@@ -80,7 +80,7 @@ Content-type:text/html; charset=utf-8;
                     <!-- ICAL ALLE SENDUNGEN DES MONATS -->
 
                     <div id="icon_bar" style="display:none;">
-                        <a href="<TMPL_VAR .controllers.domain><TMPL_VAR .controllers.ical>/<TMPL_VAR month>/" title="alle Sendungen des Monats merken"><img width="16" height="16" alt="Icalendar" src="<TMPL_VAR static_files_url>image/icals.png" /></a>
+                        <a href="<TMPL_VAR .controllers.domain><TMPL_VAR .controllers.ical>/<TMPL_VAR month>/" title="alle Sendungen des Monats merken"><img width="16" height="16" alt="Icalendar" src="<TMPL_VAR static_files_url>images/icals.png" /></a>
                     </div>
 
 
@@ -91,8 +91,8 @@ Content-type:text/html; charset=utf-8;
 
                     <!-- Sendungsbild -->
 
-                    <TMPL_IF thumb>
-                        <img alt="<TMPL_VAR series_name>" src="<TMPL_VAR thumb>">
+                    <TMPL_IF thumb_url>
+                        <img alt="<TMPL_VAR series_name>" src="<TMPL_VAR thumb_url>">
                     </TMPL_IF>
 
                     <!-- Detailierte Beschreibung -->
diff --git a/website/agenda/templates/coloradio/event_details_orig.html b/website/agenda/templates/coloradio/event_details_orig.html
index 7bd8703..5c3cc20 100644
--- a/website/agenda/templates/coloradio/event_details_orig.html
+++ b/website/agenda/templates/coloradio/event_details_orig.html
@@ -41,8 +41,8 @@ Content-type:text/html; charset=utf-8;
             <TMPL_IF excerpt><hr><TMPL_ELSE><TMPL_IF user_excerpt><hr></TMPL_IF></TMPL_IF>
             <TMPL_IF no_image_in_text>
                 <p>
-                    <a href="<TMPL_VAR image>">
-                        <img alt="<TMPL_VAR series_name>" src="<TMPL_VAR thumb>">
+                    <a href="<TMPL_VAR image_url>">
+                        <img alt="<TMPL_VAR series_name>" src="<TMPL_VAR thumb_url>">
                     </a>
                 </p>
             </TMPL_IF>
@@ -60,7 +60,7 @@ Content-type:text/html; charset=utf-8;
 	
 		<a href="<TMPL_VAR .controllers.domain><TMPL_VAR .controllers.atom>/radio.atom.xml" title="Sendeplan abonnieren - Atom"><img width="16" height="16" alt="Atom Feed" src="<TMPL_VAR static_files_url>image/feed.png" /></a>
 		<a href="<TMPL_VAR .controllers.domain><TMPL_VAR .controllers.rss>/radio.rss.xml"  title="Sendeplan abonnieren - RSS"><img width="16" height="16" alt="RSS Feed" src="<TMPL_VAR static_files_url>image/feed.png" /></a>
-        <a href="<TMPL_VAR .controllers.domain><TMPL_VAR .controllers.ical>/<TMPL_VAR event_id>/<TMPL_IF series_name><TMPL_VAR series_name escape=url>-</TMPL_IF><TMPL_VAR title  escape=url>.ics" title="Termin merken"><img width="16" height="16"  alt="ICalendar" src="<TMPL_VAR static_files_url>image/ical.png" /></a>
+        <a href="<TMPL_VAR .controllers.domain><TMPL_VAR .controllers.ical>/<TMPL_VAR event_id>/<TMPL_IF series_name><TMPL_VAR series_name escape=url>-</TMPL_IF><TMPL_VAR title  escape=url>.ics" title="Termin merken"><img width="16" height="16"  alt="ICalendar" src="<TMPL_VAR static_files_url>images/ical.png" /></a>
 	</div>
 
 	<div id="calcms_comments">
diff --git a/website/agenda/templates/coloradio/event_file_export.txt b/website/agenda/templates/coloradio/event_file_export.txt
index 367c635..b035d2b 100644
--- a/website/agenda/templates/coloradio/event_file_export.txt
+++ b/website/agenda/templates/coloradio/event_file_export.txt
@@ -29,7 +29,7 @@ $events=[
 	'event_id'		=> q|<TMPL_VAR event_id>|,
 	'event_uri'		=> q|<TMPL_VAR event_uri>|,
 	'excerpt'		=> q|<TMPL_VAR excerpt>|,
-	'image'			=> q|<TMPL_VAR image>|,
+	'image'			=> q|<TMPL_VAR image_url>|,
 	'is_first_of_day'	=> q|<TMPL_VAR is_first_of_day>|,
 	'location_css'		=> q|<TMPL_VAR location_css>|,
 	'location'		=> q|<TMPL_VAR location>|,
diff --git a/website/agenda/templates/coloradio/event_list_image.html b/website/agenda/templates/coloradio/event_list_image.html
index 7795ec0..de47050 100644
--- a/website/agenda/templates/coloradio/event_list_image.html
+++ b/website/agenda/templates/coloradio/event_list_image.html
@@ -22,7 +22,7 @@ Content-type:text/html; charset=utf-8;
 <div  class="event">
 	<TMPL_IF event_id>
 		<div class="header"><TMPL_VAR series_name><br><TMPL_VAR full_title_no_series></div>
-		<div class="content" style="background-image: url(<TMPL_VAR image>)"></div>
+		<div class="content" style="background-image: url(<TMPL_VAR image_url>)"></div>
 
 		<div class="label">
 			<TMPL_VAR start_time><br/>
diff --git a/website/agenda/templates/coloradio/event_menu.html b/website/agenda/templates/coloradio/event_menu.html
index d4ddba1..186e846 100644
--- a/website/agenda/templates/coloradio/event_menu.html
+++ b/website/agenda/templates/coloradio/event_menu.html
@@ -34,7 +34,7 @@ Content-type:text/html; charset=UTF-8;
                 title="<TMPL_IF program><TMPL_VAR program> - </TMPL_IF><TMPL_IF series_name><TMPL_VAR series_name> - </TMPL_IF><TMPL_VAR title>"
             >
                 <div class="icon">
-                    <TMPL_IF icon><img src="<TMPL_VAR icon>" alt="<TMPL_VAR series_name>" /> 
+                    <TMPL_IF icon><img src="<TMPL_VAR icon_url>" alt="<TMPL_VAR series_name>" /> 
                     <TMPL_ELSE><img src="<TMPL_VAR static_files_url>image/event.icon.png" />
                     </TMPL_IF>
                 </div>
@@ -58,7 +58,7 @@ Content-type:text/html; charset=UTF-8;
                 title="<TMPL_IF program><TMPL_VAR program> - </TMPL_IF><TMPL_IF series_name><TMPL_VAR series_name> - </TMPL_IF><TMPL_VAR title>"
             >
                 <div class="icon">
-                    <TMPL_IF icon><img src="<TMPL_VAR icon>" alt="<TMPL_VAR series_name>" /> 
+                    <TMPL_IF icon><img src="<TMPL_VAR icon_url>" alt="<TMPL_VAR series_name>" /> 
                     <TMPL_ELSE><img src="<TMPL_VAR static_files_url>image/event.icon.png" />
                     </TMPL_IF>
                 </div>
diff --git a/website/agenda/templates/coloradio/event_perl.txt b/website/agenda/templates/coloradio/event_perl.txt
index fac8cab..6c13aa3 100644
--- a/website/agenda/templates/coloradio/event_perl.txt
+++ b/website/agenda/templates/coloradio/event_perl.txt
@@ -10,7 +10,7 @@ $events=[
 	'weekday_short_name'	=> q|<TMPL_VAR weekday_short_name>|,
 	'location'		    => q|<TMPL_VAR location_mapped>|,
 	'location_mapped'	=> q|<TMPL_VAR location_mapped>|,
-	'image'			    => q|<TMPL_VAR image>|,
+	'image'			    => q|<TMPL_VAR image_url>|,
 	'project_title'	    => q|<TMPL_VAR project_title>|,
 	'program'		    => q|<TMPL_VAR program>|,
 	'series_name'	    => q|<TMPL_VAR series_name>|,
diff --git a/website/agenda/templates/coloradio/event_playlist.html b/website/agenda/templates/coloradio/event_playlist.html
index 6deef28..2994c67 100644
--- a/website/agenda/templates/coloradio/event_playlist.html
+++ b/website/agenda/templates/coloradio/event_playlist.html
@@ -24,7 +24,7 @@ div.event div.title div{
     <div id="event_playlist_<TMPL_VAR event_id>" class="event"  title="<TMPL_VAR full_title><TMPL_IF excerpt>. <TMPL_VAR excerpt escape=url></TMPL_IF>">
 		<TMPL_COMMENT>
         <div class="icon">
-            <img src="<TMPL_VAR icon>"></img>
+            <img src="<TMPL_VAR icon_url>"></img>
         </div>
 		</TMPL_COMMENT>
         <div class="title">
diff --git a/website/agenda/templates/coloradio/event_pure1.html b/website/agenda/templates/coloradio/event_pure1.html
index b065a7a..8b2d9d1 100644
--- a/website/agenda/templates/coloradio/event_pure1.html
+++ b/website/agenda/templates/coloradio/event_pure1.html
@@ -46,8 +46,8 @@ Content-type:text/html; charset=utf-8;
                 <!--
                     <TMPL_IF no_image_in_text>
                         <p>
-                            <a href="<TMPL_VAR image>">
-                                <img alt="<TMPL_VAR series_name>" src="<TMPL_VAR thumb>">
+                            <a href="<TMPL_VAR image_url>">
+                                <img alt="<TMPL_VAR series_name>" src="<TMPL_VAR thumb_url>">
                             </a>
                         </p>
                     </TMPL_IF>
@@ -63,7 +63,7 @@ Content-type:text/html; charset=utf-8;
                                 <!-- ICAL EVENT -->
 
                                 <div class="ical_event">
-                                    <a href="<TMPL_VAR .controllers.domain><TMPL_VAR .controllers.ical>/<TMPL_VAR event_id>/<TMPL_VAR full_title escape=hyphen>.ics" title="Termin merken"><!--<img width="16" height="16"  alt="ICalendar" src="<TMPL_VAR static_files_url>image/ical.png" />-->im Kalender speichern</a>
+                                    <a href="<TMPL_VAR .controllers.domain><TMPL_VAR .controllers.ical>/<TMPL_VAR event_id>/<TMPL_VAR full_title escape=hyphen>.ics" title="Termin merken"><!--<img width="16" height="16"  alt="ICalendar" src="<TMPL_VAR static_files_url>images/ical.png" />-->im Kalender speichern</a>
                                 </div>
                         </div>
                     </TMPL_IF>
@@ -80,7 +80,7 @@ Content-type:text/html; charset=utf-8;
                     <!-- ICAL ALLE SENDUNGEN DES MONATS -->
 
                     <div id="icon_bar" style="display:none;">
-                        <a href="<TMPL_VAR .controllers.domain><TMPL_VAR .controllers.ical>/<TMPL_VAR month>/" title="alle Sendungen des Monats merken"><img width="16" height="16" alt="Icalendar" src="<TMPL_VAR static_files_url>image/icals.png" /></a>
+                        <a href="<TMPL_VAR .controllers.domain><TMPL_VAR .controllers.ical>/<TMPL_VAR month>/" title="alle Sendungen des Monats merken"><img width="16" height="16" alt="Icalendar" src="<TMPL_VAR static_files_url>images/icals.png" /></a>
                     </div>
 
 
@@ -91,8 +91,8 @@ Content-type:text/html; charset=utf-8;
 
                     <!-- Sendungsbild -->
 
-                    <TMPL_IF thumb>
-                        <img alt="<TMPL_VAR series_name>" src="<TMPL_VAR thumb>">
+                    <TMPL_IF thumb_url>
+                        <img alt="<TMPL_VAR series_name>" src="<TMPL_VAR thumb_url>">
                     </TMPL_IF>
 
                     <!-- Detailierte Beschreibung -->
diff --git a/website/agenda/templates/coloradio/event_running.html b/website/agenda/templates/coloradio/event_running.html
index 9306753..d4f271d 100644
--- a/website/agenda/templates/coloradio/event_running.html
+++ b/website/agenda/templates/coloradio/event_running.html
@@ -67,7 +67,7 @@ Access-Control-Allow-Origin: *
 				<TMPL_COMMENT>
 				<div class="image-attach-teaser" style="width: 150px;">
 					<a href="<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>">
-						<img class="image image-thumbnail" src="<TMPL_VAR image>" width="150" height="150" />
+						<img class="image image-thumbnail" src="<TMPL_VAR image_url>" width="150" height="150" />
 					</a>
 				</div>
 				</TMPL_COMMENT>