diff --git a/calendar.test.js b/calendar.test.js
index d3b7dd6..db121ba 100644
--- a/calendar.test.js
+++ b/calendar.test.js
@@ -40,6 +40,11 @@ describe('Calendar Merging API', () => {
                         prefix: 'Date Event',
                         override: false,
                     },
+                    {
+                        "prefix": "holidays",
+                        "override": false,
+                        "url": "https://www.calendarlabs.com/ical-calendar/ics/76/US_Holidays.ics"
+                      },
                 ],
             });
         expect(response.status).toBe(200);
diff --git a/calendar/Date Based Calendar.ics b/calendar/Date_Based_Calendar.ics
similarity index 76%
rename from calendar/Date Based Calendar.ics
rename to calendar/Date_Based_Calendar.ics
index b763206..e42612c 100644
--- a/calendar/Date Based Calendar.ics	
+++ b/calendar/Date_Based_Calendar.ics
@@ -4,57 +4,57 @@ PRODID:-//sebbo.net//ical-generator//EN
 NAME:Date Based Calendar
 X-WR-CALNAME:Date Based Calendar
 BEGIN:VEVENT
-UID:2j0k@Ryan-jr
+UID:eusk@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124806Z
+DTSTAMP:20241031T123423Z
 DTSTART:20230219T210000Z
 DTEND:20230224T210000Z
 SUMMARY:Date Event Winterferien 2023 Bayern
 END:VEVENT
 BEGIN:VEVENT
-UID:0ug3@Ryan-jr
+UID:e0sc@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124806Z
+DTSTAMP:20241031T123423Z
 DTSTART:20230402T210000Z
 DTEND:20230415T210000Z
 SUMMARY:Date Event Osterferien 2023 Bayern
 END:VEVENT
 BEGIN:VEVENT
-UID:5u1l@Ryan-jr
+UID:842b@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124806Z
+DTSTAMP:20241031T123423Z
 DTSTART:20230529T210000Z
 DTEND:20230609T210000Z
 SUMMARY:Date Event Pfingstferien 2023 Bayern
 END:VEVENT
 BEGIN:VEVENT
-UID:hf4c@Ryan-jr
+UID:xr1j@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124806Z
+DTSTAMP:20241031T123423Z
 DTSTART:20230730T210000Z
 DTEND:20230911T210000Z
 SUMMARY:Date Event Sommerferien 2023 Bayern
 END:VEVENT
 BEGIN:VEVENT
-UID:41b3@Ryan-jr
+UID:j537@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124806Z
+DTSTAMP:20241031T123423Z
 DTSTART:20231029T210000Z
 DTEND:20231103T210000Z
 SUMMARY:Date Event Herbstferien 2023 Bayern
 END:VEVENT
 BEGIN:VEVENT
-UID:gmms@Ryan-jr
+UID:gsiw@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124806Z
+DTSTAMP:20241031T123423Z
 DTSTART:20231121T210000Z
 DTEND:20231122T210000Z
 SUMMARY:Date Event Herbstferien 2023 Bayern
 END:VEVENT
 BEGIN:VEVENT
-UID:k7ag@Ryan-jr
+UID:7ch5@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124806Z
+DTSTAMP:20241031T123423Z
 DTSTART:20231222T210000Z
 DTEND:20240105T210000Z
 SUMMARY:Date Event Weihnachtsferien 2023 Bayern
diff --git a/calendar/Date Based Calendar.json b/calendar/Date_Based_Calendar.json
similarity index 91%
rename from calendar/Date Based Calendar.json
rename to calendar/Date_Based_Calendar.json
index 02389f7..ba66db5 100644
--- a/calendar/Date Based Calendar.json	
+++ b/calendar/Date_Based_Calendar.json
@@ -1,5 +1,5 @@
 {
-  "id": "Date Based Calendar",
+  "id": "Date_Based_Calendar",
   "linkGroupName": "Date Based Calendar",
   "calendars": [
     {
diff --git a/calendar/No Prefix Calendar.ics b/calendar/No_Prefix_Calendar.ics
similarity index 73%
rename from calendar/No Prefix Calendar.ics
rename to calendar/No_Prefix_Calendar.ics
index 294be7b..4d31ee9 100644
--- a/calendar/No Prefix Calendar.ics	
+++ b/calendar/No_Prefix_Calendar.ics
@@ -4,209 +4,209 @@ PRODID:-//sebbo.net//ical-generator//EN
 NAME:No Prefix Calendar
 X-WR-CALNAME:No Prefix Calendar
 BEGIN:VEVENT
-UID:97to@Ryan-jr
+UID:z2y1@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124808Z
+DTSTAMP:20241031T123632Z
 DTSTART:20231231T210000Z
 DTEND:20231231T210000Z
 SUMMARY: New Year's Day
 END:VEVENT
 BEGIN:VEVENT
-UID:uv3g@Ryan-jr
+UID:50ax@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124808Z
+DTSTAMP:20241031T123632Z
 DTSTART:20240101T210000Z
 DTEND:20240101T210000Z
 SUMMARY: New Year's Day Holiday
 END:VEVENT
 BEGIN:VEVENT
-UID:0ehc@Ryan-jr
+UID:ges7@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124808Z
+DTSTAMP:20241031T123632Z
 DTSTART:20240102T210000Z
 DTEND:20240102T210000Z
 SUMMARY: New Year's Day Holiday
 END:VEVENT
 BEGIN:VEVENT
-UID:ho86@Ryan-jr
+UID:tiio@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124808Z
+DTSTAMP:20241031T123632Z
 DTSTART:20240103T210000Z
 DTEND:20240103T210000Z
 SUMMARY: New Year's Day Holiday
 END:VEVENT
 BEGIN:VEVENT
-UID:nmei@Ryan-jr
+UID:fnfl@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124808Z
+DTSTAMP:20241031T123632Z
 DTSTART:20240104T210000Z
 DTEND:20240104T210000Z
 SUMMARY: New Year's Day Holiday
 END:VEVENT
 BEGIN:VEVENT
-UID:yqf8@Ryan-jr
+UID:cy1l@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124808Z
+DTSTAMP:20241031T123632Z
 DTSTART:20240106T210000Z
 DTEND:20240106T210000Z
 SUMMARY: Orthodox Christmas
 END:VEVENT
 BEGIN:VEVENT
-UID:i71u@Ryan-jr
+UID:vwo2@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124808Z
+DTSTAMP:20241031T123632Z
 DTSTART:20240107T210000Z
 DTEND:20240107T210000Z
 SUMMARY: Orthodox Christmas Holiday
 END:VEVENT
 BEGIN:VEVENT
-UID:1hhq@Ryan-jr
+UID:m65y@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124808Z
+DTSTAMP:20241031T123632Z
 DTSTART:20240222T210000Z
 DTEND:20240222T210000Z
 SUMMARY: Defender of the Fatherland
 END:VEVENT
 BEGIN:VEVENT
-UID:o022@Ryan-jr
+UID:a80k@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124808Z
+DTSTAMP:20241031T123632Z
 DTSTART:20240307T210000Z
 DTEND:20240307T210000Z
 SUMMARY: Intl. Women's Day
 END:VEVENT
 BEGIN:VEVENT
-UID:17yk@Ryan-jr
+UID:2j5i@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124808Z
+DTSTAMP:20241031T123632Z
 DTSTART:20240430T210000Z
 DTEND:20240430T210000Z
 SUMMARY: Spring and Labor Day
 END:VEVENT
 BEGIN:VEVENT
-UID:isc9@Ryan-jr
+UID:rkdh@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124808Z
+DTSTAMP:20241031T123632Z
 DTSTART:20240508T210000Z
 DTEND:20240508T210000Z
 SUMMARY: Victory Day
 END:VEVENT
 BEGIN:VEVENT
-UID:t10p@Ryan-jr
+UID:wfs4@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124808Z
+DTSTAMP:20241031T123632Z
 DTSTART:20240611T210000Z
 DTEND:20240611T210000Z
 SUMMARY: Russia Day
 END:VEVENT
 BEGIN:VEVENT
-UID:5zfk@Ryan-jr
+UID:pyth@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124808Z
+DTSTAMP:20241031T123632Z
 DTSTART:20241103T210000Z
 DTEND:20241103T210000Z
 SUMMARY: Civil Unity Day
 END:VEVENT
 BEGIN:VEVENT
-UID:540b@Ryan-jr
+UID:bahh@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124808Z
+DTSTAMP:20241031T123632Z
 DTSTART:20241231T210000Z
 DTEND:20241231T210000Z
 SUMMARY: New Year's Day
 END:VEVENT
 BEGIN:VEVENT
-UID:ut2e@Ryan-jr
+UID:wf1w@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124808Z
+DTSTAMP:20241031T123632Z
 DTSTART:20250101T210000Z
 DTEND:20250101T210000Z
 SUMMARY: New Year's Day Holiday
 END:VEVENT
 BEGIN:VEVENT
-UID:zz4x@Ryan-jr
+UID:qm2q@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124808Z
+DTSTAMP:20241031T123632Z
 DTSTART:20250102T210000Z
 DTEND:20250102T210000Z
 SUMMARY: New Year's Day Holiday
 END:VEVENT
 BEGIN:VEVENT
-UID:pyog@Ryan-jr
+UID:x92f@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124808Z
+DTSTAMP:20241031T123632Z
 DTSTART:20250103T210000Z
 DTEND:20250103T210000Z
 SUMMARY: New Year's Day Holiday
 END:VEVENT
 BEGIN:VEVENT
-UID:acj8@Ryan-jr
+UID:uhdj@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124808Z
+DTSTAMP:20241031T123632Z
 DTSTART:20250104T210000Z
 DTEND:20250104T210000Z
 SUMMARY: New Year's Day Holiday
 END:VEVENT
 BEGIN:VEVENT
-UID:3umc@Ryan-jr
+UID:cmov@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124808Z
+DTSTAMP:20241031T123632Z
 DTSTART:20250106T210000Z
 DTEND:20250106T210000Z
 SUMMARY: Orthodox Christmas
 END:VEVENT
 BEGIN:VEVENT
-UID:zngf@Ryan-jr
+UID:nbbn@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124808Z
+DTSTAMP:20241031T123632Z
 DTSTART:20250107T210000Z
 DTEND:20250107T210000Z
 SUMMARY: Orthodox Christmas Holiday
 END:VEVENT
 BEGIN:VEVENT
-UID:hisd@Ryan-jr
+UID:21sy@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124808Z
+DTSTAMP:20241031T123632Z
 DTSTART:20250223T210000Z
 DTEND:20250223T210000Z
 SUMMARY: Defender of the Fatherland
 END:VEVENT
 BEGIN:VEVENT
-UID:05nq@Ryan-jr
+UID:ue0u@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124808Z
+DTSTAMP:20241031T123632Z
 DTSTART:20250309T210000Z
 DTEND:20250309T210000Z
 SUMMARY: Intl. Women's Day
 END:VEVENT
 BEGIN:VEVENT
-UID:qsc6@Ryan-jr
+UID:5wxv@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124808Z
+DTSTAMP:20241031T123632Z
 DTSTART:20250430T210000Z
 DTEND:20250430T210000Z
 SUMMARY: Spring and Labor Day
 END:VEVENT
 BEGIN:VEVENT
-UID:rbdz@Ryan-jr
+UID:wytq@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124808Z
+DTSTAMP:20241031T123632Z
 DTSTART:20250508T210000Z
 DTEND:20250508T210000Z
 SUMMARY: Victory Day
 END:VEVENT
 BEGIN:VEVENT
-UID:ctg3@Ryan-jr
+UID:kfol@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124808Z
+DTSTAMP:20241031T123632Z
 DTSTART:20250611T210000Z
 DTEND:20250611T210000Z
 SUMMARY: Russia Day
 END:VEVENT
 BEGIN:VEVENT
-UID:g5gz@Ryan-jr
+UID:yacx@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124808Z
+DTSTAMP:20241031T123632Z
 DTSTART:20251103T210000Z
 DTEND:20251103T210000Z
 SUMMARY: Civil Unity Day
diff --git a/calendar/No Prefix Calendar.json b/calendar/No_Prefix_Calendar.json
similarity index 87%
rename from calendar/No Prefix Calendar.json
rename to calendar/No_Prefix_Calendar.json
index a59884a..0f3aa63 100644
--- a/calendar/No Prefix Calendar.json	
+++ b/calendar/No_Prefix_Calendar.json
@@ -1,5 +1,5 @@
 {
-  "id": "No Prefix Calendar",
+  "id": "No_Prefix_Calendar",
   "linkGroupName": "No Prefix Calendar",
   "calendars": [
     {
diff --git a/calendar/Override Calendar.ics b/calendar/Override_Calendar.ics
similarity index 72%
rename from calendar/Override Calendar.ics
rename to calendar/Override_Calendar.ics
index bcf3dca..7df04c6 100644
--- a/calendar/Override Calendar.ics	
+++ b/calendar/Override_Calendar.ics
@@ -4,209 +4,209 @@ PRODID:-//sebbo.net//ical-generator//EN
 NAME:Override Calendar
 X-WR-CALNAME:Override Calendar
 BEGIN:VEVENT
-UID:byac@Ryan-jr
+UID:4u49@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124808Z
+DTSTAMP:20241031T123632Z
 DTSTART:20231231T210000Z
 DTEND:20231231T210000Z
 SUMMARY:Override Event
 END:VEVENT
 BEGIN:VEVENT
-UID:n988@Ryan-jr
+UID:yqm0@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124808Z
+DTSTAMP:20241031T123632Z
 DTSTART:20240101T210000Z
 DTEND:20240101T210000Z
 SUMMARY:Override Event
 END:VEVENT
 BEGIN:VEVENT
-UID:jkuk@Ryan-jr
+UID:85ny@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124808Z
+DTSTAMP:20241031T123632Z
 DTSTART:20240102T210000Z
 DTEND:20240102T210000Z
 SUMMARY:Override Event
 END:VEVENT
 BEGIN:VEVENT
-UID:3vw6@Ryan-jr
+UID:z1tw@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124808Z
+DTSTAMP:20241031T123632Z
 DTSTART:20240103T210000Z
 DTEND:20240103T210000Z
 SUMMARY:Override Event
 END:VEVENT
 BEGIN:VEVENT
-UID:rzrw@Ryan-jr
+UID:dr7o@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124808Z
+DTSTAMP:20241031T123632Z
 DTSTART:20240104T210000Z
 DTEND:20240104T210000Z
 SUMMARY:Override Event
 END:VEVENT
 BEGIN:VEVENT
-UID:5ij9@Ryan-jr
+UID:nir4@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124808Z
+DTSTAMP:20241031T123632Z
 DTSTART:20240106T210000Z
 DTEND:20240106T210000Z
 SUMMARY:Override Event
 END:VEVENT
 BEGIN:VEVENT
-UID:ggsp@Ryan-jr
+UID:hlhz@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124808Z
+DTSTAMP:20241031T123632Z
 DTSTART:20240107T210000Z
 DTEND:20240107T210000Z
 SUMMARY:Override Event
 END:VEVENT
 BEGIN:VEVENT
-UID:nu3r@Ryan-jr
+UID:kbvd@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124808Z
+DTSTAMP:20241031T123632Z
 DTSTART:20240222T210000Z
 DTEND:20240222T210000Z
 SUMMARY:Override Event
 END:VEVENT
 BEGIN:VEVENT
-UID:2vot@Ryan-jr
+UID:bm3i@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124808Z
+DTSTAMP:20241031T123632Z
 DTSTART:20240307T210000Z
 DTEND:20240307T210000Z
 SUMMARY:Override Event
 END:VEVENT
 BEGIN:VEVENT
-UID:0xb5@Ryan-jr
+UID:x9rv@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124808Z
+DTSTAMP:20241031T123632Z
 DTSTART:20240430T210000Z
 DTEND:20240430T210000Z
 SUMMARY:Override Event
 END:VEVENT
 BEGIN:VEVENT
-UID:wqid@Ryan-jr
+UID:ddt9@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124808Z
+DTSTAMP:20241031T123632Z
 DTSTART:20240508T210000Z
 DTEND:20240508T210000Z
 SUMMARY:Override Event
 END:VEVENT
 BEGIN:VEVENT
-UID:rpka@Ryan-jr
+UID:4k4i@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124808Z
+DTSTAMP:20241031T123632Z
 DTSTART:20240611T210000Z
 DTEND:20240611T210000Z
 SUMMARY:Override Event
 END:VEVENT
 BEGIN:VEVENT
-UID:6zp1@Ryan-jr
+UID:tjrp@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124808Z
+DTSTAMP:20241031T123632Z
 DTSTART:20241103T210000Z
 DTEND:20241103T210000Z
 SUMMARY:Override Event
 END:VEVENT
 BEGIN:VEVENT
-UID:4b5t@Ryan-jr
+UID:5iux@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124808Z
+DTSTAMP:20241031T123632Z
 DTSTART:20241231T210000Z
 DTEND:20241231T210000Z
 SUMMARY:Override Event
 END:VEVENT
 BEGIN:VEVENT
-UID:0rok@Ryan-jr
+UID:294t@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124808Z
+DTSTAMP:20241031T123632Z
 DTSTART:20250101T210000Z
 DTEND:20250101T210000Z
 SUMMARY:Override Event
 END:VEVENT
 BEGIN:VEVENT
-UID:6m1u@Ryan-jr
+UID:mqtr@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124808Z
+DTSTAMP:20241031T123632Z
 DTSTART:20250102T210000Z
 DTEND:20250102T210000Z
 SUMMARY:Override Event
 END:VEVENT
 BEGIN:VEVENT
-UID:0ndk@Ryan-jr
+UID:3igs@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124808Z
+DTSTAMP:20241031T123632Z
 DTSTART:20250103T210000Z
 DTEND:20250103T210000Z
 SUMMARY:Override Event
 END:VEVENT
 BEGIN:VEVENT
-UID:oe71@Ryan-jr
+UID:27iz@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124808Z
+DTSTAMP:20241031T123632Z
 DTSTART:20250104T210000Z
 DTEND:20250104T210000Z
 SUMMARY:Override Event
 END:VEVENT
 BEGIN:VEVENT
-UID:sfzq@Ryan-jr
+UID:jqkh@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124808Z
+DTSTAMP:20241031T123632Z
 DTSTART:20250106T210000Z
 DTEND:20250106T210000Z
 SUMMARY:Override Event
 END:VEVENT
 BEGIN:VEVENT
-UID:8q24@Ryan-jr
+UID:ied9@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124808Z
+DTSTAMP:20241031T123632Z
 DTSTART:20250107T210000Z
 DTEND:20250107T210000Z
 SUMMARY:Override Event
 END:VEVENT
 BEGIN:VEVENT
-UID:a64z@Ryan-jr
+UID:hgm7@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124808Z
+DTSTAMP:20241031T123632Z
 DTSTART:20250223T210000Z
 DTEND:20250223T210000Z
 SUMMARY:Override Event
 END:VEVENT
 BEGIN:VEVENT
-UID:tj17@Ryan-jr
+UID:3utt@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124808Z
+DTSTAMP:20241031T123632Z
 DTSTART:20250309T210000Z
 DTEND:20250309T210000Z
 SUMMARY:Override Event
 END:VEVENT
 BEGIN:VEVENT
-UID:pija@Ryan-jr
+UID:s5h8@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124808Z
+DTSTAMP:20241031T123632Z
 DTSTART:20250430T210000Z
 DTEND:20250430T210000Z
 SUMMARY:Override Event
 END:VEVENT
 BEGIN:VEVENT
-UID:97qd@Ryan-jr
+UID:jkou@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124808Z
+DTSTAMP:20241031T123632Z
 DTSTART:20250508T210000Z
 DTEND:20250508T210000Z
 SUMMARY:Override Event
 END:VEVENT
 BEGIN:VEVENT
-UID:cjjc@Ryan-jr
+UID:ynhm@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124808Z
+DTSTAMP:20241031T123632Z
 DTSTART:20250611T210000Z
 DTEND:20250611T210000Z
 SUMMARY:Override Event
 END:VEVENT
 BEGIN:VEVENT
-UID:uczl@Ryan-jr
+UID:c1ol@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124808Z
+DTSTAMP:20241031T123632Z
 DTSTART:20251103T210000Z
 DTEND:20251103T210000Z
 SUMMARY:Override Event
diff --git a/calendar/Override Calendar.json b/calendar/Override_Calendar.json
similarity index 88%
rename from calendar/Override Calendar.json
rename to calendar/Override_Calendar.json
index 86c7eed..570c4a7 100644
--- a/calendar/Override Calendar.json	
+++ b/calendar/Override_Calendar.json
@@ -1,5 +1,5 @@
 {
-  "id": "Override Calendar",
+  "id": "Override_Calendar",
   "linkGroupName": "Override Calendar",
   "calendars": [
     {
diff --git a/calendar/Time Based Calendar.ics b/calendar/Time_Based_Calendar.ics
similarity index 74%
rename from calendar/Time Based Calendar.ics
rename to calendar/Time_Based_Calendar.ics
index e3970d2..4b3dcc3 100644
--- a/calendar/Time Based Calendar.ics	
+++ b/calendar/Time_Based_Calendar.ics
@@ -4,209 +4,209 @@ PRODID:-//sebbo.net//ical-generator//EN
 NAME:Time Based Calendar
 X-WR-CALNAME:Time Based Calendar
 BEGIN:VEVENT
-UID:q5m4@Ryan-jr
+UID:xpwc@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124807Z
+DTSTAMP:20241031T123631Z
 DTSTART:20231231T210000Z
 DTEND:20231231T210000Z
 SUMMARY:Time Event New Year's Day
 END:VEVENT
 BEGIN:VEVENT
-UID:9lje@Ryan-jr
+UID:zc83@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124807Z
+DTSTAMP:20241031T123631Z
 DTSTART:20240101T210000Z
 DTEND:20240101T210000Z
 SUMMARY:Time Event New Year's Day Holiday
 END:VEVENT
 BEGIN:VEVENT
-UID:hf2x@Ryan-jr
+UID:xavw@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124807Z
+DTSTAMP:20241031T123631Z
 DTSTART:20240102T210000Z
 DTEND:20240102T210000Z
 SUMMARY:Time Event New Year's Day Holiday
 END:VEVENT
 BEGIN:VEVENT
-UID:xwzc@Ryan-jr
+UID:j3hu@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124807Z
+DTSTAMP:20241031T123631Z
 DTSTART:20240103T210000Z
 DTEND:20240103T210000Z
 SUMMARY:Time Event New Year's Day Holiday
 END:VEVENT
 BEGIN:VEVENT
-UID:8pzm@Ryan-jr
+UID:yjq6@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124807Z
+DTSTAMP:20241031T123631Z
 DTSTART:20240104T210000Z
 DTEND:20240104T210000Z
 SUMMARY:Time Event New Year's Day Holiday
 END:VEVENT
 BEGIN:VEVENT
-UID:aa76@Ryan-jr
+UID:yv4p@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124807Z
+DTSTAMP:20241031T123631Z
 DTSTART:20240106T210000Z
 DTEND:20240106T210000Z
 SUMMARY:Time Event Orthodox Christmas
 END:VEVENT
 BEGIN:VEVENT
-UID:6tkg@Ryan-jr
+UID:rm3v@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124807Z
+DTSTAMP:20241031T123631Z
 DTSTART:20240107T210000Z
 DTEND:20240107T210000Z
 SUMMARY:Time Event Orthodox Christmas Holiday
 END:VEVENT
 BEGIN:VEVENT
-UID:14t0@Ryan-jr
+UID:t314@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124807Z
+DTSTAMP:20241031T123631Z
 DTSTART:20240222T210000Z
 DTEND:20240222T210000Z
 SUMMARY:Time Event Defender of the Fatherland
 END:VEVENT
 BEGIN:VEVENT
-UID:r1xp@Ryan-jr
+UID:7zd2@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124807Z
+DTSTAMP:20241031T123631Z
 DTSTART:20240307T210000Z
 DTEND:20240307T210000Z
 SUMMARY:Time Event Intl. Women's Day
 END:VEVENT
 BEGIN:VEVENT
-UID:g8yq@Ryan-jr
+UID:lfrr@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124807Z
+DTSTAMP:20241031T123631Z
 DTSTART:20240430T210000Z
 DTEND:20240430T210000Z
 SUMMARY:Time Event Spring and Labor Day
 END:VEVENT
 BEGIN:VEVENT
-UID:atae@Ryan-jr
+UID:sjd5@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124807Z
+DTSTAMP:20241031T123631Z
 DTSTART:20240508T210000Z
 DTEND:20240508T210000Z
 SUMMARY:Time Event Victory Day
 END:VEVENT
 BEGIN:VEVENT
-UID:ashf@Ryan-jr
+UID:0cl6@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124807Z
+DTSTAMP:20241031T123631Z
 DTSTART:20240611T210000Z
 DTEND:20240611T210000Z
 SUMMARY:Time Event Russia Day
 END:VEVENT
 BEGIN:VEVENT
-UID:u9a6@Ryan-jr
+UID:lac1@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124807Z
+DTSTAMP:20241031T123631Z
 DTSTART:20241103T210000Z
 DTEND:20241103T210000Z
 SUMMARY:Time Event Civil Unity Day
 END:VEVENT
 BEGIN:VEVENT
-UID:5pwn@Ryan-jr
+UID:mtik@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124807Z
+DTSTAMP:20241031T123631Z
 DTSTART:20241231T210000Z
 DTEND:20241231T210000Z
 SUMMARY:Time Event New Year's Day
 END:VEVENT
 BEGIN:VEVENT
-UID:cpul@Ryan-jr
+UID:wreq@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124807Z
+DTSTAMP:20241031T123631Z
 DTSTART:20250101T210000Z
 DTEND:20250101T210000Z
 SUMMARY:Time Event New Year's Day Holiday
 END:VEVENT
 BEGIN:VEVENT
-UID:xkx5@Ryan-jr
+UID:fi0b@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124807Z
+DTSTAMP:20241031T123631Z
 DTSTART:20250102T210000Z
 DTEND:20250102T210000Z
 SUMMARY:Time Event New Year's Day Holiday
 END:VEVENT
 BEGIN:VEVENT
-UID:2x9h@Ryan-jr
+UID:s1b4@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124807Z
+DTSTAMP:20241031T123631Z
 DTSTART:20250103T210000Z
 DTEND:20250103T210000Z
 SUMMARY:Time Event New Year's Day Holiday
 END:VEVENT
 BEGIN:VEVENT
-UID:bm15@Ryan-jr
+UID:uqtg@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124807Z
+DTSTAMP:20241031T123631Z
 DTSTART:20250104T210000Z
 DTEND:20250104T210000Z
 SUMMARY:Time Event New Year's Day Holiday
 END:VEVENT
 BEGIN:VEVENT
-UID:ex5t@Ryan-jr
+UID:5vf9@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124807Z
+DTSTAMP:20241031T123631Z
 DTSTART:20250106T210000Z
 DTEND:20250106T210000Z
 SUMMARY:Time Event Orthodox Christmas
 END:VEVENT
 BEGIN:VEVENT
-UID:8jpa@Ryan-jr
+UID:szwz@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124807Z
+DTSTAMP:20241031T123631Z
 DTSTART:20250107T210000Z
 DTEND:20250107T210000Z
 SUMMARY:Time Event Orthodox Christmas Holiday
 END:VEVENT
 BEGIN:VEVENT
-UID:xyvk@Ryan-jr
+UID:uqhk@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124807Z
+DTSTAMP:20241031T123631Z
 DTSTART:20250223T210000Z
 DTEND:20250223T210000Z
 SUMMARY:Time Event Defender of the Fatherland
 END:VEVENT
 BEGIN:VEVENT
-UID:kg26@Ryan-jr
+UID:j4y3@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124807Z
+DTSTAMP:20241031T123631Z
 DTSTART:20250309T210000Z
 DTEND:20250309T210000Z
 SUMMARY:Time Event Intl. Women's Day
 END:VEVENT
 BEGIN:VEVENT
-UID:3cyv@Ryan-jr
+UID:qho3@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124807Z
+DTSTAMP:20241031T123631Z
 DTSTART:20250430T210000Z
 DTEND:20250430T210000Z
 SUMMARY:Time Event Spring and Labor Day
 END:VEVENT
 BEGIN:VEVENT
-UID:5jkc@Ryan-jr
+UID:xh8k@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124807Z
+DTSTAMP:20241031T123631Z
 DTSTART:20250508T210000Z
 DTEND:20250508T210000Z
 SUMMARY:Time Event Victory Day
 END:VEVENT
 BEGIN:VEVENT
-UID:p0az@Ryan-jr
+UID:0yr0@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124807Z
+DTSTAMP:20241031T123631Z
 DTSTART:20250611T210000Z
 DTEND:20250611T210000Z
 SUMMARY:Time Event Russia Day
 END:VEVENT
 BEGIN:VEVENT
-UID:kaku@Ryan-jr
+UID:fj9l@Ryan-jr
 SEQUENCE:0
-DTSTAMP:20241030T124807Z
+DTSTAMP:20241031T123631Z
 DTSTART:20251103T210000Z
 DTEND:20251103T210000Z
 SUMMARY:Time Event Civil Unity Day
diff --git a/calendar/Time Based Calendar.json b/calendar/Time_Based_Calendar.json
similarity index 87%
rename from calendar/Time Based Calendar.json
rename to calendar/Time_Based_Calendar.json
index c6cb549..5fc947e 100644
--- a/calendar/Time Based Calendar.json	
+++ b/calendar/Time_Based_Calendar.json
@@ -1,5 +1,5 @@
 {
-  "id": "Time Based Calendar",
+  "id": "Time_Based_Calendar",
   "linkGroupName": "Time Based Calendar",
   "calendars": [
     {