diff --git a/calendar/inc/functions.inc.php b/calendar/inc/functions.inc.php
index 71448ce731..fcc6d10d91 100755
--- a/calendar/inc/functions.inc.php
+++ b/calendar/inc/functions.inc.php
@@ -733,7 +733,7 @@
 	$str .= "<td valign=\"top\" width=\"75\" height=\"75\">".$phpgw->common->grab_owner_name($owner)."</td>";
       }
       for ($j=0;$j<$this->daysinweek;$j++) {
-	$date = $this->gmtdate($startdate + ($j * 24 * 3600));
+	$date = $this->localdates($startdate + ($j * 24 * 3600));
         if ($weekly || ($date["full"] >= $monthstart && $date["full"] <= $monthend)) {
 	  if($weekly) $cellcolor = $phpgw->nextmatchs->alternate_row_color($cellcolor);
 	  $str .= "<td valign=\"top\" width=\"75\" height=\"75\"";
@@ -1176,10 +1176,10 @@
 	  $p->set_unknowns("remove");
       $p->set_file(array('day_cal' => 'day_cal.tpl',
       					 'mini_week' => 'mini_week.tpl',
-      					 'day_row_99' => 'day_row_99.tpl',
+//      					 'day_row_99' => 'day_row_99.tpl',
       					 'day_row_event' => 'day_row_event.tpl',
       					 'day_row_time' => 'day_row_time.tpl'));
-      $p->set_block('day_cal','mini_week','day_row_99','day_row_event','day_row_time');
+      $p->set_block('day_cal','mini_week','day_row_event','day_row_time');
 
 
       if (! $phpgw_info["user"]["preferences"]["calendar"]["workdaystarts"] &&
@@ -1225,20 +1225,25 @@
           $this->last_row = $i;
         }
       }
+      $p->set_var('time_bgcolor',$phpgw_info["theme"]["cal_dayview"]);
+      $p->set_var('bg_time_image',$phpgw->common->get_image_path('phpgwapi').'/navbar_filler.jpg');
+      $p->set_var('font_color',$phpgw_info["theme"]["bg_text"]);
+      $p->set_var('font',$phpgw_info["theme"]["font"]);
       if (isset($this->hour_arr[99]) && strlen($this->hour_arr[99])) {
-        $p->set_var('bgcolor1',$phpgw_info["theme"]["cal_dayview"]);
-        $p->set_var('text',$this->hour_arr[99]);
+        $p->set_var('event',$this->hour_arr[99]);
         $p->set_var('bgcolor',$phpgw->nextmatchs->alternate_row_color());
+        $p->parse('monthweek_day','day_row_event',False);
+        
+        $p->set_var('open_link','');
+        $p->set_var('close_link','');
         $p->set_var('time','&nbsp;');
-        $p->parse('monthweek_day','day_row_99',False);
+        $p->parse('monthweek_day','day_row_time',True);
         $p->parse('row','mini_week',True);
+        $p->set_var('monthweek_day','');
       }
       $this->rowspan = 0;
-      $p->set_var('bgcolor1',$phpgw_info["theme"]["cal_dayview"]);
-      $p->set_var('font_color',$phpgw_info["theme"]["bg_text"]);
       $times = 0;
       for ($i=$this->first_hour;$i<=$this->last_hour;$i++) {
-        $p->set_var('bgcolor',$phpgw->nextmatchs->alternate_row_color());
         if(isset($this->hour_arr[$i])) $h = $this->hour_arr[$i]; else $h = "";
         $time = $this->build_time_for_display($i * 10000);
         $p->set_var('extras','');
@@ -1248,46 +1253,46 @@
           // ends at 11:15 and another starts at 11:30.
           if (strlen($h)) {
             $p->set_var('event',$this->hour_arr[$i]);
+            $p->set_var('bgcolor',$phpgw->nextmatchs->alternate_row_color());
             $p->parse('monthweek_day','day_row_event',False);
-            $rows = 1;
           }
           $this->rowspan--;
         } else {
           if (!strlen($h)) {
             $p->set_var('event','&nbsp;');
+            $p->set_var('bgcolor',$phpgw->nextmatchs->alternate_row_color());
             $p->parse('monthweek_day','day_row_event',False);
-            $rows = 1;
           } else {
             $this->rowspan = isset($this->rowspan_arr[$i])?$this->rowspan_arr[$i]:0;
             if ($this->rowspan > 1) {
-              $p->set_var('extras',' valign="top" rowspan="'.$this->rowspan.'"');
+              $p->set_var('extras',' rowspan="'.$this->rowspan.'"');
               $p->set_var('event',$this->hour_arr[$i]);
+              $p->set_var('bgcolor',$phpgw->nextmatchs->alternate_row_color());
               $p->parse('monthweek_day','day_row_event',False);
-              $rows = $this->rowspan;
             } else {
               $p->set_var('event',$this->hour_arr[$i]);
+              $p->set_var('bgcolor',$phpgw->nextmatchs->alternate_row_color());
               $p->parse('monthweek_day','day_row_event',False);
-              $rows = 1;
             }
           }
         }
         $p->set_var('open_link','');
         $p->set_var('close_link','');
+        $str = ' - ';
         if(!$this->printer_friendly) {
-          $p->set_var('open_link','<a href="'.$phpgw->link($phpgw_info["server"]["webserver_url"]."/calendar/edit_entry.php","year=".$date["year"]
+          $str .= '<a href="'.$phpgw->link($phpgw_info["server"]["webserver_url"]."/calendar/edit_entry.php","year=".$date["year"]
                 . "&month=".$date["month"]."&day=".$date["day"]
                 . "&hour=".substr($time,0,strpos($time,":"))
-                . "&minute=".substr($time,strpos($time,":")+1,2)).'">');
+                . "&minute=".substr($time,strpos($time,":")+1,2)).'">';
         }
-        $p->set_var('time',$time);
+        $p->set_var('open_link',$str);
+        $p->set_var('time',(intval(substr($time,0,strpos($time,':'))) < 10 ? '0'.$time : $time) );
         if(!$this->printer_friendly) {
           $p->set_var('close_link','</a>');
         }
-      $p->parse('monthweek_day','day_row_time',True);
-//      $times++;
-//      if ($times == $rows) { $p->set_var('monthweek_day',''); $times = 0; }
-      $p->parse('row','mini_week',True);
-      $p->set_var('monthweek_day','');
+        $p->parse('monthweek_day','day_row_time',True);
+        $p->parse('row','mini_week',True);
+        $p->set_var('monthweek_day','');
       }	// end for
       return $p->finish($p->parse('out','day_cal'));
     }	// end function
diff --git a/calendar/templates/default/day_cal.tpl b/calendar/templates/default/day_cal.tpl
index 8f9a28aea9..1b74146bb7 100755
--- a/calendar/templates/default/day_cal.tpl
+++ b/calendar/templates/default/day_cal.tpl
@@ -1,5 +1,35 @@
 <!-- $Id$ -->
-<table border="0" width="100%" cellspacing="1" cellpadding="2" border="0">
+
+<!-- background-color: #{time_bgcolor}; -->
+
+ <style type="text/css">
+  <!--
+    .event
+    {
+      width: 93%
+      color: #{font_color};
+      font-family: {font};
+      font-weight: 100;
+      font-size: 80%;
+      line-height: 220%;
+      vertical-align: middle;
+    }
+
+    .time
+    {
+      width: 7%;
+      background-image: url('{bg_time_image}');
+      color: #{font_color};
+      font-family: {font};
+      font-size: 65%;
+      line-height: 220%;
+      vertical-align: middle;
+    }
+
+  -->
+ </style>
+
+<table border="0" width="100%" cellspacing="0" cellpadding="0">
 {row}
 </table>
 
diff --git a/calendar/templates/default/day_row_99.tpl b/calendar/templates/default/day_row_99.tpl
deleted file mode 100755
index 5f6524520d..0000000000
--- a/calendar/templates/default/day_row_99.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- $Id$ -->
-<!-- BEGIN day_row_99 -->
-<tr><td bgcolor="{bgcolor}">{text}</td><td bgcolor="{bgcolor1}">{time}</td></tr>
-<!-- END day_row_99 -->
-
diff --git a/calendar/templates/default/day_row_event.tpl b/calendar/templates/default/day_row_event.tpl
index 55eacdde9b..6c66493698 100755
--- a/calendar/templates/default/day_row_event.tpl
+++ b/calendar/templates/default/day_row_event.tpl
@@ -1,4 +1,4 @@
 <!-- $Id$ -->
 <!-- BEGIN day_row_event -->
- <td bgcolor="{bgcolor}"{extras}>{event}</td>
+ <td class="event" bgcolor="{bgcolor}"{extras}>{event}</td>
 <!-- END day_row_event -->
diff --git a/calendar/templates/default/day_row_time.tpl b/calendar/templates/default/day_row_time.tpl
index a86f508fab..f1500e766f 100755
--- a/calendar/templates/default/day_row_time.tpl
+++ b/calendar/templates/default/day_row_time.tpl
@@ -1,4 +1,4 @@
 <!-- $Id$ -->
 <!-- BEGIN day_row_time -->
- <th width="14%" bgcolor="{bgcolor1}"><font color="{font_color}">{open_link}{time}{close_link}</font></th>
+ <td class="time">{open_link}{time}{close_link}</td>
 <!-- END day_row_time -->
diff --git a/calendar/templates/default/mini_day.tpl b/calendar/templates/default/mini_day.tpl
index 5b13bf6279..a52269bb69 100755
--- a/calendar/templates/default/mini_day.tpl
+++ b/calendar/templates/default/mini_day.tpl
@@ -1,4 +1,4 @@
 <!-- $Id$ -->
 <!-- BEGIN mini_day -->
-     <td bgcolor="{bgcolor2}" align="center"><font size="-2"><b>{dayname}</b></font></td>
+     <td bgcolor="{bgcolor}" align="center"{day_image}><font size="-2">{dayname}</font></td>
 <!-- END mini_day -->
diff --git a/calendar/templates/verdilak/day_cal.tpl b/calendar/templates/verdilak/day_cal.tpl
index 8f9a28aea9..1b74146bb7 100755
--- a/calendar/templates/verdilak/day_cal.tpl
+++ b/calendar/templates/verdilak/day_cal.tpl
@@ -1,5 +1,35 @@
 <!-- $Id$ -->
-<table border="0" width="100%" cellspacing="1" cellpadding="2" border="0">
+
+<!-- background-color: #{time_bgcolor}; -->
+
+ <style type="text/css">
+  <!--
+    .event
+    {
+      width: 93%
+      color: #{font_color};
+      font-family: {font};
+      font-weight: 100;
+      font-size: 80%;
+      line-height: 220%;
+      vertical-align: middle;
+    }
+
+    .time
+    {
+      width: 7%;
+      background-image: url('{bg_time_image}');
+      color: #{font_color};
+      font-family: {font};
+      font-size: 65%;
+      line-height: 220%;
+      vertical-align: middle;
+    }
+
+  -->
+ </style>
+
+<table border="0" width="100%" cellspacing="0" cellpadding="0">
 {row}
 </table>
 
diff --git a/calendar/templates/verdilak/day_row_99.tpl b/calendar/templates/verdilak/day_row_99.tpl
deleted file mode 100755
index ed5622bc8d..0000000000
--- a/calendar/templates/verdilak/day_row_99.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- $Id$ -->
-<!-- BEGIN day_row_99 -->
-<td bgcolor="{bgcolor}">{text}</td><td bgcolor="{bgcolor1}">{time}</td>
-<!-- END day_row_99 -->
-
diff --git a/calendar/templates/verdilak/day_row_event.tpl b/calendar/templates/verdilak/day_row_event.tpl
index 55eacdde9b..6c66493698 100755
--- a/calendar/templates/verdilak/day_row_event.tpl
+++ b/calendar/templates/verdilak/day_row_event.tpl
@@ -1,4 +1,4 @@
 <!-- $Id$ -->
 <!-- BEGIN day_row_event -->
- <td bgcolor="{bgcolor}"{extras}>{event}</td>
+ <td class="event" bgcolor="{bgcolor}"{extras}>{event}</td>
 <!-- END day_row_event -->
diff --git a/calendar/templates/verdilak/day_row_time.tpl b/calendar/templates/verdilak/day_row_time.tpl
index a86f508fab..f1500e766f 100755
--- a/calendar/templates/verdilak/day_row_time.tpl
+++ b/calendar/templates/verdilak/day_row_time.tpl
@@ -1,4 +1,4 @@
 <!-- $Id$ -->
 <!-- BEGIN day_row_time -->
- <th width="14%" bgcolor="{bgcolor1}"><font color="{font_color}">{open_link}{time}{close_link}</font></th>
+ <td class="time">{open_link}{time}{close_link}</td>
 <!-- END day_row_time -->
diff --git a/calendar/templates/verdilak/mini_day.tpl b/calendar/templates/verdilak/mini_day.tpl
index 828bf88de4..a52269bb69 100755
--- a/calendar/templates/verdilak/mini_day.tpl
+++ b/calendar/templates/verdilak/mini_day.tpl
@@ -1,4 +1,4 @@
 <!-- $Id$ -->
 <!-- BEGIN mini_day -->
-     <td bgcolor="{bgcolor}" align="center"{day_image}>{dayname}</td>
+     <td bgcolor="{bgcolor}" align="center"{day_image}><font size="-2">{dayname}</font></td>
 <!-- END mini_day -->