diff --git a/Models/Calendar.php b/Models/Calendar.php
index 406a0a9..947a470 100644
--- a/Models/Calendar.php
+++ b/Models/Calendar.php
@@ -315,4 +315,24 @@ class Calendar
 
         return $events;
     }
+
+    /**
+     * Has event on date
+     *
+     * @param \DateTime $date Date of the event
+     *
+     * @return bool
+     *
+     * @since  1.0.0
+     */
+    public function hasEventOnDate(\DateTime $date) : bool
+    {
+        foreach ($this->events as $event) {
+            if ($event->getCreatedAt()->format('Y-m-d') === $date->format('Y-m-d')) {
+                return true;
+            }
+        }
+
+        return false;
+    }
 }
diff --git a/Models/CalendarMapper.php b/Models/CalendarMapper.php
index 8de5576..bd37bdf 100644
--- a/Models/CalendarMapper.php
+++ b/Models/CalendarMapper.php
@@ -10,6 +10,7 @@
  * @license    OMS License 1.0
  * @version    1.0.0
  * @link       http://orange-management.com
+ * @todo only load events of 3 month or 1 year?!
  */
 declare(strict_types=1);
 namespace Modules\Calendar\Models;
diff --git a/Theme/Backend/calendar-dashboard.tpl.php b/Theme/Backend/calendar-dashboard.tpl.php
index 2ce0e12..0cde3a7 100644
--- a/Theme/Backend/calendar-dashboard.tpl.php
+++ b/Theme/Backend/calendar-dashboard.tpl.php
@@ -35,23 +35,25 @@ $calendar = $this->getData('calendar');
                 <?php $current = $calendar->getDate()->getMonthCalendar(0); $isActiveMonth = false;
                 for($i = 0; $i < 6; $i++) : ?>
                 <ul class="days">
-                    <?php for($j = 0; $j < 7; $j++) : $isActiveMonth = ($current[$i*7+$j] === 1) ? !$isActiveMonth : $isActiveMonth; ?>
-                            <?php if($isActiveMonth) : ?>
-                                <li class="day">
-                                    <div class="date"><?= $current[$i*7+$j]; ?></div>
-                            <?php else: ?>
-                                <li class="day other-month">
-                                    <div class="date"><?= $current[$i*7+$j]; ?></div>
-                            <?php endif; ?>
-                        <?php
-                        $events = $calendar->getEventByDate(new \DateTime('now'));
-                        foreach($events as $event) : ?> 
-                            <div id="event-tag-<?= htmlspecialchars($event->getId(), ENT_COMPAT, 'utf-8'); ?>" class="event">
-                                <div class="event-desc"><?= htmlspecialchars($event->getName(), ENT_COMPAT, 'utf-8'); ?></div>
-                                <div class="event-time">2:00pm to 5:00pm</div>
-                            </div>
-                        <?php endforeach; ?>
-                    <?php endfor; ?>
+                    <?php for($j = 0; $j < 7; $j++) : 
+                        $isActiveMonth = ((int) $current[$i*7+$j]->format('d') === 1) ? !$isActiveMonth : $isActiveMonth; 
+                    ?>
+                        <?php if($isActiveMonth) :?>
+                        <li class="day">
+                            <div class="date"><?= $current[$i*7+$j]->format('d'); ?></div>
+                                <?php else: ?>
+                        <li class="day other-month">
+                            <div class="date"><?= $current[$i*7+$j]->format('d'); ?></div>
+                                <?php endif; ?>
+                            <?php
+                            $events = $calendar->getEventByDate($current[$i*7+$j]);
+                            foreach($events as $event) : ?> 
+                                <div id="event-tag-<?= htmlspecialchars($event->getId(), ENT_COMPAT, 'utf-8'); ?>" class="event">
+                        <div class="event-desc"><?= htmlspecialchars($event->getName(), ENT_COMPAT, 'utf-8'); ?></div>
+                        <div class="event-time">2:00pm to 5:00pm</div>
+                                </div>
+                            <?php endforeach; ?>
+                        <?php endfor; ?>
                     </li>
                 </ul>
                 <?php endfor;?>
diff --git a/Theme/Backend/css/styles.css b/Theme/Backend/css/styles.css
index a90a1c8..da75103 100644
--- a/Theme/Backend/css/styles.css
+++ b/Theme/Backend/css/styles.css
@@ -61,6 +61,9 @@
       background: #dfdfdf; }
   .m-calendar.m-calendar-mini .days li {
     height: auto; }
+  .m-calendar .has-event {
+    font-weight: bold;
+    background: #009aaf; }
 
 @media (max-width: 768px) {
   .m-calendar .weekdays, .m-calendar .other-month {
diff --git a/Theme/Backend/css/styles.scss b/Theme/Backend/css/styles.scss
index fc9b908..ae4e264 100644
--- a/Theme/Backend/css/styles.scss
+++ b/Theme/Backend/css/styles.scss
@@ -91,6 +91,11 @@
             height: auto;
         }
     }
+
+    .has-event {
+        font-weight: bold;
+        background: #009aaf;
+    }
 }
 
 @media(max-width: 768px) {
diff --git a/Theme/Backend/dashboard-calendar.tpl.php b/Theme/Backend/dashboard-calendar.tpl.php
index ea6f4c7..ab2eea8 100644
--- a/Theme/Backend/dashboard-calendar.tpl.php
+++ b/Theme/Backend/dashboard-calendar.tpl.php
@@ -20,24 +20,18 @@ $calendar = $this->getData('calendar');
 	<?php $current = $calendar->getDate()->getMonthCalendar(0); $isActiveMonth = false;
     for($i = 0; $i < 6; $i++) : ?>
     <ul class="days">
-        <?php for($j = 0; $j < 7; $j++) : $isActiveMonth = ($current[$i*7+$j] === 1) ? !$isActiveMonth : $isActiveMonth; ?>
+        <?php for($j = 0; $j < 7; $j++) : 
+			$isActiveMonth = ((int) $current[$i*7+$j]->format('d') === 1) ? !$isActiveMonth : $isActiveMonth; 
+		?>
             <?php if($isActiveMonth) :?>
-			<li class="day">
-				<div class="date"><?= $current[$i*7+$j]; ?></div>
+			<li class="day<?= $calendar->hasEventOnDate($current[$i*7+$j]) ? ' has-event' : '';?>">
+				<div class="date"><?= $current[$i*7+$j]->format('d'); ?></div>
 					<?php else: ?>
-			<li class="day other-month">
-				<div class="date"><?= $current[$i*7+$j]; ?></div>
-					<?php endif; ?>
-				<?php
-				$events = $calendar->getEventByDate(new \DateTime('now'));
-				foreach($events as $event) : ?> 
-					<div id="event-tag-<?= htmlspecialchars($event->getId(), ENT_COMPAT, 'utf-8'); ?>" class="event">
-			<div class="event-desc"><?= htmlspecialchars($event->getName(), ENT_COMPAT, 'utf-8'); ?></div>
-			<div class="event-time">2:00pm to 5:00pm</div>
-					</div>
-				<?php endforeach; ?>
-			<?php endfor; ?>
-			</li>
+			<li class="day other-month<?= $calendar->hasEventOnDate($current[$i*7+$j]) ? ' has-event' : '';?>">
+				<div class="date"><?= $current[$i*7+$j]->format('d'); ?></div>
+			<?php endif; ?>
+		<?php endfor; ?>
+		</li>
     </ul>
     <?php endfor;?>
 </div>