--- calendar/src/Plugin/views/style/Calendar.php	2016-03-01 22:08:57.000000000 +0000
+++ calendar/src/Plugin/views/style/Calendar.php	2016-04-04 04:52:01.303197600 +0000
@@ -546,9 +546,12 @@
       /** @var \Drupal\calendar\CalendarEvent $event_info */
       foreach ($events as $event_info) {
 //        $event->granularity = $this->dateInfo->granularity;
-        $item_start = $event_info->getStartDate()->format('Y-m-d');
-        $item_end = $event_info->getEndDate()->format('Y-m-d');
-        $time_start = $event_info->getStartDate()->format('H:i:s');
+        $item_start = $event_info->calendar_start_date->format('Y-m-d');
+        //$item_start = $event_info->getStartDate()->format('Y-m-d');
+        $item_end = $event_info->calendar_end_date->format('Y-m-d');
+        //$item_end = $event_info->getEndDate()->format('Y-m-d');
+        $time_start = $event_info->calendar_start_date->format('H:i:s');
+        //$time_start = $event_info->getStartDate()->format('H:i:s');
         $event_info->setRenderedFields($this->rendered_fields[$row_index]);
         $items[$item_start][$time_start][] = $event_info;
       }
@@ -686,7 +689,8 @@
                 '#date' => $current_day_date,
                 '#view' => $this->view,
                 '#items' => $this->items,
-                '#selected' => $in_month,
+                '#selected' =>  ($in_month) ? (bool) (count($multiday_buckets[$week_day]) + count($singleday_buckets[$week_day])) : FALSE
+                //'#selected' => $in_month,
               ],
               'colspan' => 1,
               'rowspan' => 1,
@@ -1078,7 +1082,7 @@
               $is_multi_day = ($start_ydate < $cur_ydate || $end_ydate > $cur_ydate);

               // Check if the event spans over multiple days.
-              if ($multiday_theme && ($is_multi_day || $all_day)) {
+              if ($multiday_theme && ($is_multi_day )) { // || $all_day

                 // Remove multiday items from the total count. We can't hide
                 // them or they will break.