diff --git a/calendar/Date based events.ics b/calendar/Date based events.ics
index 4363ce1..4ac55e9 100644
--- a/calendar/Date based events.ics	
+++ b/calendar/Date based events.ics	
@@ -1,214 +1,606 @@
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:-//sebbo.net//ical-generator//EN
-NAME:Date based events
-X-WR-CALNAME:Date based events
+NAME:date based events
+X-WR-CALNAME:date based events
 BEGIN:VEVENT
-UID:rvmd@Ryan-jr
+UID:9ogo@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241029T110944Z
+DTSTAMP:20241029T123547Z
+DTSTART:20171231T210000Z
+DTEND:20180101T210000Z
+SUMMARY:holidays New Year’s Day
+END:VEVENT
+BEGIN:VEVENT
+UID:2lpk@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20180329T210000Z
+DTEND:20180330T210000Z
+SUMMARY:holidays Good Friday
+END:VEVENT
+BEGIN:VEVENT
+UID:0x9g@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20180401T210000Z
+DTEND:20180402T210000Z
+SUMMARY:holidays Easter Monday
+END:VEVENT
+BEGIN:VEVENT
+UID:6xcf@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20180506T210000Z
+DTEND:20180507T210000Z
+SUMMARY:holidays Early May bank holiday
+END:VEVENT
+BEGIN:VEVENT
+UID:cb64@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20180527T210000Z
+DTEND:20180528T210000Z
+SUMMARY:holidays Spring bank holiday
+END:VEVENT
+BEGIN:VEVENT
+UID:nar9@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20180826T210000Z
+DTEND:20180827T210000Z
+SUMMARY:holidays Summer bank holiday
+END:VEVENT
+BEGIN:VEVENT
+UID:wv2d@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20181224T210000Z
+DTEND:20181225T210000Z
+SUMMARY:holidays Christmas Day
+END:VEVENT
+BEGIN:VEVENT
+UID:gg26@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20181225T210000Z
+DTEND:20181226T210000Z
+SUMMARY:holidays Boxing Day
+END:VEVENT
+BEGIN:VEVENT
+UID:0jt0@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20181231T210000Z
+DTEND:20190101T210000Z
+SUMMARY:holidays New Year’s Day
+END:VEVENT
+BEGIN:VEVENT
+UID:m1hg@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20190418T210000Z
+DTEND:20190419T210000Z
+SUMMARY:holidays Good Friday
+END:VEVENT
+BEGIN:VEVENT
+UID:ofsk@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20190421T210000Z
+DTEND:20190422T210000Z
+SUMMARY:holidays Easter Monday
+END:VEVENT
+BEGIN:VEVENT
+UID:yp76@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20190505T210000Z
+DTEND:20190506T210000Z
+SUMMARY:holidays Early May bank holiday
+END:VEVENT
+BEGIN:VEVENT
+UID:91so@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20190526T210000Z
+DTEND:20190527T210000Z
+SUMMARY:holidays Spring bank holiday
+END:VEVENT
+BEGIN:VEVENT
+UID:iybc@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20190825T210000Z
+DTEND:20190826T210000Z
+SUMMARY:holidays Summer bank holiday
+END:VEVENT
+BEGIN:VEVENT
+UID:9xkz@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20191224T210000Z
+DTEND:20191225T210000Z
+SUMMARY:holidays Christmas Day
+END:VEVENT
+BEGIN:VEVENT
+UID:y8ex@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20191225T210000Z
+DTEND:20191226T210000Z
+SUMMARY:holidays Boxing Day
+END:VEVENT
+BEGIN:VEVENT
+UID:q10s@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20191231T210000Z
+DTEND:20200101T210000Z
+SUMMARY:holidays New Year’s Day
+END:VEVENT
+BEGIN:VEVENT
+UID:zpgx@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20200409T210000Z
+DTEND:20200410T210000Z
+SUMMARY:holidays Good Friday
+END:VEVENT
+BEGIN:VEVENT
+UID:ew0i@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20200412T210000Z
+DTEND:20200413T210000Z
+SUMMARY:holidays Easter Monday
+END:VEVENT
+BEGIN:VEVENT
+UID:bjoa@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20200507T210000Z
+DTEND:20200508T210000Z
+SUMMARY:holidays Early May bank holiday (VE day)
+END:VEVENT
+BEGIN:VEVENT
+UID:rwr6@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20200524T210000Z
+DTEND:20200525T210000Z
+SUMMARY:holidays Spring bank holiday
+END:VEVENT
+BEGIN:VEVENT
+UID:f6b0@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20200830T210000Z
+DTEND:20200831T210000Z
+SUMMARY:holidays Summer bank holiday
+END:VEVENT
+BEGIN:VEVENT
+UID:z81j@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20201224T210000Z
+DTEND:20201225T210000Z
+SUMMARY:holidays Christmas Day
+END:VEVENT
+BEGIN:VEVENT
+UID:51zj@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20201227T210000Z
+DTEND:20201228T210000Z
+SUMMARY:holidays Boxing Day
+END:VEVENT
+BEGIN:VEVENT
+UID:it3d@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20201231T210000Z
+DTEND:20210101T210000Z
+SUMMARY:holidays New Year’s Day
+END:VEVENT
+BEGIN:VEVENT
+UID:qdz0@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20210401T210000Z
+DTEND:20210402T210000Z
+SUMMARY:holidays Good Friday
+END:VEVENT
+BEGIN:VEVENT
+UID:qcr4@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20210404T210000Z
+DTEND:20210405T210000Z
+SUMMARY:holidays Easter Monday
+END:VEVENT
+BEGIN:VEVENT
+UID:y4mb@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20210502T210000Z
+DTEND:20210503T210000Z
+SUMMARY:holidays Early May bank holiday
+END:VEVENT
+BEGIN:VEVENT
+UID:x3aq@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20210530T210000Z
+DTEND:20210531T210000Z
+SUMMARY:holidays Spring bank holiday
+END:VEVENT
+BEGIN:VEVENT
+UID:bhqt@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20210829T210000Z
+DTEND:20210830T210000Z
+SUMMARY:holidays Summer bank holiday
+END:VEVENT
+BEGIN:VEVENT
+UID:vlrg@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20211226T210000Z
+DTEND:20211227T210000Z
+SUMMARY:holidays Christmas Day
+END:VEVENT
+BEGIN:VEVENT
+UID:68wi@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20211227T210000Z
+DTEND:20211228T210000Z
+SUMMARY:holidays Boxing Day
+END:VEVENT
+BEGIN:VEVENT
+UID:8bls@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20220102T210000Z
+DTEND:20220103T210000Z
+SUMMARY:holidays New Year’s Day
+END:VEVENT
+BEGIN:VEVENT
+UID:y7ae@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20220414T210000Z
+DTEND:20220415T210000Z
+SUMMARY:holidays Good Friday
+END:VEVENT
+BEGIN:VEVENT
+UID:14ak@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20220417T210000Z
+DTEND:20220418T210000Z
+SUMMARY:holidays Easter Monday
+END:VEVENT
+BEGIN:VEVENT
+UID:lbwb@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20220501T210000Z
+DTEND:20220502T210000Z
+SUMMARY:holidays Early May bank holiday
+END:VEVENT
+BEGIN:VEVENT
+UID:5im0@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20220601T210000Z
+DTEND:20220602T210000Z
+SUMMARY:holidays Spring bank holiday
+END:VEVENT
+BEGIN:VEVENT
+UID:bl0t@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20220602T210000Z
+DTEND:20220603T210000Z
+SUMMARY:holidays Platinum Jubilee bank holiday
+END:VEVENT
+BEGIN:VEVENT
+UID:yjca@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20220828T210000Z
+DTEND:20220829T210000Z
+SUMMARY:holidays Summer bank holiday
+END:VEVENT
+BEGIN:VEVENT
+UID:ie5z@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20220918T210000Z
+DTEND:20220919T210000Z
+SUMMARY:holidays Bank Holiday for the State Funeral of Queen Elizabeth II
+END:VEVENT
+BEGIN:VEVENT
+UID:ieq5@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20221225T210000Z
+DTEND:20221226T210000Z
+SUMMARY:holidays Boxing Day
+END:VEVENT
+BEGIN:VEVENT
+UID:hz7u@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20221226T210000Z
+DTEND:20221227T210000Z
+SUMMARY:holidays Christmas Day
+END:VEVENT
+BEGIN:VEVENT
+UID:d0pp@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20230101T210000Z
+DTEND:20230102T210000Z
+SUMMARY:holidays New Year’s Day
+END:VEVENT
+BEGIN:VEVENT
+UID:58wj@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20230406T210000Z
+DTEND:20230407T210000Z
+SUMMARY:holidays Good Friday
+END:VEVENT
+BEGIN:VEVENT
+UID:zmb6@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20230409T210000Z
+DTEND:20230410T210000Z
+SUMMARY:holidays Easter Monday
+END:VEVENT
+BEGIN:VEVENT
+UID:6wd9@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20230430T210000Z
+DTEND:20230501T210000Z
+SUMMARY:holidays Early May bank holiday
+END:VEVENT
+BEGIN:VEVENT
+UID:1m9t@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20230507T210000Z
+DTEND:20230508T210000Z
+SUMMARY:holidays Bank holiday for the coronation of King Charles III
+END:VEVENT
+BEGIN:VEVENT
+UID:pdxo@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20230528T210000Z
+DTEND:20230529T210000Z
+SUMMARY:holidays Spring bank holiday
+END:VEVENT
+BEGIN:VEVENT
+UID:wzm8@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20230827T210000Z
+DTEND:20230828T210000Z
+SUMMARY:holidays Summer bank holiday
+END:VEVENT
+BEGIN:VEVENT
+UID:eg01@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20231224T210000Z
+DTEND:20231225T210000Z
+SUMMARY:holidays Christmas Day
+END:VEVENT
+BEGIN:VEVENT
+UID:48yp@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20231225T210000Z
+DTEND:20231226T210000Z
+SUMMARY:holidays Boxing Day
+END:VEVENT
+BEGIN:VEVENT
+UID:mwr9@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
 DTSTART:20231231T210000Z
-DTEND:20231231T210000Z
-SUMMARY:Us holidays New Year's Day
+DTEND:20240101T210000Z
+SUMMARY:holidays New Year’s Day
 END:VEVENT
 BEGIN:VEVENT
-UID:mc8t@Ryan-jr
+UID:xwgg@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241029T110944Z
-DTSTART:20240114T210000Z
-DTEND:20240114T210000Z
-SUMMARY:Us holidays M L King Day
-END:VEVENT
-BEGIN:VEVENT
-UID:knir@Ryan-jr
-SEQUENCE:0
-DTSTAMP:20241029T110944Z
-DTSTART:20240218T210000Z
-DTEND:20240218T210000Z
-SUMMARY:Us holidays Presidents' Day
-END:VEVENT
-BEGIN:VEVENT
-UID:ef3e@Ryan-jr
-SEQUENCE:0
-DTSTAMP:20241029T110944Z
+DTSTAMP:20241029T123547Z
 DTSTART:20240328T210000Z
-DTEND:20240328T210000Z
-SUMMARY:Us holidays Good Friday
+DTEND:20240329T210000Z
+SUMMARY:holidays Good Friday
 END:VEVENT
 BEGIN:VEVENT
-UID:e28y@Ryan-jr
+UID:vn7j@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241029T110944Z
-DTSTART:20240330T210000Z
-DTEND:20240330T210000Z
-SUMMARY:Us holidays Easter Sunday
+DTSTAMP:20241029T123547Z
+DTSTART:20240331T210000Z
+DTEND:20240401T210000Z
+SUMMARY:holidays Easter Monday
 END:VEVENT
 BEGIN:VEVENT
-UID:hxw4@Ryan-jr
+UID:1qut@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241029T110944Z
+DTSTAMP:20241029T123547Z
+DTSTART:20240505T210000Z
+DTEND:20240506T210000Z
+SUMMARY:holidays Early May bank holiday
+END:VEVENT
+BEGIN:VEVENT
+UID:60iy@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
 DTSTART:20240526T210000Z
-DTEND:20240526T210000Z
-SUMMARY:Us holidays Memorial Day
+DTEND:20240527T210000Z
+SUMMARY:holidays Spring bank holiday
 END:VEVENT
 BEGIN:VEVENT
-UID:kvbh@Ryan-jr
+UID:8ksk@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241029T110944Z
-DTSTART:20240618T210000Z
-DTEND:20240618T210000Z
-SUMMARY:Us holidays Juneteenth
+DTSTAMP:20241029T123547Z
+DTSTART:20240825T210000Z
+DTEND:20240826T210000Z
+SUMMARY:holidays Summer bank holiday
 END:VEVENT
 BEGIN:VEVENT
-UID:943x@Ryan-jr
+UID:r16y@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241029T110944Z
-DTSTART:20240703T210000Z
-DTEND:20240703T210000Z
-SUMMARY:Us holidays Independence Day
-END:VEVENT
-BEGIN:VEVENT
-UID:htv4@Ryan-jr
-SEQUENCE:0
-DTSTAMP:20241029T110944Z
-DTSTART:20240901T210000Z
-DTEND:20240901T210000Z
-SUMMARY:Us holidays Labor Day
-END:VEVENT
-BEGIN:VEVENT
-UID:gyyu@Ryan-jr
-SEQUENCE:0
-DTSTAMP:20241029T110944Z
-DTSTART:20241013T210000Z
-DTEND:20241013T210000Z
-SUMMARY:Us holidays Columbus Day
-END:VEVENT
-BEGIN:VEVENT
-UID:5rjp@Ryan-jr
-SEQUENCE:0
-DTSTAMP:20241029T110944Z
-DTSTART:20241110T210000Z
-DTEND:20241110T210000Z
-SUMMARY:Us holidays Veterans Day
-END:VEVENT
-BEGIN:VEVENT
-UID:8u52@Ryan-jr
-SEQUENCE:0
-DTSTAMP:20241029T110944Z
-DTSTART:20241127T210000Z
-DTEND:20241127T210000Z
-SUMMARY:Us holidays Thanksgiving Day
-END:VEVENT
-BEGIN:VEVENT
-UID:f9s4@Ryan-jr
-SEQUENCE:0
-DTSTAMP:20241029T110944Z
+DTSTAMP:20241029T123547Z
 DTSTART:20241224T210000Z
-DTEND:20241224T210000Z
-SUMMARY:Us holidays Christmas
+DTEND:20241225T210000Z
+SUMMARY:holidays Christmas Day
 END:VEVENT
 BEGIN:VEVENT
-UID:78f7@Ryan-jr
+UID:euyq@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241029T110944Z
+DTSTAMP:20241029T123547Z
+DTSTART:20241225T210000Z
+DTEND:20241226T210000Z
+SUMMARY:holidays Boxing Day
+END:VEVENT
+BEGIN:VEVENT
+UID:yeoy@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
 DTSTART:20241231T210000Z
-DTEND:20241231T210000Z
-SUMMARY:Us holidays New Year's Day
+DTEND:20250101T210000Z
+SUMMARY:holidays New Year’s Day
 END:VEVENT
 BEGIN:VEVENT
-UID:c4mh@Ryan-jr
+UID:ott2@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241029T110944Z
-DTSTART:20250119T210000Z
-DTEND:20250119T210000Z
-SUMMARY:Us holidays M L King Day
-END:VEVENT
-BEGIN:VEVENT
-UID:uq9v@Ryan-jr
-SEQUENCE:0
-DTSTAMP:20241029T110944Z
-DTSTART:20250216T210000Z
-DTEND:20250216T210000Z
-SUMMARY:Us holidays Presidents' Day
-END:VEVENT
-BEGIN:VEVENT
-UID:rb4a@Ryan-jr
-SEQUENCE:0
-DTSTAMP:20241029T110944Z
+DTSTAMP:20241029T123547Z
 DTSTART:20250417T210000Z
-DTEND:20250417T210000Z
-SUMMARY:Us holidays Good Friday
+DTEND:20250418T210000Z
+SUMMARY:holidays Good Friday
 END:VEVENT
 BEGIN:VEVENT
-UID:spkz@Ryan-jr
+UID:7c7w@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241029T110944Z
-DTSTART:20250419T210000Z
-DTEND:20250419T210000Z
-SUMMARY:Us holidays Easter Sunday
+DTSTAMP:20241029T123547Z
+DTSTART:20250420T210000Z
+DTEND:20250421T210000Z
+SUMMARY:holidays Easter Monday
 END:VEVENT
 BEGIN:VEVENT
-UID:jzz3@Ryan-jr
+UID:u47m@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241029T110944Z
+DTSTAMP:20241029T123547Z
+DTSTART:20250504T210000Z
+DTEND:20250505T210000Z
+SUMMARY:holidays Early May bank holiday
+END:VEVENT
+BEGIN:VEVENT
+UID:sth3@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
 DTSTART:20250525T210000Z
-DTEND:20250525T210000Z
-SUMMARY:Us holidays Memorial Day
+DTEND:20250526T210000Z
+SUMMARY:holidays Spring bank holiday
 END:VEVENT
 BEGIN:VEVENT
-UID:mwow@Ryan-jr
+UID:nuh7@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241029T110944Z
-DTSTART:20250618T210000Z
-DTEND:20250618T210000Z
-SUMMARY:Us holidays Juneteenth
+DTSTAMP:20241029T123547Z
+DTSTART:20250824T210000Z
+DTEND:20250825T210000Z
+SUMMARY:holidays Summer bank holiday
 END:VEVENT
 BEGIN:VEVENT
-UID:dks4@Ryan-jr
+UID:f77u@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241029T110944Z
-DTSTART:20250703T210000Z
-DTEND:20250703T210000Z
-SUMMARY:Us holidays Independence Day
-END:VEVENT
-BEGIN:VEVENT
-UID:tbcf@Ryan-jr
-SEQUENCE:0
-DTSTAMP:20241029T110944Z
-DTSTART:20250831T210000Z
-DTEND:20250831T210000Z
-SUMMARY:Us holidays Labor Day
-END:VEVENT
-BEGIN:VEVENT
-UID:3kkj@Ryan-jr
-SEQUENCE:0
-DTSTAMP:20241029T110944Z
-DTSTART:20251012T210000Z
-DTEND:20251012T210000Z
-SUMMARY:Us holidays Columbus Day
-END:VEVENT
-BEGIN:VEVENT
-UID:ejxr@Ryan-jr
-SEQUENCE:0
-DTSTAMP:20241029T110944Z
-DTSTART:20251110T210000Z
-DTEND:20251110T210000Z
-SUMMARY:Us holidays Veterans Day
-END:VEVENT
-BEGIN:VEVENT
-UID:znr9@Ryan-jr
-SEQUENCE:0
-DTSTAMP:20241029T110944Z
-DTSTART:20251126T210000Z
-DTEND:20251126T210000Z
-SUMMARY:Us holidays Thanksgiving Day
-END:VEVENT
-BEGIN:VEVENT
-UID:ry53@Ryan-jr
-SEQUENCE:0
-DTSTAMP:20241029T110944Z
+DTSTAMP:20241029T123547Z
 DTSTART:20251224T210000Z
-DTEND:20251224T210000Z
-SUMMARY:Us holidays Christmas
+DTEND:20251225T210000Z
+SUMMARY:holidays Christmas Day
+END:VEVENT
+BEGIN:VEVENT
+UID:xlu0@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20251225T210000Z
+DTEND:20251226T210000Z
+SUMMARY:holidays Boxing Day
+END:VEVENT
+BEGIN:VEVENT
+UID:wkr0@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20251231T210000Z
+DTEND:20260101T210000Z
+SUMMARY:holidays New Year’s Day
+END:VEVENT
+BEGIN:VEVENT
+UID:8ya9@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20260402T210000Z
+DTEND:20260403T210000Z
+SUMMARY:holidays Good Friday
+END:VEVENT
+BEGIN:VEVENT
+UID:ri56@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20260405T210000Z
+DTEND:20260406T210000Z
+SUMMARY:holidays Easter Monday
+END:VEVENT
+BEGIN:VEVENT
+UID:7ny2@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20260503T210000Z
+DTEND:20260504T210000Z
+SUMMARY:holidays Early May bank holiday
+END:VEVENT
+BEGIN:VEVENT
+UID:djsp@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20260524T210000Z
+DTEND:20260525T210000Z
+SUMMARY:holidays Spring bank holiday
+END:VEVENT
+BEGIN:VEVENT
+UID:e55u@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20260830T210000Z
+DTEND:20260831T210000Z
+SUMMARY:holidays Summer bank holiday
+END:VEVENT
+BEGIN:VEVENT
+UID:geum@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20261224T210000Z
+DTEND:20261225T210000Z
+SUMMARY:holidays Christmas Day
+END:VEVENT
+BEGIN:VEVENT
+UID:7y8f@Ryan-jr
+SEQUENCE:0
+DTSTAMP:20241029T123547Z
+DTSTART:20261227T210000Z
+DTEND:20261228T210000Z
+SUMMARY:holidays Boxing Day
 END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/calendar/Date based events.json b/calendar/Date based events.json
index e9a63f6..995b449 100644
--- a/calendar/Date based events.json	
+++ b/calendar/Date based events.json	
@@ -1,11 +1,11 @@
 {
-  "id": "Date based events",
-  "linkGroupName": "Date based events",
+  "id": "date based events",
+  "linkGroupName": "date based events",
   "calendars": [
     {
-      "prefix": "Us holidays",
+      "prefix": "holidays",
       "override": false,
-      "url": "https://www.calendarlabs.com/ical-calendar/ics/76/US_Holidays.ics"
+      "url": "https://www.gov.uk/bank-holidays/england-and-wales.ics"
     }
   ]
 }
\ No newline at end of file
diff --git a/calendar/time based events.ics b/calendar/time based events.ics
index 0d53e7b..145ee4e 100644
--- a/calendar/time based events.ics	
+++ b/calendar/time based events.ics	
@@ -4,211 +4,211 @@ PRODID:-//sebbo.net//ical-generator//EN
 NAME:time based events
 X-WR-CALNAME:time based events
 BEGIN:VEVENT
-UID:k4ar@Ryan-jr
+UID:l62h@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241029T122603Z
+DTSTAMP:20241029T123322Z
 DTSTART:20231231T210000Z
 DTEND:20231231T210000Z
-SUMMARY:Holidays in sanfransisco New Year's Day
+SUMMARY:holidays New Year's Day
 END:VEVENT
 BEGIN:VEVENT
-UID:2edk@Ryan-jr
+UID:0hyw@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241029T122603Z
+DTSTAMP:20241029T123322Z
 DTSTART:20240101T210000Z
 DTEND:20240101T210000Z
-SUMMARY:Holidays in sanfransisco New Year's Day Holiday
+SUMMARY:holidays New Year's Day Holiday
 END:VEVENT
 BEGIN:VEVENT
-UID:m9qv@Ryan-jr
+UID:i8vp@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241029T122603Z
+DTSTAMP:20241029T123322Z
 DTSTART:20240102T210000Z
 DTEND:20240102T210000Z
-SUMMARY:Holidays in sanfransisco New Year's Day Holiday
+SUMMARY:holidays New Year's Day Holiday
 END:VEVENT
 BEGIN:VEVENT
-UID:6dox@Ryan-jr
+UID:arf3@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241029T122603Z
+DTSTAMP:20241029T123322Z
 DTSTART:20240103T210000Z
 DTEND:20240103T210000Z
-SUMMARY:Holidays in sanfransisco New Year's Day Holiday
+SUMMARY:holidays New Year's Day Holiday
 END:VEVENT
 BEGIN:VEVENT
-UID:0qxx@Ryan-jr
+UID:8bso@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241029T122603Z
+DTSTAMP:20241029T123322Z
 DTSTART:20240104T210000Z
 DTEND:20240104T210000Z
-SUMMARY:Holidays in sanfransisco New Year's Day Holiday
+SUMMARY:holidays New Year's Day Holiday
 END:VEVENT
 BEGIN:VEVENT
-UID:b6f0@Ryan-jr
+UID:qfq0@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241029T122603Z
+DTSTAMP:20241029T123322Z
 DTSTART:20240106T210000Z
 DTEND:20240106T210000Z
-SUMMARY:Holidays in sanfransisco Orthodox Christmas
+SUMMARY:holidays Orthodox Christmas
 END:VEVENT
 BEGIN:VEVENT
-UID:gi1t@Ryan-jr
+UID:to2h@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241029T122603Z
+DTSTAMP:20241029T123322Z
 DTSTART:20240107T210000Z
 DTEND:20240107T210000Z
-SUMMARY:Holidays in sanfransisco Orthodox Christmas Holiday
+SUMMARY:holidays Orthodox Christmas Holiday
 END:VEVENT
 BEGIN:VEVENT
-UID:hjdb@Ryan-jr
+UID:kz5h@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241029T122603Z
+DTSTAMP:20241029T123322Z
 DTSTART:20240222T210000Z
 DTEND:20240222T210000Z
-SUMMARY:Holidays in sanfransisco Defender of the Fatherland
+SUMMARY:holidays Defender of the Fatherland
 END:VEVENT
 BEGIN:VEVENT
-UID:ahjr@Ryan-jr
+UID:6p4n@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241029T122603Z
+DTSTAMP:20241029T123322Z
 DTSTART:20240307T210000Z
 DTEND:20240307T210000Z
-SUMMARY:Holidays in sanfransisco Intl. Women's Day
+SUMMARY:holidays Intl. Women's Day
 END:VEVENT
 BEGIN:VEVENT
-UID:sywr@Ryan-jr
+UID:rjlz@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241029T122603Z
+DTSTAMP:20241029T123322Z
 DTSTART:20240430T210000Z
 DTEND:20240430T210000Z
-SUMMARY:Holidays in sanfransisco Spring and Labor Day
+SUMMARY:holidays Spring and Labor Day
 END:VEVENT
 BEGIN:VEVENT
-UID:6gpi@Ryan-jr
+UID:n0p0@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241029T122603Z
+DTSTAMP:20241029T123322Z
 DTSTART:20240508T210000Z
 DTEND:20240508T210000Z
-SUMMARY:Holidays in sanfransisco Victory Day
+SUMMARY:holidays Victory Day
 END:VEVENT
 BEGIN:VEVENT
-UID:fst0@Ryan-jr
+UID:txgs@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241029T122603Z
+DTSTAMP:20241029T123322Z
 DTSTART:20240611T210000Z
 DTEND:20240611T210000Z
-SUMMARY:Holidays in sanfransisco Russia Day
+SUMMARY:holidays Russia Day
 END:VEVENT
 BEGIN:VEVENT
-UID:qf4t@Ryan-jr
+UID:kpcp@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241029T122603Z
+DTSTAMP:20241029T123322Z
 DTSTART:20241103T210000Z
 DTEND:20241103T210000Z
-SUMMARY:Holidays in sanfransisco Civil Unity Day
+SUMMARY:holidays Civil Unity Day
 END:VEVENT
 BEGIN:VEVENT
-UID:mox5@Ryan-jr
+UID:syew@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241029T122603Z
+DTSTAMP:20241029T123322Z
 DTSTART:20241231T210000Z
 DTEND:20241231T210000Z
-SUMMARY:Holidays in sanfransisco New Year's Day
+SUMMARY:holidays New Year's Day
 END:VEVENT
 BEGIN:VEVENT
-UID:6ebe@Ryan-jr
+UID:qjyr@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241029T122603Z
+DTSTAMP:20241029T123322Z
 DTSTART:20250101T210000Z
 DTEND:20250101T210000Z
-SUMMARY:Holidays in sanfransisco New Year's Day Holiday
+SUMMARY:holidays New Year's Day Holiday
 END:VEVENT
 BEGIN:VEVENT
-UID:b4pi@Ryan-jr
+UID:kpgi@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241029T122603Z
+DTSTAMP:20241029T123322Z
 DTSTART:20250102T210000Z
 DTEND:20250102T210000Z
-SUMMARY:Holidays in sanfransisco New Year's Day Holiday
+SUMMARY:holidays New Year's Day Holiday
 END:VEVENT
 BEGIN:VEVENT
-UID:jq1d@Ryan-jr
+UID:9p42@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241029T122603Z
+DTSTAMP:20241029T123322Z
 DTSTART:20250103T210000Z
 DTEND:20250103T210000Z
-SUMMARY:Holidays in sanfransisco New Year's Day Holiday
+SUMMARY:holidays New Year's Day Holiday
 END:VEVENT
 BEGIN:VEVENT
-UID:g7n3@Ryan-jr
+UID:558t@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241029T122603Z
+DTSTAMP:20241029T123322Z
 DTSTART:20250104T210000Z
 DTEND:20250104T210000Z
-SUMMARY:Holidays in sanfransisco New Year's Day Holiday
+SUMMARY:holidays New Year's Day Holiday
 END:VEVENT
 BEGIN:VEVENT
-UID:beg6@Ryan-jr
+UID:nhhg@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241029T122603Z
+DTSTAMP:20241029T123322Z
 DTSTART:20250106T210000Z
 DTEND:20250106T210000Z
-SUMMARY:Holidays in sanfransisco Orthodox Christmas
+SUMMARY:holidays Orthodox Christmas
 END:VEVENT
 BEGIN:VEVENT
-UID:h3ld@Ryan-jr
+UID:zxtj@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241029T122603Z
+DTSTAMP:20241029T123322Z
 DTSTART:20250107T210000Z
 DTEND:20250107T210000Z
-SUMMARY:Holidays in sanfransisco Orthodox Christmas Holiday
+SUMMARY:holidays Orthodox Christmas Holiday
 END:VEVENT
 BEGIN:VEVENT
-UID:eoyu@Ryan-jr
+UID:kb13@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241029T122603Z
+DTSTAMP:20241029T123322Z
 DTSTART:20250223T210000Z
 DTEND:20250223T210000Z
-SUMMARY:Holidays in sanfransisco Defender of the Fatherland
+SUMMARY:holidays Defender of the Fatherland
 END:VEVENT
 BEGIN:VEVENT
-UID:09ip@Ryan-jr
+UID:pnyh@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241029T122603Z
+DTSTAMP:20241029T123322Z
 DTSTART:20250309T210000Z
 DTEND:20250309T210000Z
-SUMMARY:Holidays in sanfransisco Intl. Women's Day
+SUMMARY:holidays Intl. Women's Day
 END:VEVENT
 BEGIN:VEVENT
-UID:g0t3@Ryan-jr
+UID:4e08@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241029T122603Z
+DTSTAMP:20241029T123322Z
 DTSTART:20250430T210000Z
 DTEND:20250430T210000Z
-SUMMARY:Holidays in sanfransisco Spring and Labor Day
+SUMMARY:holidays Spring and Labor Day
 END:VEVENT
 BEGIN:VEVENT
-UID:mrz9@Ryan-jr
+UID:ciwg@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241029T122603Z
+DTSTAMP:20241029T123322Z
 DTSTART:20250508T210000Z
 DTEND:20250508T210000Z
-SUMMARY:Holidays in sanfransisco Victory Day
+SUMMARY:holidays Victory Day
 END:VEVENT
 BEGIN:VEVENT
-UID:1ny7@Ryan-jr
+UID:25dd@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241029T122603Z
+DTSTAMP:20241029T123322Z
 DTSTART:20250611T210000Z
 DTEND:20250611T210000Z
-SUMMARY:Holidays in sanfransisco Russia Day
+SUMMARY:holidays Russia Day
 END:VEVENT
 BEGIN:VEVENT
-UID:rgd9@Ryan-jr
+UID:m4rh@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241029T122603Z
+DTSTAMP:20241029T123322Z
 DTSTART:20251103T210000Z
 DTEND:20251103T210000Z
-SUMMARY:Holidays in sanfransisco Civil Unity Day
+SUMMARY:holidays Civil Unity Day
 END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/calendar/time based events.json b/calendar/time based events.json
index 7112f78..441dfaf 100644
--- a/calendar/time based events.json	
+++ b/calendar/time based events.json	
@@ -3,7 +3,7 @@
   "linkGroupName": "time based events",
   "calendars": [
     {
-      "prefix": "Holidays in sanfransisco",
+      "prefix": "holidays",
       "override": false,
       "url": "https://www.calendarlabs.com/ical-calendar/ics/65/San_Francisco_Public_Holidays.ics"
     }
diff --git a/server.js b/server.js
index 0ee5a3d..66e2231 100644
--- a/server.js
+++ b/server.js
@@ -161,12 +161,23 @@ app.get('/calendar/:name', async (req, res) => {
                         const end = new Date(event.end);
                         const summary = result.override ? result.prefix : `${result.prefix} ${event.summary}`;
 
-                        // Add event to the calendar
-                        calendar.createEvent({
-                            start: start,
-                            end: end,
-                            summary: summary,
-                        });
+                        // Check if the event is date-based or time-based
+                        if (event.start.includes('T')) {
+                            // Time-based event
+                            calendar.createEvent({
+                                start: start,
+                                end: end,
+                                summary: summary,
+                            });
+                        } else {
+                            // Date-based event
+                            calendar.createEvent({
+                                start: start,
+                                end: end,
+                                summary: summary,
+                                allDay: true, // Mark as an all-day event
+                            });
+                        }
                     });
                 });