diff --git a/lib/calcms/auth.pm b/lib/calcms/auth.pm
index 6fbc270..50c499b 100644
--- a/lib/calcms/auth.pm
+++ b/lib/calcms/auth.pm
@@ -246,7 +246,7 @@ sub show_login_form ($$) {
 
     if ( ( $user ne '' ) && ( $message ne '' ) ) {
         $requestReset = qq{
-            <a href="requestPassword.cgi?user=$user">Passwort vergessen?</a>
+            <a href="request-password.cgi?user=$user">Passwort vergessen?</a>
         };
     }
 
diff --git a/lib/calcms/password_requests.pm b/lib/calcms/password_requests.pm
index 1060069..e94d157 100644
--- a/lib/calcms/password_requests.pm
+++ b/lib/calcms/password_requests.pm
@@ -155,7 +155,7 @@ sub sendToken ($$) {
     $entry->{token}        = Session::Token->new->get;
 
     my $baseUrl = $config->{locations}->{source_base_url} . $config->{locations}->{editor_base_url};
-    my $url     = $baseUrl . "/requestPassword.cgi?token=" . $entry->{token};
+    my $url     = $baseUrl . "/request-password.cgi?token=" . $entry->{token};
     my $content = "Hi,$user->{full_name}\n\n";
     $content .= "Someone just tried to reset your password for $baseUrl.\n\n";
     $content .= "If you like to set a new password, please follow the link below\n";
diff --git a/website/agenda/planung/assign_series.cgi b/website/agenda/planung/assign-series.cgi
similarity index 99%
rename from website/agenda/planung/assign_series.cgi
rename to website/agenda/planung/assign-series.cgi
index f80499a..8de15c6 100755
--- a/website/agenda/planung/assign_series.cgi
+++ b/website/agenda/planung/assign-series.cgi
@@ -238,7 +238,7 @@ sub check_params {
         $checked->{studio_id} = -1;
     }
 
-    $checked->{template} = template::check( $config, $params->{template}, 'assign_series' );
+    $checked->{template} = template::check( $config, $params->{template}, 'assign-series' );
 
     return $checked;
 }
diff --git a/website/agenda/planung/audio_recordings.cgi b/website/agenda/planung/audio-recordings.cgi
similarity index 98%
rename from website/agenda/planung/audio_recordings.cgi
rename to website/agenda/planung/audio-recordings.cgi
index 4e5541a..b4c4433 100755
--- a/website/agenda/planung/audio_recordings.cgi
+++ b/website/agenda/planung/audio-recordings.cgi
@@ -90,8 +90,8 @@ template::process( $config, 'print', template::check( $config, 'default.html' ),
 exit unless uac::check( $config, $params, $user_presets ) == 1;
 
 print q{
-    <script src="js/audio_recordings.js" type="text/javascript"></script>
-    <link rel="stylesheet" href="css/audio_recordings.css" type="text/css" /> 
+    <script src="js/audio-recordings.js" type="text/javascript"></script>
+    <link rel="stylesheet" href="css/audio-recordings.css" type="text/css" /> 
 } unless (params::isJson);
 
 my $permissions = $request->{permissions};
@@ -557,7 +557,7 @@ sub check_params {
     my $checked = {};
     $checked->{error} = '';
     $checked->{template} =
-      template::check( $config, $params->{template}, 'upload_audio_recordings' );
+      template::check( $config, $params->{template}, 'upload-audio-recordings' );
 
     #print Dumper($params);
     #numeric values
diff --git a/website/agenda/planung/comment.cgi b/website/agenda/planung/comment.cgi
index 0ec88a9..cbf3683 100755
--- a/website/agenda/planung/comment.cgi
+++ b/website/agenda/planung/comment.cgi
@@ -254,7 +254,7 @@ sub check_params {
     #template
     my $template = '';
     if ( defined $checked->{action} ) {
-        $template = template::check( $config, $params->{template}, 'edit_comment' )
+        $template = template::check( $config, $params->{template}, 'edit-comment' )
           if $checked->{action} eq 'showComment';
     } else {
         $template = template::check( $config, $params->{template}, 'comments' );
diff --git a/website/agenda/planung/create_events.cgi b/website/agenda/planung/create-events.cgi
similarity index 99%
rename from website/agenda/planung/create_events.cgi
rename to website/agenda/planung/create-events.cgi
index 6150ce9..296507d 100755
--- a/website/agenda/planung/create_events.cgi
+++ b/website/agenda/planung/create-events.cgi
@@ -232,7 +232,7 @@ sub check_params {
         $checked->{studio_id} = -1;
     }
 
-    $checked->{template} = template::check( $config, $params->{template}, 'create_events' );
+    $checked->{template} = template::check( $config, $params->{template}, 'create-events' );
 
     return $checked;
 }
diff --git a/website/agenda/planung/css/audio_recordings.css b/website/agenda/planung/css/audio-recordings.css
similarity index 100%
rename from website/agenda/planung/css/audio_recordings.css
rename to website/agenda/planung/css/audio-recordings.css
diff --git a/website/agenda/planung/css/list_series.css b/website/agenda/planung/css/list-series.css
similarity index 100%
rename from website/agenda/planung/css/list_series.css
rename to website/agenda/planung/css/list-series.css
diff --git a/website/agenda/planung/css/studio_timeslots.css b/website/agenda/planung/css/studio-timeslots.css
similarity index 100%
rename from website/agenda/planung/css/studio_timeslots.css
rename to website/agenda/planung/css/studio-timeslots.css
diff --git a/website/agenda/planung/css/wiki_preview.css b/website/agenda/planung/css/wiki_preview.css
deleted file mode 100644
index a4caa26..0000000
--- a/website/agenda/planung/css/wiki_preview.css
+++ /dev/null
@@ -1,4 +0,0 @@
-form table {
-    margin: 6px;
-    padding: 6px;
-}
\ No newline at end of file
diff --git a/website/agenda/planung/css/work_time.css b/website/agenda/planung/css/work-time.css
similarity index 100%
rename from website/agenda/planung/css/work_time.css
rename to website/agenda/planung/css/work-time.css
diff --git a/website/agenda/planung/event_history.cgi b/website/agenda/planung/event-history.cgi
similarity index 98%
rename from website/agenda/planung/event_history.cgi
rename to website/agenda/planung/event-history.cgi
index 8906514..7ddf21f 100755
--- a/website/agenda/planung/event_history.cgi
+++ b/website/agenda/planung/event-history.cgi
@@ -115,9 +115,9 @@ sub show_history {
     }
 
     #print STDERR Dumper($params);
-    $params->{loc} = localization::get( $config, { user => $params->{presets}->{user}, file => 'event_history' } );
+    $params->{loc} = localization::get( $config, { user => $params->{presets}->{user}, file => 'event-history' } );
 
-    template::process( $config, 'print', template::check( $config, 'event_history' ), $params );
+    template::process( $config, 'print', template::check( $config, 'event-history' ), $params );
 }
 
 #show existing event history
@@ -250,7 +250,7 @@ sub check_params {
 
     my $checked  = {};
     my $template = '';
-    $checked->{template} = template::check( $config, $params->{template}, 'event_history' );
+    $checked->{template} = template::check( $config, $params->{template}, 'event-history' );
 
     my $debug = $params->{debug} || '';
     if ( $debug =~ /([a-z\_\,]+)/ ) {
diff --git a/website/agenda/planung/event.cgi b/website/agenda/planung/event.cgi
index 69a2e28..6467b9a 100755
--- a/website/agenda/planung/event.cgi
+++ b/website/agenda/planung/event.cgi
@@ -312,7 +312,7 @@ sub show_event {
 
     #print STDERR Dumper($params);
     $params->{loc} = localization::get( $config, { user => $params->{presets}->{user}, file => 'event' } );
-    template::process( $config, 'print', template::check( $config, 'edit_event' ), $params );
+    template::process( $config, 'print', template::check( $config, 'edit-event' ), $params );
 }
 
 sub getJson {
@@ -456,7 +456,7 @@ sub show_new_event {
     }
 
     $params->{loc} = localization::get( $config, { user => $params->{presets}->{user}, file => 'event,comment' } );
-    template::process( $config, 'print', template::check( $config, 'edit_event' ), $params );
+    template::process( $config, 'print', template::check( $config, 'edit-event' ), $params );
 
     #print '<pre>'.Dumper($params).'</pre>';
 }
diff --git a/website/agenda/planung/image-upload.cgi b/website/agenda/planung/image-upload.cgi
index 142ff96..5938053 100755
--- a/website/agenda/planung/image-upload.cgi
+++ b/website/agenda/planung/image-upload.cgi
@@ -286,7 +286,7 @@ sub get_filename {
 sub check_filename {
     my $filename = shift;
 
-    my @valid_extensions = ( 'png', 'jpeg', 'jpg', 'gif', 'pdf', 'txt', 'bmp', 'ps', 'eps', 'wmf' );
+    my @valid_extensions = ( 'png', 'jpeg', 'jpg', 'gif', 'pdf', 'txt', 'bmp', 'ps', 'eps', 'wmf', 'svg' );
     if ( $filename =~ /\.([a-zA-Z]{3,5})$/ ) {
         my $extension = lc $1;
         unless ( grep( /$extension/, @valid_extensions ) ) {
diff --git a/website/agenda/planung/image.cgi b/website/agenda/planung/image.cgi
index 14a7f3e..d6d8247 100755
--- a/website/agenda/planung/image.cgi
+++ b/website/agenda/planung/image.cgi
@@ -65,7 +65,7 @@ $headerParams->{loc} = localization::get( $config, { user => $user, file => 'men
 if ( $params->{search} ) {
     template::process( $config, 'print', template::check( $config, 'default.html' ), $headerParams );
 } else {
-    template::process( $config, 'print', template::check( $config, 'ajax_header.html' ), $headerParams );
+    template::process( $config, 'print', template::check( $config, 'ajax-header.html' ), $headerParams );
 }
 
 return unless uac::check( $config, $params, $user_presets ) == 1;
@@ -241,7 +241,7 @@ sub show_image {
 
     #set global values for update and delete, per image values are evaluated later
     $template_params->{allow}->{update_image} =
-      $template_params->{allow}->{update_image_own} || $template_params->{allow}->{seriesupdate_image_others};
+      $template_params->{allow}->{update_image_own} || $template_params->{allow}->{update_image_others};
     $template_params->{allow}->{delete_image} =
       $template_params->{allow}->{delete_image_own} || $template_params->{allow}->{delete_image_others};
     template::process( $config, 'print', $params->{template}, $template_params );
diff --git a/website/agenda/planung/js/audio_recordings.js b/website/agenda/planung/js/audio-recordings.js
similarity index 99%
rename from website/agenda/planung/js/audio_recordings.js
rename to website/agenda/planung/js/audio-recordings.js
index 670c117..b3c9c79 100644
--- a/website/agenda/planung/js/audio_recordings.js
+++ b/website/agenda/planung/js/audio-recordings.js
@@ -57,7 +57,7 @@ function uploadFile(uploadButton){
     hideError();
     showProgress();
     var request=$.ajax({
-        url: 'audio_recordings.cgi',
+        url: 'audio-recordings.cgi',
         type: 'POST',
         data: new FormData($('#audio_recordings_upload')[0]),
         cache: false,
diff --git a/website/agenda/planung/js/calendar.js b/website/agenda/planung/js/calendar.js
index a4c5861..d843353 100644
--- a/website/agenda/planung/js/calendar.js
+++ b/website/agenda/planung/js/calendar.js
@@ -1023,7 +1023,7 @@ function handleWorktime(id, event){
     if (schedule_id<0)  return;
     var start_date=$(this).attr("start");
 
-    var url="work_time.cgi?action=show_new_event_from_schedule&project_id="+project_id+"&studio_id="+studio_id+"&schedule_id="+schedule_id+"&start_date="+start_date;
+    var url="work-time.cgi?action=show_new_event_from_schedule&project_id="+project_id+"&studio_id="+studio_id+"&schedule_id="+schedule_id+"&start_date="+start_date;
     if(event.which==1){
         load(url);
     }
diff --git a/website/agenda/planung/js/edit_event.js b/website/agenda/planung/js/edit-event.js
similarity index 100%
rename from website/agenda/planung/js/edit_event.js
rename to website/agenda/planung/js/edit-event.js
diff --git a/website/agenda/planung/js/edit_image.js b/website/agenda/planung/js/edit-image.js
similarity index 100%
rename from website/agenda/planung/js/edit_image.js
rename to website/agenda/planung/js/edit-image.js
diff --git a/website/agenda/planung/js/edit_series.js b/website/agenda/planung/js/edit-series.js
similarity index 100%
rename from website/agenda/planung/js/edit_series.js
rename to website/agenda/planung/js/edit-series.js
diff --git a/website/agenda/planung/js/image_upload.js b/website/agenda/planung/js/image-upload.js
similarity index 96%
rename from website/agenda/planung/js/image_upload.js
rename to website/agenda/planung/js/image-upload.js
index 6518b2c..c036d17 100644
--- a/website/agenda/planung/js/image_upload.js
+++ b/website/agenda/planung/js/image-upload.js
@@ -27,7 +27,7 @@ function uploadImage(){
         //remove existing image from list
         $('#imageList div.images #img_'+image_id).remove();
 
-        var url='show-image.cgi?project_id='+getProjectId()+'&studioId='+getStudioId()+'&type=icon&filename='+filename;
+        var url='show-image.cgi?project_id='+getProjectId()+'&studio_id='+getStudioId()+'&type=icon&filename='+filename;
 
         var html = '<div';
         html += ' id="img_' + image_id + '"';
diff --git a/website/agenda/planung/js/image.js b/website/agenda/planung/js/image.js
index b5b3e3d..11c5277 100644
--- a/website/agenda/planung/js/image.js
+++ b/website/agenda/planung/js/image.js
@@ -21,7 +21,7 @@ function updateActiveImage(){
 // open dialog to show or edit image properties
 function updateImageEditor(elem, filename, target, project_id, studio_id, series_id, event_id, pid){
     var url='image.cgi?show='+filename;
-    url += '&template=edit_image.html';
+    url += '&template=edit-image.html';
     url += '&target=' + target;
     url += '&project_id='+project_id;
     url += '&studio_id='+studio_id;
@@ -130,7 +130,7 @@ function deleteImage(id, filename) {
 function hideImageDetails(id, filename){
     try{$('#img_editor').dialog('close');}catch(e){}
 
-    var url='image.cgi?show='+filename+'&template=image_single.html&project_id='+project_id+'&studio_id='+studio_id;
+    var url='image.cgi?show='+filename+'&template=image-single.html&project_id='+project_id+'&studio_id='+studio_id;
     console.log("hideImageDetails, load url="+url)
     $("#"+id).load(url);
     return false;
diff --git a/website/agenda/planung/js/list_series.js b/website/agenda/planung/js/list-series.js
similarity index 100%
rename from website/agenda/planung/js/list_series.js
rename to website/agenda/planung/js/list-series.js
diff --git a/website/agenda/planung/js/page_leave_handler.js b/website/agenda/planung/js/page-leave-handler.js
similarity index 100%
rename from website/agenda/planung/js/page_leave_handler.js
rename to website/agenda/planung/js/page-leave-handler.js
diff --git a/website/agenda/planung/js/studio_timeslots.js b/website/agenda/planung/js/studio-timeslots.js
similarity index 98%
rename from website/agenda/planung/js/studio_timeslots.js
rename to website/agenda/planung/js/studio-timeslots.js
index 1ef179a..70d29e8 100644
--- a/website/agenda/planung/js/studio_timeslots.js
+++ b/website/agenda/planung/js/studio-timeslots.js
@@ -27,7 +27,7 @@ function updateWeekdays(){
 function showDates(){
     var date=$('#show_date select').val();
 
-    var url='studio_timeslots.cgi?';
+    var url='studio-timeslots.cgi?';
     url+='project_id='+getProjectId();
     url+='&studio_id='+getStudioId();
     url+='&action=show_dates';
diff --git a/website/agenda/planung/notify_events.cgi b/website/agenda/planung/notify-events.cgi
similarity index 98%
rename from website/agenda/planung/notify_events.cgi
rename to website/agenda/planung/notify-events.cgi
index 4b0f138..82cb9d4 100755
--- a/website/agenda/planung/notify_events.cgi
+++ b/website/agenda/planung/notify-events.cgi
@@ -120,7 +120,7 @@ sub show_events {
         $params->{'allow'}->{$permission} = $request->{permissions}->{$permission};
     }
 
-    $params->{loc} = localization::get( $config, { user => $params->{presets}->{user}, file => 'notify_events' } );
+    $params->{loc} = localization::get( $config, { user => $params->{presets}->{user}, file => 'notify-events' } );
     template::process( $config, 'print', $params->{template}, $params );
 
 }
@@ -242,7 +242,7 @@ sub check_params {
 
     my $checked  = {};
     my $template = '';
-    $checked->{template} = template::check( $config, $params->{template}, 'notify_events' );
+    $checked->{template} = template::check( $config, $params->{template}, 'notify-events' );
 
     my $debug = $params->{debug} || '';
     if ( $debug =~ /([a-z\_\,]+)/ ) {
diff --git a/website/agenda/planung/pot/de/audio_recordings.po b/website/agenda/planung/pot/de/audio-recordings.po
similarity index 100%
rename from website/agenda/planung/pot/de/audio_recordings.po
rename to website/agenda/planung/pot/de/audio-recordings.po
diff --git a/website/agenda/planung/pot/de/create_events.po b/website/agenda/planung/pot/de/create-events.po
similarity index 100%
rename from website/agenda/planung/pot/de/create_events.po
rename to website/agenda/planung/pot/de/create-events.po
diff --git a/website/agenda/planung/pot/de/event_history.po b/website/agenda/planung/pot/de/event-history.po
similarity index 100%
rename from website/agenda/planung/pot/de/event_history.po
rename to website/agenda/planung/pot/de/event-history.po
diff --git a/website/agenda/planung/pot/de/notify_events.po b/website/agenda/planung/pot/de/notify-events.po
similarity index 100%
rename from website/agenda/planung/pot/de/notify_events.po
rename to website/agenda/planung/pot/de/notify-events.po
diff --git a/website/agenda/planung/pot/de/selectEvent.po b/website/agenda/planung/pot/de/select-event.po
similarity index 100%
rename from website/agenda/planung/pot/de/selectEvent.po
rename to website/agenda/planung/pot/de/select-event.po
diff --git a/website/agenda/planung/pot/de/selectSeries.po b/website/agenda/planung/pot/de/select-series.po
similarity index 100%
rename from website/agenda/planung/pot/de/selectSeries.po
rename to website/agenda/planung/pot/de/select-series.po
diff --git a/website/agenda/planung/pot/de/studio_timeslots.po b/website/agenda/planung/pot/de/studio-timeslots.po
similarity index 100%
rename from website/agenda/planung/pot/de/studio_timeslots.po
rename to website/agenda/planung/pot/de/studio-timeslots.po
diff --git a/website/agenda/planung/pot/de/user_settings.po b/website/agenda/planung/pot/de/user-settings.po
similarity index 100%
rename from website/agenda/planung/pot/de/user_settings.po
rename to website/agenda/planung/pot/de/user-settings.po
diff --git a/website/agenda/planung/pot/de/user_stats.po b/website/agenda/planung/pot/de/user-stats.po
similarity index 100%
rename from website/agenda/planung/pot/de/user_stats.po
rename to website/agenda/planung/pot/de/user-stats.po
diff --git a/website/agenda/planung/pot/de/work_time.po b/website/agenda/planung/pot/de/work-time.po
similarity index 100%
rename from website/agenda/planung/pot/de/work_time.po
rename to website/agenda/planung/pot/de/work-time.po
diff --git a/website/agenda/planung/pot/en/audio_recordings.po b/website/agenda/planung/pot/en/audio-recordings.po
similarity index 100%
rename from website/agenda/planung/pot/en/audio_recordings.po
rename to website/agenda/planung/pot/en/audio-recordings.po
diff --git a/website/agenda/planung/pot/en/create_events.po b/website/agenda/planung/pot/en/create-events.po
similarity index 100%
rename from website/agenda/planung/pot/en/create_events.po
rename to website/agenda/planung/pot/en/create-events.po
diff --git a/website/agenda/planung/pot/en/event_history.po b/website/agenda/planung/pot/en/event-history.po
similarity index 100%
rename from website/agenda/planung/pot/en/event_history.po
rename to website/agenda/planung/pot/en/event-history.po
diff --git a/website/agenda/planung/pot/en/notify_events.po b/website/agenda/planung/pot/en/notify-events.po
similarity index 100%
rename from website/agenda/planung/pot/en/notify_events.po
rename to website/agenda/planung/pot/en/notify-events.po
diff --git a/website/agenda/planung/pot/en/selectEvent.po b/website/agenda/planung/pot/en/select-event.po
similarity index 100%
rename from website/agenda/planung/pot/en/selectEvent.po
rename to website/agenda/planung/pot/en/select-event.po
diff --git a/website/agenda/planung/pot/en/selectSeries.po b/website/agenda/planung/pot/en/select-series.po
similarity index 100%
rename from website/agenda/planung/pot/en/selectSeries.po
rename to website/agenda/planung/pot/en/select-series.po
diff --git a/website/agenda/planung/pot/en/studio_timeslots.po b/website/agenda/planung/pot/en/studio-timeslots.po
similarity index 100%
rename from website/agenda/planung/pot/en/studio_timeslots.po
rename to website/agenda/planung/pot/en/studio-timeslots.po
diff --git a/website/agenda/planung/pot/en/user_settings.po b/website/agenda/planung/pot/en/user-settings.po
similarity index 100%
rename from website/agenda/planung/pot/en/user_settings.po
rename to website/agenda/planung/pot/en/user-settings.po
diff --git a/website/agenda/planung/pot/en/user_stats.po b/website/agenda/planung/pot/en/user-stats.po
similarity index 100%
rename from website/agenda/planung/pot/en/user_stats.po
rename to website/agenda/planung/pot/en/user-stats.po
diff --git a/website/agenda/planung/pot/en/work_time.po b/website/agenda/planung/pot/en/work-time.po
similarity index 100%
rename from website/agenda/planung/pot/en/work_time.po
rename to website/agenda/planung/pot/en/work-time.po
diff --git a/website/agenda/planung/requestPassword.cgi b/website/agenda/planung/request-password.cgi
similarity index 99%
rename from website/agenda/planung/requestPassword.cgi
rename to website/agenda/planung/request-password.cgi
index 717a207..00ede19 100755
--- a/website/agenda/planung/requestPassword.cgi
+++ b/website/agenda/planung/request-password.cgi
@@ -143,7 +143,7 @@ sub check_params {
     my $checked = {};
 
     #my $template = '';
-    #$checked->{template} = template::check($config,  $params->{template}, 'requestPassword' );
+    #$checked->{template} = template::check($config,  $params->{template}, 'request-password' );
 
     my $debug = $params->{debug} || '';
     if ( $debug =~ /([a-z\_\,]+)/ ) {
diff --git a/website/agenda/planung/select-event.cgi b/website/agenda/planung/select-event.cgi
index a022987..0116ff0 100755
--- a/website/agenda/planung/select-event.cgi
+++ b/website/agenda/planung/select-event.cgi
@@ -49,7 +49,7 @@ $request = uac::prepare_request( $request, $user_presets );
 
 $params = $request->{params}->{checked};
 $params = uac::set_template_permissions( $request->{permissions}, $params );
-$params->{loc} = localization::get( $config, { user => $user, file => 'selectEvent' } );
+$params->{loc} = localization::get( $config, { user => $user, file => 'select-event' } );
 
 #process header
 print "Content-type:text/html; charset=UTF-8;\n\n";
@@ -172,7 +172,7 @@ sub check_params {
         $checked->{studio_id} = -1;
     }
 
-    $checked->{template} = template::check( $config, $params->{template}, 'selectEvent' );
+    $checked->{template} = template::check( $config, $params->{template}, 'select-event' );
 
     return $checked;
 }
diff --git a/website/agenda/planung/select-series.cgi b/website/agenda/planung/select-series.cgi
index ca468b0..d8d282b 100755
--- a/website/agenda/planung/select-series.cgi
+++ b/website/agenda/planung/select-series.cgi
@@ -48,7 +48,7 @@ $request = uac::prepare_request( $request, $user_presets );
 
 $params = $request->{params}->{checked};
 $params = uac::set_template_permissions( $request->{permissions}, $params );
-$params->{loc} = localization::get( $config, { user => $user, file => 'selectSeries' } );
+$params->{loc} = localization::get( $config, { user => $user, file => 'select-series' } );
 
 #process header
 print "Content-type:text/html; charset=UTF-8;\n\n";
@@ -149,7 +149,7 @@ sub check_params {
         $checked->{studio_id} = -1;
     }
 
-    $checked->{template} = template::check( $config, $params->{template}, 'selectSeries' );
+    $checked->{template} = template::check( $config, $params->{template}, 'select-series' );
 
     return $checked;
 }
diff --git a/website/agenda/planung/series.cgi b/website/agenda/planung/series.cgi
index 8577738..6c8a03c 100755
--- a/website/agenda/planung/series.cgi
+++ b/website/agenda/planung/series.cgi
@@ -102,12 +102,12 @@ $config->{access}->{write} = 0;
 #print STDERR "show_series\n";
 
 if ( defined $params->{series_id} ) {
-    print q{<script src="js/edit_series.js" type="text/javascript"></script>} unless params::isJson();
+    print q{<script src="js/edit-series.js" type="text/javascript"></script>} unless params::isJson();
     show_series( $config, $request );
 } else {
     print q{
-    	<link rel="stylesheet" href="css/list_series.css" type="text/css" /> 
-        <script src="js/list_series.js" type="text/javascript"></script>
+    	<link rel="stylesheet" href="css/list-series.css" type="text/css" /> 
+        <script src="js/list-series.js" type="text/javascript"></script>
     } unless params::isJson();
     list_series( $config, $request );
 }
@@ -1262,7 +1262,7 @@ sub check_params {
     }
 
     if ( defined $checked->{series_id} ) {
-        $checked->{template} = template::check( $config, $params->{template}, 'edit_series' );
+        $checked->{template} = template::check( $config, $params->{template}, 'edit-series' );
     } else {
         $checked->{template} = template::check( $config, $params->{template}, 'series' );
     }
diff --git a/website/agenda/planung/show-playout.cgi b/website/agenda/planung/show-playout.cgi
index 649544a..5999271 100755
--- a/website/agenda/planung/show-playout.cgi
+++ b/website/agenda/planung/show-playout.cgi
@@ -137,7 +137,7 @@ sub check_params {
 
     my $checked = {};
     $checked->{error} = '';
-    $checked->{template} = template::check( $config, $params->{template}, 'show_playout' );
+    $checked->{template} = template::check( $config, $params->{template}, 'show-playout' );
 
     #numeric values
     for my $param ( 'project_id', 'studio_id', 'default_studio_id', 'series_id', 'event_id', 'id' )
diff --git a/website/agenda/planung/studio_timeslots.cgi b/website/agenda/planung/studio-timeslots.cgi
similarity index 97%
rename from website/agenda/planung/studio_timeslots.cgi
rename to website/agenda/planung/studio-timeslots.cgi
index 78bc9ca..dad699a 100755
--- a/website/agenda/planung/studio_timeslots.cgi
+++ b/website/agenda/planung/studio-timeslots.cgi
@@ -78,9 +78,9 @@ if ( $action eq 'show_dates' ) {
 	<script src="js/jquery.tablesorter.widgets.min.js"></script>
 	<script src="js/jquery.tablesorter.scroller.js"></script>
 
-        <script src="js/studio_timeslots.js" type="text/javascript"></script>
+        <script src="js/studio-timeslots.js" type="text/javascript"></script>
 	    <script src="js/datetime.js" type="text/javascript"></script>
-	    <link rel="stylesheet" href="css/studio_timeslots.css" type="text/css" /> 
+	    <link rel="stylesheet" href="css/studio-timeslots.css" type="text/css" /> 
     };
 }
 
@@ -208,7 +208,7 @@ sub showTimeslotSchedule {
     }
 
     $params->{loc} =
-      localization::get( $config, { user => $params->{presets}->{user}, file => 'all,studio_timeslots' } );
+      localization::get( $config, { user => $params->{presets}->{user}, file => 'all,studio-timeslots' } );
 
     my $studio_id  = $params->{studio_id};
     my $project_id = $params->{project_id};
@@ -310,7 +310,7 @@ sub showDates {
     );
 
     $params->{loc} =
-      localization::get( $config, { user => $params->{presets}->{user}, file => 'all,studio_timeslots' } );
+      localization::get( $config, { user => $params->{presets}->{user}, file => 'all,studio-timeslots' } );
     my $language = $params->{loc}->{region};
 
     # translate weekday names to selected language
@@ -355,7 +355,7 @@ sub showDates {
         $params->{$key} = $result->{$key};
     }
 
-    my $template = template::check( $config, 'studio_timeslot_dates' );
+    my $template = template::check( $config, 'studio-timeslot-dates' );
     template::process( $config, 'print', $template, $params );
 }
 
@@ -399,7 +399,7 @@ sub check_params {
         $checked->{studio_id} = -1;
     }
 
-    $checked->{template} = template::check( $config, $params->{template}, 'studio_timeslots' );
+    $checked->{template} = template::check( $config, $params->{template}, 'studio-timeslots' );
 
     for my $param ('frequency') {
         if ( ( defined $params->{$param} ) && ( $params->{$param} =~ /(\d+)/ ) ) {
diff --git a/website/agenda/planung/templates/ajax_header.html b/website/agenda/planung/templates/ajax-header.html
similarity index 100%
rename from website/agenda/planung/templates/ajax_header.html
rename to website/agenda/planung/templates/ajax-header.html
diff --git a/website/agenda/planung/templates/assign_series.html b/website/agenda/planung/templates/assign-series.html
similarity index 94%
rename from website/agenda/planung/templates/assign_series.html
rename to website/agenda/planung/templates/assign-series.html
index e562c31..ff93f0b 100644
--- a/website/agenda/planung/templates/assign_series.html
+++ b/website/agenda/planung/templates/assign-series.html
@@ -17,7 +17,7 @@
             $('#assignments_form input[name="series_id"]').val(series_id);
             //console.log(project_id+" "+studio_id+" "+series_id);
 
-            var url="assign_series.cgi?project_id="+project_id+'&studio_id='+studio_id+'&series_id='+series_id+'&action=assign_series';
+            var url="assign-series.cgi?project_id="+project_id+'&studio_id='+studio_id+'&series_id='+series_id+'&action=assign_series';
             //console.log(url);
             $('#assignments_form').submit();
             return false;
@@ -45,7 +45,7 @@
                 </TMPL_LOOP>
             </select>
 
-            <form action="assign_series.cgi?project_id=<TMPL_VAR .project_id>&studio_id=<TMPL_VAR .studio_id>" method="post" id="assignments_form">
+            <form action="assign-series.cgi?project_id=<TMPL_VAR .project_id>&studio_id=<TMPL_VAR .studio_id>" method="post" id="assignments_form">
                 <input type="hidden" name="project_id" value="<TMPL_VAR .project_id>">
                 <input type="hidden" name="studio_id" value="<TMPL_VAR .studio_id>">
                 <input type="hidden" name="series_id" value="<TMPL_VAR .series_id>">	
diff --git a/website/agenda/planung/templates/change_password.html b/website/agenda/planung/templates/change-password.html
similarity index 100%
rename from website/agenda/planung/templates/change_password.html
rename to website/agenda/planung/templates/change-password.html
diff --git a/website/agenda/planung/templates/comments.html b/website/agenda/planung/templates/comments.html
index 1aefaf7..4998979 100644
--- a/website/agenda/planung/templates/comments.html
+++ b/website/agenda/planung/templates/comments.html
@@ -9,12 +9,12 @@
     <script src="js/jquery-ui-timepicker.js" type="text/javascript"></script>
 
     <script src="js/series.js" type="text/javascript"></script>
-    <script src="js/edit_event.js" type="text/javascript"></script>
+    <script src="js/edit-event.js" type="text/javascript"></script>
     <script src="js/image.js" type="text/javascript"></script>
     -->
     <script src="js/jquery.autosize.min.js" type="text/javascript"></script>
     <script src="js/comment.js" type="text/javascript"></script>
-    <script src="js/page_leave_handler.js" type="text/javascript"></script>
+    <script src="js/page-leave-handler.js" type="text/javascript"></script>
     <script>
         var region='<TMPL_VAR loc.region>';
         var event_id='<TMPL_VAR event_id>';
diff --git a/website/agenda/planung/templates/create_events.html b/website/agenda/planung/templates/create-events.html
similarity index 100%
rename from website/agenda/planung/templates/create_events.html
rename to website/agenda/planung/templates/create-events.html
diff --git a/website/agenda/planung/templates/default.html b/website/agenda/planung/templates/default.html
index 27d1c2a..7aaad28 100644
--- a/website/agenda/planung/templates/default.html
+++ b/website/agenda/planung/templates/default.html
@@ -32,7 +32,7 @@
 </TMPL_IF>
 
 <TMPL_IF .allow.read_studio_timeslot_schedule>
-<div><a href="studio_timeslots.cgi?project_id=<TMPL_VAR project_id>&studio_id=<TMPL_VAR default_studio_id>"><i class="fas fa-clock"></i>&nbsp;<TMPL_VAR .loc.timeslots></a></div>
+<div><a href="studio-timeslots.cgi?project_id=<TMPL_VAR project_id>&studio_id=<TMPL_VAR default_studio_id>"><i class="fas fa-clock"></i>&nbsp;<TMPL_VAR .loc.timeslots></a></div>
 </TMPL_IF>
 
 <TMPL_IF .allow.read_studio>
@@ -44,14 +44,14 @@
 </TMPL_IF>
 
 <TMPL_IF .allow.read_schedule>
-<div><a href="work_time.cgi?project_id=<TMPL_VAR project_id>&studio_id=<TMPL_VAR default_studio_id>"><i class="fas fa-clock"></i>&nbsp;<TMPL_VAR .loc.schedule></a></div>
+<div><a href="work-time.cgi?project_id=<TMPL_VAR project_id>&studio_id=<TMPL_VAR default_studio_id>"><i class="fas fa-clock"></i>&nbsp;<TMPL_VAR .loc.schedule></a></div>
 </TMPL_IF>
 
 <TMPL_IF .allow.update_image_others>
 <div><a href="image.cgi?project_id=<TMPL_VAR project_id>&studio_id=<TMPL_VAR default_studio_id>&search=<TMPL_VAR .presets.user>"><i class="fas fa-images"></i>&nbsp;<TMPL_VAR .loc.images></a></div>
 </TMPL_IF>
 
-<div title="<TMPL_VAR .loc.profile>"><a href="user_settings.cgi?project_id=<TMPL_VAR project_id>&studio_id=<TMPL_VAR default_studio_id>"><i class="fas fa-cog"></i>&nbsp;<TMPL_VAR .loc.profile></a></div>
+<div title="<TMPL_VAR .loc.profile>"><a href="user-settings.cgi?project_id=<TMPL_VAR project_id>&studio_id=<TMPL_VAR default_studio_id>"><i class="fas fa-cog"></i>&nbsp;<TMPL_VAR .loc.profile></a></div>
 
 <div title="<TMPL_VAR .loc.help>"><a href="help.cgi?project_id=<TMPL_VAR project_id>&studio_id=<TMPL_VAR default_studio_id>"><i class="fas fa-info"></i>&nbsp;<TMPL_VAR .loc.help></a></div>
 
diff --git a/website/agenda/planung/templates/edit_comment.html b/website/agenda/planung/templates/edit-comment.html
similarity index 100%
rename from website/agenda/planung/templates/edit_comment.html
rename to website/agenda/planung/templates/edit-comment.html
diff --git a/website/agenda/planung/templates/edit_event.html b/website/agenda/planung/templates/edit-event.html
similarity index 98%
rename from website/agenda/planung/templates/edit_event.html
rename to website/agenda/planung/templates/edit-event.html
index 15593f9..45dd988 100644
--- a/website/agenda/planung/templates/edit_event.html
+++ b/website/agenda/planung/templates/edit-event.html
@@ -12,10 +12,10 @@
     <script src="js/jquery.autosize.min.js" type="text/javascript"></script>
 
     <script src="js/series.js" type="text/javascript"></script>
-    <script src="js/edit_event.js" type="text/javascript"></script>
+    <script src="js/edit-event.js" type="text/javascript"></script>
     <script src="js/image.js" type="text/javascript"></script>
     <script src="js/comment.js" type="text/javascript"></script>
-    <script src="js/page_leave_handler.js" type="text/javascript"></script>
+    <script src="js/page-leave-handler.js" type="text/javascript"></script>
     <script>
         var region='<TMPL_VAR loc.region>';
         var event_id='<TMPL_VAR event_id>';
@@ -102,7 +102,7 @@
 
     <TMPL_UNLESS new_event>
         <TMPL_IF .allow.upload_audio_recordings>
-            <form style="float:right" action="audio_recordings.cgi">
+            <form style="float:right" action="audio-recordings.cgi">
                 <input type="hidden" name="project_id" value="<TMPL_VAR .project_id>">
                 <input type="hidden" name="studio_id"  value="<TMPL_VAR .studio_id>">
                 <input type="hidden" name="series_id"  value="<TMPL_VAR .series_id>">    
@@ -134,7 +134,7 @@
 
     <TMPL_IF .allow.read_event>
         <button target="_blank"
-            onclick="load('event_history.cgi?project_id=<TMPL_VAR project_id>&studio_id=<TMPL_VAR studio_id>&series_id=<TMPL_VAR series_id>&event_id=<TMPL_VAR event_id>');"
+            onclick="load('event-history.cgi?project_id=<TMPL_VAR project_id>&studio_id=<TMPL_VAR studio_id>&series_id=<TMPL_VAR series_id>&event_id=<TMPL_VAR event_id>');"
         ><TMPL_VAR .loc.button_show_changes></button>
     </TMPL_IF>
 
diff --git a/website/agenda/planung/templates/edit_image.html b/website/agenda/planung/templates/edit-image.html
similarity index 96%
rename from website/agenda/planung/templates/edit_image.html
rename to website/agenda/planung/templates/edit-image.html
index 5133356..c99c07f 100644
--- a/website/agenda/planung/templates/edit_image.html
+++ b/website/agenda/planung/templates/edit-image.html
@@ -1,6 +1,6 @@
 
-<script src="js/edit_image.js" type="text/javascript"></script>
-<script src="js/page_leave_handler.js" type="text/javascript"></script>
+<script src="js/edit-image.js" type="text/javascript"></script>
+<script src="js/page-leave-handler.js" type="text/javascript"></script>
 
 <TMPL_IF no_results>
 found no image
diff --git a/website/agenda/planung/templates/edit_series.html b/website/agenda/planung/templates/edit-series.html
similarity index 99%
rename from website/agenda/planung/templates/edit_series.html
rename to website/agenda/planung/templates/edit-series.html
index 60d69b8..a1187f1 100644
--- a/website/agenda/planung/templates/edit_series.html
+++ b/website/agenda/planung/templates/edit-series.html
@@ -42,7 +42,7 @@
 
         <TMPL_IF .allow.read_event>
             <button target="_blank"
-                onclick="load('event_history.cgi?project_id=<TMPL_VAR .project_id>&studio_id=<TMPL_VAR .studio_id>&series_id=<TMPL_VAR series_id>');"
+                onclick="load('event-history.cgi?project_id=<TMPL_VAR .project_id>&studio_id=<TMPL_VAR .studio_id>&series_id=<TMPL_VAR series_id>');"
                 style="float:left"
             ><TMPL_VAR .loc.button_show_changes></button>
         </TMPL_IF>
diff --git a/website/agenda/planung/templates/edit_user_roles.html b/website/agenda/planung/templates/edit-user-roles.html
similarity index 100%
rename from website/agenda/planung/templates/edit_user_roles.html
rename to website/agenda/planung/templates/edit-user-roles.html
diff --git a/website/agenda/planung/templates/edit_work_time.html b/website/agenda/planung/templates/edit-work-time.html
similarity index 98%
rename from website/agenda/planung/templates/edit_work_time.html
rename to website/agenda/planung/templates/edit-work-time.html
index 4ce465a..695ffeb 100644
--- a/website/agenda/planung/templates/edit_work_time.html
+++ b/website/agenda/planung/templates/edit-work-time.html
@@ -2,7 +2,7 @@
 
 	<script src="js/datetime.js" type="text/javascript"></script>
 <!--	<script src="js/localization.js" type="text/javascript"></script> -->
-	<link rel="stylesheet" href="css/work_time.css" type="text/css" /> 
+	<link rel="stylesheet" href="css/work-time.css" type="text/css" /> 
 
 	<link href="css/jquery-ui-timepicker.css" type="text/css" rel="stylesheet" /> 
 	<script src="js/jquery-ui-timepicker.js" type="text/javascript"></script>
@@ -44,7 +44,7 @@
 	<TMPL_LOOP schedule>
 	<div class="row schedule<TMPL_IF selected> selected</TMPL_IF>">
 		<form method="post"
-		    action="work_time.cgi?project_id=<TMPL_VAR .project_id>&studio_id=<TMPL_VAR .studio_id>&schedule_id=<TMPL_VAR schedule_id>"
+		    action="work-time.cgi?project_id=<TMPL_VAR .project_id>&studio_id=<TMPL_VAR .studio_id>&schedule_id=<TMPL_VAR schedule_id>"
 		    id="schedule_<TMPL_VAR schedule_id>"
 		>
             <input type="hidden" name="project_id" value="<TMPL_VAR .project_id>">
@@ -165,7 +165,7 @@
     <!-- add schedule -->
 	<div class="row schedule row<TMPL_IF show_hint_to_add_schedule> active</TMPL_IF>">
 		<form id="schedule_add" method="post" 
-		    action="work_time.cgi?project_id=<TMPL_VAR .project_id>&studio_id=<TMPL_VAR .studio_id>"
+		    action="work-time.cgi?project_id=<TMPL_VAR .project_id>&studio_id=<TMPL_VAR .studio_id>"
 		>
             <input type="hidden" name="project_id" value="<TMPL_VAR .project_id>">
 			<input type="hidden" name="studio_id"  value="<TMPL_VAR .studio_id>" />
diff --git a/website/agenda/planung/templates/error_log.html b/website/agenda/planung/templates/error-log.html
similarity index 100%
rename from website/agenda/planung/templates/error_log.html
rename to website/agenda/planung/templates/error-log.html
diff --git a/website/agenda/planung/templates/event_history.html b/website/agenda/planung/templates/event-history.html
similarity index 99%
rename from website/agenda/planung/templates/event_history.html
rename to website/agenda/planung/templates/event-history.html
index bb5f0e5..c095667 100644
--- a/website/agenda/planung/templates/event_history.html
+++ b/website/agenda/planung/templates/event-history.html
@@ -58,7 +58,7 @@
         if (project_id=='') return ;
         if (studio_id=='')  return ;
         if (event_id=='')   return ;
-        var url= 'event_history.cgi?';
+        var url= 'event-history.cgi?';
         url+='project_id='+project_id;
         url+='&studio_id='+studio_id;
         url+='&series_id='+series_id;
diff --git a/website/agenda/planung/templates/header_head.html b/website/agenda/planung/templates/header-head.html
similarity index 100%
rename from website/agenda/planung/templates/header_head.html
rename to website/agenda/planung/templates/header-head.html
diff --git a/website/agenda/planung/templates/header.html b/website/agenda/planung/templates/header.html
index dd99d60..f8e6b45 100644
--- a/website/agenda/planung/templates/header.html
+++ b/website/agenda/planung/templates/header.html
@@ -8,7 +8,7 @@ Content-Type: text/html; charset=UTF-8;
     <meta http-equiv="Content-Script-Type" content="javascript" />
     <meta http-equiv="Content-Style-Type" content="text/css" />
     <TMPL_IF arefresh_time><meta http-equiv="refresh" content="<TMPL_VAR refresh_time>;url=<TMPL_VAR refresh_url escape=url>"></TMPL_IF>
-    <TMPL_INCLUDE header_head.html>
+    <TMPL_INCLUDE header-head.html>
 </head>
 <body>
 <center>
diff --git a/website/agenda/planung/templates/image_single.html b/website/agenda/planung/templates/image-single.html
similarity index 100%
rename from website/agenda/planung/templates/image_single.html
rename to website/agenda/planung/templates/image-single.html
diff --git a/website/agenda/planung/templates/image-upload.html b/website/agenda/planung/templates/image-upload.html
index 94146df..c32c4e0 100644
--- a/website/agenda/planung/templates/image-upload.html
+++ b/website/agenda/planung/templates/image-upload.html
@@ -1,4 +1,4 @@
-<script src="js/edit_image.js" type="text/javascript"></script>
+<script src="js/edit-image.js" type="text/javascript"></script>
 
     <div class="editor">
         <TMPL_IF action>
diff --git a/website/agenda/planung/templates/image.html b/website/agenda/planung/templates/image.html
index 1f43209..fb9d71d 100644
--- a/website/agenda/planung/templates/image.html
+++ b/website/agenda/planung/templates/image.html
@@ -1,10 +1,10 @@
 
 <link type="text/css" href="css/image.css" rel="stylesheet"/>
 <script src="js/image.js" type="text/javascript"></script>
-<script src="js/page_leave_handler.js" type="text/javascript"></script>
+<script src="js/page-leave-handler.js" type="text/javascript"></script>
 
 <TMPL_IF .allow.create_image>
-<script src="js/image_upload.js" type="text/javascript"></script>
+<script src="js/image-upload.js" type="text/javascript"></script>
 </TMPL_IF>
 
 <script>
diff --git a/website/agenda/planung/templates/notify_daily.html b/website/agenda/planung/templates/notify-daily.html
similarity index 100%
rename from website/agenda/planung/templates/notify_daily.html
rename to website/agenda/planung/templates/notify-daily.html
diff --git a/website/agenda/planung/templates/notify_daily.txt b/website/agenda/planung/templates/notify-daily.txt
similarity index 100%
rename from website/agenda/planung/templates/notify_daily.txt
rename to website/agenda/planung/templates/notify-daily.txt
diff --git a/website/agenda/planung/templates/notify_events.html b/website/agenda/planung/templates/notify-events.html
similarity index 96%
rename from website/agenda/planung/templates/notify_events.html
rename to website/agenda/planung/templates/notify-events.html
index 15dc1d9..c136b1a 100644
--- a/website/agenda/planung/templates/notify_events.html
+++ b/website/agenda/planung/templates/notify-events.html
@@ -3,7 +3,7 @@
 
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <title><TMPL_VAR .doc.title></title>
-<script src="js/page_leave_handler.js" type="text/javascript"></script>
+<script src="js/page-leave-handler.js" type="text/javascript"></script>
 
 <style>
     .mailHeader{
@@ -62,7 +62,7 @@
                 function( event ) {
                     event.preventDefault();
                     var $form = $( this );
-                    var posting = $.post("notify_events.cgi", $form.serialize());    
+                    var posting = $.post("notify-events.cgi", $form.serialize());    
                     posting.done(
                         function( data ) {
                             var content = $( data ).find( "#content" );
diff --git a/website/agenda/planung/templates/notify_overview.html b/website/agenda/planung/templates/notify-overview.html
similarity index 100%
rename from website/agenda/planung/templates/notify_overview.html
rename to website/agenda/planung/templates/notify-overview.html
diff --git a/website/agenda/planung/templates/notify_overview.txt b/website/agenda/planung/templates/notify-overview.txt
similarity index 100%
rename from website/agenda/planung/templates/notify_overview.txt
rename to website/agenda/planung/templates/notify-overview.txt
diff --git a/website/agenda/planung/templates/show_playout.html b/website/agenda/planung/templates/show-playout.html
similarity index 100%
rename from website/agenda/planung/templates/show_playout.html
rename to website/agenda/planung/templates/show-playout.html
diff --git a/website/agenda/planung/templates/studio_timeslot_dates.html b/website/agenda/planung/templates/studio-timeslot-dates.html
similarity index 100%
rename from website/agenda/planung/templates/studio_timeslot_dates.html
rename to website/agenda/planung/templates/studio-timeslot-dates.html
diff --git a/website/agenda/planung/templates/studio_timeslots.html b/website/agenda/planung/templates/studio-timeslots.html
similarity index 98%
rename from website/agenda/planung/templates/studio_timeslots.html
rename to website/agenda/planung/templates/studio-timeslots.html
index 007320c..7285d8d 100644
--- a/website/agenda/planung/templates/studio_timeslots.html
+++ b/website/agenda/planung/templates/studio-timeslots.html
@@ -36,7 +36,7 @@
 
 			<TMPL_LOOP schedule>
 			<div class="row schedule" id="schedule_<TMPL_VAR schedule_id>">
-				<form method="post" action="studio_timeslots.cgi?project_id=<TMPL_VAR .project_id>&studio_id=<TMPL_VAR .studio_id>" id="form_schedule_<TMPL_VAR schedule_id>">
+				<form method="post" action="studio-timeslots.cgi?project_id=<TMPL_VAR .project_id>&studio_id=<TMPL_VAR .studio_id>" id="form_schedule_<TMPL_VAR schedule_id>">
 					<input type="hidden" name="project_id"      value="<TMPL_VAR .project_id>" />
 					<input type="hidden" name="studio_id"       value="<TMPL_VAR .studio_id>" />
 					<input type="hidden" name="schedule_id"     value="<TMPL_VAR schedule_id>" />
@@ -76,7 +76,7 @@
 			
 			<!-- add schedule-->
 			<div class="row">
-				<form method="post" action="studio_timeslots.cgi">
+				<form method="post" action="studio-timeslots.cgi">
 					<input type="hidden" name="project_id"     value="<TMPL_VAR .project_id>" />
 					<input type="hidden" name="studio_id"      value="<TMPL_VAR .studio_id>" />
 					<div class="cell weekday"></div>
diff --git a/website/agenda/planung/templates/studios.html b/website/agenda/planung/templates/studios.html
index ade4d1b..cdb17f9 100644
--- a/website/agenda/planung/templates/studios.html
+++ b/website/agenda/planung/templates/studios.html
@@ -40,7 +40,7 @@
 
         <TMPL_IF .allow.read_event>
             <button target="_blank"
-                onclick="load('event_history.cgi?project_id=<TMPL_VAR .project_id>&studio_id=<TMPL_VAR id>');"
+                onclick="load('event-history.cgi?project_id=<TMPL_VAR .project_id>&studio_id=<TMPL_VAR id>');"
             ><TMPL_VAR .loc.button_show_changes></button>
         </TMPL_IF>
     </div>
diff --git a/website/agenda/planung/templates/upload_audio_recordings.html b/website/agenda/planung/templates/upload-audio-recordings.html
similarity index 100%
rename from website/agenda/planung/templates/upload_audio_recordings.html
rename to website/agenda/planung/templates/upload-audio-recordings.html
diff --git a/website/agenda/planung/templates/user_settings.html b/website/agenda/planung/templates/user-settings.html
similarity index 100%
rename from website/agenda/planung/templates/user_settings.html
rename to website/agenda/planung/templates/user-settings.html
diff --git a/website/agenda/planung/templates/user_stats.html b/website/agenda/planung/templates/user-stats.html
similarity index 100%
rename from website/agenda/planung/templates/user_stats.html
rename to website/agenda/planung/templates/user-stats.html
diff --git a/website/agenda/planung/user_settings.cgi b/website/agenda/planung/user-settings.cgi
similarity index 99%
rename from website/agenda/planung/user_settings.cgi
rename to website/agenda/planung/user-settings.cgi
index cd1817e..e63ba96 100755
--- a/website/agenda/planung/user_settings.cgi
+++ b/website/agenda/planung/user-settings.cgi
@@ -104,7 +104,7 @@ sub show_settings {
     my $period = $user_settings->{period} || 'month';
     $params->{ 'period_' . $period } = 1;
 
-    $params->{loc} = localization::get( $config, { language => $language, file => 'user_settings' } );
+    $params->{loc} = localization::get( $config, { language => $language, file => 'user-settings' } );
 
     for my $color ( @{ $params->{colors} } ) {
         $color->{title} = $params->{loc}->{ $color->{title} };
@@ -191,7 +191,7 @@ sub check_params {
 
     #template
     my $template = '';
-    $template = template::check( $config, $params->{template}, 'user_settings' );
+    $template = template::check( $config, $params->{template}, 'user-settings' );
     $checked->{template} = $template;
 
     #numeric values
diff --git a/website/agenda/planung/user_stats.cgi b/website/agenda/planung/user-stats.cgi
similarity index 97%
rename from website/agenda/planung/user_stats.cgi
rename to website/agenda/planung/user-stats.cgi
index e611d06..8ed6d39 100755
--- a/website/agenda/planung/user_stats.cgi
+++ b/website/agenda/planung/user-stats.cgi
@@ -75,7 +75,7 @@ sub show_stats {
     $params->{permissions} = $permissions;
     $params->{errors}      = $errors;
 
-    $params->{loc} = localization::get( $config, { user => $params->{presets}->{user}, file => 'user_stats' } );
+    $params->{loc} = localization::get( $config, { user => $params->{presets}->{user}, file => 'user-stats' } );
     uac::set_template_permissions( $permissions, $params );
     template::process( $config, 'print', $params->{template}, $params );
 }
@@ -88,7 +88,7 @@ sub check_params {
 
     #template
     my $template = '';
-    $template = template::check( $config, $params->{template}, 'user_stats' );
+    $template = template::check( $config, $params->{template}, 'user-stats' );
     $checked->{template} = $template;
 
     #numeric values
diff --git a/website/agenda/planung/users.cgi b/website/agenda/planung/users.cgi
index adcaf85..dfe1bd4 100755
--- a/website/agenda/planung/users.cgi
+++ b/website/agenda/planung/users.cgi
@@ -251,7 +251,7 @@ sub change_password {
     uac::set_template_permissions( $permissions, $params );
 
     #print Dumper($permissions);
-    template::process( $config, 'print', template::check( $config, 'change_password' ), $params );
+    template::process( $config, 'print', template::check( $config, 'change-password' ), $params );
 }
 
 sub delete_user {
diff --git a/website/agenda/planung/work_time.cgi b/website/agenda/planung/work-time.cgi
similarity index 99%
rename from website/agenda/planung/work_time.cgi
rename to website/agenda/planung/work-time.cgi
index b8ad7b1..b851520 100755
--- a/website/agenda/planung/work_time.cgi
+++ b/website/agenda/planung/work-time.cgi
@@ -256,7 +256,7 @@ sub show_work_schedule {
     }
 
     #print STDERR '<pre>'.Dumper($params).'</pre>';
-    $params->{loc} = localization::get( $config, { user => $params->{presets}->{user}, file => 'work_time' } );
+    $params->{loc} = localization::get( $config, { user => $params->{presets}->{user}, file => 'work-time' } );
     template::process( $config, 'print', $params->{template}, $params );
 }
 
@@ -297,7 +297,7 @@ sub check_params {
         $checked->{studio_id} = -1;
     }
 
-    $checked->{template} = template::check( $config, $params->{template}, 'edit_work_time' );
+    $checked->{template} = template::check( $config, $params->{template}, 'edit-work-time' );
 
     if ( ( defined $checked->{action} ) && ( $checked->{action} eq 'save_schedule' ) ) {