Repository: focus-shift/jollyday
Pull request #623 (2024-09-20 12:13:34)

Improve usa
<!--

Thanks for contributing.
Please review the following notes before submitting you pull request.

Please look for other issues or pull requests which already work on this topic. Is somebody already on it? Do you need to synchronize?

# Security Vulnerabilities

🛑 STOP! 🛑 If your contribution fixes a security vulnerability, please do not submit it.
Instead, please write an E-Mail to to one of the maintainer with all the information
to recreate the security vulnerability.

# Describing Your Changes

If, having reviewed the notes above, you're ready to submit your pull request, please
provide a brief description of the proposed changes.

If they:
 🐞 fix a bug, please describe the broken behaviour and how the changes fix it.
    Please label with 'type: bug' and 'status: new'
    
 🎁 make an enhancement, please describe the new functionality and why you believe it's useful.
    Please label with 'type: enhancement' and 'status: new'
 
If your pull request relates to any existing issues,
please reference them by using the issue number prefixed with #.

-->



Patch:
diff --git a/jollyday-core/src/main/resources/holidays/Holidays_us.xml b/jollyday-core/src/main/resources/holidays/Holidays_us.xml
index 029c8868..05f843a6 100644
--- a/jollyday-core/src/main/resources/holidays/Holidays_us.xml
+++ b/jollyday-core/src/main/resources/holidays/Holidays_us.xml
@@ -5,49 +5,61 @@
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xsi:schemaLocation="https://focus_shift.de/jollyday/schema/holiday https://focus_shift.de/jollyday/schema/holiday/holiday.xsd">
   <Holidays>
-    <Fixed month="JANUARY" day="1" descriptionPropertiesKey="NEW_YEAR"/>
+    <Fixed month="JANUARY" day="1" descriptionPropertiesKey="NEW_YEAR">
+      <MovingCondition substitute="SATURDAY" with="PREVIOUS" weekday="FRIDAY"/>
+      <MovingCondition substitute="SUNDAY" with="NEXT" weekday="MONDAY"/>
+    </Fixed>
     <Fixed month="MAY" day="30" validFrom="1869" validTo="1967" descriptionPropertiesKey="MEMORIAL_DAY"/>
     <Fixed month="JUNE" day="19" validFrom="2021" descriptionPropertiesKey="JUNETEENTH">
       <MovingCondition substitute="SATURDAY" with="PREVIOUS" weekday="FRIDAY"/>
       <MovingCondition substitute="SUNDAY" with="NEXT" weekday="MONDAY"/>
     </Fixed>
-    <Fixed month="JULY" day="4" validFrom="1776" descriptionPropertiesKey="INDEPENDENCE_DAY"/>
-    <Fixed month="NOVEMBER" day="11" validFrom="1938" descriptionPropertiesKey="VETERANS_DAY"/>
-    <Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS"/>
-    <RelativeToWeekdayInMonth weekday="TUESDAY" when="AFTER" descriptionPropertiesKey="ELECTION_DAY" every="EVEN_YEARS">
-      <FixedWeekday which="FIRST" weekday="MONDAY" month="NOVEMBER"/>
-    </RelativeToWeekdayInMonth>
+    <Fixed month="JULY" day="4" validFrom="1776" descriptionPropertiesKey="INDEPENDENCE_DAY">
+      <MovingCondition substitute="SATURDAY" with="PREVIOUS" weekday="FRIDAY"/>
+      <MovingCondition substitute="SUNDAY" with="NEXT" weekday="MONDAY"/>
+    </Fixed>
+    <Fixed month="NOVEMBER" day="11" validFrom="1938" descriptionPropertiesKey="VETERANS_DAY">
+      <MovingCondition substitute="SATURDAY" with="PREVIOUS" weekday="FRIDAY"/>
+      <MovingCondition substitute="SUNDAY" with="NEXT" weekday="MONDAY"/>
+    </Fixed>
+    <Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS">
+      <MovingCondition substitute="SATURDAY" with="PREVIOUS" weekday="FRIDAY"/>
+      <MovingCondition substitute="SUNDAY" with="NEXT" weekday="MONDAY"/>
+    </Fixed>
     <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
     <FixedWeekday which="THIRD" weekday="MONDAY" month="FEBRUARY" validFrom="1971" descriptionPropertiesKey="PRESIDENTS_DAY"/>
     <FixedWeekday which="LAST" weekday="MONDAY" month="MAY" validFrom="1968" descriptionPropertiesKey="MEMORIAL_DAY"/>
     <FixedWeekday which="FIRST" weekday="MONDAY" month="SEPTEMBER" validFrom="1895" descriptionPropertiesKey="LABOUR_DAY"/>
-    <FixedWeekday which="SECOND" weekday="MONDAY" month="OCTOBER" validFrom="1937" descriptionPropertiesKey="COLUMBUS_DAY"/>
     <FixedWeekday which="FOURTH" weekday="THURSDAY" month="NOVEMBER" validFrom="1863" descriptionPropertiesKey="THANKSGIVING"/>
   </Holidays>
 
+  <Sources>
+    <Source>https://en.wikipedia.org/wiki/Federal_holidays_in_the_United_States</Source>
+    <Source>https://en.wikipedia.org/wiki/Indigenous_Peoples%27_Day_(United_States)#Indigenous_Peoples_Day_observers</Source>
+    <Source>https://en.wikipedia.org/wiki/Confederate_Memorial_Day</Source>
+    <Source of="ISO 3166">https://www.iso.org/obp/ui/#iso:code:3166:US</Source>
+    <Source of="ISO 3166-2">https://en.wikipedia.org/wiki/ISO_3166-2:US</Source>
+  </Sources>
+
   <SubConfigurations hierarchy="al" description="Alabama">
     <Holidays>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
       <FixedWeekday which="THIRD" weekday="MONDAY" month="FEBRUARY" validFrom="1968" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <FixedWeekday which="FOURTH" weekday="MONDAY" month="APRIL" descriptionPropertiesKey="CONFEDERATE"/>
-      <FixedWeekday which="FIRST" weekday="MONDAY" month="JUNE" descriptionPropertiesKey="JEFFERSON_DAVIS"/>
+      <FixedWeekday which="FOURTH" weekday="MONDAY" month="APRIL" descriptionPropertiesKey="CONFEDERATE" localizedType="OBSERVANCE"/>
+      <FixedWeekday which="FIRST" weekday="MONDAY" month="JUNE" descriptionPropertiesKey="JEFFERSON_DAVIS" localizedType="OBSERVANCE"/>
       <FixedWeekday which="SECOND" weekday="MONDAY" month="OCTOBER" validFrom="1934" descriptionPropertiesKey="COLUMBUS_DAY"/>
     </Holidays>
   </SubConfigurations>
 
   <SubConfigurations hierarchy="ak" description="Alaska">
     <Holidays>
-      <Fixed month="OCTOBER" day="18" descriptionPropertiesKey="ALASKA"/>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="FEBRUARY" validFrom="1968" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <FixedWeekday which="LAST" weekday="MONDAY" month="MARCH" descriptionPropertiesKey="SEWARD"/>
+      <Fixed month="OCTOBER" day="18" descriptionPropertiesKey="ALASKA" localizedType="OBSERVANCE"/>
+      <FixedWeekday which="LAST" weekday="MONDAY" month="MARCH" descriptionPropertiesKey="SEWARD" localizedType="OBSERVANCE"/>
     </Holidays>
   </SubConfigurations>
 
   <SubConfigurations hierarchy="az" description="Arizona">
     <Holidays>
       <Fixed month="FEBRUARY" day="22" validFrom="1879" validTo="1967" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
       <FixedWeekday which="THIRD" weekday="MONDAY" month="FEBRUARY" validFrom="1968" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
       <FixedWeekday which="SECOND" weekday="MONDAY" month="OCTOBER" validFrom="1934" descriptionPropertiesKey="COLUMBUS_DAY"/>
     </Holidays>
@@ -55,96 +67,98 @@
 
   <SubConfigurations hierarchy="ar" description="Arkansas">
     <Holidays>
-      <Fixed month="DECEMBER" day="24" descriptionPropertiesKey="CHRISTMAS_EVE"/>
+      <Fixed month="DECEMBER" day="24" descriptionPropertiesKey="CHRISTMAS_EVE" localizedType="OBSERVANCE"/>
       <Fixed month="FEBRUARY" day="22" validFrom="1879" validTo="1967" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
       <FixedWeekday which="THIRD" weekday="MONDAY" month="FEBRUARY" validFrom="1968" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
     </Holidays>
   </SubConfigurations>
 
   <SubConfigurations hierarchy="ca" description="California">
     <Holidays>
-      <Fixed month="FEBRUARY" day="12" descriptionPropertiesKey="LINCOLN"/>
-      <Fixed month="MARCH" day="31" descriptionPropertiesKey="CESAR_CHAVEZ"/>
+      <Fixed month="FEBRUARY" day="12" descriptionPropertiesKey="LINCOLN" localizedType="OBSERVANCE">
+        <MovingCondition substitute="SUNDAY" with="NEXT" weekday="MONDAY"/>
+      </Fixed>
+      <Fixed month="MARCH" day="31" descriptionPropertiesKey="CESAR_CHAVEZ">
+        <MovingCondition substitute="SUNDAY" with="NEXT" weekday="MONDAY"/>
+      </Fixed>
       <Fixed month="FEBRUARY" day="22" validFrom="1879" validTo="1967" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
       <FixedWeekday which="THIRD" weekday="MONDAY" month="FEBRUARY" validFrom="1968" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
+      <!-- DAY after Thanksgiving missing -->
     </Holidays>
-
-    <SubConfigurations hierarchy="be" description="Berkeley">
-      <Holidays>
-        <Fixed month="MARCH" day="8"/>
-        <Fixed month="OCTOBER" day="21"/>
-      </Holidays>
-    </SubConfigurations>
-
   </SubConfigurations>
 
   <SubConfigurations hierarchy="co" description="Colorado">
     <Holidays>
       <Fixed month="FEBRUARY" day="22" validFrom="1879" validTo="1967" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
       <FixedWeekday which="THIRD" weekday="MONDAY" month="FEBRUARY" validFrom="1968" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
       <FixedWeekday which="SECOND" weekday="MONDAY" month="OCTOBER" validFrom="1906" descriptionPropertiesKey="COLUMBUS_DAY"/>
+      <!-- Cabrini Day is missing on first monday in october -->
     </Holidays>
   </SubConfigurations>
 
   <SubConfigurations hierarchy="ct" description="Connecticut">
     <Holidays>
-      <Fixed month="FEBRUARY" day="12" descriptionPropertiesKey="LINCOLN"/>
+      <Fixed month="FEBRUARY" day="12" descriptionPropertiesKey="LINCOLN">
+        <MovingCondition substitute="SATURDAY" with="PREVIOUS" weekday="FRIDAY"/>
+        <MovingCondition substitute="SUNDAY" with="NEXT" weekday="MONDAY"/>
+      </Fixed>
       <Fixed month="FEBRUARY" day="22" validFrom="1879" validTo="1967" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
       <FixedWeekday which="THIRD" weekday="MONDAY" month="FEBRUARY" validFrom="1968" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
       <FixedWeekday which="SECOND" weekday="MONDAY" month="OCTOBER" validFrom="1934" descriptionPropertiesKey="COLUMBUS_DAY"/>
       <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
     </Holidays>
+
+    <Sources>
+      <Source>https://portal.ct.gov/about/legal-state-holidays</Source>
+    </Sources>
   </SubConfigurations>
 
   <SubConfigurations hierarchy="de" description="Delaware">
     <Holidays>
       <Fixed month="FEBRUARY" day="22" validFrom="1879" validTo="1967" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
       <FixedWeekday which="THIRD" weekday="MONDAY" month="FEBRUARY" validFrom="1968" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
       <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
+      <!-- DAY after Thanksgiving missing -->
     </Holidays>
+
+    <Sources>
+      <Source>https://delcode.delaware.gov/title1/c005/index.html</Source>
+    </Sources>
   </SubConfigurations>
 
   <SubConfigurations hierarchy="fl" description="Florida">
     <Holidays>
       <Fixed month="FEBRUARY" day="22" validFrom="1879" validTo="1967" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
       <FixedWeekday which="THIRD" weekday="MONDAY" month="FEBRUARY" validFrom="1968" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <FixedWeekday which="SECOND" weekday="MONDAY" month="OCTOBER" validFrom="1934" descriptionPropertiesKey="COLUMBUS_DAY"/>
-      <FixedWeekday which="FOURTH" weekday="MONDAY" month="APRIL" descriptionPropertiesKey="CONFEDERATE"/>
+      <FixedWeekday which="FOURTH" weekday="MONDAY" month="APRIL" descriptionPropertiesKey="CONFEDERATE" localizedType="OBSERVANCE"/>
+      <!-- DAY after Thanksgiving missing -->
     </Holidays>
   </SubConfigurations>
 
   <SubConfigurations hierarchy="ga" description="Georgia">
     <Holidays>
       <Fixed month="FEBRUARY" day="22" validFrom="1879" validTo="1967" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
       <FixedWeekday which="THIRD" weekday="MONDAY" month="FEBRUARY" validFrom="1968" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
       <FixedWeekday which="SECOND" weekday="MONDAY" month="OCTOBER" validFrom="1934" descriptionPropertiesKey="COLUMBUS_DAY"/>
-      <FixedWeekday which="FOURTH" weekday="MONDAY" month="APRIL" descriptionPropertiesKey="CONFEDERATE"/>
+      <FixedWeekday which="FOURTH" weekday="MONDAY" month="APRIL" validFrom="1874" validTo="2016" descriptionPropertiesKey="CONFEDERATE"/>
+      <!-- state holiday - Day after 4th Thursday in November missing -->
     </Holidays>
   </SubConfigurations>
 
   <SubConfigurations hierarchy="hi" description="Hawaii">
     <Holidays>
-      <Fixed month="MARCH" day="26" descriptionPropertiesKey="KALANIANAOLE"/>
-      <Fixed month="JUNE" day="11" descriptionPropertiesKey="KAMEHAMEHA"/>
+      <Fixed month="MARCH" day="26" descriptionPropertiesKey="KALANIANAOLE" localizedType="OBSERVANCE"/>
+      <Fixed month="JUNE" day="11" descriptionPropertiesKey="KAMEHAMEHA" localizedType="OBSERVANCE"/>
       <Fixed month="FEBRUARY" day="22" validFrom="1879" validTo="1967" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
       <FixedWeekday which="THIRD" weekday="MONDAY" month="FEBRUARY" validFrom="1968" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <FixedWeekday which="THIRD" weekday="FRIDAY" month="AUGUST" descriptionPropertiesKey="STATEHOOD"/>
-      <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
+      <FixedWeekday which="THIRD" weekday="FRIDAY" month="AUGUST" descriptionPropertiesKey="STATEHOOD" localizedType="OBSERVANCE"/>
+      <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY" localizedType="OBSERVANCE"/>
     </Holidays>
   </SubConfigurations>
 
   <SubConfigurations hierarchy="id" description="Idaho">
     <Holidays>
       <Fixed month="FEBRUARY" day="22" validFrom="1879" validTo="1967" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
       <FixedWeekday which="THIRD" weekday="MONDAY" month="FEBRUARY" validFrom="1968" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
       <FixedWeekday which="SECOND" weekday="MONDAY" month="OCTOBER" validFrom="1934" descriptionPropertiesKey="COLUMBUS_DAY"/>
     </Holidays>
@@ -152,94 +166,84 @@
 
   <SubConfigurations hierarchy="il" description="Illinois">
     <Holidays>
-      <Fixed month="FEBRUARY" day="12" descriptionPropertiesKey="LINCOLN"/>
+      <Fixed month="FEBRUARY" day="12" descriptionPropertiesKey="LINCOLN" localizedType="OBSERVANCE"/>
       <Fixed month="FEBRUARY" day="22" validFrom="1879" validTo="1967" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <RelativeToWeekdayInMonth weekday="TUESDAY" when="AFTER" descriptionPropertiesKey="ELECTION_DAY" every="EVEN_YEARS">
-        <FixedWeekday which="FIRST" weekday="MONDAY" month="NOVEMBER"/>
-      </RelativeToWeekdayInMonth>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
       <FixedWeekday which="THIRD" weekday="MONDAY" month="FEBRUARY" validFrom="1968" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
       <FixedWeekday which="SECOND" weekday="MONDAY" month="OCTOBER" validFrom="1934" descriptionPropertiesKey="COLUMBUS_DAY"/>
-      <FixedWeekday which="FIRST" weekday="MONDAY" month="MARCH" descriptionPropertiesKey="PULASKI"/>
+      <FixedWeekday which="FIRST" weekday="MONDAY" month="MARCH" descriptionPropertiesKey="PULASKI" localizedType="OBSERVANCE"/>
     </Holidays>
   </SubConfigurations>
 
   <SubConfigurations hierarchy="in" description="Indiana">
     <Holidays>
-      <Fixed month="DECEMBER" day="24" descriptionPropertiesKey="CHRISTMAS_EVE"/>
-      <RelativeToWeekdayInMonth weekday="TUESDAY" when="AFTER" descriptionPropertiesKey="ELECTION_DAY">
-        <FixedWeekday which="FIRST" weekday="MONDAY" month="MAY"/>
-      </RelativeToWeekdayInMonth>
-      <RelativeToWeekdayInMonth weekday="TUESDAY" when="AFTER" descriptionPropertiesKey="ELECTION_DAY">
-        <FixedWeekday which="FIRST" weekday="MONDAY" month="NOVEMBER"/>
-      </RelativeToWeekdayInMonth>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
-      <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
-      <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
+      <Fixed month="DECEMBER" day="24" descriptionPropertiesKey="CHRISTMAS_EVE" localizedType="OBSERVANCE"/>
+      <FixedWeekday which="SECOND" weekday="MONDAY" month="OCTOBER" validFrom="1934" descriptionPropertiesKey="COLUMBUS_DAY"/>
+      <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY" localizedType="OBSERVANCE"/>
+      <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY" localizedType="OBSERVANCE"/>
     </Holidays>
   </SubConfigurations>
 
   <SubConfigurations hierarchy="ia" description="Iowa">
     <Holidays>
-      <Fixed month="DECEMBER" day="24" descriptionPropertiesKey="CHRISTMAS_EVE"/>
-      <Fixed month="DECEMBER" day="31" descriptionPropertiesKey="NEW_YEARS_EVE"/>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
+      <Fixed month="DECEMBER" day="24" descriptionPropertiesKey="CHRISTMAS_EVE" localizedType="OBSERVANCE"/>
+      <Fixed month="DECEMBER" day="31" descriptionPropertiesKey="NEW_YEARS_EVE" localizedType="OBSERVANCE"/>
+      <FixedWeekday which="SECOND" weekday="MONDAY" month="OCTOBER" validFrom="1934" descriptionPropertiesKey="COLUMBUS_DAY"/>
+      <!-- DAY after Thanksgiving missing -->
     </Holidays>
   </SubConfigurations>
 
   <SubConfigurations hierarchy="ks" description="Kansas">
     <Holidays>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
+      <FixedWeekday which="SECOND" weekday="MONDAY" month="OCTOBER" validFrom="1934" descriptionPropertiesKey="COLUMBUS_DAY"/>
+      <!-- DAY after Thanksgiving missing -->
     </Holidays>
   </SubConfigurations>
 
   <SubConfigurations hierarchy="ky" description="Kentucky">
     <Holidays>
-      <Fixed month="DECEMBER" day="24" descriptionPropertiesKey="CHRISTMAS_EVE"/>
-      <Fixed month="DECEMBER" day="31" descriptionPropertiesKey="NEW_YEARS_EVE"/>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
-      <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
+      <Fixed month="DECEMBER" day="24" descriptionPropertiesKey="CHRISTMAS_EVE" localizedType="OBSERVANCE"/>
+      <Fixed month="DECEMBER" day="31" descriptionPropertiesKey="NEW_YEARS_EVE" localizedType="OBSERVANCE"/>
+      <FixedWeekday which="SECOND" weekday="MONDAY" month="OCTOBER" validFrom="1934" descriptionPropertiesKey="COLUMBUS_DAY"/>
+      <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY" localizedType="OBSERVANCE"/>
+      <!-- DAY after Thanksgiving missing -->
     </Holidays>
   </SubConfigurations>
 
   <SubConfigurations hierarchy="la" description="Louisiana">
     <Holidays>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
-      <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
-      <ChristianHoliday type="MARDI_GRAS" descriptionPropertiesKey="christian.MARDI_GRAS"/>
+      <Fixed month="APRIL" day="26" validFrom="1925" validTo="2022" descriptionPropertiesKey="CONFEDERATE"/>
+      <FixedWeekday which="SECOND" weekday="MONDAY" month="OCTOBER" validFrom="1934" descriptionPropertiesKey="COLUMBUS_DAY"/>
+      <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY" localizedType="OBSERVANCE"/>
+      <ChristianHoliday type="MARDI_GRAS" descriptionPropertiesKey="christian.MARDI_GRAS" localizedType="OBSERVANCE"/>
     </Holidays>
   </SubConfigurations>
 
   <SubConfigurations hierarchy="me" description="Maine">
     <Holidays>
       <Fixed month="FEBRUARY" day="22" validFrom="1879" validTo="1967" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
       <FixedWeekday which="THIRD" weekday="MONDAY" month="FEBRUARY" validFrom="1968" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
       <FixedWeekday which="SECOND" weekday="MONDAY" month="OCTOBER" validFrom="1934" descriptionPropertiesKey="COLUMBUS_DAY"/>
+      <!-- DAY after Thanksgiving missing -->
     </Holidays>
   </SubConfigurations>
 
   <SubConfigurations hierarchy="md" description="Maryland">
     <Holidays>
       <Fixed month="FEBRUARY" day="22" validFrom="1879" validTo="1967" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <RelativeToWeekdayInMonth weekday="FRIDAY" when="BEFORE" descriptionPropertiesKey="SERVICE_REDUCTION">
+      <RelativeToWeekdayInMonth weekday="FRIDAY" when="BEFORE" descriptionPropertiesKey="SERVICE_REDUCTION" localizedType="OBSERVANCE">
         <FixedWeekday which="LAST" weekday="MONDAY" month="MAY"/>
       </RelativeToWeekdayInMonth>
-      <RelativeToWeekdayInMonth weekday="TUESDAY" when="AFTER" descriptionPropertiesKey="ELECTION_DAY">
-        <FixedWeekday which="FIRST" weekday="MONDAY" month="NOVEMBER"/>
-      </RelativeToWeekdayInMonth>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
       <FixedWeekday which="THIRD" weekday="MONDAY" month="FEBRUARY" validFrom="1968" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
       <FixedWeekday which="SECOND" weekday="MONDAY" month="OCTOBER" validFrom="1934" descriptionPropertiesKey="COLUMBUS_DAY"/>
+      <!-- American Indian Heritage Day missing -->
     </Holidays>
   </SubConfigurations>
 
   <SubConfigurations hierarchy="ma" description="Massachusetts">
     <Holidays>
       <Fixed month="FEBRUARY" day="22" validFrom="1879" validTo="1967" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
       <FixedWeekday which="THIRD" weekday="MONDAY" month="FEBRUARY" validFrom="1968" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="APRIL" descriptionPropertiesKey="PATRIOT"/>
+      <FixedWeekday which="THIRD" weekday="MONDAY" month="APRIL" descriptionPropertiesKey="PATRIOT" localizedType="OBSERVANCE"/>
       <FixedWeekday which="SECOND" weekday="MONDAY" month="OCTOBER" validFrom="1934" descriptionPropertiesKey="COLUMBUS_DAY"/>
     </Holidays>
     <SubConfigurations hierarchy="sc" description="Suffolk County">
@@ -248,7 +252,6 @@
         <Fixed month="JUNE" day="17" descriptionPropertiesKey="BUNKER_HILL"/>
       </Holidays>
     </SubConfigurations>
-
     <SubConfigurations hierarchy="ca" description="Cambridge">
       <Holidays>
         <Fixed month="MARCH" day="17" descriptionPropertiesKey="EVACUATION"/>
@@ -258,39 +261,45 @@
 
   <SubConfigurations hierarchy="mi" description="Michigan">
     <Holidays>
-      <Fixed month="OCTOBER" day="30"/>
       <Fixed month="DECEMBER" day="24" descriptionPropertiesKey="CHRISTMAS_EVE"/>
       <Fixed month="DECEMBER" day="31" descriptionPropertiesKey="NEW_YEARS_EVE"/>
       <Fixed month="FEBRUARY" day="22" validFrom="1879" validTo="1967" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
       <FixedWeekday which="THIRD" weekday="MONDAY" month="FEBRUARY" validFrom="1968" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
+      <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY" localizedType="OBSERVANCE"/>
+      <!-- DAY after Thanksgiving missing -->
     </Holidays>
+
+    <Sources>
+      <Source>https://www.michigan.gov/som/government/state-holidays</Source>
+    </Sources>
   </SubConfigurations>
 
   <SubConfigurations hierarchy="mn" description="Minnesota">
     <Holidays>
       <Fixed month="FEBRUARY" day="22" validFrom="1879" validTo="1967" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
       <FixedWeekday which="THIRD" weekday="MONDAY" month="FEBRUARY" validFrom="1968" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
+      <!-- DAY after Thanksgiving missing -->
     </Holidays>
   </SubConfigurations>
 
   <SubConfigurations hierarchy="ms" description="Mississippi">
     <Holidays>
       <Fixed month="FEBRUARY" day="22" validFrom="1879" validTo="1967" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
       <FixedWeekday which="THIRD" weekday="MONDAY" month="FEBRUARY" validFrom="1968" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
       <FixedWeekday which="FOURTH" weekday="MONDAY" month="APRIL" descriptionPropertiesKey="CONFEDERATE"/>
+      <FixedWeekday which="SECOND" weekday="MONDAY" month="OCTOBER" validFrom="1934" descriptionPropertiesKey="COLUMBUS_DAY"/>
     </Holidays>
+
+    <Sources>
+      <Source>https://www.sos.ms.gov/communications-publications/state-holidays</Source>
+    </Sources>
   </SubConfigurations>
 
   <SubConfigurations hierarchy="mo" description="Missouri">
     <Holidays>
-      <Fixed month="FEBRUARY" day="12" descriptionPropertiesKey="LINCOLN"/>
-      <Fixed month="MAY" day="8" descriptionPropertiesKey="TRUMAN"/>
+      <Fixed month="FEBRUARY" day="12" descriptionPropertiesKey="LINCOLN" localizedType="OBSERVANCE"/>
+      <Fixed month="MAY" day="8" descriptionPropertiesKey="TRUMAN" localizedType="OBSERVANCE"/>
       <Fixed month="FEBRUARY" day="22" validFrom="1879" validTo="1967" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
       <FixedWeekday which="THIRD" weekday="MONDAY" month="FEBRUARY" validFrom="1968" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
       <FixedWeekday which="SECOND" weekday="MONDAY" month="OCTOBER" validFrom="1934" descriptionPropertiesKey="COLUMBUS_DAY"/>
     </Holidays>
@@ -298,76 +307,69 @@
 
   <SubConfigurations hierarchy="mt" description="Montana">
     <Holidays>
-      <Fixed month="DECEMBER" day="24" descriptionPropertiesKey="CHRISTMAS_EVE"/>
-      <Fixed month="DECEMBER" day="31" descriptionPropertiesKey="NEW_YEARS_EVE"/>
       <Fixed month="FEBRUARY" day="22" validFrom="1879" validTo="1967" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <RelativeToWeekdayInMonth weekday="TUESDAY" when="AFTER" descriptionPropertiesKey="THANKSGIVING">
+      <RelativeToWeekdayInMonth weekday="TUESDAY" when="AFTER" descriptionPropertiesKey="THANKSGIVING" localizedType="OBSERVANCE">
         <FixedWeekday which="FIRST" weekday="MONDAY" month="NOVEMBER"/>
       </RelativeToWeekdayInMonth>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
       <FixedWeekday which="THIRD" weekday="MONDAY" month="FEBRUARY" validFrom="1968" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
+      <FixedWeekday which="SECOND" weekday="MONDAY" month="OCTOBER" validFrom="1934" descriptionPropertiesKey="COLUMBUS_DAY"/>
     </Holidays>
   </SubConfigurations>
 
   <SubConfigurations hierarchy="ne" description="Nebraska">
     <Holidays>
       <Fixed month="FEBRUARY" day="22" validFrom="1879" validTo="1967" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
       <FixedWeekday which="THIRD" weekday="MONDAY" month="FEBRUARY" validFrom="1968" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
       <FixedWeekday which="LAST" weekday="FRIDAY" month="APRIL" descriptionPropertiesKey="ARBOR"/>
       <FixedWeekday which="SECOND" weekday="MONDAY" month="OCTOBER" validFrom="1934" descriptionPropertiesKey="COLUMBUS_DAY"/>
+      <!-- DAY after Thanksgiving missing -->
+      <!-- US Indigenous People's Day missing -->
     </Holidays>
   </SubConfigurations>
 
   <SubConfigurations hierarchy="nv" description="Nevada">
     <Holidays>
       <Fixed month="FEBRUARY" day="22" validFrom="1879" validTo="1967" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
       <FixedWeekday which="THIRD" weekday="MONDAY" month="FEBRUARY" validFrom="1968" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <FixedWeekday which="LAST" weekday="FRIDAY" month="OCTOBER" descriptionPropertiesKey="NEVADA"/>
+      <FixedWeekday which="LAST" weekday="FRIDAY" month="OCTOBER" descriptionPropertiesKey="NEVADA" localizedType="OBSERVANCE"/>
+      <!-- DAY after Thanksgiving missing -->
     </Holidays>
   </SubConfigurations>
 
   <SubConfigurations hierarchy="nh" description="New Hampshire">
     <Holidays>
       <Fixed month="FEBRUARY" day="22" validFrom="1879" validTo="1967" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
       <FixedWeekday which="THIRD" weekday="MONDAY" month="FEBRUARY" validFrom="1968" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
+      <FixedWeekday which="SECOND" weekday="MONDAY" month="OCTOBER" validFrom="1934" descriptionPropertiesKey="COLUMBUS_DAY"/>
+      <!-- DAY after Thanksgiving missing -->
     </Holidays>
   </SubConfigurations>
 
   <SubConfigurations hierarchy="nj" description="New Jersey">
     <Holidays>
-      <Fixed month="FEBRUARY" day="12" descriptionPropertiesKey="LINCOLN"/>
+      <Fixed month="FEBRUARY" day="12" descriptionPropertiesKey="LINCOLN" localizedType="OBSERVANCE"/>
       <Fixed month="FEBRUARY" day="22" validFrom="1879" validTo="1967" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <RelativeToWeekdayInMonth weekday="TUESDAY" when="AFTER" descriptionPropertiesKey="ELECTION_DAY">
-        <FixedWeekday which="FIRST" weekday="MONDAY" month="NOVEMBER"/>
-      </RelativeToWeekdayInMonth>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
       <FixedWeekday which="THIRD" weekday="MONDAY" month="FEBRUARY" validFrom="1968" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
       <FixedWeekday which="SECOND" weekday="MONDAY" month="OCTOBER" validFrom="1934" descriptionPropertiesKey="COLUMBUS_DAY"/>
-      <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
+      <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY" localizedType="OBSERVANCE"/>
     </Holidays>
   </SubConfigurations>
 
   <SubConfigurations hierarchy="nm" description="New Mexico">
     <Holidays>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
       <FixedWeekday which="SECOND" weekday="MONDAY" month="OCTOBER" validFrom="1934" descriptionPropertiesKey="COLUMBUS_DAY"/>
+      <!-- US Indigenous People's Day missing -->
+      <!-- DAY after Thanksgiving missing -->
     </Holidays>
   </SubConfigurations>
 
   <SubConfigurations hierarchy="ny" description="New York">
     <Holidays>
       <Fixed month="FEBRUARY" day="22" validFrom="1879" validTo="1967" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <Fixed month="FEBRUARY" day="12" descriptionPropertiesKey="LINCOLN"/>
-      <RelativeToWeekdayInMonth weekday="TUESDAY" when="AFTER" descriptionPropertiesKey="ELECTION_DAY">
-        <FixedWeekday which="FIRST" weekday="MONDAY" month="NOVEMBER"/>
-      </RelativeToWeekdayInMonth>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
+      <Fixed month="FEBRUARY" day="12" descriptionPropertiesKey="LINCOLN" localizedType="OBSERVANCE"/>
       <FixedWeekday which="THIRD" weekday="MONDAY" month="FEBRUARY" validFrom="1968" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
       <FixedWeekday which="SECOND" weekday="MONDAY" month="OCTOBER" validFrom="1934" descriptionPropertiesKey="COLUMBUS_DAY"/>
-      <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
+      <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY" localizedType="OBSERVANCE"/>
     </Holidays>
     <SubConfigurations hierarchy="nyc" description="New York City">
       <Holidays>
@@ -379,16 +381,15 @@
   <SubConfigurations hierarchy="nc" description="North Carolina">
     <Holidays>
       <Fixed month="DECEMBER" day="24" descriptionPropertiesKey="CHRISTMAS_EVE"/>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
-      <FixedWeekday which="FOURTH" weekday="MONDAY" month="APRIL" descriptionPropertiesKey="CONFEDERATE"/>
-      <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
+      <FixedWeekday which="FOURTH" weekday="MONDAY" month="APRIL" descriptionPropertiesKey="CONFEDERATE" localizedType="OBSERVANCE"/>
+      <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY" localizedType="OBSERVANCE"/>
+      <!-- DAY after Thanksgiving missing -->
     </Holidays>
     <SubConfigurations hierarchy="ce" description="Charlotte">
       <Holidays>
         <Fixed month="MAY" day="20" descriptionPropertiesKey="INDEPENDENCE_DAY"/>
       </Holidays>
     </SubConfigurations>
-
     <SubConfigurations hierarchy="me" description="Mecklenburg">
       <Holidays>
         <Fixed month="MAY" day="20" descriptionPropertiesKey="INDEPENDENCE_DAY"/>
@@ -399,101 +400,100 @@
   <SubConfigurations hierarchy="nd" description="North Dakota">
     <Holidays>
       <Fixed month="FEBRUARY" day="22" validFrom="1879" validTo="1967" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
       <FixedWeekday which="THIRD" weekday="MONDAY" month="FEBRUARY" validFrom="1968" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
-      <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
+      <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY" localizedType="OBSERVANCE"/>
+      <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY" localizedType="OBSERVANCE"/>
     </Holidays>
   </SubConfigurations>
 
   <SubConfigurations hierarchy="oh" description="Ohio">
     <Holidays>
       <Fixed month="FEBRUARY" day="22" validFrom="1879" validTo="1967" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
       <FixedWeekday which="THIRD" weekday="MONDAY" month="FEBRUARY" validFrom="1968" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
       <FixedWeekday which="SECOND" weekday="MONDAY" month="OCTOBER" validFrom="1934" descriptionPropertiesKey="COLUMBUS_DAY"/>
+      <!-- Ulysses S. Grant Day is missing-->
     </Holidays>
   </SubConfigurations>
 
   <SubConfigurations hierarchy="ok" description="Oklahoma">
     <Holidays>
       <Fixed month="FEBRUARY" day="22" validFrom="1879" validTo="1967" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
       <FixedWeekday which="THIRD" weekday="MONDAY" month="FEBRUARY" validFrom="1968" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
+      <FixedWeekday which="SECOND" weekday="MONDAY" month="OCTOBER" validFrom="1934" descriptionPropertiesKey="COLUMBUS_DAY"/>
+      <!-- Christmas Eve is missing -->
+      <!-- DAY after Thanksgiving missing -->
     </Holidays>
   </SubConfigurations>
 
   <SubConfigurations hierarchy="or" description="Oregon">
     <Holidays>
       <Fixed month="FEBRUARY" day="22" validFrom="1879" validTo="1967" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
       <FixedWeekday which="THIRD" weekday="MONDAY" month="FEBRUARY" validFrom="1968" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
+      <!-- DAY after Thanksgiving missing -->
     </Holidays>
   </SubConfigurations>
 
   <SubConfigurations hierarchy="pa" description="Pennsylvania">
     <Holidays>
       <Fixed month="FEBRUARY" day="22" validFrom="1879" validTo="1967" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
       <FixedWeekday which="THIRD" weekday="MONDAY" month="FEBRUARY" validFrom="1968" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
       <FixedWeekday which="SECOND" weekday="MONDAY" month="OCTOBER" validFrom="1934" descriptionPropertiesKey="COLUMBUS_DAY"/>
+      <!-- DAY after Thanksgiving missing -->
     </Holidays>
   </SubConfigurations>
 
   <SubConfigurations hierarchy="ri" description="Rhode Island">
     <Holidays>
-      <FixedWeekday which="SECOND" weekday="MONDAY" month="AUGUST" descriptionPropertiesKey="VICTORY"/>
+      <FixedWeekday which="SECOND" weekday="MONDAY" month="AUGUST" descriptionPropertiesKey="VICTORY" localizedType="OBSERVANCE"/>
       <FixedWeekday which="SECOND" weekday="MONDAY" month="OCTOBER" validFrom="1934" descriptionPropertiesKey="COLUMBUS_DAY"/>
     </Holidays>
   </SubConfigurations>
 
   <SubConfigurations hierarchy="sc" description="South Carolina">
     <Holidays>
-      <Fixed month="MAY" day="10" descriptionPropertiesKey="CONFEDERATE"/>
+      <Fixed month="MAY" day="10" validFrom="2000" descriptionPropertiesKey="CONFEDERATE" localizedType="OBSERVANCE"/>
       <Fixed month="FEBRUARY" day="22" validFrom="1879" validTo="1967" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <RelativeToWeekdayInMonth weekday="TUESDAY" when="AFTER" descriptionPropertiesKey="ELECTION_DAY">
-        <FixedWeekday which="FIRST" weekday="MONDAY" month="NOVEMBER"/>
-      </RelativeToWeekdayInMonth>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
       <FixedWeekday which="THIRD" weekday="MONDAY" month="FEBRUARY" validFrom="1968" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
+      <FixedWeekday which="SECOND" weekday="MONDAY" month="OCTOBER" validFrom="1934" descriptionPropertiesKey="COLUMBUS_DAY"/>
+      <!-- DAY after Thanksgiving missing -->
     </Holidays>
   </SubConfigurations>
 
   <SubConfigurations hierarchy="sd" description="South Dakota">
     <Holidays>
       <Fixed month="FEBRUARY" day="22" validFrom="1879" validTo="1967" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
       <FixedWeekday which="THIRD" weekday="MONDAY" month="FEBRUARY" validFrom="1968" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <FixedWeekday which="SECOND" weekday="MONDAY" month="OCTOBER" validFrom="1934" descriptionPropertiesKey="COLUMBUS_DAY"/>
+      <!-- Native Americans Day missing -->
     </Holidays>
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="tn" description="Tennesee">
+  <SubConfigurations hierarchy="tn" description="Tennessee">
     <Holidays>
       <Fixed month="DECEMBER" day="24" descriptionPropertiesKey="CHRISTMAS_EVE"/>
       <Fixed month="FEBRUARY" day="22" validFrom="1879" validTo="1967" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
       <FixedWeekday which="THIRD" weekday="MONDAY" month="FEBRUARY" validFrom="1968" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <FixedWeekday which="FOURTH" weekday="MONDAY" month="APRIL" descriptionPropertiesKey="CONFEDERATE"/>
-      <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
+      <FixedWeekday which="FOURTH" weekday="MONDAY" month="APRIL" descriptionPropertiesKey="CONFEDERATE" localizedType="OBSERVANCE"/>
+      <FixedWeekday which="SECOND" weekday="MONDAY" month="OCTOBER" validFrom="1934" descriptionPropertiesKey="COLUMBUS_DAY"/>
+      <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY" localizedType="OBSERVANCE"/>
+      <!-- Friday after Thanksgiving missing -->
     </Holidays>
   </SubConfigurations>
 
   <SubConfigurations hierarchy="tx" description="Texas">
     <Holidays>
-      <Fixed month="DECEMBER" day="24" descriptionPropertiesKey="CHRISTMAS_EVE"/>
+      <Fixed month="DECEMBER" day="24" descriptionPropertiesKey="CHRISTMAS_EVE" localizedType="OBSERVANCE"/>
       <Fixed month="FEBRUARY" day="22" validFrom="1879" validTo="1967" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
       <FixedWeekday which="THIRD" weekday="MONDAY" month="FEBRUARY" validFrom="1968" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <FixedWeekday which="FOURTH" weekday="MONDAY" month="APRIL" descriptionPropertiesKey="CONFEDERATE"/>
+      <FixedWeekday which="FOURTH" weekday="MONDAY" month="APRIL" validFrom="1973" descriptionPropertiesKey="CONFEDERATE"/>
+      <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY" localizedType="OBSERVANCE"/>
+      <!-- DAY after Thanksgiving missing -->
     </Holidays>
   </SubConfigurations>
 
   <SubConfigurations hierarchy="ut" description="Utah">
     <Holidays>
-      <Fixed month="JULY" day="24" descriptionPropertiesKey="PIONEER"/>
+      <Fixed month="JULY" day="24" descriptionPropertiesKey="PIONEER" localizedType="OBSERVANCE"/>
       <Fixed month="FEBRUARY" day="22" validFrom="1879" validTo="1967" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
       <FixedWeekday which="THIRD" weekday="MONDAY" month="FEBRUARY" validFrom="1968" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
       <FixedWeekday which="SECOND" weekday="MONDAY" month="OCTOBER" validFrom="1934" descriptionPropertiesKey="COLUMBUS_DAY"/>
     </Holidays>
@@ -502,10 +502,8 @@
   <SubConfigurations hierarchy="vt" description="Vermont">
     <Holidays>
       <Fixed month="FEBRUARY" day="22" validFrom="1879" validTo="1967" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
       <FixedWeekday which="THIRD" weekday="MONDAY" month="FEBRUARY" validFrom="1968" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="AUGUST" descriptionPropertiesKey="BENNINGTON"/>
-      <FixedWeekday which="SECOND" weekday="MONDAY" month="OCTOBER" validFrom="1934" descriptionPropertiesKey="COLUMBUS_DAY"/>
+      <FixedWeekday which="THIRD" weekday="MONDAY" month="AUGUST" descriptionPropertiesKey="BENNINGTON" localizedType="OBSERVANCE"/>
     </Holidays>
   </SubConfigurations>
 
@@ -515,57 +513,52 @@
       <RelativeToWeekdayInMonth weekday="FRIDAY" when="BEFORE" descriptionPropertiesKey="LEE_JACKSON">
         <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
       </RelativeToWeekdayInMonth>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
       <FixedWeekday which="THIRD" weekday="MONDAY" month="FEBRUARY" validFrom="1968" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
       <FixedWeekday which="SECOND" weekday="MONDAY" month="OCTOBER" validFrom="1934" descriptionPropertiesKey="COLUMBUS_DAY"/>
     </Holidays>
+
+    <Sources>
+      <Source>https://law.lis.virginia.gov/vacode/title2.2/chapter33/section2.2-3300/</Source>
+    </Sources>
   </SubConfigurations>
 
   <SubConfigurations hierarchy="wa" description="Washington">
     <Holidays>
       <Fixed month="FEBRUARY" day="22" validFrom="1879" validTo="1967" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
       <FixedWeekday which="THIRD" weekday="MONDAY" month="FEBRUARY" validFrom="1968" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
+      <!-- Native American Heritage Day - Day after 4th Thursday in November missing -->
     </Holidays>
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="dc" description="District of Columbia">
+  <SubConfigurations hierarchy="wv" description="West Virginia">
     <Holidays>
+      <Fixed month="JUNE" day="20" descriptionPropertiesKey="WEST_VIRGINIA" localizedType="OBSERVANCE"/>
       <Fixed month="FEBRUARY" day="22" validFrom="1879" validTo="1967" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
       <FixedWeekday which="THIRD" weekday="MONDAY" month="FEBRUARY" validFrom="1968" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
       <FixedWeekday which="SECOND" weekday="MONDAY" month="OCTOBER" validFrom="1934" descriptionPropertiesKey="COLUMBUS_DAY"/>
+      <!-- DAY after Thanksgiving missing -->
     </Holidays>
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="wv" description="West Virginia">
+  <SubConfigurations hierarchy="wi" description="Wisconsin">
     <Holidays>
-      <Fixed month="JUNE" day="20" descriptionPropertiesKey="WEST_VIRGINIA"/>
       <Fixed month="FEBRUARY" day="22" validFrom="1879" validTo="1967" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
       <FixedWeekday which="THIRD" weekday="MONDAY" month="FEBRUARY" validFrom="1968" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <FixedWeekday which="SECOND" weekday="MONDAY" month="OCTOBER" validFrom="1934" descriptionPropertiesKey="COLUMBUS_DAY"/>
     </Holidays>
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="wi" description="Wisconsin">
+  <SubConfigurations hierarchy="wy" description="Wyoming">
     <Holidays>
       <Fixed month="FEBRUARY" day="22" validFrom="1879" validTo="1967" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <RelativeToWeekdayInMonth weekday="TUESDAY" when="AFTER" descriptionPropertiesKey="ELECTION_DAY">
-        <FixedWeekday which="FIRST" weekday="MONDAY" month="NOVEMBER"/>
-      </RelativeToWeekdayInMonth>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
       <FixedWeekday which="THIRD" weekday="MONDAY" month="FEBRUARY" validFrom="1968" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <FixedWeekday which="SECOND" weekday="TUESDAY" month="SEPTEMBER" descriptionPropertiesKey="ELECTION_DAY"/>
-      <FixedWeekday which="SECOND" weekday="MONDAY" month="OCTOBER" validFrom="1934" descriptionPropertiesKey="COLUMBUS_DAY"/>
     </Holidays>
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="wy" description="Wyoming">
+  <SubConfigurations hierarchy="dc" description="Washington, D.C.">
     <Holidays>
       <Fixed month="FEBRUARY" day="22" validFrom="1879" validTo="1967" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
       <FixedWeekday which="THIRD" weekday="MONDAY" month="FEBRUARY" validFrom="1968" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
+      <!-- Juneteenth missing Jun 19 -->
     </Holidays>
   </SubConfigurations>
 </Configuration>


Test patch:
diff --git a/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/country/AbstractCountryTestBase.java b/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/country/AbstractCountryTestBase.java
index 53da11c6..cac23916 100644
--- a/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/country/AbstractCountryTestBase.java
+++ b/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/country/AbstractCountryTestBase.java
@@ -47,7 +47,11 @@ public abstract class AbstractCountryTestBase {
   protected void compareHierarchies(CalendarHierarchy expected, CalendarHierarchy found) {
     assertThat(found.getDescription()).isNotNull();
     assertThat(found.getId()).isEqualTo(expected.getId());
-    assertThat(found.getChildren()).hasSize(expected.getChildren().size());
+
+    assertThat(found.getChildren())
+      .withFailMessage("Number of %s children should be %s but are %s", found.getDescription(), expected.getChildren().size(), found.getChildren().size())
+      .hasSameSizeAs(expected.getChildren());
+
     for (String id : expected.getChildren().keySet()) {
       assertThat(found.getChildren()).containsKey(id);
       compareHierarchies(expected.getChildren().get(id), found.getChildren().get(id));
@@ -105,7 +109,7 @@ public abstract class AbstractCountryTestBase {
     for (final Holiday expectedHoliday : expectedHolidays) {
       assertThat(expectedHoliday.getDescription()).isNotNull();
       if (!CalendarUtil.contains(foundHolidays, expectedHoliday.getDate())) {
-        fail("Could not find " + expectedHoliday + " in " + expectedHierarchy.getDescription() + " - " + foundHolidays);
+        fail("Could not find " + expectedHoliday + " in " + expectedHierarchy.getDescription() + " -  " + foundHolidays);
       }
     }
 
diff --git a/jollyday-tests/src/test/resources/holidays/Holidays_test_us_2010.xml b/jollyday-tests/src/test/resources/holidays/Holidays_test_us_2010.xml
index d6fcd2b6..3834df0a 100644
--- a/jollyday-tests/src/test/resources/holidays/Holidays_test_us_2010.xml
+++ b/jollyday-tests/src/test/resources/holidays/Holidays_test_us_2010.xml
@@ -5,9 +5,7 @@
                xsi:schemaLocation="https://focus_shift.de/jollyday/schema/holiday https://focus_shift.de/jollyday/schema/holiday/holiday.xsd">
   <Holidays>
     <Fixed month="JANUARY" day="1"/>
-    <Fixed month="JULY" day="4"/>
     <Fixed month="NOVEMBER" day="11"/>
-    <Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS"/>
     <Fixed month="MAY" day="31"/>
     <Fixed month="SEPTEMBER" day="6"/>
     <Fixed month="NOVEMBER" day="25"/>
@@ -17,8 +15,6 @@
       <Fixed month="JANUARY" day="18"/>
       <Fixed month="FEBRUARY" day="15"/>
       <Fixed month="APRIL" day="26"/>
-      <Fixed month="JUNE" day="7"/>
-
       <Fixed month="OCTOBER" day="11"/>
     </Holidays>
   </SubConfigurations>
@@ -51,12 +47,6 @@
       <Fixed month="JANUARY" day="18"/>
       <Fixed month="FEBRUARY" day="15"/>
     </Holidays>
-    <SubConfigurations hierarchy="be" description="Berkeley">
-      <Holidays>
-        <Fixed month="MARCH" day="8"/>
-        <Fixed month="OCTOBER" day="21"/>
-      </Holidays>
-    </SubConfigurations>
   </SubConfigurations>
   <SubConfigurations hierarchy="co" description="Colorado">
     <Holidays>
@@ -85,14 +75,12 @@
     <Holidays>
       <Fixed month="JANUARY" day="18"/>
       <Fixed month="FEBRUARY" day="15"/>
-      <Fixed month="OCTOBER" day="11"/>
     </Holidays>
   </SubConfigurations>
   <SubConfigurations hierarchy="fl" description="Florida">
     <Holidays>
       <Fixed month="JANUARY" day="18"/>
       <Fixed month="FEBRUARY" day="15"/>
-      <Fixed month="OCTOBER" day="11"/>
     </Holidays>
   </SubConfigurations>
   <SubConfigurations hierarchy="ga" description="Georgia">
@@ -122,7 +110,6 @@
   <SubConfigurations hierarchy="il" description="Illinois">
     <Holidays>
       <Fixed month="FEBRUARY" day="12"/>
-      <Fixed month="NOVEMBER" day="2"/>
       <Fixed month="JANUARY" day="18"/>
       <Fixed month="FEBRUARY" day="15"/>
       <Fixed month="OCTOBER" day="11"/>
@@ -132,8 +119,6 @@
   <SubConfigurations hierarchy="in" description="Indiana">
     <Holidays>
       <Fixed month="DECEMBER" day="24" descriptionPropertiesKey="CHRISTMAS_EVE"/>
-      <Fixed month="MAY" day="4"/>
-      <Fixed month="NOVEMBER" day="2"/>
       <Fixed month="JANUARY" day="18"/>
       <Fixed month="APRIL" day="2"/>
       <Fixed month="APRIL" day="5"/>
@@ -179,7 +164,6 @@
       <Fixed month="FEBRUARY" day="15"/>
       <Fixed month="OCTOBER" day="11"/>
       <Fixed month="MAY" day="28"/>
-      <Fixed month="NOVEMBER" day="2"/>
     </Holidays>
   </SubConfigurations>
   <SubConfigurations hierarchy="ma" description="Massachusetts">
@@ -203,7 +187,6 @@
   </SubConfigurations>
   <SubConfigurations hierarchy="mi" description="Michigan">
     <Holidays>
-      <Fixed month="OCTOBER" day="30"/>
       <Fixed month="DECEMBER" day="24" descriptionPropertiesKey="CHRISTMAS_EVE"/>
       <Fixed month="DECEMBER" day="31"/>
       <Fixed month="JANUARY" day="18"/>
@@ -236,7 +219,6 @@
   <SubConfigurations hierarchy="mt" description="Montana">
     <Holidays>
       <Fixed month="DECEMBER" day="24" descriptionPropertiesKey="CHRISTMAS_EVE"/>
-      <Fixed month="DECEMBER" day="31"/>
       <Fixed month="JANUARY" day="18"/>
       <Fixed month="FEBRUARY" day="15"/>
       <Fixed month="NOVEMBER" day="2"/>
@@ -270,7 +252,6 @@
       <Fixed month="FEBRUARY" day="15"/>
       <Fixed month="OCTOBER" day="11"/>
       <Fixed month="APRIL" day="2"/>
-      <Fixed month="NOVEMBER" day="2"/>
     </Holidays>
   </SubConfigurations>
   <SubConfigurations hierarchy="nm" description="New Mexico">
@@ -282,7 +263,6 @@
   <SubConfigurations hierarchy="ny" description="New York">
     <Holidays>
       <Fixed month="FEBRUARY" day="12"/>
-      <Fixed month="NOVEMBER" day="2"/>
       <Fixed month="JANUARY" day="18"/>
       <Fixed month="FEBRUARY" day="15"/>
       <Fixed month="OCTOBER" day="11"/>
@@ -362,7 +342,6 @@
     <Holidays>
       <Fixed month="JANUARY" day="18"/>
       <Fixed month="FEBRUARY" day="15"/>
-      <Fixed month="OCTOBER" day="11"/>
     </Holidays>
   </SubConfigurations>
   <SubConfigurations hierarchy="tn" description="Tennesee">
@@ -392,7 +371,6 @@
     <Holidays>
       <Fixed month="JANUARY" day="18"/>
       <Fixed month="FEBRUARY" day="15"/>
-      <Fixed month="OCTOBER" day="11"/>
       <Fixed month="AUGUST" day="16"/>
     </Holidays>
   </SubConfigurations>
@@ -422,9 +400,6 @@
     <Holidays>
       <Fixed month="JANUARY" day="18"/>
       <Fixed month="FEBRUARY" day="15"/>
-      <Fixed month="OCTOBER" day="11"/>
-      <Fixed month="NOVEMBER" day="2"/>
-      <Fixed month="SEPTEMBER" day="14"/>
     </Holidays>
   </SubConfigurations>
   <SubConfigurations hierarchy="wy" description="Wyoming">
diff --git a/jollyday-tests/src/test/resources/holidays/Holidays_test_us_2022.xml b/jollyday-tests/src/test/resources/holidays/Holidays_test_us_2022.xml
index 41611df0..e16860f5 100644
--- a/jollyday-tests/src/test/resources/holidays/Holidays_test_us_2022.xml
+++ b/jollyday-tests/src/test/resources/holidays/Holidays_test_us_2022.xml
@@ -4,14 +4,12 @@
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xsi:schemaLocation="https://focus_shift.de/jollyday/schema/holiday https://focus_shift.de/jollyday/schema/holiday/holiday.xsd">
   <Holidays>
-    <Fixed month="JANUARY" day="1"/>
     <Fixed month="MAY" day="30" descriptionPropertiesKey="MEMORIAL_DAY"/>
     <Fixed month="JUNE" day="20" descriptionPropertiesKey="JUNETEENTH"/>
     <Fixed month="JULY" day="4"/>
     <Fixed month="SEPTEMBER" day="5" descriptionPropertiesKey="LABOR_DAY"/>
     <Fixed month="NOVEMBER" day="11"/>
     <Fixed month="NOVEMBER" day="24" descriptionPropertiesKey="THANKSGIVING"/>
-    <Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS"/>
   </Holidays>
   <SubConfigurations hierarchy="al" description="Alabama">
     <Holidays>
@@ -51,12 +49,6 @@
       <Fixed month="JANUARY" day="17"/>
       <Fixed month="FEBRUARY" day="21"/>
     </Holidays>
-    <SubConfigurations hierarchy="be" description="Berkeley">
-      <Holidays>
-        <Fixed month="MARCH" day="8"/>
-        <Fixed month="OCTOBER" day="21"/>
-      </Holidays>
-    </SubConfigurations>
   </SubConfigurations>
   <SubConfigurations hierarchy="co" description="Colorado">
     <Holidays>
@@ -67,7 +59,6 @@
   </SubConfigurations>
   <SubConfigurations hierarchy="ct" description="Connecticut">
     <Holidays>
-      <Fixed month="FEBRUARY" day="12"/>
       <Fixed month="JANUARY" day="17"/>
       <Fixed month="FEBRUARY" day="21"/>
       <Fixed month="OCTOBER" day="10"/>
@@ -85,14 +76,12 @@
     <Holidays>
       <Fixed month="JANUARY" day="17"/>
       <Fixed month="FEBRUARY" day="21"/>
-      <Fixed month="OCTOBER" day="10"/>
     </Holidays>
   </SubConfigurations>
   <SubConfigurations hierarchy="fl" description="Florida">
     <Holidays>
       <Fixed month="JANUARY" day="17"/>
       <Fixed month="FEBRUARY" day="21"/>
-      <Fixed month="OCTOBER" day="10"/>
     </Holidays>
   </SubConfigurations>
   <SubConfigurations hierarchy="ga" description="Georgia">
@@ -100,7 +89,6 @@
       <Fixed month="JANUARY" day="17"/>
       <Fixed month="FEBRUARY" day="21"/>
       <Fixed month="OCTOBER" day="10"/>
-      <Fixed month="APRIL" day="25"/>
     </Holidays>
   </SubConfigurations>
   <SubConfigurations hierarchy="hi" description="Hawaii">
@@ -122,7 +110,6 @@
   <SubConfigurations hierarchy="il" description="Illinois">
     <Holidays>
       <Fixed month="FEBRUARY" day="12"/>
-      <Fixed month="NOVEMBER" day="8"/>
       <Fixed month="JANUARY" day="17"/>
       <Fixed month="FEBRUARY" day="21"/>
       <Fixed month="OCTOBER" day="10"/>
@@ -132,8 +119,6 @@
   <SubConfigurations hierarchy="in" description="Indiana">
     <Holidays>
       <Fixed month="DECEMBER" day="24" descriptionPropertiesKey="CHRISTMAS_EVE"/>
-      <Fixed month="MAY" day="3"/>
-      <Fixed month="NOVEMBER" day="8"/>
       <Fixed month="JANUARY" day="17"/>
       <Fixed month="APRIL" day="15"/>
       <Fixed month="APRIL" day="18"/>
@@ -179,7 +164,6 @@
       <Fixed month="FEBRUARY" day="21"/>
       <Fixed month="OCTOBER" day="10"/>
       <Fixed month="MAY" day="30" descriptionPropertiesKey="MEMORIAL_DAY"/>
-      <Fixed month="NOVEMBER" day="8"/>
     </Holidays>
   </SubConfigurations>
   <SubConfigurations hierarchy="ma" description="Massachusetts">
@@ -203,7 +187,6 @@
   </SubConfigurations>
   <SubConfigurations hierarchy="mi" description="Michigan">
     <Holidays>
-      <Fixed month="OCTOBER" day="30"/>
       <Fixed month="DECEMBER" day="24" descriptionPropertiesKey="CHRISTMAS_EVE"/>
       <Fixed month="DECEMBER" day="31"/>
       <Fixed month="JANUARY" day="17"/>
@@ -235,8 +218,6 @@
   </SubConfigurations>
   <SubConfigurations hierarchy="mt" description="Montana">
     <Holidays>
-      <Fixed month="DECEMBER" day="24" descriptionPropertiesKey="CHRISTMAS_EVE"/>
-      <Fixed month="DECEMBER" day="31"/>
       <Fixed month="JANUARY" day="17"/>
       <Fixed month="FEBRUARY" day="21"/>
       <Fixed month="NOVEMBER" day="8"/>
@@ -270,7 +251,6 @@
       <Fixed month="FEBRUARY" day="21"/>
       <Fixed month="OCTOBER" day="10"/>
       <Fixed month="APRIL" day="15"/>
-      <Fixed month="NOVEMBER" day="8"/>
     </Holidays>
   </SubConfigurations>
   <SubConfigurations hierarchy="nm" description="New Mexico">
@@ -282,7 +262,6 @@
   <SubConfigurations hierarchy="ny" description="New York">
     <Holidays>
       <Fixed month="FEBRUARY" day="12"/>
-      <Fixed month="NOVEMBER" day="8"/>
       <Fixed month="JANUARY" day="17"/>
       <Fixed month="FEBRUARY" day="21"/>
       <Fixed month="OCTOBER" day="10"/>
@@ -362,7 +341,6 @@
     <Holidays>
       <Fixed month="JANUARY" day="17"/>
       <Fixed month="FEBRUARY" day="21"/>
-      <Fixed month="OCTOBER" day="10"/>
     </Holidays>
   </SubConfigurations>
   <SubConfigurations hierarchy="tn" description="Tennesee">
@@ -392,7 +370,6 @@
     <Holidays>
       <Fixed month="JANUARY" day="17"/>
       <Fixed month="FEBRUARY" day="21"/>
-      <Fixed month="OCTOBER" day="10"/>
       <Fixed month="AUGUST" day="15"/>
     </Holidays>
   </SubConfigurations>
@@ -422,9 +399,6 @@
     <Holidays>
       <Fixed month="JANUARY" day="17"/>
       <Fixed month="FEBRUARY" day="21"/>
-      <Fixed month="OCTOBER" day="10"/>
-      <Fixed month="NOVEMBER" day="8"/>
-      <Fixed month="SEPTEMBER" day="13"/>
     </Holidays>
   </SubConfigurations>
   <SubConfigurations hierarchy="wy" description="Wyoming">