Index: event.module
===================================================================
--- event.module	(revision 219)
+++ event.module	(working copy)
@@ -500,16 +500,12 @@
       break;
 
     case 'block':
-        // create navigation links
-        $prev = _event_nav($stamp, 'prev', 'month', $types, $terms);
-        $next = _event_nav($stamp, 'next', 'month', $types, $terms);
+        // create caption and navigation links
+        $caption = 
+					_event_nav($stamp, 'prev', 'month', $types, $terms) . ' ' .
+					l(t(gmdate('F', $stamp)) .' '. $year, 'event/'. $year .'/'. $month .'/'. $day .'/month') . ' ' .
+					_event_nav($stamp, 'next', 'month', $types, $terms);
 
-        $headertitle = l(t(gmdate('F', $stamp)) .' '. $year, 'event/'. $year .'/'. $month .'/'. $day .'/month');
-        $header = array(
-          array('class' => 'prev', 'data' => $prev),
-          array('class' => 'heading', 'data' => $headertitle, 'colspan' => 5),
-          array('class' => 'next', 'data' => $next));
-
         $callback = 'event_render_day_single';
         $view = 'block';
       break;
@@ -517,13 +513,15 @@
 
   // get weekdays array and header information
   $weekdays = event_week_days();
-  $rows[] = event_week_header();
+  $header = event_week_header();
+	$rows = array();
 
   // get GMT current date value
   $today = _event_user_date();
 
   // name of the month
-  $month_name = gmdate('M', $stamp);
+  $month_name = t(gmdate('F', $stamp));
+  $month_name_abbrev = t(gmdate('M', $stamp));
 
   // timestamp of first day of month
   $curstamp = gmmktime(0, 0, 0, $month, 01, $year);
@@ -540,8 +538,7 @@
     for ($x = $start; $x < 7; $x++) {
       $cur_day = (($week * 7) + ($x + 1) - $offset);
       $row[$x] = array(
-        'class' => strtolower("$month_name ". $weekdays[$x]['day'] . ($curstamp == $today ? ' today' : '') . ($cur_day == $day ? ' selected' : '')),
-        'id' => strtolower($month_name . $cur_day),
+        'class' => strtolower($weekdays[$x]['day']) . " day-$cur_day" . ($curstamp == $today ? ' today' : '') . ($cur_day == $day ? ' selected' : ''),
         'data' => $callback($year, $month, $cur_day, $view, $types, $terms));
       $curstamp += 86400;
       if ($curstamp > $lastday) {
@@ -554,12 +551,21 @@
     $row = array();
   }
 
+  // add .pad class to padding cells
+	foreach ((array) $rows as $r => $row) {
+		foreach ((array) $row as $d => $day) {
+			if(empty($day)) {
+				$rows[$r][$d] = array('class' => 'pad');
+			}
+		}
+	}
+
   switch ($op) {
     case 'page':
         return $rows;
       break;
     case 'block':
-        return theme("event_calendar_month", $op, $header, $rows);
+        return theme("event_calendar_month", $op, $header, $rows, $attributes = array('class' => strtolower($month_name)), $caption);
       break;
   }
 }
@@ -1745,8 +1751,8 @@
 function event_block($op = 'list', $delta = 0) {
   switch ($op) {
     case 'list' :
-      $blocks[0]['info'] = t('Calendar to browse events.');
-      $blocks[1]['info'] = t('List of upcoming events.');
+      $blocks[0]['info'] = t("A calendar-view of this month's events only.");
+      $blocks[1]['info'] = t('A list-view of all events by date.');
       return $blocks;
       break;
     case 'view' :
@@ -1764,11 +1770,11 @@
             else {
               $stamp = _event_user_date();
             }
-            $block['subject'] = t('Events');
+            $block['subject'] = t('Event Calendar');
             $block['content'] = event_calendar_month('block', $stamp);
             return $block;
           case 1:
-            $block['subject'] = t('Upcoming events');
+            $block['subject'] = t('Upcoming Events');
             $block['content'] = event_block_upcoming(variable_get('event_upcoming_limit', '6'));
             return $block;
         }
Index: event.theme
===================================================================
--- event.theme	(revision 219)
+++ event.theme	(working copy)
@@ -12,8 +12,8 @@
  * @param day
  *   The day to display.
  */
-function theme_event_calendar_month($op, $header, $rows) {
-  $output = theme("table", $header, $rows);
+function theme_event_calendar_month($op, $header, $rows, $attributes, $caption) {
+  $output = theme("table", $header, $rows, $attributes, $caption);
   return '<div class="event-calendar"><div class="month-view">'. $output ."</div></div>\n";
 }