diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0825e4a1..f02a8f22 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Added scroll up in fullscreen newsfeed article view
 - Changed fullscreen newsfeed width from 100% to 100vw (better results)
 - Added option to calendar module that colors only the symbol instead of the whole line
+- Added option for new display format in the calendar module with date headers with times/events below.
 
 ### Changed
 - Use Electron 2 Beta. **Please test!**
diff --git a/modules/default/calendar/calendar.js b/modules/default/calendar/calendar.js
index 3f9d3071..3f87b9e2 100755
--- a/modules/default/calendar/calendar.js
+++ b/modules/default/calendar/calendar.js
@@ -132,7 +132,7 @@ Module.register("calendar", {
 			return wrapper;
 		}
 
-		var lastSeenDate = '';
+		var lastSeenDate = "";
 
 		for (var e in events) {
 			var event = events[e];
@@ -154,7 +154,7 @@ Module.register("calendar", {
 			}
 
 
-			
+
 			var eventWrapper = document.createElement("tr");
 
 			if (this.config.colored && !this.config.coloredSymbolOnly) {
@@ -215,11 +215,11 @@ Module.register("calendar", {
 			}
 
 			if(this.config.timeFormat === "dateheaders"){
-				
+
 				if (event.fullDayEvent) {
 					titleWrapper.colSpan = "2";
 					titleWrapper.align = "left";
-					
+
 				}else{
 					var timeWrapper = document.createElement("td");
 					timeWrapper.className = "time light";
@@ -227,24 +227,24 @@ Module.register("calendar", {
 					timeWrapper.style.paddingLeft = "2px";
 					var timeFormatString = "";
 					switch (config.timeFormat) {
-						case 12: {
-							timeFormatString = "h:mm A";
-							break;
-						}
-						case 24: {
-							timeFormatString = "HH:mm";
-							break;
-						}
-						default: {
-							timeFormatString = "HH:mm";
-							break;
-						}
+					case 12: {
+						timeFormatString = "h:mm A";
+						break;
+					}
+					case 24: {
+						timeFormatString = "HH:mm";
+						break;
+					}
+					default: {
+						timeFormatString = "HH:mm";
+						break;
+					}
 					}
 					timeWrapper.innerHTML = moment(event.startDate, "x").format(timeFormatString);
 					eventWrapper.appendChild(timeWrapper);
 					titleWrapper.align = "right";
 				}
-				
+
 				eventWrapper.appendChild(titleWrapper);
 			}else{
 				var timeWrapper = document.createElement("td");
@@ -418,7 +418,7 @@ Module.register("calendar", {
 						continue;
 					}
 				}
-        if(this.listContainsEvent(events,event)){
+				if(this.listContainsEvent(events,event)){
 					continue;
 				}
 				event.url = c;