diff --git a/components/Calendar.vue b/components/Calendar.vue
index 26050cea..daad3726 100644
--- a/components/Calendar.vue
+++ b/components/Calendar.vue
@@ -12,7 +12,7 @@
             <div class="day-number">{{ d.day }}</div>
             <div v-if="tooltips && year.eventsByDate[d.toString()] !== undefined && d.equals(selectedDay)" class="day-tooltip card text-dark shadow">
                 <div class="card-header d-flex justify-content-between">
-                    <p class="h5 mb-0"><strong><T :params="{day: d.day}">calendar.dates.{{d.month}}</T></strong></p>
+                    <p class="h5 mb-0"><DateWords :day="d"/></p>
                     <span>
                         <nuxt-link :to="`/${config.calendar.route}/${d}`">
                             <Icon v="link"/>
@@ -185,7 +185,7 @@
                 position: absolute;
                 bottom: 0;
                 left: 100%;
-                width: 300px;
+                width: 360px;
                 @include media-breakpoint-down('md', $grid-breakpoints) {
                     position: fixed;
                     left: 0;
diff --git a/components/DateWords.vue b/components/DateWords.vue
new file mode 100644
index 00000000..9c302737
--- /dev/null
+++ b/components/DateWords.vue
@@ -0,0 +1,18 @@
+<template>
+    <span>
+        {{$t('calendar.date', {year: day.year, date: $t('calendar.dates.' + day.month, {day: day.day})})}}
+        <DateLocal :day="day" :inline="inline"/>
+    </span>
+</template>
+
+<script>
+import DateLocal from '../data/calendar/DateLocal.vue';
+
+export default {
+    components: { DateLocal },
+    props: {
+        day: { required: true },
+        inline: { type: Boolean },
+    },
+};
+</script>
diff --git a/locale/_/calendar/DateLocal.vue b/locale/_/calendar/DateLocal.vue
new file mode 100644
index 00000000..cc340bc4
--- /dev/null
+++ b/locale/_/calendar/DateLocal.vue
@@ -0,0 +1 @@
+<template></template>
diff --git a/locale/_/events.js b/locale/_/calendar/events.js
similarity index 99%
rename from locale/_/events.js
rename to locale/_/calendar/events.js
index 81cce71f..966c932f 100644
--- a/locale/_/events.js
+++ b/locale/_/calendar/events.js
@@ -1,4 +1,4 @@
-const {Event, Day, day, week, month, EventLevel} = require("../../src/calendar/helpers");
+const {Event, Day, day, week, month, EventLevel} = require("../../../src/calendar/helpers");
 
 module.exports = [
     // --- months ---
diff --git a/locale/_base/calendar/DateLocal.vue b/locale/_base/calendar/DateLocal.vue
new file mode 100644
index 00000000..cc340bc4
--- /dev/null
+++ b/locale/_base/calendar/DateLocal.vue
@@ -0,0 +1 @@
+<template></template>
diff --git a/locale/eo/events.js b/locale/_base/calendar/events.js
similarity index 72%
rename from locale/eo/events.js
rename to locale/_base/calendar/events.js
index 4ddd9a26..49365489 100644
--- a/locale/eo/events.js
+++ b/locale/_base/calendar/events.js
@@ -1,4 +1,4 @@
-const {Event, day, week, month, dayYear, EventLevel} = require("../../src/calendar/helpers");
+const {Event, day, week, month, dayYear, EventLevel} = require("../../../src/calendar/helpers");
 
 module.exports = [
 ];
diff --git a/locale/de/calendar/DateLocal.vue b/locale/de/calendar/DateLocal.vue
new file mode 100644
index 00000000..cc340bc4
--- /dev/null
+++ b/locale/de/calendar/DateLocal.vue
@@ -0,0 +1 @@
+<template></template>
diff --git a/locale/de/events.js b/locale/de/calendar/events.js
similarity index 97%
rename from locale/de/events.js
rename to locale/de/calendar/events.js
index 91992c3f..5ceca2a5 100644
--- a/locale/de/events.js
+++ b/locale/de/calendar/events.js
@@ -1,4 +1,4 @@
-const {Event, day, week, month, dayYear, EventLevel} = require("../../src/calendar/helpers");
+const {Event, day, week, month, dayYear, EventLevel} = require("../../../src/calendar/helpers");
 
 module.exports = [
     // --- months ---
diff --git a/locale/en/calendar/DateLocal.vue b/locale/en/calendar/DateLocal.vue
new file mode 100644
index 00000000..cc340bc4
--- /dev/null
+++ b/locale/en/calendar/DateLocal.vue
@@ -0,0 +1 @@
+<template></template>
diff --git a/locale/en/events.js b/locale/en/calendar/events.js
similarity index 99%
rename from locale/en/events.js
rename to locale/en/calendar/events.js
index 0fb84b33..9176118f 100644
--- a/locale/en/events.js
+++ b/locale/en/calendar/events.js
@@ -1,4 +1,4 @@
-const {Event, day, week, month, dayYear, EventLevel, Day} = require("../../src/calendar/helpers");
+const {Event, day, week, month, dayYear, EventLevel, Day} = require("../../../src/calendar/helpers");
 
 module.exports = [
     // --- months ---
diff --git a/locale/en/translations.suml b/locale/en/translations.suml
index cc989a21..4c33ad88 100644
--- a/locale/en/translations.suml
+++ b/locale/en/translations.suml
@@ -825,7 +825,7 @@ report:
 calendar:
     header: 'Calendar'
     headerLong: 'Queer Calendar'
-    date: '%date% %year%'
+    date: '%date%, %year%'
     months:
         1: 'January'
         2: 'February'
diff --git a/locale/eo/calendar/DateLocal.vue b/locale/eo/calendar/DateLocal.vue
new file mode 100644
index 00000000..cc340bc4
--- /dev/null
+++ b/locale/eo/calendar/DateLocal.vue
@@ -0,0 +1 @@
+<template></template>
diff --git a/locale/_base/events.js b/locale/eo/calendar/events.js
similarity index 72%
rename from locale/_base/events.js
rename to locale/eo/calendar/events.js
index 4ddd9a26..49365489 100644
--- a/locale/_base/events.js
+++ b/locale/eo/calendar/events.js
@@ -1,4 +1,4 @@
-const {Event, day, week, month, dayYear, EventLevel} = require("../../src/calendar/helpers");
+const {Event, day, week, month, dayYear, EventLevel} = require("../../../src/calendar/helpers");
 
 module.exports = [
 ];
diff --git a/locale/es/calendar/DateLocal.vue b/locale/es/calendar/DateLocal.vue
new file mode 100644
index 00000000..cc340bc4
--- /dev/null
+++ b/locale/es/calendar/DateLocal.vue
@@ -0,0 +1 @@
+<template></template>
diff --git a/locale/es/events.js b/locale/es/calendar/events.js
similarity index 99%
rename from locale/es/events.js
rename to locale/es/calendar/events.js
index 70bb14c6..72115663 100644
--- a/locale/es/events.js
+++ b/locale/es/calendar/events.js
@@ -1,4 +1,4 @@
-const {Event, day, week, month, dayYear, EventLevel} = require("../../src/calendar/helpers");
+const {Event, day, week, month, dayYear, EventLevel} = require("../../../src/calendar/helpers");
 
 module.exports = [
     // --- months ---
diff --git a/locale/fr/calendar/DateLocal.vue b/locale/fr/calendar/DateLocal.vue
new file mode 100644
index 00000000..cc340bc4
--- /dev/null
+++ b/locale/fr/calendar/DateLocal.vue
@@ -0,0 +1 @@
+<template></template>
diff --git a/locale/fr/events.js b/locale/fr/calendar/events.js
similarity index 98%
rename from locale/fr/events.js
rename to locale/fr/calendar/events.js
index 58bfbcd4..ea340ffb 100644
--- a/locale/fr/events.js
+++ b/locale/fr/calendar/events.js
@@ -1,4 +1,4 @@
-const {Event, day, week, month, dayYear, EventLevel, Day} = require("../../src/calendar/helpers");
+const {Event, day, week, month, dayYear, EventLevel, Day} = require("../../../src/calendar/helpers");
 
 module.exports = [
     // --- months ---
diff --git a/locale/gl/calendar/DateLocal.vue b/locale/gl/calendar/DateLocal.vue
new file mode 100644
index 00000000..cc340bc4
--- /dev/null
+++ b/locale/gl/calendar/DateLocal.vue
@@ -0,0 +1 @@
+<template></template>
diff --git a/locale/gl/events.js b/locale/gl/calendar/events.js
similarity index 72%
rename from locale/gl/events.js
rename to locale/gl/calendar/events.js
index 4ddd9a26..49365489 100644
--- a/locale/gl/events.js
+++ b/locale/gl/calendar/events.js
@@ -1,4 +1,4 @@
-const {Event, day, week, month, dayYear, EventLevel} = require("../../src/calendar/helpers");
+const {Event, day, week, month, dayYear, EventLevel} = require("../../../src/calendar/helpers");
 
 module.exports = [
 ];
diff --git a/locale/ja/calendar/DateLocal.vue b/locale/ja/calendar/DateLocal.vue
new file mode 100644
index 00000000..cc340bc4
--- /dev/null
+++ b/locale/ja/calendar/DateLocal.vue
@@ -0,0 +1 @@
+<template></template>
diff --git a/locale/ja/events.js b/locale/ja/calendar/events.js
similarity index 72%
rename from locale/ja/events.js
rename to locale/ja/calendar/events.js
index 4ddd9a26..49365489 100644
--- a/locale/ja/events.js
+++ b/locale/ja/calendar/events.js
@@ -1,4 +1,4 @@
-const {Event, day, week, month, dayYear, EventLevel} = require("../../src/calendar/helpers");
+const {Event, day, week, month, dayYear, EventLevel} = require("../../../src/calendar/helpers");
 
 module.exports = [
 ];
diff --git a/locale/lad/calendar/DateLocal.vue b/locale/lad/calendar/DateLocal.vue
new file mode 100644
index 00000000..63836721
--- /dev/null
+++ b/locale/lad/calendar/DateLocal.vue
@@ -0,0 +1,26 @@
+<template>
+    <span><span v-if="inline"> — </span><br v-else/>{{heDate.toLocaleDateString('en-US-u-ca-hebrew', {
+        month: 'long',
+        year: 'numeric',
+        day: '2-digit'
+    })}}</span>
+</template>
+
+<script>
+import HeDate from 'he-date';
+
+export default {
+    props: {
+        day: { required: true },
+        inline: { type: Boolean },
+    },
+    computed: {
+        heDate() {
+            const HeDateClass = typeof(HeDate) === 'function' ? HeDate : window.HeDate;
+            console.log(HeDateClass);
+            // return 'TODO';
+            return new HeDateClass(+this.day.toDate());
+        },
+    },
+};
+</script>
diff --git a/locale/lad/calendar/events.js b/locale/lad/calendar/events.js
new file mode 100644
index 00000000..49365489
--- /dev/null
+++ b/locale/lad/calendar/events.js
@@ -0,0 +1,4 @@
+const {Event, day, week, month, dayYear, EventLevel} = require("../../../src/calendar/helpers");
+
+module.exports = [
+];
diff --git a/locale/lad/config.suml b/locale/lad/config.suml
index 948f0812..2c81f597 100644
--- a/locale/lad/config.suml
+++ b/locale/lad/config.suml
@@ -115,7 +115,8 @@ profile:
         defaultPronoun: 'ey_'
 
 calendar:
-    enabled: false
+    enabled: true
+    route: 'kalendario'
 
 census:
     enabled: false
diff --git a/locale/lad/events.js b/locale/lad/events.js
deleted file mode 100644
index 4ddd9a26..00000000
--- a/locale/lad/events.js
+++ /dev/null
@@ -1,4 +0,0 @@
-const {Event, day, week, month, dayYear, EventLevel} = require("../../src/calendar/helpers");
-
-module.exports = [
-];
diff --git a/locale/lad/translations.suml b/locale/lad/translations.suml
index 4f3ddc08..6ef98cd1 100644
--- a/locale/lad/translations.suml
+++ b/locale/lad/translations.suml
@@ -810,6 +810,7 @@ flags:
 calendar:
     header: 'Kalendario'
     headerLong: 'Kalendario kuir'
+    date: '%date% %year%'
     months:
         1: 'Djenayo'
         2: 'Febrayo'
@@ -916,6 +917,8 @@ calendar:
         genderfluid_week: 'Semana de la Conciencia de Género Fluido'
         pan_week: 'Semana de la Vizibilidad Pan'
         parents_day: 'Dia de les Xadres Expansivo de Género'
+        hiv_testing_day: 'Día Internacional de la Prueba del VIH'  # TODO
+        freedressing_day: 'Día de la Libertad de Vestimenta'  # TODO
     banner: 'Oy selebramos'
     celebrating_custom: 'se selebra'
     celebrating_day: 'se selebra el'
diff --git a/locale/nl/calendar/DateLocal.vue b/locale/nl/calendar/DateLocal.vue
new file mode 100644
index 00000000..cc340bc4
--- /dev/null
+++ b/locale/nl/calendar/DateLocal.vue
@@ -0,0 +1 @@
+<template></template>
diff --git a/locale/nl/events.js b/locale/nl/calendar/events.js
similarity index 95%
rename from locale/nl/events.js
rename to locale/nl/calendar/events.js
index 4fd4e921..3826b347 100644
--- a/locale/nl/events.js
+++ b/locale/nl/calendar/events.js
@@ -1,4 +1,4 @@
-const {Event, day, week, month, dayYear, EventLevel, Day} = require("../../src/calendar/helpers");
+const {Event, day, week, month, dayYear, EventLevel, Day} = require("../../../src/calendar/helpers");
 
 module.exports = [
 
diff --git a/locale/no/calendar/DateLocal.vue b/locale/no/calendar/DateLocal.vue
new file mode 100644
index 00000000..cc340bc4
--- /dev/null
+++ b/locale/no/calendar/DateLocal.vue
@@ -0,0 +1 @@
+<template></template>
diff --git a/locale/no/events.js b/locale/no/calendar/events.js
similarity index 100%
rename from locale/no/events.js
rename to locale/no/calendar/events.js
diff --git a/locale/pl/calendar/DateLocal.vue b/locale/pl/calendar/DateLocal.vue
new file mode 100644
index 00000000..cc340bc4
--- /dev/null
+++ b/locale/pl/calendar/DateLocal.vue
@@ -0,0 +1 @@
+<template></template>
diff --git a/locale/pl/events.js b/locale/pl/calendar/events.js
similarity index 99%
rename from locale/pl/events.js
rename to locale/pl/calendar/events.js
index 7a5d0bec..b5e99a40 100644
--- a/locale/pl/events.js
+++ b/locale/pl/calendar/events.js
@@ -1,4 +1,4 @@
-const {Event, day, week, month, dayYear, EventLevel} = require("../../src/calendar/helpers");
+const {Event, day, week, month, dayYear, EventLevel} = require("../../../src/calendar/helpers");
 
 module.exports = [
     // --- months ---
diff --git a/locale/pt/calendar/DateLocal.vue b/locale/pt/calendar/DateLocal.vue
new file mode 100644
index 00000000..cc340bc4
--- /dev/null
+++ b/locale/pt/calendar/DateLocal.vue
@@ -0,0 +1 @@
+<template></template>
diff --git a/locale/pt/events.js b/locale/pt/calendar/events.js
similarity index 99%
rename from locale/pt/events.js
rename to locale/pt/calendar/events.js
index b0514c01..3fa2affd 100644
--- a/locale/pt/events.js
+++ b/locale/pt/calendar/events.js
@@ -1,4 +1,4 @@
-const {Event, day, week, month, dayYear, EventLevel} = require("../../src/calendar/helpers");
+const {Event, day, week, month, dayYear, EventLevel} = require("../../../src/calendar/helpers");
 
 module.exports = [
     // --- months ---
diff --git a/locale/ru/calendar/DateLocal.vue b/locale/ru/calendar/DateLocal.vue
new file mode 100644
index 00000000..cc340bc4
--- /dev/null
+++ b/locale/ru/calendar/DateLocal.vue
@@ -0,0 +1 @@
+<template></template>
diff --git a/locale/ru/events.js b/locale/ru/calendar/events.js
similarity index 93%
rename from locale/ru/events.js
rename to locale/ru/calendar/events.js
index 2923868a..7ec5a37a 100644
--- a/locale/ru/events.js
+++ b/locale/ru/calendar/events.js
@@ -1,4 +1,4 @@
-const {Event, day, week, month, dayYear, EventLevel} = require("../../src/calendar/helpers");
+const {Event, day, week, month, dayYear, EventLevel} = require("../../../src/calendar/helpers");
 
 module.exports = [
     // --- static date ---
diff --git a/locale/yi/calendar/DateLocal.vue b/locale/yi/calendar/DateLocal.vue
new file mode 100644
index 00000000..cc340bc4
--- /dev/null
+++ b/locale/yi/calendar/DateLocal.vue
@@ -0,0 +1 @@
+<template></template>
diff --git a/locale/yi/events.js b/locale/yi/calendar/events.js
similarity index 100%
rename from locale/yi/events.js
rename to locale/yi/calendar/events.js
diff --git a/locale/zh/calendar/DateLocal.vue b/locale/zh/calendar/DateLocal.vue
new file mode 100644
index 00000000..cc340bc4
--- /dev/null
+++ b/locale/zh/calendar/DateLocal.vue
@@ -0,0 +1 @@
+<template></template>
diff --git a/locale/zh/events.js b/locale/zh/calendar/events.js
similarity index 100%
rename from locale/zh/events.js
rename to locale/zh/calendar/events.js
diff --git a/package.json b/package.json
index 803997ba..8d190eb4 100644
--- a/package.json
+++ b/package.json
@@ -26,6 +26,7 @@
     "express-session": "^1.17.1",
     "generic-diff": "^1.0.1",
     "grant": "^5.4.5",
+    "he-date": "^1.2.2",
     "html-loader": "^1.3.2",
     "ics": "^2.31.0",
     "js-base64": "^3.5.2",
diff --git a/routes/calendarDay.vue b/routes/calendarDay.vue
index a015a651..379bed14 100644
--- a/routes/calendarDay.vue
+++ b/routes/calendarDay.vue
@@ -24,7 +24,7 @@
                 </div>
                 <div class="calendar-events my-3">
                     <h3>
-                        {{$t('calendar.date', {year: day.year, date: $t('calendar.dates.' + day.month, {day: day.day})})}}
+                        <DateWords :day="day"/>
                     </h3>
                     <ul class="list-unstyled mb-0">
                         <li v-for="event in year.eventsByDate[day.toString()]" class="mb-2">
diff --git a/src/calendar/calendar.js b/src/calendar/calendar.js
index 15eb42cf..6dac1eec 100644
--- a/src/calendar/calendar.js
+++ b/src/calendar/calendar.js
@@ -1,6 +1,6 @@
 const { Calendar, Event, EventLevel, day } = require('./helpers');
-const internationalEvents = require('../../locale/_/events');
-const localEvents = require('../../data/events');
+const internationalEvents = require('../../locale/_/calendar/events');
+const localEvents = require('../../data/calendar/events');
 
 const rawNamedays = require('../../data/names/namedays.json');
 
diff --git a/yarn.lock b/yarn.lock
index d685c8c6..49534b3f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4949,6 +4949,11 @@ hasha@^5.2.2:
     is-stream "^2.0.0"
     type-fest "^0.8.0"
 
+he-date@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/he-date/-/he-date-1.2.2.tgz#b79a9abd99b1618aac2f67298a6d46104c582133"
+  integrity sha512-W7YetxS2jkehJDmtCC0cpXNHvKINHpUQy3BS+oUYDcP16tsM1PIAwRY9r7Ct5yJPVaPWoEQWfQxo6Nrfv5Unuw==
+
 he@1.2.0, he@^1.1.0, he@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"