diff --git a/website/agenda/templates/default/comments_newest.html b/website/agenda/templates/default/comments_newest.html
index 1194598..19ab16c 100644
--- a/website/agenda/templates/default/comments_newest.html
+++ b/website/agenda/templates/default/comments_newest.html
@@ -9,10 +9,8 @@ Access-Control-Allow-Origin: *
 	<meta http-equiv="Content-Style-Type" content="text/css" />
 </head>
 <body>
-<div id="sendungen">
-</div>
 <TMPL_LOOP comments>
-	<a id="event_list_id_<TMPL_VAR event_id>" class="click_for_detail" href="<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#comments">
+	<a href="<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#comments">
 	<div class="comments level<TMPL_VAR level>">
 		<span class="author"><TMPL_VAR author escape=none></span>:
 		<span class="content"><TMPL_VAR short_content escape=none></span>
diff --git a/website/agenda/templates/default/event.ics b/website/agenda/templates/default/event.ics
index 0bd4757..6126b51 100644
--- a/website/agenda/templates/default/event.ics
+++ b/website/agenda/templates/default/event.ics
@@ -40,7 +40,7 @@ LAST-MODIFIED;TZID=<TMPL_VAR time_zone>:<TMPL_VAR modified_at>
 LOCATION:<TMPL_VAR location_mapped>
 SEQUENCE:0
 STATUS:CONFIRMED
-SUMMARY:<TMPL_VAR full_title> - coloRadio
+SUMMARY:<TMPL_VAR full_title>
 URL:<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri>
 TRANSP:OPAQUE
 CATEGORIES:<TMPL_VAR project_title>
diff --git a/website/agenda/templates/default/event_playlist_long.html b/website/agenda/templates/default/event_playlist_long.html
index f29596e..705f3b3 100644
--- a/website/agenda/templates/default/event_playlist_long.html
+++ b/website/agenda/templates/default/event_playlist_long.html
@@ -4,10 +4,11 @@ Access-Control-Allow-Origin: *
 <!DOCTYPE html>
 <html>
 <head>
-    <meta http-equiv="Cache-control" content="public">
-    <meta http-equiv="Content-Script-Type" content="javascript" />
-    <meta http-equiv="Content-Style-Type" content="text/css" />
-    <title>Playlist <TMPL_VAR project_title></title>
+	<meta http-equiv="Cache-control" content="public">
+	<meta http-equiv="Content-Script-Type" content="javascript" />
+	<meta http-equiv="Content-Style-Type" content="text/css" />
+	<title>Playlist <TMPL_VAR project_title></title>
+
 <script>
 /**
  * @fileoverview dragscroll - scroll area by dragging
@@ -104,48 +105,18 @@ Access-Control-Allow-Origin: *
 </head>
 
 <body>
-<div id="playlist_container" class="_dragscroll">
-
-Playlist Long <br><br>
-
+<div id="playlist_container" class="dragscroll">
 <TMPL_LOOP NAME=events>
-
-    <a class="playlist_long_event_detail" href="<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>" > 
-        <div id="event_playlist_<TMPL_VAR event_id>" class="eventContainer event">
-            <div class="top" title="<TMPL_VAR full_title><TMPL_IF excerpt>. <TMPL_VAR excerpt></TMPL_IF>">
-                    <TMPL_VAR weekday_short_name> <TMPL_VAR start_time_name>
-            </div>
+    <a href="<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>" > 
+    	<div id="event_playlist_<TMPL_VAR event_id>" class="eventContainer event">
+		    <div class="top" title="<TMPL_VAR full_title><TMPL_IF excerpt>. <TMPL_VAR excerpt></TMPL_IF>">
+				    <TMPL_VAR weekday_short_name> <TMPL_VAR start_time_name>
+		    </div>
             <div class="bottom">
                 <TMPL_IF series_name><TMPL_VAR series_name><TMPL_ELSE><TMPL_VAR title></TMPL_IF>
             </div>
-        </a>
-
-    <div class="scripted" style="display:none;">
-        <a class="zeige_sendungsdetails_playlist_long playlist_long_event_detail" id="link_zu_event_<TMPL_VAR event_id>" href="#"> 
-            <div id="event_playlist_<TMPL_VAR event_id>" class="eventContainer event">
-                <div class="top" title="<TMPL_VAR full_title><TMPL_IF excerpt>. <TMPL_VAR excerpt></TMPL_IF>">
-                        <TMPL_VAR weekday_short_name> <TMPL_VAR start_time_name>
-                </div>
-                <div class="bottom">
-                    <TMPL_IF series_name><TMPL_VAR series_name><TMPL_ELSE><TMPL_VAR title></TMPL_IF>
-                </div>
-            </div>
-        </a>
-    </div>
-
-    <noscript>
-        <a class="playlist_long_event_detail" href="<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>" > 
-            <div id="event_playlist_<TMPL_VAR event_id>" class="eventContainer event">
-                <div class="top" title="<TMPL_VAR full_title><TMPL_IF excerpt>. <TMPL_VAR excerpt></TMPL_IF>">
-                        <TMPL_VAR weekday_short_name> <TMPL_VAR start_time_name>
-                </div>
-                <div class="bottom">
-                    <TMPL_IF series_name><TMPL_VAR series_name><TMPL_ELSE><TMPL_VAR title></TMPL_IF>
-                </div>
-            </div>
-        </a>
-    </noscript>
-
+    	</div>
+    </a>
 </TMPL_LOOP>
 </div>
 </body>
diff --git a/website/agenda/templates/default/event_running.html b/website/agenda/templates/default/event_running.html
index 9306753..fc71f37 100644
--- a/website/agenda/templates/default/event_running.html
+++ b/website/agenda/templates/default/event_running.html
@@ -5,7 +5,6 @@ Access-Control-Allow-Origin: *
 <html>
 <body>
 <TMPL_IF no_result>
-<!--
     <script>
     jQuery( document ).ready(function() {
         //load next shows into current playlist
@@ -23,9 +22,6 @@ Access-Control-Allow-Origin: *
             overflow:hidden;
         }
     </style>
--->
-<!--
-
 	<div class="content" style="clear:both"> 
 
 	    <h1 class="summary title">
@@ -44,8 +40,6 @@ Access-Control-Allow-Origin: *
 		    <TMLP_VAR count> Treffer:
 	    </TMPL_IF>
 	</div>
--->
-
 
 </TMPL_IF>
 
diff --git a/website/agenda/templates/default/no_result.html b/website/agenda/templates/default/no_result.html
index 6553217..94f6a88 100644
--- a/website/agenda/templates/default/no_result.html
+++ b/website/agenda/templates/default/no_result.html
@@ -4,13 +4,13 @@
     <script>
     jQuery( document ).ready(function() {
         //load next shows into current playlist
-        if(jQuery('#sendungen').length!=0) jQuery('#sendungen').load('/agenda/playlistLong/');
+        if(jQuery('#coming_shows').length!=0) jQuery('#coming_shows').load('/agenda/playlistLong/');
 
         //hide next shows
-        // if(jQuery('#calcms_playlist').length!=0) jQuery('#calcms_playlist').parent().parent().hide();
+        if(jQuery('#calcms_playlist').length!=0) jQuery('#calcms_playlist').parent().parent().hide();
 
         //hide programm menu
-        // if(jQuery('#calcms_menu').length!=0) jQuery('#calcms_menu').parent().parent().hide();
+        if(jQuery('#calcms_menu').length!=0) jQuery('#calcms_menu').parent().parent().hide();
     });
     </script>
 
diff --git a/website/agenda/templates/default/no_search_result.html b/website/agenda/templates/default/no_search_result.html
index ddeb73f..15ee10e 100644
--- a/website/agenda/templates/default/no_search_result.html
+++ b/website/agenda/templates/default/no_search_result.html
@@ -3,7 +3,7 @@
 	Keine Sendung gefunden.
 </div>
 </TMPL_IF>
-<!--<TMPL_IF event_count><TMPL_VAR event_count> Treffer</TMPL_IF>-->
+<TMPL_IF event_count><TMPL_VAR event_count> Treffer</TMPL_IF>
 
 
 
diff --git a/website/agenda/templates/default/series_names.html b/website/agenda/templates/default/series_names.html
index eeaedb6..6743ab0 100644
--- a/website/agenda/templates/default/series_names.html
+++ b/website/agenda/templates/default/series_names.html
@@ -18,13 +18,8 @@ Access-Control-Allow-Origin: *
     style="display:none;"
 >
 
-<<<<<<<< HEAD:website/agenda/templates/coloradio/series_names.html
-<option value="">- Sendereihe ausw&auml;hlen -</option>
-<TMPL_LOOP series_names><option value="<TMPL_VAR series_name escape=0>"<TMPL_VAR selected escape=0>><TMPL_VAR series_name> <!--(<TMPL_VAR sum>)--></option>
-========
 <option value="">- Sendereihe -</option>
 <TMPL_LOOP series_names><option value="<TMPL_VAR series_name escape=none>"<TMPL_VAR selected escape=none>><TMPL_VAR series_name> (<TMPL_VAR sum>)</option>
->>>>>>>> calcms/master:website/agenda/templates/default/series_names.html
 </TMPL_LOOP>
 
 </select>
