diff --git a/lib/calcms/template.pm b/lib/calcms/template.pm
index 715f042..6d360f7 100644
--- a/lib/calcms/template.pm
+++ b/lib/calcms/template.pm
@@ -169,8 +169,6 @@ sub setRelativeUrls {
     return $params;
 }
 
-#requires read config
-#TODO:add config
 sub check($;$$) {
     my $config   = shift;
     my $template = shift || '';
@@ -195,12 +193,14 @@ sub check($;$$) {
     }
 
     $template = ( split( /\//, $template ) )[-1];
-    my $cwd = Cwd::getcwd();
-
     $template .= '.html' unless ( $template =~ /\./ );
-    log::error( $config, "template not found: '$cwd/$template'" ) 
-        unless -e $cwd . '/templates/' . $template;
-    $template = $cwd . '/templates/' . $template;
+    my $dir = "templates";
+    my $cwd = Cwd::getcwd();
+    my $theme = $config->{locations}->{theme} //= 'default';
+    $dir .= "/$theme" if $cwd =~ m{/agenda$} && $theme;
+    log::error( $config, "template not found: '$dir'" )
+        unless -e "$cwd/$dir/$template";
+    $template = "$cwd/$dir/$template";
 
     return $template;
 }
diff --git a/website/agenda/config/config.cgi.off b/website/agenda/config/config.cgi.off
index 8532779..d403f16 100755
--- a/website/agenda/config/config.cgi.off
+++ b/website/agenda/config/config.cgi.off
@@ -87,6 +87,7 @@ domain                      ${DOMAIN}
     # multi language support
     admin_pot_dir           ${BASE_DIR}/agenda/planung/pot/
     email                   info@${DOMAIN}
+    theme                   default
 </locations>
 
 <permissions>
diff --git a/website/agenda/templates/calendar.html b/website/agenda/templates/default/calendar.html
similarity index 100%
rename from website/agenda/templates/calendar.html
rename to website/agenda/templates/default/calendar.html
diff --git a/website/agenda/templates/categories.html b/website/agenda/templates/default/categories.html
similarity index 100%
rename from website/agenda/templates/categories.html
rename to website/agenda/templates/default/categories.html
diff --git a/website/agenda/templates/comments.html b/website/agenda/templates/default/comments.html
similarity index 100%
rename from website/agenda/templates/comments.html
rename to website/agenda/templates/default/comments.html
diff --git a/website/agenda/templates/comments.xml b/website/agenda/templates/default/comments.xml
similarity index 100%
rename from website/agenda/templates/comments.xml
rename to website/agenda/templates/default/comments.xml
diff --git a/website/agenda/templates/comments_newest.html b/website/agenda/templates/default/comments_newest.html
similarity index 100%
rename from website/agenda/templates/comments_newest.html
rename to website/agenda/templates/default/comments_newest.html
diff --git a/website/agenda/templates/default.html b/website/agenda/templates/default/default.html
similarity index 100%
rename from website/agenda/templates/default.html
rename to website/agenda/templates/default/default.html
diff --git a/website/agenda/templates/event.atom.xml b/website/agenda/templates/default/event.atom.xml
similarity index 100%
rename from website/agenda/templates/event.atom.xml
rename to website/agenda/templates/default/event.atom.xml
diff --git a/website/agenda/templates/event.ics b/website/agenda/templates/default/event.ics
similarity index 100%
rename from website/agenda/templates/event.ics
rename to website/agenda/templates/default/event.ics
diff --git a/website/agenda/templates/event.json-p b/website/agenda/templates/default/event.json-p
similarity index 100%
rename from website/agenda/templates/event.json-p
rename to website/agenda/templates/default/event.json-p
diff --git a/website/agenda/templates/event.rss.xml b/website/agenda/templates/default/event.rss.xml
similarity index 100%
rename from website/agenda/templates/event.rss.xml
rename to website/agenda/templates/default/event.rss.xml
diff --git a/website/agenda/templates/event_dashboard.html.js b/website/agenda/templates/default/event_dashboard.html.js
similarity index 100%
rename from website/agenda/templates/event_dashboard.html.js
rename to website/agenda/templates/default/event_dashboard.html.js
diff --git a/website/agenda/templates/event_dashboard_details.html b/website/agenda/templates/default/event_dashboard_details.html
similarity index 100%
rename from website/agenda/templates/event_dashboard_details.html
rename to website/agenda/templates/default/event_dashboard_details.html
diff --git a/website/agenda/templates/event_details.html b/website/agenda/templates/default/event_details.html
similarity index 97%
rename from website/agenda/templates/event_details.html
rename to website/agenda/templates/default/event_details.html
index 3108a0d..ace3d69 100644
--- a/website/agenda/templates/event_details.html
+++ b/website/agenda/templates/default/event_details.html
@@ -3,7 +3,6 @@
 Access-Control-Allow-Origin: *
 
 <!DOCTYPE html>
-<TMPL_IF extern_access><TMPL_INCLUDE ../index.html>gesucht und gefunden...<TMPL_ELSE>
 <html>
 <body>
 	<TMPL_IF no_result>
@@ -90,5 +89,3 @@ Access-Control-Allow-Origin: *
 </TMPL_LOOP>
 </body>
 </html>
-</TMPL_IF>
-
diff --git a/website/agenda/templates/event_file_export.txt b/website/agenda/templates/default/event_file_export.txt
similarity index 100%
rename from website/agenda/templates/event_file_export.txt
rename to website/agenda/templates/default/event_file_export.txt
diff --git a/website/agenda/templates/event_freefm.xml b/website/agenda/templates/default/event_freefm.xml
similarity index 100%
rename from website/agenda/templates/event_freefm.xml
rename to website/agenda/templates/default/event_freefm.xml
diff --git a/website/agenda/templates/event_list.html b/website/agenda/templates/default/event_list.html
similarity index 100%
rename from website/agenda/templates/event_list.html
rename to website/agenda/templates/default/event_list.html
diff --git a/website/agenda/templates/event_media.rss.xml b/website/agenda/templates/default/event_media.rss.xml
similarity index 100%
rename from website/agenda/templates/event_media.rss.xml
rename to website/agenda/templates/default/event_media.rss.xml
diff --git a/website/agenda/templates/event_menu.html b/website/agenda/templates/default/event_menu.html
similarity index 100%
rename from website/agenda/templates/event_menu.html
rename to website/agenda/templates/default/event_menu.html
diff --git a/website/agenda/templates/event_perl.txt b/website/agenda/templates/default/event_perl.txt
similarity index 100%
rename from website/agenda/templates/event_perl.txt
rename to website/agenda/templates/default/event_perl.txt
diff --git a/website/agenda/templates/event_playlist.html b/website/agenda/templates/default/event_playlist.html
similarity index 100%
rename from website/agenda/templates/event_playlist.html
rename to website/agenda/templates/default/event_playlist.html
diff --git a/website/agenda/templates/event_playlist.txt b/website/agenda/templates/default/event_playlist.txt
similarity index 100%
rename from website/agenda/templates/event_playlist.txt
rename to website/agenda/templates/default/event_playlist.txt
diff --git a/website/agenda/templates/event_playlist_long.html b/website/agenda/templates/default/event_playlist_long.html
similarity index 100%
rename from website/agenda/templates/event_playlist_long.html
rename to website/agenda/templates/default/event_playlist_long.html
diff --git a/website/agenda/templates/event_playlist_show.html b/website/agenda/templates/default/event_playlist_show.html
similarity index 100%
rename from website/agenda/templates/event_playlist_show.html
rename to website/agenda/templates/default/event_playlist_show.html
diff --git a/website/agenda/templates/event_playlist_twitter.txt b/website/agenda/templates/default/event_playlist_twitter.txt
similarity index 100%
rename from website/agenda/templates/event_playlist_twitter.txt
rename to website/agenda/templates/default/event_playlist_twitter.txt
diff --git a/website/agenda/templates/event_rds.txt b/website/agenda/templates/default/event_rds.txt
similarity index 100%
rename from website/agenda/templates/event_rds.txt
rename to website/agenda/templates/default/event_rds.txt
diff --git a/website/agenda/templates/event_redirect.html b/website/agenda/templates/default/event_redirect.html
similarity index 100%
rename from website/agenda/templates/event_redirect.html
rename to website/agenda/templates/default/event_redirect.html
diff --git a/website/agenda/templates/event_running.html b/website/agenda/templates/default/event_running.html
similarity index 96%
rename from website/agenda/templates/event_running.html
rename to website/agenda/templates/default/event_running.html
index 911c37a..b3ffc98 100644
--- a/website/agenda/templates/event_running.html
+++ b/website/agenda/templates/default/event_running.html
@@ -3,7 +3,6 @@
 Access-Control-Allow-Origin: *
 
 <!DOCTYPE html>
-<TMPL_IF extern_access><TMPL_INCLUDE ../index.html>gesucht und gefunden...<TMPL_ELSE>
 <html>
 <body>
 <TMPL_IF no_result>
@@ -77,7 +76,6 @@ Access-Control-Allow-Origin: *
 			<TMPL_UNLESS __last__><hr /></TMPL_UNLESS>
 		</TMPL_IF>
 	</TMPL_LOOP>
-	</TMPL_IF>
 
 <!--end of content -->
 
diff --git a/website/agenda/templates/event_utc_time.json b/website/agenda/templates/default/event_utc_time.json
similarity index 100%
rename from website/agenda/templates/event_utc_time.json
rename to website/agenda/templates/default/event_utc_time.json
diff --git a/website/agenda/templates/events_playout.json b/website/agenda/templates/default/events_playout.json
similarity index 100%
rename from website/agenda/templates/events_playout.json
rename to website/agenda/templates/default/events_playout.json
diff --git a/website/agenda/templates/events_playout.json-p b/website/agenda/templates/default/events_playout.json-p
similarity index 100%
rename from website/agenda/templates/events_playout.json-p
rename to website/agenda/templates/default/events_playout.json-p
diff --git a/website/agenda/templates/no_result.html b/website/agenda/templates/default/no_result.html
similarity index 100%
rename from website/agenda/templates/no_result.html
rename to website/agenda/templates/default/no_result.html
diff --git a/website/agenda/templates/no_search_result.html b/website/agenda/templates/default/no_search_result.html
similarity index 100%
rename from website/agenda/templates/no_search_result.html
rename to website/agenda/templates/default/no_search_result.html
diff --git a/website/agenda/templates/playlist_twitter.txt b/website/agenda/templates/default/playlist_twitter.txt
similarity index 100%
rename from website/agenda/templates/playlist_twitter.txt
rename to website/agenda/templates/default/playlist_twitter.txt
diff --git a/website/agenda/templates/series.html b/website/agenda/templates/default/series.html
similarity index 100%
rename from website/agenda/templates/series.html
rename to website/agenda/templates/default/series.html
diff --git a/website/agenda/templates/series_names.html b/website/agenda/templates/default/series_names.html
similarity index 100%
rename from website/agenda/templates/series_names.html
rename to website/agenda/templates/default/series_names.html
diff --git a/website/agenda/templates/series_names.js b/website/agenda/templates/default/series_names.js
similarity index 100%
rename from website/agenda/templates/series_names.js
rename to website/agenda/templates/default/series_names.js