Index: themes/calendar-month.tpl.php
===================================================================
--- themes/calendar-month.tpl.php	(revision 527)
+++ themes/calendar-month.tpl.php	(working copy)
@@ -18,6 +18,11 @@
  *
  */
 //dsm('Display: '. $display_type .': '. $min_date_formatted .' to '. $max_date_formatted);
+
+module_load_include('inc', 'booking_timeslots');
+$module_link = booking_timeslots_get_ctype_name(NULL, TRUE);
+$view_name = $variables['view']->name;
+
 ?>
 <div class="calendar-calendar">
   <div class="month-view">
@@ -39,8 +44,7 @@
                 <?php print $cell['data']; ?>
                 <?php
                   if (strpos($cell['data'], 'All') ===FALSE && strpos($cell['class'],'future')!==FALSE) {
-                    $cid = arg(0);
-                    $link = str_replace($cid.'-', $cid.'/',$cell['id']);
+                    $link = $module_link . '/' . str_replace($view_name .'-', '', $cell['id'] .' '. variable_get('booking_timeslot_hour_from', 8) .':00:00');
                     print '<br><center>'.l(t('Book now'),$link).'</center>';
                   }
                 ?>
Index: themes/calendar-week.tpl.php
===================================================================
--- themes/calendar-week.tpl.php	(revision 527)
+++ themes/calendar-week.tpl.php	(working copy)
@@ -26,6 +26,10 @@
 //dsm('Display: '. $display_type .': '. $min_date_formatted .' to '. $max_date_formatted);
 //dsm($rows);
 //dsm($items);
+
+module_load_include('inc', 'booking_timeslots');
+$module_link = booking_timeslots_get_ctype_name(NULL, TRUE);
+
 ?>
 
 <div class="calendar-calendar">
@@ -51,8 +55,7 @@
              <?php print $day['datebox']; ?>
              <div class="calendar">
              <div class="inner">
-               <?php $cid = arg(0); ?>
-               <?php $link = $cid . '/' . $day['date']; ?>
+               <?php $link = $module_link . '/' . $day['date'] .' '. variable_get('booking_timeslot_hour_from', 8) .':00:00'; ?>
                <?php $content_slot = l(t('Book now'), $link); ?>
                <?php print array_key_exists('all_day', $day) && count($day['all_day']) ? implode($day['all_day']) : $content_slot; ?>
              </div>
