diff --git a/package-lock.json b/package-lock.json
index cc9bb47..293585d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,10 +12,12 @@
         "@tremor/react": "^3.12.0",
         "@types/ramda": "^0.29.9",
         "date-fns": "^2.30.0",
+        "heat-calendar": "^1.0.7",
         "next": "14.0.4",
         "ramda": "^0.29.1",
         "react": "^18",
         "react-calendar-heatmap": "^1.9.0",
+        "react-date-heatmap": "^1.0.4",
         "react-dom": "^18",
         "react-tooltip": "^5.25.0",
         "reaviz": "^15.2.1",
@@ -3280,6 +3282,15 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/heat-calendar": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/heat-calendar/-/heat-calendar-1.0.7.tgz",
+      "integrity": "sha512-K99EwrxqmH+Va00PkVxHFl7mefBjHN1qi38HlY7bEIrPDY0Gs03AjhDhSJiRZA/HRNpQBsASHSKlhwRrO1ZV1Q==",
+      "peerDependencies": {
+        "react": "^18.2.0",
+        "react-dom": "^18.2.0"
+      }
+    },
     "node_modules/hex-rgb": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/hex-rgb/-/hex-rgb-4.3.0.tgz",
@@ -4794,6 +4805,14 @@
         "react": ">= 16.8.0"
       }
     },
+    "node_modules/react-date-heatmap": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/react-date-heatmap/-/react-date-heatmap-1.0.4.tgz",
+      "integrity": "sha512-pyH1F6uNROUDSXnKikNTp9LZZzrDi31+wlgujkLwjahi9KmqasHj3RwKvfjL+O6YlTZMlGJ/J8vRsidzNW4+Lg==",
+      "peerDependencies": {
+        "react": "^18.2.0"
+      }
+    },
     "node_modules/react-day-picker": {
       "version": "8.9.1",
       "resolved": "https://registry.npmjs.org/react-day-picker/-/react-day-picker-8.9.1.tgz",
diff --git a/package.json b/package.json
index fdfa5dc..781ff3f 100644
--- a/package.json
+++ b/package.json
@@ -13,10 +13,12 @@
     "@tremor/react": "^3.12.0",
     "@types/ramda": "^0.29.9",
     "date-fns": "^2.30.0",
+    "heat-calendar": "^1.0.7",
     "next": "14.0.4",
     "ramda": "^0.29.1",
     "react": "^18",
     "react-calendar-heatmap": "^1.9.0",
+    "react-date-heatmap": "^1.0.4",
     "react-dom": "^18",
     "react-tooltip": "^5.25.0",
     "reaviz": "^15.2.1",
diff --git a/src/app/calendarOverviewCard.tsx b/src/app/calendarOverviewCard.tsx
index 6d3fe00..07df2c0 100644
--- a/src/app/calendarOverviewCard.tsx
+++ b/src/app/calendarOverviewCard.tsx
@@ -51,7 +51,7 @@ function useCalendarData() {
 
         // Group by day, sum up seconds
         const grouped = R.groupBy((entry) => {
-            return dFns.formatISO(dFns.parseISO(entry.raw_json.start));
+            return dFns.formatISO(dFns.startOfDay(dFns.parseISO(entry.raw_json.start)));
         }, timeEntries);
 
         const summed = R.mapObjIndexed((entries) => {
@@ -81,10 +81,10 @@ export function CalendarOverviewCard() {
             values={data}
             classForValue={value => `color-github-${computeCompletionShade(value?.count ?? 0)}`}
             tooltipDataAttrs={(value: any) => {
-                return value.count ? {
+                return {
                     'data-tooltip-id': `calendar-tooltip`,
-                    'data-tooltip-content': `${value.count.toFixed(2)} hours`
-                } : undefined;
+                    'data-tooltip-content': value.count ?`${dFns.format(value.date, 'EEE do: ')} ${value.count.toFixed(2)} hours` : `No time logged`
+                }
             }}
         />
     </Card>