diff --git a/jollyday-core/src/main/java/de/focus_shift/jollyday/core/HolidayCalendar.java b/jollyday-core/src/main/java/de/focus_shift/jollyday/core/HolidayCalendar.java
index 53c9636ac..89f9cb5b4 100644
--- a/jollyday-core/src/main/java/de/focus_shift/jollyday/core/HolidayCalendar.java
+++ b/jollyday-core/src/main/java/de/focus_shift/jollyday/core/HolidayCalendar.java
@@ -5,7 +5,6 @@
 /**
  * This enum provides a list of all supported holiday calendars.
  *
- * @author Sven Diedrichsen (sven.diedrichsen@gmail.com)
  * @version $Id$
  */
 public enum HolidayCalendar {
@@ -47,5 +46,4 @@ public enum HolidayCalendar {
   public String getId() {
     return id;
   }
-
 }
diff --git a/jollyday-core/src/main/resources/holidays/Holidays_at.xml b/jollyday-core/src/main/resources/holidays/Holidays_at.xml
index ca71d3d3d..3f020b86b 100644
--- a/jollyday-core/src/main/resources/holidays/Holidays_at.xml
+++ b/jollyday-core/src/main/resources/holidays/Holidays_at.xml
@@ -23,56 +23,56 @@
     <ChristianHoliday type="CORPUS_CHRISTI" descriptionPropertiesKey="christian.CORPUS_CHRISTI"/>
   </Holidays>
 
-  <SubConfigurations hierarchy="b" description="Burgenland">
+  <SubConfigurations hierarchy="1" description="Burgenland">
     <Holidays>
       <Fixed month="NOVEMBER" day="11" descriptionPropertiesKey="MARTINS_DAY"/>
     </Holidays>
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="k" description="Kärnten">
+  <SubConfigurations hierarchy="2" description="Kärnten">
     <Holidays>
       <Fixed month="MARCH" day="19" descriptionPropertiesKey="JOSEFS_DAY"/>
       <Fixed month="OCTOBER" day="10" descriptionPropertiesKey="PLEBISCITE"/>
     </Holidays>
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="la" description="Niederösterreich">
+  <SubConfigurations hierarchy="3" description="Niederösterreich">
     <Holidays>
       <Fixed month="NOVEMBER" day="15" descriptionPropertiesKey="LEOPOLD"/>
     </Holidays>
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="ua" description="Oberösterreich">
+  <SubConfigurations hierarchy="4" description="Oberösterreich">
     <Holidays>
       <Fixed month="MAY" day="4" descriptionPropertiesKey="FLORIAN"/>
     </Holidays>
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="s" description="Salzburg">
+  <SubConfigurations hierarchy="5" description="Salzburg">
     <Holidays>
       <Fixed month="SEPTEMBER" day="24" descriptionPropertiesKey="RUPERT"/>
     </Holidays>
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="st" description="Steiermark">
+  <SubConfigurations hierarchy="6" description="Steiermark">
     <Holidays>
       <Fixed month="MARCH" day="19" descriptionPropertiesKey="JOSEFS_DAY"/>
     </Holidays>
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="t" description="Tirol">
+  <SubConfigurations hierarchy="7" description="Tirol">
     <Holidays>
       <Fixed month="MARCH" day="19" descriptionPropertiesKey="JOSEFS_DAY"/>
     </Holidays>
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="va" description="Vorarlberg">
+  <SubConfigurations hierarchy="8" description="Vorarlberg">
     <Holidays>
       <Fixed month="MARCH" day="19" descriptionPropertiesKey="JOSEFS_DAY"/>
     </Holidays>
   </SubConfigurations>
 
-  <SubConfigurations hierarchy="w" description="Wien">
+  <SubConfigurations hierarchy="9" description="Wien">
     <Holidays>
       <Fixed month="NOVEMBER" day="15" descriptionPropertiesKey="LEOPOLD"/>
     </Holidays>
diff --git a/jollyday-core/src/main/resources/holidays/Holidays_au.xml b/jollyday-core/src/main/resources/holidays/Holidays_au.xml
index 908ab4fc8..5dd1ae26e 100644
--- a/jollyday-core/src/main/resources/holidays/Holidays_au.xml
+++ b/jollyday-core/src/main/resources/holidays/Holidays_au.xml
@@ -43,6 +43,7 @@
     <ChristianHoliday type="EASTER_SATURDAY" descriptionPropertiesKey="christian.EASTER_SATURDAY"/>
     <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
   </Holidays>
+
   <SubConfigurations hierarchy="act" description="Australian Capital Territory">
     <Holidays>
       <Fixed month="JANUARY" day="1" validFrom="2008" validTo="2019" descriptionPropertiesKey="NEW_YEAR">
@@ -69,13 +70,14 @@
       <FixedWeekday which="SECOND" weekday="MONDAY" month="JUNE" descriptionPropertiesKey="QUEENS_BIRTHDAY"/>
       <FixedWeekday which="FIRST" weekday="MONDAY" month="OCTOBER" descriptionPropertiesKey="LABOUR_DAY"/>
       <FixedWeekday which="FIRST" weekday="TUESDAY" month="NOVEMBER" validTo="2019"
-                        descriptionPropertiesKey="FAMILY_COMMUNITY"/>
+                    descriptionPropertiesKey="FAMILY_COMMUNITY"/>
       <FixedWeekdayRelativeToFixed validFrom="2020" which="FIRST" weekday="MONDAY" when="AFTER"
-                                       descriptionPropertiesKey="RECONCILIATION">
+                                   descriptionPropertiesKey="RECONCILIATION">
         <day month="MAY" day="26"/>
       </FixedWeekdayRelativeToFixed>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="nsw" description="New South Wales">
     <Holidays>
       <Fixed month="JANUARY" day="1" validFrom="2008" validTo="2019" descriptionPropertiesKey="NEW_YEAR">
@@ -95,9 +97,10 @@
       <FixedWeekday which="SECOND" weekday="MONDAY" month="JUNE" descriptionPropertiesKey="QUEENS_BIRTHDAY"/>
       <FixedWeekday which="FIRST" weekday="MONDAY" month="OCTOBER" descriptionPropertiesKey="LABOUR_DAY"/>
       <FixedWeekday which="FIRST" weekday="MONDAY" month="AUGUST" validFrom="2020"
-                        descriptionPropertiesKey="BANK_HOLIDAY"/>
+                    descriptionPropertiesKey="BANK_HOLIDAY"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="nt" description="Nothern Territory">
     <Holidays>
       <Fixed month="JANUARY" day="1" validFrom="2008" validTo="2019" descriptionPropertiesKey="NEW_YEAR">
@@ -123,6 +126,7 @@
       <FixedWeekday which="FIRST" weekday="MONDAY" month="AUGUST" descriptionPropertiesKey="PICNIC"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="qld" description="Queensland">
     <Holidays>
       <Fixed month="JANUARY" day="1" validFrom="2008" validTo="2019" descriptionPropertiesKey="NEW_YEAR">
@@ -142,10 +146,11 @@
       </Fixed>
       <FixedWeekday which="FIRST" weekday="MONDAY" month="MAY" descriptionPropertiesKey="LABOUR_DAY"/>
       <FixedWeekday which="SECOND" weekday="MONDAY" month="JUNE" validTo="2019"
-                        descriptionPropertiesKey="QUEENS_BIRTHDAY"/>
+                    descriptionPropertiesKey="QUEENS_BIRTHDAY"/>
       <FixedWeekday which="FIRST" weekday="MONDAY" month="OCTOBER" validFrom="2020"
-                        descriptionPropertiesKey="QUEENS_BIRTHDAY"/>
+                    descriptionPropertiesKey="QUEENS_BIRTHDAY"/>
     </Holidays>
+
     <SubConfigurations hierarchy="br" description="Brisbane Area">
       <Holidays>
         <FixedWeekdayBetweenFixed weekday="WEDNESDAY" validFrom="2020" descriptionPropertiesKey="EKKA">
@@ -155,6 +160,7 @@
       </Holidays>
     </SubConfigurations>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="sa" description="South Australia">
     <Holidays>
       <Fixed month="JANUARY" day="1" validFrom="2008" validTo="2019" descriptionPropertiesKey="NEW_YEAR">
@@ -186,6 +192,7 @@
       <FixedWeekday which="FIRST" weekday="MONDAY" month="OCTOBER" descriptionPropertiesKey="LABOUR_DAY"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="tas" description="Tasmania">
     <Holidays>
       <Fixed month="APRIL" day="25" validTo="2019" descriptionPropertiesKey="ANZAC"/>
@@ -205,17 +212,21 @@
       <FixedWeekday which="SECOND" weekday="MONDAY" month="JUNE" descriptionPropertiesKey="QUEENS_BIRTHDAY"/>
       <ChristianHoliday type="EASTER_TUESDAY" descriptionPropertiesKey="christian.EASTER_TUESDAY"/>
     </Holidays>
+
     <SubConfigurations hierarchy="ho" description="Hobart Area">
       <Holidays>
         <FixedWeekday which="SECOND" weekday="MONDAY" month="FEBRUARY" descriptionPropertiesKey="HOBART"/>
       </Holidays>
     </SubConfigurations>
+
     <SubConfigurations hierarchy="nh" description="Non-Hobart Area">
       <Holidays>
         <FixedWeekday which="FIRST" weekday="MONDAY" month="NOVEMBER" descriptionPropertiesKey="RECREATION"/>
       </Holidays>
     </SubConfigurations>
+
   </SubConfigurations>
+
   <SubConfigurations hierarchy="vic" description="Victoria">
     <Holidays>
       <Fixed month="APRIL" day="25" validTo="2019" descriptionPropertiesKey="ANZAC"/>
@@ -233,10 +244,10 @@
       <FixedWeekday which="SECOND" weekday="MONDAY" month="MARCH" descriptionPropertiesKey="LABOUR_DAY"/>
       <FixedWeekday which="SECOND" weekday="MONDAY" month="JUNE" descriptionPropertiesKey="QUEENS_BIRTHDAY"/>
       <FixedWeekday which="FIRST" weekday="TUESDAY" month="NOVEMBER" descriptionPropertiesKey="MELBOURNE_CUP"/>
-      <FixedWeekday which="LAST" weekday="FRIDAY" month="SEPTEMBER" validFrom="2020"
-                        descriptionPropertiesKey="AFL"/>
+      <FixedWeekday which="LAST" weekday="FRIDAY" month="SEPTEMBER" validFrom="2020" descriptionPropertiesKey="AFL"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="wa" description="Western Australia">
     <Holidays>
       <Fixed month="JANUARY" day="1" validFrom="2008" validTo="2019" descriptionPropertiesKey="NEW_YEAR">
@@ -260,10 +271,9 @@
         <MovingCondition substitute="SUNDAY" with="NEXT" weekday="MONDAY"/>
       </Fixed>
       <FixedWeekday which="FIRST" weekday="MONDAY" month="MARCH" descriptionPropertiesKey="LABOUR_DAY"/>
-      <FixedWeekday which="FIRST" weekday="MONDAY" month="JUNE" validTo="2019"
-                        descriptionPropertiesKey="FOUNDATION"/>
+      <FixedWeekday which="FIRST" weekday="MONDAY" month="JUNE" validTo="2019" descriptionPropertiesKey="FOUNDATION"/>
       <FixedWeekday which="FIRST" weekday="MONDAY" month="JUNE" validFrom="2020"
-                        descriptionPropertiesKey="WESTERN_AUSTRALIA"/>
+                    descriptionPropertiesKey="WESTERN_AUSTRALIA"/>
       <FixedWeekday which="LAST" weekday="MONDAY" month="SEPTEMBER" descriptionPropertiesKey="QUEENS_BIRTHDAY"/>
     </Holidays>
   </SubConfigurations>
diff --git a/jollyday-core/src/main/resources/holidays/Holidays_ba.xml b/jollyday-core/src/main/resources/holidays/Holidays_ba.xml
index 643f0ed30..259e88272 100644
--- a/jollyday-core/src/main/resources/holidays/Holidays_ba.xml
+++ b/jollyday-core/src/main/resources/holidays/Holidays_ba.xml
@@ -25,14 +25,16 @@
     <IslamicHoliday type="ID_UL_ADHA" descriptionPropertiesKey="islamic.ID_UL_ADHA"/>
     <IslamicHoliday type="MAWLID_AN_NABI" descriptionPropertiesKey="islamic.MAWLID_AN_NABI"/>
   </Holidays>
-  <SubConfigurations hierarchy="rs" description="Republika Srpska">
+
+  <SubConfigurations hierarchy="srp" description="Republika Srpska">
     <Holidays>
       <Fixed month="JANUARY" day="9" descriptionPropertiesKey="REPUBLIC_DAY"/>
       <Fixed month="MAY" day="9" descriptionPropertiesKey="VICTORY"/>
       <Fixed month="NOVEMBER" day="21" descriptionPropertiesKey="DAYTON"/>
     </Holidays>
   </SubConfigurations>
-  <SubConfigurations hierarchy="fbh" description="Federation of Bosnia and Herzegovina">
+
+  <SubConfigurations hierarchy="bih" description="Federation of Bosnia and Herzegovina">
     <Holidays>
       <Fixed month="MARCH" day="1" descriptionPropertiesKey="INDEPENDENCE_DAY"/>
       <Fixed month="NOVEMBER" day="25" descriptionPropertiesKey="NATIONAL_DAY"/>
diff --git a/jollyday-core/src/main/resources/holidays/Holidays_be.xml b/jollyday-core/src/main/resources/holidays/Holidays_be.xml
index a4e0ec499..4f8bef3ab 100644
--- a/jollyday-core/src/main/resources/holidays/Holidays_be.xml
+++ b/jollyday-core/src/main/resources/holidays/Holidays_be.xml
@@ -16,13 +16,9 @@
     <Fixed month="NOVEMBER" day="15" localizedType="UNOFFICIAL_HOLIDAY" descriptionPropertiesKey="KINGS_FEAST"/>
     <Fixed month="DECEMBER" day="31" descriptionPropertiesKey="NEW_YEARS_EVE" localizedType="UNOFFICIAL_HOLIDAY"/>
     <ChristianHoliday type="EASTER" descriptionPropertiesKey="christian.EASTER" localizedType="OFFICIAL_HOLIDAY"/>
-    <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"
-                      localizedType="OFFICIAL_HOLIDAY"/>
-    <ChristianHoliday type="ASCENSION_DAY" descriptionPropertiesKey="christian.ASCENSION_DAY"
-                      localizedType="OFFICIAL_HOLIDAY"/>
-    <ChristianHoliday type="PENTECOST" descriptionPropertiesKey="christian.PENTECOST"
-                      localizedType="OFFICIAL_HOLIDAY"/>
-    <ChristianHoliday type="PENTECOST_MONDAY" descriptionPropertiesKey="christian.PENTECOST_MONDAY"
-                      localizedType="OFFICIAL_HOLIDAY"/>
+    <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
+    <ChristianHoliday type="ASCENSION_DAY" descriptionPropertiesKey="christian.ASCENSION_DAY"/>
+    <ChristianHoliday type="PENTECOST" descriptionPropertiesKey="christian.PENTECOST"/>
+    <ChristianHoliday type="PENTECOST_MONDAY" descriptionPropertiesKey="christian.PENTECOST_MONDAY"/>
   </Holidays>
 </Configuration>
diff --git a/jollyday-core/src/main/resources/holidays/Holidays_br.xml b/jollyday-core/src/main/resources/holidays/Holidays_br.xml
index dd3c2f003..628fa702d 100644
--- a/jollyday-core/src/main/resources/holidays/Holidays_br.xml
+++ b/jollyday-core/src/main/resources/holidays/Holidays_br.xml
@@ -19,6 +19,7 @@
     <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
     <ChristianHoliday type="CORPUS_CHRISTI" descriptionPropertiesKey="christian.CORPUS_CHRISTI"/>
   </Holidays>
+
   <SubConfigurations hierarchy="rj" description="Rio de Janeiro">
     <Holidays>
       <Fixed month="APRIL" day="23" validFrom="2007" descriptionPropertiesKey="ST_GEORGE"/>
@@ -31,6 +32,7 @@
       </Holidays>
     </SubConfigurations>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="sp" description="Sao Paulo">
     <Holidays>
       <Fixed month="JULY" day="9" descriptionPropertiesKey="CONST_REVOLUTION"/>
@@ -42,8 +44,9 @@
       </Holidays>
     </SubConfigurations>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="mg" description="Minas Gerais">
-    <Holidays></Holidays>
+    <Holidays/>
     <SubConfigurations hierarchy="bh" description="Belo Horizonte">
       <Holidays>
         <Fixed month="AUGUST" day="15" descriptionPropertiesKey="LADY_GOOD_VOYAGE"/>
@@ -51,64 +54,76 @@
       </Holidays>
     </SubConfigurations>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="ms" description="Mato Grosso do Sul">
     <Holidays>
       <Fixed month="OCTOBER" day="11" descriptionPropertiesKey="FOUNDATION"/>
     </Holidays>
+
     <SubConfigurations hierarchy="cg" description="Campo Grande">
       <Holidays>
         <Fixed month="AUGUST" day="26" descriptionPropertiesKey="FOUNDATION"/>
       </Holidays>
     </SubConfigurations>
+
     <SubConfigurations hierarchy="do" description="Dourados">
       <Holidays>
         <Fixed month="DECEMBER" day="8" descriptionPropertiesKey="LADY_CONCEICAO"/>
       </Holidays>
     </SubConfigurations>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="pr" description="Parana">
-    <Holidays></Holidays>
+    <Holidays/>
     <SubConfigurations hierarchy="cu" description="Curitiba">
       <Holidays>
         <Fixed month="SEPTEMBER" day="8" descriptionPropertiesKey="LADY_LIGHT_PINE"/>
       </Holidays>
     </SubConfigurations>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="rs" description="Rio Grande do Sul">
     <Holidays>
       <Fixed month="SEPTEMBER" day="20" descriptionPropertiesKey="FARROUS_REVOLUTION"/>
     </Holidays>
+
     <SubConfigurations hierarchy="sm" description="Santa Maria">
       <Holidays>
         <Fixed month="DECEMBER" day="8" descriptionPropertiesKey="LADY_CONCEICAO"/>
       </Holidays>
     </SubConfigurations>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="rn" description="Rio Grande do Norte">
     <Holidays>
       <Fixed month="OCTOBER" day="3" descriptionPropertiesKey="MARTYRS_DAY"/>
     </Holidays>
+
     <SubConfigurations hierarchy="na" description="Natal">
       <Holidays>
         <Fixed month="NOVEMBER" day="21" descriptionPropertiesKey="LADY_APRESENTACAO"/>
       </Holidays>
     </SubConfigurations>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="go" description="Goiás">
     <Holidays>
       <Fixed month="OCTOBER" day="24" descriptionPropertiesKey="FOUNDATION"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="pe" description="Pernambuco">
     <Holidays>
       <Fixed month="DECEMBER" day="8" descriptionPropertiesKey="LADY_CONCEICAO"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="pb" description="Paraíba">
     <Holidays>
       <Fixed month="JULY" day="26" descriptionPropertiesKey="JOAO_PESSOA_DAY"/>
       <Fixed month="AUGUST" day="5" descriptionPropertiesKey="FOUNDATION"/>
     </Holidays>
+
     <SubConfigurations hierarchy="jpa" description="João Pessoa">
       <Holidays>
         <Fixed month="JUNE" day="24" descriptionPropertiesKey="ST_JOHN"/>
diff --git a/jollyday-core/src/main/resources/holidays/Holidays_ca.xml b/jollyday-core/src/main/resources/holidays/Holidays_ca.xml
index 275c230e8..072a6bc8b 100644
--- a/jollyday-core/src/main/resources/holidays/Holidays_ca.xml
+++ b/jollyday-core/src/main/resources/holidays/Holidays_ca.xml
@@ -12,6 +12,7 @@
     <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
     <ChristianHoliday type="EASTER" descriptionPropertiesKey="christian.EASTER"/>
   </Holidays>
+
   <SubConfigurations hierarchy="on" description="Ontario">
     <Holidays>
       <Fixed month="DECEMBER" day="26" descriptionPropertiesKey="BOXING_DAY"/>
@@ -24,6 +25,7 @@
       <FixedWeekday which="SECOND" weekday="MONDAY" month="OCTOBER" descriptionPropertiesKey="THANKSGIVING"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="yt" description="Yukon">
     <Holidays>
       <Fixed month="NOVEMBER" day="11" descriptionPropertiesKey="REMEMBRANCE"/>
@@ -35,6 +37,7 @@
       <FixedWeekday which="SECOND" weekday="MONDAY" month="OCTOBER" descriptionPropertiesKey="THANKSGIVING"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="qc" description="Quebec">
     <Holidays>
       <Fixed month="JUNE" day="24" descriptionPropertiesKey="SAINT_JEAN_BAPTISTE_DAY"/>
@@ -47,17 +50,20 @@
       <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="ns" description="Nova Scotia">
     <Holidays>
       <Fixed month="NOVEMBER" day="11" descriptionPropertiesKey="REMEMBRANCE"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="nb" description="New Brunswick">
     <Holidays>
       <Fixed month="NOVEMBER" day="11" descriptionPropertiesKey="REMEMBRANCE"/>
       <FixedWeekday which="FIRST" weekday="MONDAY" month="AUGUST" descriptionPropertiesKey="NATIONAL_DAY"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="mb" description="Manitoba">
     <Holidays>
       <Fixed month="NOVEMBER" day="11" descriptionPropertiesKey="REMEMBRANCE"/>
@@ -70,6 +76,7 @@
       <FixedWeekday which="THIRD" weekday="MONDAY" month="FEBRUARY" descriptionPropertiesKey="FAMILY_DAY"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="nt" description="Northwest Territories">
     <Holidays>
       <Fixed month="NOVEMBER" day="11" descriptionPropertiesKey="REMEMBRANCE"/>
@@ -82,6 +89,7 @@
       <FixedWeekday which="FIRST" weekday="MONDAY" month="AUGUST" descriptionPropertiesKey="CIVIC"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="nu" description="Nunavut">
     <Holidays>
       <Fixed month="NOVEMBER" day="11" descriptionPropertiesKey="REMEMBRANCE"/>
@@ -94,6 +102,7 @@
       <FixedWeekday which="FIRST" weekday="MONDAY" month="AUGUST" descriptionPropertiesKey="CIVIC"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="bc" description="British Columbia">
     <Holidays>
       <Fixed month="NOVEMBER" day="11" descriptionPropertiesKey="REMEMBRANCE"/>
@@ -106,11 +115,13 @@
       <FixedWeekday which="SECOND" weekday="MONDAY" month="OCTOBER" descriptionPropertiesKey="THANKSGIVING"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="pe" description="Prince Edward Island">
     <Holidays>
       <Fixed month="NOVEMBER" day="11" descriptionPropertiesKey="REMEMBRANCE"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="sk" description="Saskatchewan">
     <Holidays>
       <Fixed month="NOVEMBER" day="11" descriptionPropertiesKey="REMEMBRANCE"/>
@@ -124,6 +135,7 @@
       <FixedWeekday which="FIRST" weekday="MONDAY" month="AUGUST" descriptionPropertiesKey="NATIONAL_DAY"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="ab" description="Alberta">
     <Holidays>
       <Fixed month="NOVEMBER" day="11" descriptionPropertiesKey="REMEMBRANCE"/>
@@ -137,9 +149,11 @@
       <FixedWeekday which="SECOND" weekday="MONDAY" month="OCTOBER" descriptionPropertiesKey="THANKSGIVING"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="nl" description="Newfoundland and Labrador">
     <Holidays>
       <Fixed month="NOVEMBER" day="11" descriptionPropertiesKey="REMEMBRANCE"/>
     </Holidays>
   </SubConfigurations>
+
 </Configuration>
diff --git a/jollyday-core/src/main/resources/holidays/Holidays_de.xml b/jollyday-core/src/main/resources/holidays/Holidays_de.xml
index 34fa8bb40..6335f06fb 100644
--- a/jollyday-core/src/main/resources/holidays/Holidays_de.xml
+++ b/jollyday-core/src/main/resources/holidays/Holidays_de.xml
@@ -39,7 +39,6 @@
     <Holidays>
       <Fixed month="MARCH" day="8" descriptionPropertiesKey="INTERNATIONAL_WOMAN" validFrom="2019"/>
       <Fixed month="MAY" day="8" descriptionPropertiesKey="LIBERATION" validFrom="2020" validTo="2020"/>
-
       <RelativeToFixed validFrom="1945" validTo="1989" descriptionPropertiesKey="REPENTANCE_PRAYER">
         <Weekday>WEDNESDAY</Weekday>
         <When>BEFORE</When>
@@ -75,36 +74,39 @@
     <Holidays>
       <Fixed month="JANUARY" day="6" descriptionPropertiesKey="EPIPHANY"/>
       <Fixed month="NOVEMBER" day="1" descriptionPropertiesKey="ALL_SAINTS"/>
-
       <RelativeToFixed validFrom="1981" validTo="1989" descriptionPropertiesKey="REPENTANCE_PRAYER">
-      <Weekday>WEDNESDAY</Weekday>
-      <When>BEFORE</When>
-      <Date month="NOVEMBER" day="23"/>
-    </RelativeToFixed>
-
+        <Weekday>WEDNESDAY</Weekday>
+        <When>BEFORE</When>
+        <Date month="NOVEMBER" day="23"/>
+      </RelativeToFixed>
       <ChristianHoliday type="CORPUS_CHRISTI" descriptionPropertiesKey="christian.CORPUS_CHRISTI"/>
     </Holidays>
+
     <SubConfigurations hierarchy="mu" description="Munich">
       <Holidays>
         <Fixed day="15" month="AUGUST" descriptionPropertiesKey="ASSUMPTION_DAY"/>
       </Holidays>
     </SubConfigurations>
+
     <SubConfigurations hierarchy="ag" description="Augsburg">
       <Holidays>
         <Fixed day="8" month="AUGUST" descriptionPropertiesKey="PEACE"/>
         <Fixed day="15" month="AUGUST" descriptionPropertiesKey="ASSUMPTION_DAY"/>
       </Holidays>
     </SubConfigurations>
+
     <SubConfigurations hierarchy="wu" description="Würzburg">
       <Holidays>
         <Fixed day="15" month="AUGUST" descriptionPropertiesKey="ASSUMPTION_DAY"/>
       </Holidays>
     </SubConfigurations>
+
     <SubConfigurations hierarchy="re" description="Regensburg">
       <Holidays>
         <Fixed day="15" month="AUGUST" descriptionPropertiesKey="ASSUMPTION_DAY"/>
       </Holidays>
     </SubConfigurations>
+
     <SubConfigurations hierarchy="in" description="Ingolstadt">
       <Holidays>
         <Fixed day="15" month="AUGUST" descriptionPropertiesKey="ASSUMPTION_DAY"/>
@@ -119,7 +121,6 @@
         <When>BEFORE</When>
         <Date month="NOVEMBER" day="23"/>
       </RelativeToFixed>
-
       <ChristianHoliday type="EASTER" descriptionPropertiesKey="christian.EASTER"/>
       <ChristianHoliday type="CORPUS_CHRISTI" descriptionPropertiesKey="christian.CORPUS_CHRISTI"/>
       <ChristianHoliday type="PENTECOST" descriptionPropertiesKey="christian.PENTECOST"/>
@@ -136,13 +137,11 @@
   <SubConfigurations hierarchy="nw" description="North Rhine-Westphalia">
     <Holidays>
       <Fixed month="NOVEMBER" day="1" descriptionPropertiesKey="ALL_SAINTS"/>
-
       <RelativeToFixed validFrom="1945" validTo="1989" descriptionPropertiesKey="REPENTANCE_PRAYER">
         <Weekday>WEDNESDAY</Weekday>
         <When>BEFORE</When>
         <Date month="NOVEMBER" day="23"/>
       </RelativeToFixed>
-
       <ChristianHoliday type="CORPUS_CHRISTI" descriptionPropertiesKey="christian.CORPUS_CHRISTI"/>
     </Holidays>
   </SubConfigurations>
@@ -150,13 +149,11 @@
   <SubConfigurations hierarchy="rp" description="Rhineland-Palatinate">
     <Holidays>
       <Fixed month="NOVEMBER" day="1" descriptionPropertiesKey="ALL_SAINTS"/>
-
       <RelativeToFixed validFrom="1945" validTo="1989" descriptionPropertiesKey="REPENTANCE_PRAYER">
         <Weekday>WEDNESDAY</Weekday>
         <When>BEFORE</When>
         <Date month="NOVEMBER" day="23"/>
       </RelativeToFixed>
-
       <ChristianHoliday type="CORPUS_CHRISTI" descriptionPropertiesKey="christian.CORPUS_CHRISTI"/>
     </Holidays>
   </SubConfigurations>
@@ -165,13 +162,11 @@
     <Holidays>
       <Fixed month="NOVEMBER" day="1" descriptionPropertiesKey="ALL_SAINTS"/>
       <Fixed month="AUGUST" day="15" descriptionPropertiesKey="ASSUMPTION_DAY"/>
-
       <RelativeToFixed validFrom="1945" validTo="1989" descriptionPropertiesKey="REPENTANCE_PRAYER">
         <Weekday>WEDNESDAY</Weekday>
         <When>BEFORE</When>
         <Date month="NOVEMBER" day="23"/>
       </RelativeToFixed>
-
       <ChristianHoliday type="CORPUS_CHRISTI" descriptionPropertiesKey="christian.CORPUS_CHRISTI"/>
     </Holidays>
   </SubConfigurations>
@@ -179,7 +174,6 @@
   <SubConfigurations hierarchy="sn" description="Saxony">
     <Holidays>
       <Fixed month="OCTOBER" day="31" descriptionPropertiesKey="REFORMATION_DAY"/>
-
       <RelativeToFixed validFrom="1995" descriptionPropertiesKey="REPENTANCE_PRAYER">
         <Weekday>WEDNESDAY</Weekday>
         <When>BEFORE</When>
@@ -205,7 +199,6 @@
   <SubConfigurations hierarchy="sh" description="Schleswig-Holstein">
     <Holidays>
       <Fixed month="OCTOBER" day="31" descriptionPropertiesKey="REFORMATION_DAY" validFrom="2018"/>
-
       <RelativeToFixed validFrom="1945" validTo="1989" descriptionPropertiesKey="REPENTANCE_PRAYER">
         <Weekday>WEDNESDAY</Weekday>
         <When>BEFORE</When>
@@ -217,7 +210,6 @@
   <SubConfigurations hierarchy="hh" description="Hamburg">
     <Holidays>
       <Fixed month="OCTOBER" day="31" descriptionPropertiesKey="REFORMATION_DAY" validFrom="2018"/>
-
       <RelativeToFixed validFrom="1945" validTo="1989" descriptionPropertiesKey="REPENTANCE_PRAYER">
         <Weekday>WEDNESDAY</Weekday>
         <When>BEFORE</When>
@@ -229,7 +221,6 @@
   <SubConfigurations hierarchy="hb" description="Bremen">
     <Holidays>
       <Fixed month="OCTOBER" day="31" descriptionPropertiesKey="REFORMATION_DAY" validFrom="2018"/>
-
       <RelativeToFixed validFrom="1945" validTo="1989" descriptionPropertiesKey="REPENTANCE_PRAYER">
         <Weekday>WEDNESDAY</Weekday>
         <When>BEFORE</When>
@@ -241,7 +232,6 @@
   <SubConfigurations hierarchy="ni" description="Lower-Saxony">
     <Holidays>
       <Fixed month="OCTOBER" day="31" descriptionPropertiesKey="REFORMATION_DAY" validFrom="2018"/>
-
       <RelativeToFixed validFrom="1945" validTo="1989" descriptionPropertiesKey="REPENTANCE_PRAYER">
         <Weekday>WEDNESDAY</Weekday>
         <When>BEFORE</When>
diff --git a/jollyday-core/src/main/resources/holidays/Holidays_es.xml b/jollyday-core/src/main/resources/holidays/Holidays_es.xml
index de2bba77e..a9aa80a38 100644
--- a/jollyday-core/src/main/resources/holidays/Holidays_es.xml
+++ b/jollyday-core/src/main/resources/holidays/Holidays_es.xml
@@ -15,6 +15,7 @@
     <Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS"/>
     <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
   </Holidays>
+
   <SubConfigurations hierarchy="an" description="Andalucia">
     <Holidays>
       <Fixed month="MARCH" day="1" descriptionPropertiesKey="REGIONAL"/>
@@ -26,6 +27,7 @@
       <ChristianHoliday type="MAUNDY_THURSDAY" descriptionPropertiesKey="christian.MAUNDY_THURSDAY"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="ar" description="Aragon">
     <Holidays>
       <Fixed month="APRIL" day="23" descriptionPropertiesKey="REGIONAL"/>
@@ -36,6 +38,7 @@
       <ChristianHoliday type="MAUNDY_THURSDAY" descriptionPropertiesKey="christian.MAUNDY_THURSDAY"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="ce" description="Ceuta">
     <Holidays>
       <Fixed month="AUGUST" day="15" descriptionPropertiesKey="ASSUMPTION_DAY"/>
@@ -44,6 +47,7 @@
       <IslamicHoliday type="ID_UL_ADHA" validFrom="2010" descriptionPropertiesKey="islamic.ID_UL_ADHA"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="ml" description="Melilla">
     <Holidays>
       <Fixed month="MARCH" day="19" descriptionPropertiesKey="ST_JOSEPH"/>
@@ -52,6 +56,7 @@
       <IslamicHoliday type="ID_UL_ADHA" validFrom="2010" descriptionPropertiesKey="islamic.ID_UL_ADHA"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="cl" description="Castile and Leon">
     <Holidays>
       <Fixed month="MARCH" day="19" descriptionPropertiesKey="ST_JOSEPH"/>
@@ -60,6 +65,7 @@
       <ChristianHoliday type="MAUNDY_THURSDAY" descriptionPropertiesKey="christian.MAUNDY_THURSDAY"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="cm" description="Castile - La Mancha">
     <Holidays>
       <Fixed month="MARCH" day="19" descriptionPropertiesKey="ST_JOSEPH"/>
@@ -68,6 +74,7 @@
       <ChristianHoliday type="MAUNDY_THURSDAY" descriptionPropertiesKey="christian.MAUNDY_THURSDAY"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="cn" description="Canary Islands">
     <Holidays>
       <Fixed month="MAY" day="31" descriptionPropertiesKey="REGIONAL"/>
@@ -75,6 +82,7 @@
       <ChristianHoliday type="MAUNDY_THURSDAY" descriptionPropertiesKey="christian.MAUNDY_THURSDAY"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="ct" description="Catalonia">
     <Holidays>
       <Fixed month="JUNE" day="24" descriptionPropertiesKey="ST_JOHN"/>
@@ -88,7 +96,9 @@
         <ChristianHoliday type="WHIT_MONDAY" descriptionPropertiesKey="christian.WHIT_MONDAY"/>
       </Holidays>
     </SubConfigurations>
+
   </SubConfigurations>
+
   <SubConfigurations hierarchy="ex" description="Extremadura">
     <Holidays>
       <Fixed month="MARCH" day="19" descriptionPropertiesKey="ST_JOSEPH"/>
@@ -97,6 +107,7 @@
       <ChristianHoliday type="MAUNDY_THURSDAY" descriptionPropertiesKey="christian.MAUNDY_THURSDAY"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="ga" description="Galicia">
     <Holidays>
       <Fixed month="MARCH" day="19" descriptionPropertiesKey="ST_JOSEPH"/>
@@ -106,6 +117,7 @@
       <ChristianHoliday type="MAUNDY_THURSDAY" descriptionPropertiesKey="christian.MAUNDY_THURSDAY"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="ib" description="Balearic Island">
     <Holidays>
       <Fixed month="MARCH" day="1" descriptionPropertiesKey="REGIONAL"/>
@@ -114,6 +126,7 @@
       <ChristianHoliday type="MAUNDY_THURSDAY" descriptionPropertiesKey="christian.MAUNDY_THURSDAY"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="lo" description="La Rioja">
     <Holidays>
       <Fixed month="MARCH" day="19" descriptionPropertiesKey="ST_JOSEPH"/>
@@ -122,7 +135,8 @@
       <ChristianHoliday type="MAUNDY_THURSDAY" descriptionPropertiesKey="christian.MAUNDY_THURSDAY"/>
     </Holidays>
   </SubConfigurations>
-  <SubConfigurations hierarchy="m" description="Madrid">
+
+  <SubConfigurations hierarchy="md" description="Madrid">
     <Holidays>
       <Fixed month="MARCH" day="19" descriptionPropertiesKey="ST_JOSEPH"/>
       <Fixed month="MAY" day="2" descriptionPropertiesKey="REGIONAL"/>
@@ -135,8 +149,10 @@
         <Fixed month="NOVEMBER" day="9" descriptionPropertiesKey="ALMUDENA_DAY"/>
       </Holidays>
     </SubConfigurations>
+
   </SubConfigurations>
-  <SubConfigurations hierarchy="mu" description="Murcia">
+
+  <SubConfigurations hierarchy="mc" description="Murcia">
     <Holidays>
       <Fixed month="MARCH" day="19" descriptionPropertiesKey="ST_JOSEPH"/>
       <Fixed month="JUNE" day="9" descriptionPropertiesKey="REGIONAL"/>
@@ -144,7 +160,8 @@
       <ChristianHoliday type="MAUNDY_THURSDAY" descriptionPropertiesKey="christian.MAUNDY_THURSDAY"/>
     </Holidays>
   </SubConfigurations>
-  <SubConfigurations hierarchy="na" description="Navarre">
+
+  <SubConfigurations hierarchy="nc" description="Navarra">
     <Holidays>
       <Fixed month="MARCH" day="19" descriptionPropertiesKey="ST_JOSEPH"/>
       <Fixed month="AUGUST" day="15" descriptionPropertiesKey="ASSUMPTION_DAY"/>
@@ -152,7 +169,8 @@
       <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
     </Holidays>
   </SubConfigurations>
-  <SubConfigurations hierarchy="o" description="Asturias">
+
+  <SubConfigurations hierarchy="as" description="Asturias">
     <Holidays>
       <Fixed month="SEPTEMBER" day="8" descriptionPropertiesKey="REGIONAL"/>
       <Fixed month="AUGUST" day="15" descriptionPropertiesKey="ASSUMPTION_DAY">
@@ -162,6 +180,7 @@
       <ChristianHoliday type="MAUNDY_THURSDAY" descriptionPropertiesKey="christian.MAUNDY_THURSDAY"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="pv" description="Euskadi">
     <Holidays>
       <Fixed month="MARCH" day="19" descriptionPropertiesKey="ST_JOSEPH"/>
@@ -171,13 +190,15 @@
       <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
     </Holidays>
   </SubConfigurations>
-  <SubConfigurations hierarchy="s" description="Cantabria">
+
+  <SubConfigurations hierarchy="cb" description="Cantabria">
     <Holidays>
       <Fixed month="AUGUST" day="15" descriptionPropertiesKey="ASSUMPTION_DAY"/>
       <Fixed month="SEPTEMBER" day="15" descriptionPropertiesKey="APARECIDA"/>
       <ChristianHoliday type="MAUNDY_THURSDAY" descriptionPropertiesKey="christian.MAUNDY_THURSDAY"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="vc" description="Valencia">
     <Holidays>
       <Fixed month="MARCH" day="19" descriptionPropertiesKey="ST_JOSEPH"/>
@@ -186,6 +207,7 @@
       <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
     </Holidays>
   </SubConfigurations>
+
 </Configuration>
 
 
diff --git a/jollyday-core/src/main/resources/holidays/Holidays_fi.xml b/jollyday-core/src/main/resources/holidays/Holidays_fi.xml
index a1327af37..fb23c544a 100644
--- a/jollyday-core/src/main/resources/holidays/Holidays_fi.xml
+++ b/jollyday-core/src/main/resources/holidays/Holidays_fi.xml
@@ -29,7 +29,8 @@
       <to month="NOVEMBER" day="6"/>
     </FixedWeekdayBetweenFixed>
   </Holidays>
-  <SubConfigurations hierarchy="ax" description="Aland">
+
+  <SubConfigurations hierarchy="01" description="Aland">
     <Holidays>
       <Fixed month="JUNE" day="9" descriptionPropertiesKey="SELF_GOVERNANCE"/>
     </Holidays>
diff --git a/jollyday-core/src/main/resources/holidays/Holidays_fr.xml b/jollyday-core/src/main/resources/holidays/Holidays_fr.xml
index 5cbe6cc81..f406d0cba 100644
--- a/jollyday-core/src/main/resources/holidays/Holidays_fr.xml
+++ b/jollyday-core/src/main/resources/holidays/Holidays_fr.xml
@@ -18,41 +18,52 @@
     <ChristianHoliday type="WHIT_MONDAY" validTo="2003" descriptionPropertiesKey="christian.WHIT_MONDAY"/>
     <ChristianHoliday type="WHIT_MONDAY" validFrom="2008" descriptionPropertiesKey="christian.WHIT_MONDAY"/>
   </Holidays>
-  <SubConfigurations hierarchy="ma" description="Martinique">
-    <Holidays>
-      <Fixed month="MAY" day="22"/>
-    </Holidays>
+
+  <SubConfigurations hierarchy="GES" description="Grand Est">
+    <Holidays/>
+
+    <SubConfigurations hierarchy="57" description="Moselle">
+      <Holidays>
+        <Fixed month="DECEMBER" day="26"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="67" description="Bas-Rhin">
+      <Holidays>
+        <Fixed month="DECEMBER" day="26"/>
+        <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="68" description="Haut-Rhin">
+      <Holidays>
+        <Fixed month="DECEMBER" day="26"/>
+        <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
+      </Holidays>
+    </SubConfigurations>
   </SubConfigurations>
-  <SubConfigurations hierarchy="gu" description="Guadeloupe">
+
+  <SubConfigurations hierarchy="971" description="Guadeloupe">
     <Holidays>
       <Fixed month="MAY" day="27"/>
     </Holidays>
   </SubConfigurations>
-  <SubConfigurations hierarchy="gy" description="Guyane">
-    <Holidays>
-      <Fixed month="JUNE" day="10"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="lr" description="La Reunion">
-    <Holidays>
-      <Fixed month="DECEMBER" day="20"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="br" description="Bas-Rhin">
+
+  <SubConfigurations hierarchy="972" description="Martinique">
     <Holidays>
-      <Fixed month="DECEMBER" day="26"/>
-      <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
+      <Fixed month="MAY" day="22"/>
     </Holidays>
   </SubConfigurations>
-  <SubConfigurations hierarchy="hr" description="Haut-Rhin">
+
+  <SubConfigurations hierarchy="973" description="Guyane">
     <Holidays>
-      <Fixed month="DECEMBER" day="26"/>
-      <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
+      <Fixed month="JUNE" day="10"/>
     </Holidays>
   </SubConfigurations>
-  <SubConfigurations hierarchy="mo" description="Moselle">
+
+  <SubConfigurations hierarchy="974" description="La Reunion">
     <Holidays>
-      <Fixed month="DECEMBER" day="26"/>
+      <Fixed month="DECEMBER" day="20"/>
     </Holidays>
   </SubConfigurations>
 </Configuration>
diff --git a/jollyday-core/src/main/resources/holidays/Holidays_in.xml b/jollyday-core/src/main/resources/holidays/Holidays_in.xml
index 22afcd342..0eb349942 100644
--- a/jollyday-core/src/main/resources/holidays/Holidays_in.xml
+++ b/jollyday-core/src/main/resources/holidays/Holidays_in.xml
@@ -26,6 +26,7 @@
       <IslamicHoliday type="ID_UL_ADHA" descriptionPropertiesKey="islamic.ID_UL_ADHA"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="ar" description="Arunāchal Pradesh">
     <Holidays>
       <Fixed month="JANUARY" day="1" descriptionPropertiesKey="NEW_YEAR"/>
@@ -36,6 +37,7 @@
       <IslamicHoliday type="ID_UL_ADHA" descriptionPropertiesKey="islamic.ID_UL_ADHA"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="as" description="Assam">
     <Holidays>
       <Fixed month="MAY" day="1" descriptionPropertiesKey="LABOUR_DAY"/>
@@ -46,6 +48,7 @@
       <IslamicHoliday type="ID_UL_ADHA" descriptionPropertiesKey="islamic.ID_UL_ADHA"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="br" description="Bihār">
     <Holidays>
       <Fixed month="MAY" day="1" descriptionPropertiesKey="LABOUR_DAY"/>
@@ -58,6 +61,7 @@
       <IslamicHoliday type="ID_UL_ADHA" descriptionPropertiesKey="islamic.ID_UL_ADHA"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="ct" description="Chhattīsgarh">
     <Holidays>
       <Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS"/>
@@ -67,6 +71,7 @@
       <IslamicHoliday type="ID_UL_ADHA" descriptionPropertiesKey="islamic.ID_UL_ADHA"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="ga" description="Goa">
     <Holidays>
       <Fixed month="MAY" day="1" descriptionPropertiesKey="LABOUR_DAY"/>
@@ -76,6 +81,7 @@
       <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="gj" description="Gujarāt">
     <Holidays>
       <Fixed month="APRIL" day="14"/>
@@ -84,6 +90,7 @@
       <IslamicHoliday type="ID_UL_ADHA" descriptionPropertiesKey="islamic.ID_UL_ADHA"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="hr" description="Haryāna">
     <Holidays>
       <Fixed month="APRIL" day="14"/>
@@ -91,6 +98,7 @@
       <IslamicHoliday type="ID_AL_FITR" descriptionPropertiesKey="islamic.ID_AL_FITR"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="hp" description="Himāchal Pradesh">
     <Holidays>
       <Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS"/>
@@ -98,6 +106,7 @@
       <IslamicHoliday type="ASCHURA" descriptionPropertiesKey="islamic.ASCHURA"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="jh" description="Jhārkhand">
     <Holidays>
       <ChristianHoliday type="EASTER" descriptionPropertiesKey="christian.EASTER"/>
@@ -105,6 +114,7 @@
       <IslamicHoliday type="ID_UL_ADHA" descriptionPropertiesKey="islamic.ID_UL_ADHA"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="ka" description="Karnātaka">
     <Holidays>
       <Fixed month="MAY" day="1" descriptionPropertiesKey="LABOUR_DAY"/>
@@ -120,6 +130,7 @@
       <IslamicHoliday type="ID_UL_ADHA" descriptionPropertiesKey="islamic.ID_UL_ADHA"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="kl" description="Kerala">
     <Holidays>
       <Fixed month="MAY" day="1" descriptionPropertiesKey="LABOUR_DAY"/>
@@ -131,6 +142,7 @@
       <IslamicHoliday type="ID_UL_ADHA" descriptionPropertiesKey="islamic.ID_UL_ADHA"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="mp" description="Madhya Pradesh">
     <Holidays>
       <Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS"/>
@@ -140,6 +152,7 @@
       <IslamicHoliday type="ID_UL_ADHA" descriptionPropertiesKey="islamic.ID_UL_ADHA"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="mh" description="Mahārāshtra">
     <Holidays>
       <Fixed month="MAY" day="1" descriptionPropertiesKey="LABOUR_DAY"/>
@@ -152,6 +165,7 @@
       <IslamicHoliday type="ID_UL_ADHA" descriptionPropertiesKey="islamic.ID_UL_ADHA"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="mn" description="Manipur">
     <Holidays>
       <Fixed month="MAY" day="1" descriptionPropertiesKey="LABOUR_DAY"/>
@@ -163,6 +177,7 @@
       <IslamicHoliday type="ID_UL_ADHA" descriptionPropertiesKey="islamic.ID_UL_ADHA"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="ml" description="Meghālaya">
     <Holidays>
       <Fixed month="JANUARY" day="1" descriptionPropertiesKey="NEW_YEAR"/>
@@ -173,6 +188,7 @@
       <IslamicHoliday type="ID_UL_ADHA" descriptionPropertiesKey="islamic.ID_UL_ADHA"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="mz" description="Mizoram">
     <Holidays>
       <Fixed month="JANUARY" day="1" descriptionPropertiesKey="NEW_YEAR"/>
@@ -183,6 +199,7 @@
       <IslamicHoliday type="ID_AL_FITR" descriptionPropertiesKey="islamic.ID_AL_FITR"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="nl" description="Nāgāland">
     <Holidays>
       <Fixed month="JANUARY" day="1" descriptionPropertiesKey="NEW_YEAR"/>
@@ -193,6 +210,7 @@
       <IslamicHoliday type="ID_UL_ADHA" descriptionPropertiesKey="islamic.ID_UL_ADHA"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="or" description="Odisha">
     <Holidays>
       <Fixed month="APRIL" day="14"/>
@@ -202,12 +220,14 @@
       <IslamicHoliday type="ID_UL_ADHA" descriptionPropertiesKey="islamic.ID_UL_ADHA"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="pb" description="Punjab">
     <Holidays>
       <Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS"/>
       <IslamicHoliday type="ID_AL_FITR" descriptionPropertiesKey="islamic.ID_AL_FITR"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="rj" description="Rājasthān">
     <Holidays>
       <Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS"/>
@@ -216,6 +236,7 @@
       <IslamicHoliday type="ID_UL_ADHA" descriptionPropertiesKey="islamic.ID_UL_ADHA"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="sk" description="Sikkim">
     <Holidays>
       <Fixed month="MAY" day="16"/>
@@ -226,6 +247,7 @@
       <IslamicHoliday type="ID_AL_FITR" descriptionPropertiesKey="islamic.ID_AL_FITR"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="tn" description="Tamil Nādu">
     <Holidays>
       <Fixed month="MAY" day="1" descriptionPropertiesKey="LABOUR_DAY"/>
@@ -240,6 +262,7 @@
       <IslamicHoliday type="ID_UL_ADHA" descriptionPropertiesKey="islamic.ID_UL_ADHA"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="tr" description="Tripura">
     <Holidays>
       <Fixed month="MAY" day="1" descriptionPropertiesKey="LABOUR_DAY"/>
@@ -249,6 +272,7 @@
       <IslamicHoliday type="ID_UL_ADHA" descriptionPropertiesKey="islamic.ID_UL_ADHA"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="up" description="Uttar Pradesh">
     <Holidays>
       <Fixed month="APRIL" day="14"/>
@@ -261,6 +285,7 @@
       <IslamicHoliday type="ID_UL_ADHA" descriptionPropertiesKey="islamic.ID_UL_ADHA"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="ut" description="Uttarākhand">
     <Holidays>
       <Fixed month="APRIL" day="14"/>
@@ -273,6 +298,7 @@
       <IslamicHoliday type="ID_UL_ADHA" descriptionPropertiesKey="islamic.ID_UL_ADHA"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="wb" description="West Bengal">
     <Holidays>
       <Fixed month="MAY" day="1" descriptionPropertiesKey="LABOUR_DAY"/>
@@ -285,6 +311,7 @@
       <IslamicHoliday type="ID_UL_ADHA" descriptionPropertiesKey="islamic.ID_UL_ADHA"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="an" description="Andaman and Nicobar Islands">
     <Holidays>
       <Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS"/>
@@ -296,6 +323,7 @@
       <IslamicHoliday type="ID_UL_ADHA" descriptionPropertiesKey="islamic.ID_UL_ADHA"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="ch" description="Chandīgarh">
     <Holidays>
       <Fixed month="APRIL" day="14"/>
@@ -307,6 +335,7 @@
       <IslamicHoliday type="ID_UL_ADHA" descriptionPropertiesKey="islamic.ID_UL_ADHA"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="dl" description="Delhi">
     <Holidays>
       <Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS"/>
@@ -317,6 +346,7 @@
       <IslamicHoliday type="ID_UL_ADHA" descriptionPropertiesKey="islamic.ID_UL_ADHA"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="dh" description="Dādra and Nagar Haveli and Damān and Diu">
     <Holidays>
       <Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS"/>
@@ -326,6 +356,7 @@
       <IslamicHoliday type="ID_UL_ADHA" descriptionPropertiesKey="islamic.ID_UL_ADHA"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="jk" description="Jammu and Kashmīr">
     <Holidays>
       <Fixed month="APRIL" day="14"/>
@@ -335,6 +366,7 @@
       <IslamicHoliday type="ID_UL_ADHA" descriptionPropertiesKey="islamic.ID_UL_ADHA"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="ld" description="Lakshadweep">
     <Holidays>
       <Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS"/>
@@ -343,6 +375,7 @@
       <IslamicHoliday type="ID_UL_ADHA" descriptionPropertiesKey="islamic.ID_UL_ADHA"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="py" description="Puducherry">
     <Holidays>
       <Fixed month="MAY" day="1" descriptionPropertiesKey="LABOUR_DAY"/>
diff --git a/jollyday-core/src/main/resources/holidays/Holidays_is.xml b/jollyday-core/src/main/resources/holidays/Holidays_is.xml
index 2eb040720..683897e54 100644
--- a/jollyday-core/src/main/resources/holidays/Holidays_is.xml
+++ b/jollyday-core/src/main/resources/holidays/Holidays_is.xml
@@ -26,8 +26,7 @@
       <from month="JANUARY" day="19"/>
       <to month="JANUARY" day="25"/>
     </FixedWeekdayBetweenFixed>
-    <FixedWeekdayRelativeToFixed which="FIRST" weekday="THURSDAY" when="AFTER"
-                                     descriptionPropertiesKey="FIRST_DAY_SUMMER">
+    <FixedWeekdayRelativeToFixed which="FIRST" weekday="THURSDAY" when="AFTER" descriptionPropertiesKey="FIRST_DAY_SUMMER">
       <day month="APRIL" day="18"/>
     </FixedWeekdayRelativeToFixed>
   </Holidays>
diff --git a/jollyday-core/src/main/resources/holidays/Holidays_it.xml b/jollyday-core/src/main/resources/holidays/Holidays_it.xml
index 420626a92..d22bd6d25 100644
--- a/jollyday-core/src/main/resources/holidays/Holidays_it.xml
+++ b/jollyday-core/src/main/resources/holidays/Holidays_it.xml
@@ -18,7 +18,8 @@
     <ChristianHoliday type="EASTER" descriptionPropertiesKey="christian.EASTER"/>
     <ChristianHoliday type="EASTER_MONDAY" validFrom="1642" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
   </Holidays>
-  <SubConfigurations hierarchy="bz" description="Südtirol">
+
+  <SubConfigurations hierarchy="32" description="Südtirol">
     <Holidays>
       <ChristianHoliday type="WHIT_MONDAY" descriptionPropertiesKey="christian.WHIT_MONDAY"/>
     </Holidays>
diff --git a/jollyday-core/src/main/resources/holidays/Holidays_lu.xml b/jollyday-core/src/main/resources/holidays/Holidays_lu.xml
index 6ef2c3631..3a64d388e 100644
--- a/jollyday-core/src/main/resources/holidays/Holidays_lu.xml
+++ b/jollyday-core/src/main/resources/holidays/Holidays_lu.xml
@@ -4,6 +4,7 @@
                xmlns="https://focus_shift.de/jollyday/schema/holiday"
                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="MAY" day="1" descriptionPropertiesKey="LABOUR_DAY"/>
@@ -17,9 +18,14 @@
     <ChristianHoliday type="ASCENSION_DAY" descriptionPropertiesKey="christian.ASCENSION_DAY"/>
     <ChristianHoliday type="WHIT_MONDAY" descriptionPropertiesKey="christian.WHIT_MONDAY"/>
   </Holidays>
-  <SubConfigurations hierarchy="clu" description="City of Luxembourg">
-    <Holidays>
-      <Fixed month="FEBRUARY" day="15" descriptionPropertiesKey="CARNIVAL"/>
-    </Holidays>
+
+  <SubConfigurations hierarchy="lu" description="Luxembourg">
+    <Holidays/>
+
+    <SubConfigurations hierarchy="clu" description="City of Luxembourg">
+      <Holidays>
+        <Fixed month="FEBRUARY" day="15" descriptionPropertiesKey="CARNIVAL"/>
+      </Holidays>
+    </SubConfigurations>
   </SubConfigurations>
 </Configuration>
diff --git a/jollyday-core/src/main/resources/holidays/Holidays_md.xml b/jollyday-core/src/main/resources/holidays/Holidays_md.xml
index 5ebfaa8ab..f363de321 100644
--- a/jollyday-core/src/main/resources/holidays/Holidays_md.xml
+++ b/jollyday-core/src/main/resources/holidays/Holidays_md.xml
@@ -19,7 +19,7 @@
     <ChristianHoliday type="EASTER_MONDAY" chronology="JULIAN" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
   </Holidays>
 
-  <Sources>
+<Sources>
     <Source of="ISO 3166">https://www.iso.org/obp/ui/#iso:code:3166:MD</Source>
     <Source of="ISO 3166-2">https://en.wikipedia.org/wiki/ISO_3166-2:MD</Source>
   </Sources>
diff --git a/jollyday-core/src/main/resources/holidays/Holidays_mx.xml b/jollyday-core/src/main/resources/holidays/Holidays_mx.xml
index aab0457f8..0cf9e9646 100644
--- a/jollyday-core/src/main/resources/holidays/Holidays_mx.xml
+++ b/jollyday-core/src/main/resources/holidays/Holidays_mx.xml
@@ -35,6 +35,7 @@
     <FixedWeekday which="THIRD" weekday="MONDAY" month="MARCH" descriptionPropertiesKey="JUAREZ_BIRTHDAY"/>
     <FixedWeekday which="THIRD" weekday="MONDAY" month="NOVEMBER" descriptionPropertiesKey="REVOLUTION"/>
   </Holidays>
+
   <SubConfigurations hierarchy="pue" description="Puebla">
     <Holidays>
       <Fixed month="MAY" day="5" descriptionPropertiesKey="MAY_DAY" localizedType="UNOFFICIAL_HOLIDAY"/>
diff --git a/jollyday-core/src/main/resources/holidays/Holidays_ng.xml b/jollyday-core/src/main/resources/holidays/Holidays_ng.xml
index fe5ea2980..d7dfa5c38 100644
--- a/jollyday-core/src/main/resources/holidays/Holidays_ng.xml
+++ b/jollyday-core/src/main/resources/holidays/Holidays_ng.xml
@@ -20,7 +20,8 @@
     <IslamicHoliday type="ID_AL_FITR" descriptionPropertiesKey="islamic.ID_AL_FITR"/>
     <IslamicHoliday type="ID_UL_ADHA" descriptionPropertiesKey="islamic.ID_UL_ADHA"/>
   </Holidays>
-  <SubConfigurations hierarchy="lag" description="Lagos">
+
+  <SubConfigurations hierarchy="la" description="Lagos">
     <Holidays>
       <Fixed month="JUNE" day="12" descriptionPropertiesKey="ELECTION_DAY"/>
     </Holidays>
diff --git a/jollyday-core/src/main/resources/holidays/Holidays_ni.xml b/jollyday-core/src/main/resources/holidays/Holidays_ni.xml
index 3decf6a50..385c8f58e 100644
--- a/jollyday-core/src/main/resources/holidays/Holidays_ni.xml
+++ b/jollyday-core/src/main/resources/holidays/Holidays_ni.xml
@@ -19,40 +19,63 @@
     <ChristianHoliday type="EASTER" descriptionPropertiesKey="christian.EASTER"/>
     <ChristianHoliday type="MAUNDY_THURSDAY" descriptionPropertiesKey="christian.MAUNDY_THURSDAY"/>
   </Holidays>
-  <SubConfigurations hierarchy="bo" description="Boaco">
+
+  <SubConfigurations hierarchy="BO" description="Boaco">
     <Holidays>
       <Fixed month="JULY" day="25" descriptionPropertiesKey="SANTIAGO"/>
     </Holidays>
   </SubConfigurations>
-  <SubConfigurations hierarchy="so" description="Somoto">
-    <Holidays>
-      <Fixed month="JULY" day="25" descriptionPropertiesKey="SANTIAGO"/>
-    </Holidays>
+
+  <SubConfigurations hierarchy="GR" description="Granada">
+    <Holidays/>
+
+    <SubConfigurations hierarchy="na" description="Nandaime">
+      <Holidays>
+        <Fixed month="JULY" day="26" descriptionPropertiesKey="SANTA_ANA"/>
+      </Holidays>
+    </SubConfigurations>
   </SubConfigurations>
-  <SubConfigurations hierarchy="mn" description="Managua">
+
+  <SubConfigurations hierarchy="MD" description="Madriz">
+    <Holidays/>
+
+    <SubConfigurations hierarchy="so" description="Somoto">
+      <Holidays>
+        <Fixed month="JULY" day="25" descriptionPropertiesKey="SANTIAGO"/>
+      </Holidays>
+    </SubConfigurations>
+  </SubConfigurations>
+
+  <SubConfigurations hierarchy="MN" description="Managua">
     <Holidays>
       <Fixed month="JULY" day="25" descriptionPropertiesKey="SANTIAGO"/>
       <Fixed month="AUGUST" day="1" descriptionPropertiesKey="SANTO_DOMINGO"/>
     </Holidays>
   </SubConfigurations>
-  <SubConfigurations hierarchy="na" description="Nandaime">
-    <Holidays>
-      <Fixed month="JULY" day="26" descriptionPropertiesKey="SANTA_ANA"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="ni" description="Niquinohomo">
-    <Holidays>
-      <Fixed month="JULY" day="26" descriptionPropertiesKey="SANTA_ANA"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="mo" description="Moyogalpa">
-    <Holidays>
-      <Fixed month="JULY" day="26" descriptionPropertiesKey="SANTA_ANA"/>
-    </Holidays>
+
+  <SubConfigurations hierarchy="MS" description="Masaya">
+    <Holidays/>
+
+    <SubConfigurations hierarchy="ni" description="Niquinohomo">
+      <Holidays>
+        <Fixed month="JULY" day="26" descriptionPropertiesKey="SANTA_ANA"/>
+      </Holidays>
+    </SubConfigurations>
   </SubConfigurations>
-  <SubConfigurations hierarchy="om" description="Ometepe">
-    <Holidays>
-      <Fixed month="JULY" day="26" descriptionPropertiesKey="SANTA_ANA"/>
-    </Holidays>
+
+  <SubConfigurations hierarchy="RI" description="Rivas">
+    <Holidays/>
+
+    <SubConfigurations hierarchy="mo" description="Moyogalpa">
+      <Holidays>
+        <Fixed month="JULY" day="26" descriptionPropertiesKey="SANTA_ANA"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="om" description="Ometepe">
+      <Holidays>
+        <Fixed month="JULY" day="26" descriptionPropertiesKey="SANTA_ANA"/>
+      </Holidays>
+    </SubConfigurations>
   </SubConfigurations>
 </Configuration>
diff --git a/jollyday-core/src/main/resources/holidays/Holidays_nyse.xml b/jollyday-core/src/main/resources/holidays/Holidays_nyse.xml
index e808c6d5e..c7caaeba8 100644
--- a/jollyday-core/src/main/resources/holidays/Holidays_nyse.xml
+++ b/jollyday-core/src/main/resources/holidays/Holidays_nyse.xml
@@ -6,46 +6,31 @@
                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">
-      <MovingCondition substitute="SATURDAY" with="PREVIOUS"
-                           weekday="FRIDAY"/>
-      <MovingCondition substitute="SUNDAY" with="NEXT"
-                           weekday="MONDAY"/>
+      <MovingCondition substitute="SATURDAY" with="PREVIOUS" weekday="FRIDAY"/>
+      <MovingCondition substitute="SUNDAY" with="NEXT" weekday="MONDAY"/>
     </Fixed>
     <Fixed month="JULY" day="4" descriptionPropertiesKey="INDEPENDENCE_DAY">
-      <MovingCondition substitute="SATURDAY" with="PREVIOUS"
-                           weekday="FRIDAY"/>
-      <MovingCondition substitute="SUNDAY" with="NEXT"
-                           weekday="MONDAY"/>
+      <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>
-    <Fixed month="JUNE" day="11" validFrom="2004" validTo="2004"
-               descriptionPropertiesKey="FUNERAL_OF_PRESIDENT_REAGAN">
-    </Fixed>
-    <Fixed month="JANUARY" day="2" validFrom="2007" validTo="2007"
-               descriptionPropertiesKey="REMEMBERANCE_OF_PRESIDENT_FORD">
-    </Fixed>
-    <Fixed month="OCTOBER" day="29" validFrom="2012"
-               validTo="2012" descriptionPropertiesKey="HURRICANE_SANDY">
-    </Fixed>
-    <Fixed month="OCTOBER" day="30" validFrom="2012"
-               validTo="2012" descriptionPropertiesKey="HURRICANE_SANDY">
+    <Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS">
+      <MovingCondition substitute="SATURDAY" with="PREVIOUS" weekday="FRIDAY"/>
+      <MovingCondition substitute="SUNDAY" with="NEXT" weekday="MONDAY"/>
     </Fixed>
+    <Fixed month="JUNE" day="11" validFrom="2004" validTo="2004" descriptionPropertiesKey="FUNERAL_OF_PRESIDENT_REAGAN"/>
+    <Fixed month="JANUARY" day="2" validFrom="2007" validTo="2007" descriptionPropertiesKey="REMEMBERANCE_OF_PRESIDENT_FORD"/>
+    <Fixed month="OCTOBER" day="29" validFrom="2012" validTo="2012" descriptionPropertiesKey="HURRICANE_SANDY"/>
+    <Fixed month="OCTOBER" day="30" validFrom="2012" validTo="2012" descriptionPropertiesKey="HURRICANE_SANDY"/>
     <FixedWeekday which="THIRD" weekday="MONDAY"
-                      month="JANUARY" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
+                  month="JANUARY" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
     <FixedWeekday which="THIRD" weekday="MONDAY"
-                      month="FEBRUARY" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
+                  month="FEBRUARY" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
     <FixedWeekday which="LAST" weekday="MONDAY"
-                      month="MAY" descriptionPropertiesKey="MEMORIAL_DAY"/>
+                  month="MAY" descriptionPropertiesKey="MEMORIAL_DAY"/>
     <FixedWeekday which="FIRST" weekday="MONDAY"
-                      month="SEPTEMBER" descriptionPropertiesKey="LABOUR_DAY"/>
+                  month="SEPTEMBER" descriptionPropertiesKey="LABOUR_DAY"/>
     <FixedWeekday which="FOURTH" weekday="THURSDAY"
-                      month="NOVEMBER" descriptionPropertiesKey="THANKSGIVING"/>
+                  month="NOVEMBER" descriptionPropertiesKey="THANKSGIVING"/>
     <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
   </Holidays>
 </Configuration>
diff --git a/jollyday-core/src/main/resources/holidays/Holidays_nz.xml b/jollyday-core/src/main/resources/holidays/Holidays_nz.xml
index 068102892..4dc379d8e 100644
--- a/jollyday-core/src/main/resources/holidays/Holidays_nz.xml
+++ b/jollyday-core/src/main/resources/holidays/Holidays_nz.xml
@@ -40,67 +40,99 @@
     <Fixed month="JULY" day="10" validFrom="2026" validTo="2026" descriptionPropertiesKey="MATARIKI"/>
     <Fixed month="JUNE" day="25" validFrom="2027" validTo="2027" descriptionPropertiesKey="MATARIKI"/>
     <Fixed month="JULY" day="14" validFrom="2028" validTo="2028" descriptionPropertiesKey="MATARIKI"/>
-    <Fixed month="JULY" day="6"  validFrom="2029" validTo="2029" descriptionPropertiesKey="MATARIKI"/>
+    <Fixed month="JULY" day="6" validFrom="2029" validTo="2029" descriptionPropertiesKey="MATARIKI"/>
     <Fixed month="JUNE" day="21" validFrom="2030" validTo="2030" descriptionPropertiesKey="MATARIKI"/>
     <Fixed month="JULY" day="11" validFrom="2031" validTo="2031" descriptionPropertiesKey="MATARIKI"/>
-    <Fixed month="JULY" day="2"  validFrom="2032" validTo="2032" descriptionPropertiesKey="MATARIKI"/>
+    <Fixed month="JULY" day="2" validFrom="2032" validTo="2032" descriptionPropertiesKey="MATARIKI"/>
     <Fixed month="JUNE" day="24" validFrom="2033" validTo="2033" descriptionPropertiesKey="MATARIKI"/>
-    <Fixed month="JULY" day="7"  validFrom="2034" validTo="2034" descriptionPropertiesKey="MATARIKI"/>
+    <Fixed month="JULY" day="7" validFrom="2034" validTo="2034" descriptionPropertiesKey="MATARIKI"/>
     <Fixed month="JUNE" day="29" validFrom="2035" validTo="2035" descriptionPropertiesKey="MATARIKI"/>
     <Fixed month="JULY" day="18" validFrom="2036" validTo="2036" descriptionPropertiesKey="MATARIKI"/>
     <Fixed month="JULY" day="10" validFrom="2037" validTo="2037" descriptionPropertiesKey="MATARIKI"/>
     <Fixed month="JUNE" day="25" validFrom="2038" validTo="2038" descriptionPropertiesKey="MATARIKI"/>
     <Fixed month="JULY" day="15" validFrom="2039" validTo="2039" descriptionPropertiesKey="MATARIKI"/>
-    <Fixed month="JULY" day="6"  validFrom="2040" validTo="2040" descriptionPropertiesKey="MATARIKI"/>
+    <Fixed month="JULY" day="6" validFrom="2040" validTo="2040" descriptionPropertiesKey="MATARIKI"/>
     <Fixed month="JULY" day="19" validFrom="2041" validTo="2041" descriptionPropertiesKey="MATARIKI"/>
     <Fixed month="JULY" day="11" validFrom="2042" validTo="2042" descriptionPropertiesKey="MATARIKI"/>
-    <Fixed month="JULY" day="3"  validFrom="2043" validTo="2043" descriptionPropertiesKey="MATARIKI"/>
+    <Fixed month="JULY" day="3" validFrom="2043" validTo="2043" descriptionPropertiesKey="MATARIKI"/>
     <Fixed month="JUNE" day="24" validFrom="2044" validTo="2044" descriptionPropertiesKey="MATARIKI"/>
-    <Fixed month="JULY" day="7"  validFrom="2045" validTo="2045" descriptionPropertiesKey="MATARIKI"/>
+    <Fixed month="JULY" day="7" validFrom="2045" validTo="2045" descriptionPropertiesKey="MATARIKI"/>
     <Fixed month="JUNE" day="29" validFrom="2046" validTo="2046" descriptionPropertiesKey="MATARIKI"/>
     <Fixed month="JULY" day="19" validFrom="2047" validTo="2047" descriptionPropertiesKey="MATARIKI"/>
-    <Fixed month="JULY" day="3"  validFrom="2048" validTo="2048" descriptionPropertiesKey="MATARIKI"/>
+    <Fixed month="JULY" day="3" validFrom="2048" validTo="2048" descriptionPropertiesKey="MATARIKI"/>
     <Fixed month="JUNE" day="25" validFrom="2049" validTo="2049" descriptionPropertiesKey="MATARIKI"/>
     <Fixed month="JULY" day="15" validFrom="2050" validTo="2050" descriptionPropertiesKey="MATARIKI"/>
     <Fixed month="JUNE" day="30" validFrom="2051" validTo="2051" descriptionPropertiesKey="MATARIKI"/>
     <Fixed month="JUNE" day="21" validFrom="2052" validTo="2052" descriptionPropertiesKey="MATARIKI"/>
 
-    <FixedWeekday which="FIRST" weekday="MONDAY" month="JUNE" descriptionPropertiesKey="QUEENS_BIRTHDAY"/>
+    <FixedWeekday which="FIRST" weekday="MONDAY" month="JUNE" validTo="2022" descriptionPropertiesKey="QUEENS_BIRTHDAY"/>
+    <FixedWeekday which="FIRST" weekday="MONDAY" month="JUNE" validFrom="2023" descriptionPropertiesKey="KINGS_DAY"/>
+
     <FixedWeekday which="FOURTH" weekday="MONDAY" month="OCTOBER" descriptionPropertiesKey="LABOUR_DAY"/>
 
     <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
     <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
   </Holidays>
+
+  <Sources>
+    <Source>https://en.wikipedia.org/wiki/Public_holidays_in_New_Zealand</Source>
+    <Source>https://www.mbie.govt.nz/assets/matariki-dates-2022-to-2052-matariki-advisory-group.pdf</Source>
+    <Source of="ISO 3166">https://www.iso.org/obp/ui/#iso:code:3166:NZ</Source>
+    <Source of="ISO 3166-2">https://en.wikipedia.org/wiki/ISO_3166-2:NZ</Source>
+  </Sources>
+
   <SubConfigurations hierarchy="auk" description="Auckland">
     <Holidays>
-      <FixedWeekdayRelativeToFixed which="FIRST" weekday="MONDAY" when="CLOSEST"
-                                       descriptionPropertiesKey="AUCKLAND_ANNIVERSARY">
+      <FixedWeekdayRelativeToFixed which="FIRST" weekday="MONDAY" when="CLOSEST" descriptionPropertiesKey="AUCKLAND_ANNIVERSARY">
         <day month="JANUARY" day="29"/>
       </FixedWeekdayRelativeToFixed>
     </Holidays>
   </SubConfigurations>
-  <SubConfigurations hierarchy="tki" description="Taranaki">
+
+  <SubConfigurations hierarchy="bop" description="Bay of Plenty">
     <Holidays>
-      <!-- 31 March, but moves to 2nd Monday in March to avoid Easter. -->
-      <FixedWeekday which="SECOND" weekday="MONDAY" month="MARCH" descriptionPropertiesKey="TARANAKI_ANNIVERSARY"/>
+      <FixedWeekdayRelativeToFixed which="FIRST" weekday="MONDAY" when="CLOSEST" descriptionPropertiesKey="AUCKLAND_ANNIVERSARY">
+        <day month="JANUARY" day="29"/>
+      </FixedWeekdayRelativeToFixed>
+    </Holidays>
+  </SubConfigurations>
+
+  <SubConfigurations hierarchy="can" description="Canterbury">
+    <Holidays>
+      <!-- 16 December, but South Canterbury observes Dominion Day, the 4th Monday in September. -->
+      <FixedWeekday which="FOURTH" weekday="MONDAY" month="SEPTEMBER" descriptionPropertiesKey="CANTERBURY_SOUTH_ANNIVERSARY"/>
+    </Holidays>
+  </SubConfigurations>
+
+  <SubConfigurations hierarchy="cit" description="Chatham Islands Territory">
+    <Holidays>
+      <FixedWeekdayRelativeToFixed which="FIRST" weekday="MONDAY" when="CLOSEST" descriptionPropertiesKey="CHATHAM_ISLANDS_ANNIVERSARY">
+        <day month="NOVEMBER" day="30"/>
+      </FixedWeekdayRelativeToFixed>
     </Holidays>
   </SubConfigurations>
+
+  <SubConfigurations hierarchy="gis" description="Gisborne">
+    <Holidays>
+      <FixedWeekdayRelativeToFixed which="FIRST" weekday="MONDAY" when="CLOSEST" descriptionPropertiesKey="AUCKLAND_ANNIVERSARY">
+        <day month="JANUARY" day="29"/>
+      </FixedWeekdayRelativeToFixed>
+    </Holidays>
+  </SubConfigurations>
+
   <SubConfigurations hierarchy="hkb" description="Hawke's Bay">
     <Holidays>
       <!-- 1 November, but moves to Friday before Labour Day. -->
       <RelativeToWeekdayInMonth weekday="FRIDAY" when="BEFORE" descriptionPropertiesKey="HAWKES_BAY_ANNIVERSARY">
         <FixedWeekday which="FOURTH" weekday="MONDAY" month="OCTOBER" descriptionPropertiesKey="LABOUR_DAY"/>
       </RelativeToWeekdayInMonth>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="wgn" description="Wellington">
-    <Holidays>
-      <FixedWeekdayRelativeToFixed which="FIRST" weekday="MONDAY" when="CLOSEST"
-                                       descriptionPropertiesKey="WELLINGTON_ANNIVERSARY">
-        <day month="JANUARY" day="22"/>
+
+      <FixedWeekdayRelativeToFixed which="FIRST" weekday="MONDAY" when="CLOSEST" descriptionPropertiesKey="AUCKLAND_ANNIVERSARY">
+        <day month="JANUARY" day="29"/>
       </FixedWeekdayRelativeToFixed>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="mbh" description="Marlborough">
     <Holidays>
       <!-- 1 November, but observed 1st Monday after Labour Day. -->
@@ -109,66 +141,84 @@
       </RelativeToWeekdayInMonth>
     </Holidays>
   </SubConfigurations>
-  <SubConfigurations hierarchy="nsn" description="Nelson">
+
+  <SubConfigurations hierarchy="mwt" description="Manawatu-Wanganui">
     <Holidays>
-      <FixedWeekdayRelativeToFixed which="FIRST" weekday="MONDAY" when="CLOSEST"
-                                       descriptionPropertiesKey="NELSON_ANNIVERSARY">
-        <day month="FEBRUARY" day="1"/>
+      <FixedWeekdayRelativeToFixed which="FIRST" weekday="MONDAY" when="CLOSEST" descriptionPropertiesKey="WELLINGTON_ANNIVERSARY">
+        <day month="JANUARY" day="22"/>
+      </FixedWeekdayRelativeToFixed>
+      <FixedWeekdayRelativeToFixed which="FIRST" weekday="MONDAY" when="CLOSEST" descriptionPropertiesKey="AUCKLAND_ANNIVERSARY">
+        <day month="JANUARY" day="29"/>
       </FixedWeekdayRelativeToFixed>
     </Holidays>
   </SubConfigurations>
-  <SubConfigurations hierarchy="can" description="Canterbury">
-    <Holidays>
-      <!-- 16 December, but Northern & Central Canterbury areas observe Christchurch Show Day.
-           The definition for the Canterbury Anniversary Day celebration as decided by Christchurch City
-           is the second Friday after the first Tuesday in November each year.
-       -->
-      <!--
-      <RelativeToWeekdayInMonth which="SECOND" weekday="FRIDAY", when="AFTER" descriptionPropertiesKey="CANTERBURY_SOUTH_ANNIVERSARY">
-         <FixedWeekday which="FIRST" weekday="TUESDAY" month="NOVEMBER" />
-      </RelativeToWeekdayInMonth>
-     -->
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="cans" description="Canterbury (South)">
+
+  <SubConfigurations hierarchy="nsn" description="Nelson">
     <Holidays>
-      <!-- 16 December, but South Canterbury observes Dominion Day, the 4th Monday in September. -->
-      <FixedWeekday which="FOURTH" weekday="MONDAY" month="SEPTEMBER"
-                        descriptionPropertiesKey="CANTERBURY_SOUTH_ANNIVERSARY"/>
+      <FixedWeekdayRelativeToFixed which="FIRST" weekday="MONDAY" when="CLOSEST" descriptionPropertiesKey="NELSON_ANNIVERSARY">
+        <day month="FEBRUARY" day="1"/>
+      </FixedWeekdayRelativeToFixed>
     </Holidays>
   </SubConfigurations>
-  <SubConfigurations hierarchy="wtc" description="Westland">
+
+  <SubConfigurations hierarchy="ntl" description="Northland">
     <Holidays>
-      <!-- Varies throughout Westland, but Greymouth observes the official day. -->
-      <FixedWeekdayRelativeToFixed which="FIRST" weekday="MONDAY" when="CLOSEST"
-                                       descriptionPropertiesKey="WESTLAND_ANNIVERSARY">
-        <day month="DECEMBER" day="1"/>
+      <FixedWeekdayRelativeToFixed which="FIRST" weekday="MONDAY" when="CLOSEST" descriptionPropertiesKey="AUCKLAND_ANNIVERSARY">
+        <day month="JANUARY" day="29"/>
       </FixedWeekdayRelativeToFixed>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="ota" description="Otago">
     <Holidays>
-      <FixedWeekdayRelativeToFixed which="FIRST" weekday="MONDAY" when="CLOSEST"
-                                       descriptionPropertiesKey="OTAGO_ANNIVERSARY">
+      <FixedWeekdayRelativeToFixed which="FIRST" weekday="MONDAY" when="CLOSEST" descriptionPropertiesKey="OTAGO_ANNIVERSARY">
         <day month="MARCH" day="23"/>
       </FixedWeekdayRelativeToFixed>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="stl" description="Southland">
     <Holidays>
       <!-- In December 2011 the three southern Mayors decided Southland Anniversary Day will be celebrated on Easter Tuesday. -->
       <ChristianHoliday validFrom="2012" type="EASTER_TUESDAY" descriptionPropertiesKey="SOUTHLAND_ANNIVERSARY"/>
-      <FixedWeekdayRelativeToFixed validTo="2011" which="FIRST" weekday="MONDAY" when="CLOSEST"
-                                       descriptionPropertiesKey="SOUTHLAND_ANNIVERSARY">
+      <FixedWeekdayRelativeToFixed validTo="2011" which="FIRST" weekday="MONDAY" when="CLOSEST" descriptionPropertiesKey="SOUTHLAND_ANNIVERSARY">
         <day month="JANUARY" day="17"/>
       </FixedWeekdayRelativeToFixed>
     </Holidays>
   </SubConfigurations>
-  <SubConfigurations hierarchy="cit" description="Chatham Islands">
+
+  <SubConfigurations hierarchy="tas" description="Tasman">
+    <Holidays/>
+  </SubConfigurations>
+
+  <SubConfigurations hierarchy="tki" description="Taranaki">
     <Holidays>
-      <FixedWeekdayRelativeToFixed which="FIRST" weekday="MONDAY" when="CLOSEST"
-                                       descriptionPropertiesKey="CHATHAM_ISLANDS_ANNIVERSARY">
-        <day month="NOVEMBER" day="30"/>
+      <!-- 31 March, but moves to 2nd Monday in March to avoid Easter. -->
+      <FixedWeekday which="SECOND" weekday="MONDAY" month="MARCH" descriptionPropertiesKey="TARANAKI_ANNIVERSARY"/>
+    </Holidays>
+  </SubConfigurations>
+
+  <SubConfigurations hierarchy="wgn" description="Wellington">
+    <Holidays>
+      <FixedWeekdayRelativeToFixed which="FIRST" weekday="MONDAY" when="CLOSEST" descriptionPropertiesKey="WELLINGTON_ANNIVERSARY">
+        <day month="JANUARY" day="22"/>
+      </FixedWeekdayRelativeToFixed>
+    </Holidays>
+  </SubConfigurations>
+
+  <SubConfigurations hierarchy="wko" description="Waikato">
+    <Holidays>
+      <FixedWeekdayRelativeToFixed which="FIRST" weekday="MONDAY" when="CLOSEST" descriptionPropertiesKey="AUCKLAND_ANNIVERSARY">
+        <day month="JANUARY" day="29"/>
+      </FixedWeekdayRelativeToFixed>
+    </Holidays>
+  </SubConfigurations>
+
+  <SubConfigurations hierarchy="wtc" description="West Coast">
+    <Holidays>
+      <!-- Varies throughout Westland, but Greymouth observes the official day. -->
+      <FixedWeekdayRelativeToFixed which="FIRST" weekday="MONDAY" when="CLOSEST" descriptionPropertiesKey="WESTLAND_ANNIVERSARY">
+        <day month="DECEMBER" day="1"/>
       </FixedWeekdayRelativeToFixed>
     </Holidays>
   </SubConfigurations>
diff --git a/jollyday-core/src/main/resources/holidays/Holidays_pt.xml b/jollyday-core/src/main/resources/holidays/Holidays_pt.xml
index 4836ee20f..6f77a5480 100644
--- a/jollyday-core/src/main/resources/holidays/Holidays_pt.xml
+++ b/jollyday-core/src/main/resources/holidays/Holidays_pt.xml
@@ -20,1570 +20,1935 @@
     <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
     <ChristianHoliday type="CORPUS_CHRISTI" descriptionPropertiesKey="christian.CORPUS_CHRISTI"/>
   </Holidays>
-  <SubConfigurations hierarchy="ABT" description="Abrantes">
-    <Holidays>
-      <Fixed month="JUNE" day="14" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="AGD" description="Águeda">
-    <Holidays>
-      <ChristianHoliday type="PENTECOST_MONDAY" descriptionPropertiesKey="christian.PENTECOST_MONDAY" localizedType="OFFICIAL_HOLIDAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="AGB" description="Aguiar da Beira">
-    <Holidays>
-      <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="ADL" description="Alandroal">
-    <Holidays>
-      <!-- Second Monday after Easter -->
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="ALB" description="Albergaria-a-Velha">
-    <Holidays>
-      <!-- Monday after the third Sunday of August -->
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="ABF" description="Albufeira">
-    <Holidays>
-      <Fixed month="AUGUST" day="20" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="ASL" description="Alcácer do Sal">
-    <Holidays>
-      <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="ACN" description="Alcanena">
-    <Holidays>
-      <!-- ASCENSION THURSDAY -->
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="ACB" description="Alcobaça">
-    <Holidays>
-      <Fixed month="AUGUST" day="20" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="ACH" description="Alcochete">
-    <Holidays>
-      <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="ACT" description="Alcoutim">
-    <Holidays>
-      <RelativeToWeekdayInMonth weekday="SUNDAY" when="AFTER" descriptionPropertiesKey="CITY_DAY">
-        <FixedWeekday which="FIRST" weekday="FRIDAY" month="SEPTEMBER"/>
-      </RelativeToWeekdayInMonth>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="ALQ" description="Alenquer">
-    <Holidays>
-      <Fixed month="JUNE" day="2" descriptionPropertiesKey="CITY_DAY"/>
-      <!-- ASCENSION THURSDAY -->
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="AFE" description="Alfândega da Fé">
-    <Holidays>
-      <Fixed month="JUNE" day="29" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="ALJ" description="Alijó">
-    <Holidays>
-      <Fixed month="NOVEMBER" day="11" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="AJZ" description="Aljezur">
-    <Holidays>
-      <Fixed month="AUGUST" day="29" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="AJT" description="Aljustrel">
-    <Holidays>
-      <Fixed month="JUNE" day="13" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="ALM" description="Almada">
-    <Holidays>
-      <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="ALD" description="Almeida">
-    <Holidays>
-      <Fixed month="JULY" day="2" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="ALR" description="Almeirim">
-    <Holidays>
-      <!-- ASCENSION THURSDAY -->
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="ADV" description="Almodôvar">
-    <Holidays>
-      <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="APC" description="Alpiarça">
-    <Holidays>
-      <Fixed month="APRIL" day="2" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="ALT" description="Alter do Chão">
-    <Holidays>
-      <!-- ASCENSION THURSDAY -->
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="AVZ" description="Alvaiázere">
-    <Holidays>
-      <Fixed month="JUNE" day="13" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="AVT" description="Alvito">
-    <Holidays>
-      <!-- ASCENSION THURSDAY -->
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="AMD" description="Amadora">
-    <Holidays>
-      <Fixed month="SEPTEMBER" day="11" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="AMT" description="Amarante">
-    <Holidays>
-      <Fixed month="JULY" day="8" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="AMR" description="Amares">
-    <Holidays>
-      <Fixed month="JUNE" day="13" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="AND" description="Anadia">
-    <Holidays>
-      <!-- ASCENSION THURSDAY -->
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="AGH" description="Angra do Heroísmo">
-    <Holidays>
-      <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="ANS" description="Ansião">
-    <Holidays>
-      <!-- ASCENSION THURSDAY -->
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="AVV" description="Arcos de Valdevez">
-    <Holidays>
-      <Fixed month="JUNE" day="11" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="AGN" description="Arganil">
-    <Holidays>
-      <Fixed month="SEPTEMBER" day="7" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="AMM" description="Armamar">
-    <Holidays>
-      <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="ARC" description="Arouca">
-    <Holidays>
-      <Fixed month="MAY" day="2" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="ARL" description="Arraiolos">
-    <Holidays>
-      <!-- ASCENSION THURSDAY -->
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="ARR" description="Arronches">
-    <Holidays>
-      <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="ARV" description="Arruda dos Vinhos">
-    <Holidays>
-      <!-- ASCENSION THURSDAY -->
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="AVR" description="Aveiro">
-    <Holidays>
-      <Fixed month="MAY" day="12" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="AVS" description="Avis">
-    <Holidays>
-      <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="AZB" description="Azambuja">
-    <Holidays>
-      <!-- ASCENSION THURSDAY -->
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="BAO" description="Baião">
-    <Holidays>
-      <Fixed month="AUGUST" day="24" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="BCL" description="Barcelos">
-    <Holidays>
-      <Fixed month="MAY" day="3" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="BRC" description="Barrancos">
-    <Holidays>
-      <Fixed month="AUGUST" day="28" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="BRR" description="Barreiro">
-    <Holidays>
-      <Fixed month="JUNE" day="28" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="BTL" description="Batalha">
-    <Holidays>
-      <Fixed month="AUGUST" day="14" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="BJA" description="Beja">
-    <Holidays>
-      <!-- ASCENSION THURSDAY -->
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="BMT" description="Belmonte">
-    <Holidays>
-      <Fixed month="APRIL" day="26" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="BNV" description="Benavente">
-    <Holidays>
-      <!-- ASCENSION THURSDAY -->
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="BBR" description="Bombarral">
-    <Holidays>
-      <Fixed month="JUNE" day="29" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="BRB" description="Borba">
-    <Holidays>
-      <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="BTC" description="Boticas">
-    <Holidays>
-      <Fixed month="NOVEMBER" day="6" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="BRG" description="Braga">
-    <Holidays>
-      <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="BGC" description="Bragança">
-    <Holidays>
-      <Fixed month="AUGUST" day="22" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="CBC" description="Cabeceiras de Basto">
-    <Holidays>
-      <Fixed month="SEPTEMBER" day="29" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="CDV" description="Cadaval">
-    <Holidays>
-      <Fixed month="JANUARY" day="13" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="CLD" description="Caldas da Rainha">
-    <Holidays>
-      <Fixed month="MAY" day="15" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="CHT" description="Calheta (Açores)">
-    <Holidays>
-      <Fixed month="NOVEMBER" day="25" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="CLT" description="Calheta (Madeira)">
-    <Holidays>
-      <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="CML" description="Câmara de Lobos">
-    <Holidays>
-      <Fixed month="OCTOBER" day="16" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="CMN" description="Caminha">
-    <Holidays>
-      <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="CMR" description="Campo Maior">
-    <Holidays>
-      <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="CNT" description="Cantanhede">
-    <Holidays>
-      <Fixed month="JULY" day="25" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="CRZ" description="Carrazeda de Ansiães">
-    <Holidays>
-      <Fixed month="AUGUST" day="31" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <!--
-      <SubConfigurations hierarchy="CRS" description="Carregal do Sal">
-        <Holidays>
-            <Fixed month="JUNE" day="13" descriptionPropertiesKey="CITY_DAY"/>
-          </Holidays>
-      </SubConfigurations>
-   -->
-  <SubConfigurations hierarchy="CTX" description="Cartaxo">
-    <Holidays>
-      <!-- ASCENSION THURSDAY -->
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="CSC" description="Cascais">
-    <Holidays>
-      <Fixed month="JUNE" day="13" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <!--
-      <SubConfigurations hierarchy="CPR" description="Castanheira de Pera">
-        <Holidays>
-            <Fixed month="JUNE" day="13" descriptionPropertiesKey="CITY_DAY"/>
-          </Holidays>
-      </SubConfigurations>
-   -->
-  <SubConfigurations hierarchy="CTB" description="Castelo Branco">
-    <Holidays>
-      <!-- Tuesday of the second week after Easter -->
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="CPV" description="Castelo de Paiva">
-    <Holidays>
-      <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="CVD" description="Castelo de Vide">
-    <Holidays>
-      <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="CDR" description="Castro Daire">
-    <Holidays>
-      <Fixed month="JUNE" day="29" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="CTM" description="Castro Marim">
-    <Holidays>
-      <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="CVR" description="Castro Verde">
-    <Holidays>
-      <Fixed month="JUNE" day="29" descriptionPropertiesKey="CITY_DAY"/>
-      <!-- ASCENSION THURSDAY -->
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="CLB" description="Celorico da Beira">
-    <Holidays>
-      <Fixed month="MAY" day="13" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="CBT" description="Celorico de Basto">
-    <Holidays>
-      <Fixed month="JUNE" day="29" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="CHM" description="Chamusca">
-    <Holidays>
-      <!-- ASCENSION THURSDAY -->
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="CHV" description="Chaves">
-    <Holidays>
-      <Fixed month="JULY" day="8" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="CNF" description="Cinfães">
-    <Holidays>
-      <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="CBR" description="Coimbra">
-    <Holidays>
-      <Fixed month="JULY" day="4" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="CDN" description="Condeixa-a-Nova">
-    <Holidays>
-      <Fixed month="JULY" day="24" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="CNS" description="Constância">
-    <Holidays>
-      <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="CCH" description="Coruche">
-    <Holidays>
-      <Fixed month="AUGUST" day="17" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <!--
-      <SubConfigurations hierarchy="CRV" description="Corvo">
-        <Holidays>
-            <Fixed month="JUNE" day="13" descriptionPropertiesKey="CITY_DAY"/>
-          </Holidays>
-      </SubConfigurations>
-   -->
-  <SubConfigurations hierarchy="CVL" description="Covilhã">
-    <Holidays>
-      <Fixed month="OCTOBER" day="20" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="CRT" description="Crato">
-    <Holidays>
-      <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="CBA" description="Cuba">
-    <Holidays>
-      <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="ELV" description="Elvas">
-    <Holidays>
-      <Fixed month="JANUARY" day="14" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="ENT" description="Entroncamento">
-    <Holidays>
-      <Fixed month="NOVEMBER" day="24" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="ESP" description="Espinho">
-    <Holidays>
-      <Fixed month="JUNE" day="16" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="EPS" description="Esposende">
-    <Holidays>
-      <Fixed month="AUGUST" day="19" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="ETR" description="Estarreja">
-    <Holidays>
-      <Fixed month="JUNE" day="13" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="ETZ" description="Estremoz">
-    <Holidays>
-      <!-- ASCENSION THURSDAY -->
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="EVR" description="Évora">
-    <Holidays>
-      <Fixed month="JUNE" day="29" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="FAF" description="Fafe">
-    <Holidays>
-      <Fixed month="MAY" day="16" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="FAR" description="Faro">
-    <Holidays>
-      <Fixed month="SEPTEMBER" day="7" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="FLG" description="Felgueiras">
-    <Holidays>
-      <Fixed month="JUNE" day="29" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="FAL" description="Ferreira do Alentejo">
-    <Holidays>
-      <Fixed month="MARCH" day="5" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="FZZ" description="Ferreira do Zêzere">
-    <Holidays>
-      <Fixed month="JUNE" day="13" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="FIG" description="Figueira da Foz">
-    <Holidays>
-      <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="FCR" description="Figueira de Castelo Rodrigo">
-    <Holidays>
-      <Fixed month="JULY" day="7" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="FVN" description="Figueiró dos Vinhos">
-    <Holidays>
-      <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="FAG" description="Fornos de Algodres">
-    <Holidays>
-      <Fixed month="SEPTEMBER" day="29" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="FEC" description="Freixo de Espada à Cinta">
-    <Holidays>
-      <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="FTR" description="Fronteira">
-    <Holidays>
-      <Fixed month="APRIL" day="6" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="FNC" description="Funchal">
-    <Holidays>
-      <Fixed month="AUGUST" day="21" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="FND" description="Fundão">
-    <Holidays>
-      <Fixed month="SEPTEMBER" day="15" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="GAV" description="Gavião">
-    <Holidays>
-      <Fixed month="NOVEMBER" day="23" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="GOI" description="Góis">
-    <Holidays>
-      <Fixed month="AUGUST" day="13" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="GLG" description="Golegã">
-    <Holidays>
-      <!-- ASCENSION THURSDAY -->
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="GDM" description="Gondomar">
-    <Holidays>
-      <!-- Monday after the first Sunday of October -->
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="GVA" description="Gouveia">
-    <Holidays>
-      <!-- Second Monday of August -->
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="GDL" description="Grândola">
-    <Holidays>
-      <Fixed month="OCTOBER" day="22" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="GRD" description="Guarda">
-    <Holidays>
-      <Fixed month="NOVEMBER" day="27" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="GMR" description="Guimarães">
-    <Holidays>
-      <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="HRT" description="Horta">
-    <Holidays>
-      <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="IDN" description="Idanha-a-Nova">
-    <Holidays>
-      <!-- Third Monday after Easter -->
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="ILH" description="Ílhavo">
-    <Holidays>
-      <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="LAG" description="Lagoa (Açores)">
-    <Holidays>
-      <Fixed month="APRIL" day="11" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="LGA" description="Lagoa (Algarve)">
-    <Holidays>
-      <Fixed month="SEPTEMBER" day="8" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="LGS" description="Lagos">
-    <Holidays>
-      <Fixed month="OCTOBER" day="27" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="LGF" description="Lajes das Flores">
-    <Holidays>
-      <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="LGP" description="Lajes do Pico">
-    <Holidays>
-      <Fixed month="JUNE" day="29" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="LMG" description="Lamego">
-    <Holidays>
-      <Fixed month="SEPTEMBER" day="8" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="LRA" description="Leiria">
-    <Holidays>
-      <Fixed month="MAY" day="22" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="LSB" description="Lisboa">
-    <Holidays>
-      <Fixed month="JUNE" day="13" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="LLE" description="Loulé">
-    <Holidays>
-      <!-- ASCENSION THURSDAY -->
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="LRS" description="Loures">
-    <Holidays>
-      <Fixed month="JULY" day="26" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="LNH" description="Lourinhã">
-    <Holidays>
-      <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="LSA" description="Lousã">
-    <Holidays>
-      <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <!--
-      <SubConfigurations hierarchy="LOU" description="Lousada">
-        <Holidays>
-            <Fixed month="JUNE" day="13" descriptionPropertiesKey="CITY_DAY"/>
-          </Holidays>
-      </SubConfigurations>
-   -->
-  <SubConfigurations hierarchy="MAC" description="Mação">
-    <Holidays>
-      <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="MCD" description="Macedo de Cavaleiros">
-    <Holidays>
-      <Fixed month="JUNE" day="29" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="MCH" description="Machico">
-    <Holidays>
-      <Fixed month="OCTOBER" day="9" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="MAD" description="Madalena">
-    <Holidays>
-      <Fixed month="JULY" day="22" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="MFR" description="Mafra">
-    <Holidays>
-      <!-- ASCENSION THURSDAY -->
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="MAI" description="Maia">
-    <Holidays>
-      <!-- Monday after the second Sunday of June -->
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="MGL" description="Mangualde">
-    <Holidays>
-      <Fixed month="SEPTEMBER" day="8" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="MTG" description="Manteigas">
-    <Holidays>
-      <Fixed month="MARCH" day="4" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="MCN" description="Marco de Canaveses">
-    <Holidays>
-      <Fixed month="SEPTEMBER" day="8" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="MGR" description="Marinha Grande">
-    <Holidays>
-      <!-- ASCENSION THURSDAY -->
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="MRV" description="Marvão">
-    <Holidays>
-      <Fixed month="SEPTEMBER" day="8" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="MTS" description="Matosinhos">
-    <Holidays>
-      <!-- Tuesday after the Pentecost Sunday -->
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="MLD" description="Mealhada">
-    <Holidays>
-      <!-- ASCENSION THURSDAY -->
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="MED" description="Mêda">
-    <Holidays>
-      <Fixed month="NOVEMBER" day="11" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="MLG" description="Melgaço">
-    <Holidays>
-      <!-- ASCENSION THURSDAY -->
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="MTL" description="Mértola">
-    <Holidays>
-      <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="MSF" description="Mesão Frio">
-    <Holidays>
-      <Fixed month="NOVEMBER" day="30" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="MIR" description="Mira">
-    <Holidays>
-      <Fixed month="JULY" day="25" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="MCV" description="Miranda do Corvo">
-    <Holidays>
-      <Fixed month="JUNE" day="1" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="MDR" description="Miranda do Douro">
-    <Holidays>
-      <Fixed month="JULY" day="10" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="MDL" description="Mirandela">
-    <Holidays>
-      <Fixed month="MAY" day="25" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="MGD" description="Mogadouro">
-    <Holidays>
-      <Fixed month="OCTOBER" day="15" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="MBR" description="Moimenta da Beira">
-    <Holidays>
-      <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="MTA" description="Moita">
-    <Holidays>
-      <!-- Tuesday after the second Sunday of September -->
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="MNC" description="Monção">
-    <Holidays>
-      <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="MCQ" description="Monchique">
-    <Holidays>
-      <!-- ASCENSION THURSDAY -->
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="MDB" description="Mondim de Basto">
-    <Holidays>
-      <Fixed month="JUNE" day="25" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="MFT" description="Monforte">
-    <Holidays>
-      <!-- Second Monday after Easter -->
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="MTR" description="Montalegre">
-    <Holidays>
-      <Fixed month="JUNE" day="9" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="MMN" description="Montemor-o-Novo">
-    <Holidays>
-      <Fixed month="MARCH" day="8" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="MMV" description="Montemor-o-Velho">
-    <Holidays>
-      <Fixed month="SEPTEMBER" day="8" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="MTJ" description="Montijo">
-    <Holidays>
-      <Fixed month="JUNE" day="29" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="MOR" description="Mora">
-    <Holidays>
-      <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="MRT" description="Mortágua">
-    <Holidays>
-      <!-- ASCENSION THURSDAY -->
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="MRA" description="Moura">
-    <Holidays>
-      <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="MOU" description="Mourão">
-    <Holidays>
-      <Fixed month="FEBRUARY" day="2" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="MUR" description="Murça">
-    <Holidays>
-      <Fixed month="MAY" day="8" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="MRS" description="Murtosa">
-    <Holidays>
-      <Fixed month="SEPTEMBER" day="8" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="NZR" description="Nazaré">
-    <Holidays>
-      <Fixed month="SEPTEMBER" day="8" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="NLS" description="Nelas">
-    <Holidays>
-      <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="NIS" description="Nisa">
-    <Holidays>
-      <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <!--
-      <SubConfigurations hierarchy="NRD" description="Nordeste">
-        <Holidays>
-            <Fixed month="JUNE" day="13" descriptionPropertiesKey="CITY_DAY"/>
-          </Holidays>
-      </SubConfigurations>
-   -->
-  <SubConfigurations hierarchy="OBD" description="Óbidos">
-    <Holidays>
-      <Fixed month="JANUARY" day="11" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="ODM" description="Odemira">
-    <Holidays>
-      <Fixed month="SEPTEMBER" day="8" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="ODV" description="Odivelas">
-    <Holidays>
-      <Fixed month="NOVEMBER" day="19" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="OER" description="Oeiras">
-    <Holidays>
-      <Fixed month="JUNE" day="7" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="OLR" description="Oleiros">
-    <Holidays>
-      <!-- Second Monday of August -->
-    </Holidays>
-  </SubConfigurations>
-  <!--
-      <SubConfigurations hierarchy="OLH" description="Olhão da Restauração">
-        <Holidays>
-            <Fixed month="JUNE" day="13" descriptionPropertiesKey="CITY_DAY"/>
-          </Holidays>
-      </SubConfigurations>
-   -->
-  <SubConfigurations hierarchy="OAZ" description="Oliveira de Azeméis">
-    <Holidays>
-      <!-- Second Monday of August -->
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="OFR" description="Oliveira de Frades">
-    <Holidays>
-      <Fixed month="OCTOBER" day="7" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="OBR" description="Oliveira do Bairro">
-    <Holidays>
-      <!-- ASCENSION THURSDAY -->
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="OHP" description="Oliveira do Hospital">
-    <Holidays>
-      <Fixed month="OCTOBER" day="7" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="ORM" description="Ourém">
-    <Holidays>
-      <Fixed month="JUNE" day="20" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="ORQ" description="Ourique">
-    <Holidays>
-      <Fixed month="SEPTEMBER" day="8" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="OVR" description="Ovar">
-    <Holidays>
-      <Fixed month="JULY" day="25" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="PFR" description="Paços de Ferreira">
-    <Holidays>
-      <Fixed month="NOVEMBER" day="6" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="PLM" description="Palmela">
-    <Holidays>
-      <Fixed month="JUNE" day="1" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="PPS" description="Pampilhosa da Serra">
-    <Holidays>
-      <Fixed month="APRIL" day="10" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="PRD" description="Paredes">
-    <Holidays>
-      <Fixed month="JUNE" day="20" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="PCR" description="Paredes de Coura">
-    <Holidays>
-      <Fixed month="AUGUST" day="10" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <!--
-      <SubConfigurations hierarchy="PGR" description="Pedrógão Grande">
-        <Holidays>
-            <Fixed month="JUNE" day="13" descriptionPropertiesKey="CITY_DAY"/>
-          </Holidays>
-      </SubConfigurations>
-   -->
-  <SubConfigurations hierarchy="PCV" description="Penacova">
-    <Holidays>
-      <Fixed month="JULY" day="17" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="PNF" description="Penafiel">
-    <Holidays>
-      <Fixed month="NOVEMBER" day="11" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <!--
-      <SubConfigurations hierarchy="PCT" description="Penalva do Castelo">
-        <Holidays>
-            <Fixed month="JUNE" day="13" descriptionPropertiesKey="CITY_DAY"/>
-          </Holidays>
-      </SubConfigurations>
-   -->
-  <SubConfigurations hierarchy="PNC" description="Penamacor">
-    <Holidays>
-      <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="PND" description="Penedono">
-    <Holidays>
-      <Fixed month="JUNE" day="29" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="PNL" description="Penela">
-    <Holidays>
-      <Fixed month="SEPTEMBER" day="29" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="PNI" description="Peniche">
-    <Holidays>
-      <!-- Monday after the first Sunday of August -->
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="PRG" description="Peso da Régua">
-    <Holidays>
-      <Fixed month="AUGUST" day="16" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="PNH" description="Pinhel">
-    <Holidays>
-      <Fixed month="AUGUST" day="25" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="PBL" description="Pombal">
-    <Holidays>
-      <Fixed month="NOVEMBER" day="11" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="PDL" description="Ponta Delgada">
-    <Holidays>
-      <!-- Sixth Monday after Easter -->
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="PTS" description="Ponta do Sol">
-    <Holidays>
-      <Fixed month="SEPTEMBER" day="8" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="PTB" description="Ponte da Barca">
-    <Holidays>
-      <Fixed month="AUGUST" day="24" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="PTL" description="Ponte de Lima">
-    <Holidays>
-      <Fixed month="SEPTEMBER" day="20" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="PSR" description="Ponte de Sor">
-    <Holidays>
-      <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="PTG" description="Portalegre">
-    <Holidays>
-      <Fixed month="MAY" day="23" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="PRL" description="Portel">
-    <Holidays>
-      <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="PTM" description="Portimão">
-    <Holidays>
-      <Fixed month="DECEMBER" day="11" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="PRT" description="Porto">
-    <Holidays>
-      <Fixed month="JUNE" day="1" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="PMS" description="Porto de Mós">
-    <Holidays>
-      <Fixed month="JUNE" day="29" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="PMZ" description="Porto Moniz">
-    <Holidays>
-      <Fixed month="JULY" day="22" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="PST" description="Porto Santo">
-    <Holidays>
-      <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="PVL" description="Póvoa de Lanhoso">
-    <Holidays>
-      <Fixed month="MARCH" day="19" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="PVZ" description="Póvoa de Varzim">
-    <Holidays>
-      <Fixed month="JUNE" day="29" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="PVC" description="Povoação">
-    <Holidays>
-      <Fixed month="JULY" day="3" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="VPV" description="Praia da Vitória">
-    <Holidays>
-      <Fixed month="JUNE" day="20" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="PNV" description="Proença-a-Nova">
-    <Holidays>
-      <Fixed month="JUNE" day="13" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="RDD" description="Redondo">
-    <Holidays>
-      <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="RMZ" description="Reguengos de Monsaraz">
-    <Holidays>
-      <Fixed month="JUNE" day="13" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="RSD" description="Resende">
-    <Holidays>
-      <Fixed month="SEPTEMBER" day="29" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="RBR" description="Ribeira Brava">
-    <Holidays>
-      <Fixed month="JUNE" day="29" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="RPN" description="Ribeira de Pena">
-    <Holidays>
-      <Fixed month="AUGUST" day="16" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="RGR" description="Ribeira Grande">
-    <Holidays>
-      <Fixed month="JUNE" day="29" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="RMR" description="Rio Maior">
-    <Holidays>
-      <Fixed month="NOVEMBER" day="6" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="SBS" description="Sabrosa">
-    <Holidays>
-      <Fixed month="SEPTEMBER" day="8" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="SBG" description="Sabugal">
-    <Holidays>
-      <!-- Second Monday after Easter -->
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="SMG" description="Salvaterra de Magos">
-    <Holidays>
-      <!-- ASCENSION THURSDAY -->
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="SCD" description="Santa Comba Dão">
-    <Holidays>
-      <Fixed month="MAY" day="3" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="SCR" description="Santa Cruz">
-    <Holidays>
-      <Fixed month="JANUARY" day="15" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="SCG" description="Santa Cruz da Graciosa">
-    <Holidays>
-      <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="SCF" description="Santa Cruz das Flores">
-    <Holidays>
-      <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="VFR" description="Santa Maria da Feira">
-    <Holidays>
-      <Fixed month="JANUARY" day="20" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="SMP" description="Santa Marta de Penaguião">
-    <Holidays>
-      <Fixed month="JANUARY" day="13" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="STN" description="Santana">
-    <Holidays>
-      <Fixed month="MAY" day="25" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="STR" description="Santarém">
-    <Holidays>
-      <Fixed month="MARCH" day="19" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="STC" description="Santiago do Cacém">
-    <Holidays>
-      <Fixed month="JULY" day="25" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="STS" description="Santo Tirso">
-    <Holidays>
-      <Fixed month="JULY" day="11" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="SBA" description="São Brás de Alportel">
-    <Holidays>
-      <Fixed month="JUNE" day="1" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="SJM" description="São João da Madeira">
-    <Holidays>
-      <Fixed month="OCTOBER" day="11" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <!--
-      <SubConfigurations hierarchy="SJP" description="São João da Pesqueira">
-        <Holidays>
-            <Fixed month="JUNE" day="13" descriptionPropertiesKey="CITY_DAY"/>
-          </Holidays>
-      </SubConfigurations>
-   -->
-  <SubConfigurations hierarchy="SPS" description="São Pedro do Sul">
-    <Holidays>
-      <Fixed month="JUNE" day="29" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="SRQ" description="São Roque do Pico">
-    <Holidays>
-      <Fixed month="AUGUST" day="16" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="SVC" description="São Vicente">
-    <Holidays>
-      <Fixed month="JANUARY" day="22" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="SRD" description="Sardoal">
-    <Holidays>
-      <Fixed month="SEPTEMBER" day="22" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="SAT" description="Sátão">
-    <Holidays>
-      <Fixed month="AUGUST" day="20" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="SEI" description="Seia">
-    <Holidays>
-      <Fixed month="JULY" day="3" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="SXL" description="Seixal">
-    <Holidays>
-      <Fixed month="JUNE" day="29" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="SRN" description="Sernancelhe">
-    <Holidays>
-      <Fixed month="MAY" day="3" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <!--
-      <SubConfigurations hierarchy="SRP" description="Serpa">
-        <Holidays>
-            <Fixed month="JUNE" day="13" descriptionPropertiesKey="CITY_DAY"/>
-          </Holidays>
-      </SubConfigurations>
-   -->
-  <SubConfigurations hierarchy="SRT" description="Sertã">
-    <Holidays>
-      <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="SSB" description="Sesimbra">
-    <Holidays>
-      <Fixed month="MAY" day="4" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="STB" description="Setúbal">
-    <Holidays>
-      <Fixed month="SEPTEMBER" day="15" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="SVV" description="Sever do Vouga">
-    <Holidays>
-      <Fixed month="SEPTEMBER" day="21" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="SLV" description="Silves">
-    <Holidays>
-      <Fixed month="SEPTEMBER" day="3" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="SNS" description="Sines">
-    <Holidays>
-      <Fixed month="NOVEMBER" day="24" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="SNT" description="Sintra">
-    <Holidays>
-      <Fixed month="JUNE" day="29" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="SMA" description="Sobral de Monte Agraço">
-    <Holidays>
-      <!-- ASCENSION THURSDAY -->
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="SRE" description="Soure">
-    <Holidays>
-      <Fixed month="SEPTEMBER" day="21" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="SSL" description="Sousel">
-    <Holidays>
-      <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="TBU" description="Tábua">
-    <Holidays>
-      <Fixed month="APRIL" day="10" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="TBC" description="Tabuaço">
-    <Holidays>
-      <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="TRC" description="Tarouca">
-    <Holidays>
-      <Fixed month="SEPTEMBER" day="29" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="TVR" description="Tavira">
-    <Holidays>
-      <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="TBR" description="Terras de Bouro">
-    <Holidays>
-      <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="TMR" description="Tomar">
-    <Holidays>
-      <Fixed month="MARCH" day="1" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="TND" description="Tondela">
-    <Holidays>
-      <Fixed month="SEPTEMBER" day="16" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="TMC" description="Torre de Moncorvo">
-    <Holidays>
-      <Fixed month="MARCH" day="19" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="TNV" description="Torres Novas">
-    <Holidays>
-      <!-- ASCENSION THURSDAY -->
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="TVD" description="Torres Vedras">
-    <Holidays>
-      <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="TCR" description="Trancoso">
-    <Holidays>
-      <Fixed month="MAY" day="29" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="TRF" description="Trofa">
-    <Holidays>
-      <Fixed month="NOVEMBER" day="19" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="VGS" description="Vagos">
-    <Holidays>
-      <ChristianHoliday type="PENTECOST_MONDAY" descriptionPropertiesKey="christian.PENTECOST_MONDAY" localizedType="OFFICIAL_HOLIDAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="VAC" description="Vale de Cambra">
-    <Holidays>
-      <Fixed month="JUNE" day="13" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="VLC" description="Valença">
-    <Holidays>
-      <Fixed month="FEBRUARY" day="18" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="VLG" description="Valongo">
-    <Holidays>
-      <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="VPC" description="Valpaços">
-    <Holidays>
-      <Fixed month="NOVEMBER" day="6" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="VLS" description="Velas">
-    <Holidays>
-      <Fixed month="APRIL" day="23" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="VND" description="Vendas Novas">
-    <Holidays>
-      <Fixed month="SEPTEMBER" day="7" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="VNT" description="Viana do Alentejo">
-    <Holidays>
-      <Fixed month="JANUARY" day="13" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="VCT" description="Viana do Castelo">
-    <Holidays>
-      <Fixed month="AUGUST" day="20" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="VDG" description="Vidigueira">
-    <Holidays>
-      <!-- ASCENSION THURSDAY -->
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="VRM" description="Vieira do Minho">
-    <Holidays>
-      <!-- Monday after the first Sunday of October -->
-    </Holidays>
-  </SubConfigurations>
-  <!--
-      <SubConfigurations hierarchy="VLR" description="Vila de Rei">
-        <Holidays>
-            <Fixed month="JUNE" day="13" descriptionPropertiesKey="CITY_DAY"/>
-          </Holidays>
-      </SubConfigurations>
-   -->
-  <SubConfigurations hierarchy="VBP" description="Vila do Bispo">
-    <Holidays>
-      <Fixed month="SEPTEMBER" day="20" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="VCD" description="Vila do Conde">
-    <Holidays>
-      <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="VPT" description="Vila do Porto">
-    <Holidays>
-      <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="VFL" description="Vila Flor">
-    <Holidays>
-      <Fixed month="AUGUST" day="24" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="VFX" description="Vila Franca de Xira">
-    <Holidays>
-      <!-- ASCENSION THURSDAY -->
-    </Holidays>
+
+  <SubConfigurations hierarchy="01" description="Aveiro">
+    <Holidays/>
+
+    <SubConfigurations hierarchy="AGD" description="Águeda">
+      <Holidays>
+        <ChristianHoliday type="PENTECOST_MONDAY" descriptionPropertiesKey="christian.PENTECOST_MONDAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="ALB" description="Albergaria-a-Velha">
+      <Holidays>
+        <!-- Monday after the third Sunday of August -->
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="AND" description="Anadia">
+      <Holidays>
+        <!-- ASCENSION THURSDAY -->
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="ARC" description="Arouca">
+      <Holidays>
+        <Fixed month="MAY" day="2" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="AVR" description="Aveiro">
+      <Holidays>
+        <Fixed month="MAY" day="12" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="CPV" description="Castelo de Paiva">
+      <Holidays>
+        <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="ESP" description="Espinho">
+      <Holidays>
+        <Fixed month="JUNE" day="16" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="ETR" description="Estarreja">
+      <Holidays>
+        <Fixed month="JUNE" day="13" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="ILH" description="Ílhavo">
+      <Holidays>
+        <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="MLD" description="Mealhada">
+      <Holidays>
+        <!-- ASCENSION THURSDAY -->
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="MRS" description="Murtosa">
+      <Holidays>
+        <Fixed month="SEPTEMBER" day="8" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="OAZ" description="Oliveira de Azeméis">
+      <Holidays>
+        <!-- Second Monday of August -->
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="VAC" description="Vale de Cambra">
+      <Holidays>
+        <Fixed month="JUNE" day="13" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="VGS" description="Vagos">
+      <Holidays>
+        <ChristianHoliday type="PENTECOST_MONDAY" descriptionPropertiesKey="christian.PENTECOST_MONDAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="SVV" description="Sever do Vouga">
+      <Holidays>
+        <Fixed month="SEPTEMBER" day="21" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="SJM" description="São João da Madeira">
+      <Holidays>
+        <Fixed month="OCTOBER" day="11" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="VFR" description="Santa Maria da Feira">
+      <Holidays>
+        <Fixed month="JANUARY" day="20" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="OVR" description="Ovar">
+      <Holidays>
+        <Fixed month="JULY" day="25" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="OBR" description="Oliveira do Bairro">
+      <Holidays>
+        <!-- ASCENSION THURSDAY -->
+      </Holidays>
+    </SubConfigurations>
   </SubConfigurations>
-  <SubConfigurations hierarchy="VFC" description="Vila Franca do Campo">
-    <Holidays>
-      <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
+
+  <SubConfigurations hierarchy="20" description="Azoren">
+    <Holidays/>
+
+    <SubConfigurations hierarchy="VFC" description="Vila Franca do Campo">
+      <Holidays>
+        <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="VPT" description="Vila do Porto">
+      <Holidays>
+        <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="VLS" description="Velas">
+      <Holidays>
+        <Fixed month="APRIL" day="23" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="SRQ" description="São Roque do Pico">
+      <Holidays>
+        <Fixed month="AUGUST" day="16" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="SCF" description="Santa Cruz das Flores">
+      <Holidays>
+        <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="SCG" description="Santa Cruz da Graciosa">
+      <Holidays>
+        <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="RGR" description="Ribeira Grande">
+      <Holidays>
+        <Fixed month="JUNE" day="29" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="VPV" description="Praia da Vitória">
+      <Holidays>
+        <Fixed month="JUNE" day="20" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="PVC" description="Povoação">
+      <Holidays>
+        <Fixed month="JULY" day="3" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="PDL" description="Ponta Delgada">
+      <Holidays>
+        <!-- Sixth Monday after Easter -->
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="NRD" description="Nordeste">
+      <Holidays>
+        <Fixed month="JUNE" day="13" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="MAD" description="Madalena">
+      <Holidays>
+        <Fixed month="JULY" day="22" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="LGP" description="Lajes do Pico">
+      <Holidays>
+        <Fixed month="JUNE" day="29" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="LGF" description="Lajes das Flores">
+      <Holidays>
+        <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="LAG" description="Lagoa (Açores)">
+      <Holidays>
+        <Fixed month="APRIL" day="11" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="HRT" description="Horta">
+      <Holidays>
+        <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="CRV" description="Corvo">
+      <Holidays>
+        <Fixed month="JUNE" day="13" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="CHT" description="Calheta (Açores)">
+      <Holidays>
+        <Fixed month="NOVEMBER" day="25" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="AGH" description="Angra do Heroísmo">
+      <Holidays>
+        <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
   </SubConfigurations>
-  <SubConfigurations hierarchy="VNB" description="Vila Nova da Barquinha">
-    <Holidays>
-      <Fixed month="JUNE" day="13" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
+
+  <SubConfigurations hierarchy="02" description="Beja">
+    <Holidays/>
+
+    <SubConfigurations hierarchy="VDG" description="Vidigueira">
+      <Holidays>
+        <!-- ASCENSION THURSDAY -->
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="SRP" description="Serpa">
+      <Holidays>
+        <Fixed month="JUNE" day="13" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="ORQ" description="Ourique">
+      <Holidays>
+        <Fixed month="SEPTEMBER" day="8" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="ODM" description="Odemira">
+      <Holidays>
+        <Fixed month="SEPTEMBER" day="8" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="MRA" description="Moura">
+      <Holidays>
+        <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="MTL" description="Mértola">
+      <Holidays>
+        <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="FAL" description="Ferreira do Alentejo">
+      <Holidays>
+        <Fixed month="MARCH" day="5" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="CBA" description="Cuba">
+      <Holidays>
+        <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="CVR" description="Castro Verde">
+      <Holidays>
+        <Fixed month="JUNE" day="29" descriptionPropertiesKey="CITY_DAY"/>
+        <!-- ASCENSION THURSDAY -->
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="BJA" description="Beja">
+      <Holidays>
+        <!-- ASCENSION THURSDAY -->
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="BRC" description="Barrancos">
+      <Holidays>
+        <Fixed month="AUGUST" day="28" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="AVT" description="Alvito">
+      <Holidays>
+        <!-- ASCENSION THURSDAY -->
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="ADV" description="Almodôvar">
+      <Holidays>
+        <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="AJT" description="Aljustrel">
+      <Holidays>
+        <Fixed month="JUNE" day="13" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
   </SubConfigurations>
-  <SubConfigurations hierarchy="VNC" description="Vila Nova de Cerveira">
-    <Holidays>
-      <Fixed month="OCTOBER" day="1" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
+
+  <SubConfigurations hierarchy="03" description="Braga">
+    <Holidays/>
+
+    <SubConfigurations hierarchy="AMR" description="Amares">
+      <Holidays>
+        <Fixed month="JUNE" day="13" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="ANS" description="Ansião">
+      <Holidays>
+        <!-- ASCENSION THURSDAY -->
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="BCL" description="Barcelos">
+      <Holidays>
+        <Fixed month="MAY" day="3" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="BRG" description="Braga">
+      <Holidays>
+        <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="BGC" description="Bragança">
+      <Holidays>
+        <Fixed month="AUGUST" day="22" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="CBC" description="Cabeceiras de Basto">
+      <Holidays>
+        <Fixed month="SEPTEMBER" day="29" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="CDV" description="Cadaval">
+      <Holidays>
+        <Fixed month="JANUARY" day="13" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="CBT" description="Celorico de Basto">
+      <Holidays>
+        <Fixed month="JUNE" day="29" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="EPS" description="Esposende">
+      <Holidays>
+        <Fixed month="AUGUST" day="19" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="FAF" description="Fafe">
+      <Holidays>
+        <Fixed month="MAY" day="16" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="GMR" description="Guimarães">
+      <Holidays>
+        <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="PVL" description="Póvoa de Lanhoso">
+      <Holidays>
+        <Fixed month="MARCH" day="19" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="TBR" description="Terras de Bouro">
+      <Holidays>
+        <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="VRM" description="Vieira do Minho">
+      <Holidays>
+        <!-- Monday after the first Sunday of October -->
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="VNF" description="Vila Nova de Famalicão">
+      <Holidays>
+        <Fixed month="JUNE" day="13" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="VVD" description="Vila Verde">
+      <Holidays>
+        <Fixed month="JUNE" day="13" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="VIZ" description="Vizela">
+      <Holidays>
+        <Fixed month="MARCH" day="19" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
   </SubConfigurations>
-  <SubConfigurations hierarchy="VNF" description="Vila Nova de Famalicão">
-    <Holidays>
-      <Fixed month="JUNE" day="13" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
+
+  <SubConfigurations hierarchy="04" description="Bragança">
+    <Holidays/>
+    <SubConfigurations hierarchy="AFE" description="Alfândega da Fé">
+      <Holidays>
+        <Fixed month="JUNE" day="29" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="CRZ" description="Carrazeda de Ansiães">
+      <Holidays>
+        <Fixed month="AUGUST" day="31" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="FEC" description="Freixo de Espada à Cinta">
+      <Holidays>
+        <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="MCD" description="Macedo de Cavaleiros">
+      <Holidays>
+        <Fixed month="JUNE" day="29" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="MDR" description="Miranda do Douro">
+      <Holidays>
+        <Fixed month="JULY" day="10" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="MDL" description="Mirandela">
+      <Holidays>
+        <Fixed month="MAY" day="25" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="MGD" description="Mogadouro">
+      <Holidays>
+        <Fixed month="OCTOBER" day="15" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="TMC" description="Torre de Moncorvo">
+      <Holidays>
+        <Fixed month="MARCH" day="19" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="VFL" description="Vila Flor">
+      <Holidays>
+        <Fixed month="AUGUST" day="24" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="VMS" description="Vimioso">
+      <Holidays>
+        <Fixed month="AUGUST" day="10" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="VNH" description="Vinhais">
+      <Holidays>
+        <Fixed month="MAY" day="20" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
   </SubConfigurations>
-  <SubConfigurations hierarchy="VLF" description="Vila Nova de Foz Côa">
-    <Holidays>
-      <Fixed month="MAY" day="21" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
+
+  <SubConfigurations hierarchy="05" description="Castelo Branco">
+    <Holidays/>
+
+    <SubConfigurations hierarchy="BMT" description="Belmonte">
+      <Holidays>
+        <Fixed month="APRIL" day="26" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="CTB" description="Castelo Branco">
+      <Holidays>
+        <!-- Tuesday of the second week after Easter -->
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="CVL" description="Covilhã">
+      <Holidays>
+        <Fixed month="OCTOBER" day="20" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="FND" description="Fundão">
+      <Holidays>
+        <Fixed month="SEPTEMBER" day="15" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="IDN" description="Idanha-a-Nova">
+      <Holidays>
+        <!-- Third Monday after Easter -->
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="OLR" description="Oleiros">
+      <Holidays>
+        <!-- Second Monday of August -->
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="PNC" description="Penamacor">
+      <Holidays>
+        <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="PNV" description="Proença-a-Nova">
+      <Holidays>
+        <Fixed month="JUNE" day="13" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="SRT" description="Sertã">
+      <Holidays>
+        <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="VLR" description="Vila de Rei">
+      <Holidays>
+        <Fixed month="JUNE" day="13" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="VVR" description="Vila Velha de Ródão">
+      <Holidays>
+        <!-- Monday after the fourth Sunday of August -->
+      </Holidays>
+    </SubConfigurations>
+
   </SubConfigurations>
-  <SubConfigurations hierarchy="VNG" description="Vila Nova de Gaia">
-    <Holidays>
-      <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
+
+  <SubConfigurations hierarchy="06" description="Coimbra">
+    <Holidays/>
+
+    <SubConfigurations hierarchy="AGN" description="Arganil">
+      <Holidays>
+        <Fixed month="SEPTEMBER" day="7" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="CNT" description="Cantanhede">
+      <Holidays>
+        <Fixed month="JULY" day="25" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="CBR" description="Coimbra">
+      <Holidays>
+        <Fixed month="JULY" day="4" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="CDN" description="Condeixa-a-Nova">
+      <Holidays>
+        <Fixed month="JULY" day="24" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="FIG" description="Figueira da Foz">
+      <Holidays>
+        <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="GOI" description="Góis">
+      <Holidays>
+        <Fixed month="AUGUST" day="13" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="LSA" description="Lousã">
+      <Holidays>
+        <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="MIR" description="Mira">
+      <Holidays>
+        <Fixed month="JULY" day="25" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="MCV" description="Miranda do Corvo">
+      <Holidays>
+        <Fixed month="JUNE" day="1" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="MMV" description="Montemor-o-Velho">
+      <Holidays>
+        <Fixed month="SEPTEMBER" day="8" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="OHP" description="Oliveira do Hospital">
+      <Holidays>
+        <Fixed month="OCTOBER" day="7" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="PPS" description="Pampilhosa da Serra">
+      <Holidays>
+        <Fixed month="APRIL" day="10" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="PCV" description="Penacova">
+      <Holidays>
+        <Fixed month="JULY" day="17" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="PNL" description="Penela">
+      <Holidays>
+        <Fixed month="SEPTEMBER" day="29" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="SRE" description="Soure">
+      <Holidays>
+        <Fixed month="SEPTEMBER" day="21" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="TBU" description="Tábua">
+      <Holidays>
+        <Fixed month="APRIL" day="10" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="PRS" description="Vila Nova de Poiares">
+      <Holidays>
+        <Fixed month="JANUARY" day="13" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
   </SubConfigurations>
-  <SubConfigurations hierarchy="VNP" description="Vila Nova de Paiva">
-    <Holidays>
-      <Fixed month="MARCH" day="2" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
+
+  <SubConfigurations hierarchy="07" description="Évora">
+    <Holidays/>
+    <SubConfigurations hierarchy="ADL" description="Alandroal">
+      <Holidays>
+        <!-- Second Monday after Easter -->
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="ARL" description="Arraiolos">
+      <Holidays>
+        <!-- ASCENSION THURSDAY -->
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="BRB" description="Borba">
+      <Holidays>
+        <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="ETZ" description="Estremoz">
+      <Holidays>
+        <!-- ASCENSION THURSDAY -->
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="EVR" description="Évora">
+      <Holidays>
+        <Fixed month="JUNE" day="29" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="MMN" description="Montemor-o-Novo">
+      <Holidays>
+        <Fixed month="MARCH" day="8" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="MOR" description="Mora">
+      <Holidays>
+        <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="MOU" description="Mourão">
+      <Holidays>
+        <Fixed month="FEBRUARY" day="2" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="PRL" description="Portel">
+      <Holidays>
+        <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="RDD" description="Redondo">
+      <Holidays>
+        <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="RMZ" description="Reguengos de Monsaraz">
+      <Holidays>
+        <Fixed month="JUNE" day="13" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="VND" description="Vendas Novas">
+      <Holidays>
+        <Fixed month="SEPTEMBER" day="7" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="VNT" description="Viana do Alentejo">
+      <Holidays>
+        <Fixed month="JANUARY" day="13" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="VVC" description="Vila Viçosa">
+      <Holidays>
+        <Fixed month="AUGUST" day="16" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
   </SubConfigurations>
-  <SubConfigurations hierarchy="PRS" description="Vila Nova de Poiares">
-    <Holidays>
-      <Fixed month="JANUARY" day="13" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
+
+  <SubConfigurations hierarchy="08" description="Faro">
+    <Holidays/>
+
+    <SubConfigurations hierarchy="ABF" description="Albufeira">
+      <Holidays>
+        <Fixed month="AUGUST" day="20" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="ACT" description="Alcoutim">
+      <Holidays>
+        <RelativeToWeekdayInMonth weekday="SUNDAY" when="AFTER" descriptionPropertiesKey="CITY_DAY">
+          <FixedWeekday which="FIRST" weekday="FRIDAY" month="SEPTEMBER"/>
+        </RelativeToWeekdayInMonth>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="AJZ" description="Aljezur">
+      <Holidays>
+        <Fixed month="AUGUST" day="29" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="CTM" description="Castro Marim">
+      <Holidays>
+        <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="FAR" description="Faro">
+      <Holidays>
+        <Fixed month="SEPTEMBER" day="7" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="LGA" description="Lagoa">
+      <Holidays>
+        <Fixed month="SEPTEMBER" day="8" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="LGS" description="Lagos">
+      <Holidays>
+        <Fixed month="OCTOBER" day="27" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="LLE" description="Loulé">
+      <Holidays>
+        <!-- ASCENSION THURSDAY -->
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="MCQ" description="Monchique">
+      <Holidays>
+        <!-- ASCENSION THURSDAY -->
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="OLH" description="Olhão">
+      <Holidays>
+        <Fixed month="JUNE" day="13" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="PTM" description="Portimão">
+      <Holidays>
+        <Fixed month="DECEMBER" day="11" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="SBA" description="São Brás de Alportel">
+      <Holidays>
+        <Fixed month="JUNE" day="1" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="SLV" description="Silves">
+      <Holidays>
+        <Fixed month="SEPTEMBER" day="3" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="TVR" description="Tavira">
+      <Holidays>
+        <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="VBP" description="Vila do Bispo">
+      <Holidays>
+        <Fixed month="SEPTEMBER" day="20" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="VRS" description="Vila Real de Santo António">
+      <Holidays>
+        <Fixed month="MAY" day="13" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
   </SubConfigurations>
-  <SubConfigurations hierarchy="VPA" description="Vila Pouca de Aguiar">
-    <Holidays>
-      <Fixed month="JUNE" day="22" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
+
+  <SubConfigurations hierarchy="09" description="Guarda">
+    <Holidays/>
+    <SubConfigurations hierarchy="AGB" description="Aguiar da Beira">
+      <Holidays>
+        <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="ALD" description="Almeida">
+      <Holidays>
+        <Fixed month="JULY" day="2" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="CLB" description="Celorico da Beira">
+      <Holidays>
+        <Fixed month="MAY" day="13" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="FCR" description="Figueira de Castelo Rodrigo">
+      <Holidays>
+        <Fixed month="JULY" day="7" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="FAG" description="Fornos de Algodres">
+      <Holidays>
+        <Fixed month="SEPTEMBER" day="29" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="GVA" description="Gouveia">
+      <Holidays>
+        <!-- Second Monday of August -->
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="GRD" description="Guarda">
+      <Holidays>
+        <Fixed month="NOVEMBER" day="27" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="MTG" description="Manteigas">
+      <Holidays>
+        <Fixed month="MARCH" day="4" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="MED" description="Mêda">
+      <Holidays>
+        <Fixed month="NOVEMBER" day="11" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="PNH" description="Pinhel">
+      <Holidays>
+        <Fixed month="AUGUST" day="25" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="SBG" description="Sabugal">
+      <Holidays>
+        <!-- Second Monday after Easter -->
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="SEI" description="Seia">
+      <Holidays>
+        <Fixed month="JULY" day="3" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="TCR" description="Trancoso">
+      <Holidays>
+        <Fixed month="MAY" day="29" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="VLF" description="Vila Nova de Foz Côa">
+      <Holidays>
+        <Fixed month="MAY" day="21" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
   </SubConfigurations>
-  <SubConfigurations hierarchy="VRL" description="Vila Real">
-    <Holidays>
-      <Fixed month="MAY" day="13" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
+
+  <SubConfigurations hierarchy="10" description="Leiria">
+    <Holidays/>
+
+    <SubConfigurations hierarchy="ACB" description="Alcobaça">
+      <Holidays>
+        <Fixed month="AUGUST" day="20" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="AVZ" description="Alvaiázere">
+      <Holidays>
+        <Fixed month="JUNE" day="13" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="BTL" description="Batalha">
+      <Holidays>
+        <Fixed month="AUGUST" day="14" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="BBR" description="Bombarral">
+      <Holidays>
+        <Fixed month="JUNE" day="29" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="CLD" description="Caldas da Rainha">
+      <Holidays>
+        <Fixed month="MAY" day="15" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="CPR" description="Castanheira de Pera">
+      <Holidays>
+        <Fixed month="JUNE" day="13" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="FVN" description="Figueiró dos Vinhos">
+      <Holidays>
+        <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="LRA" description="Leiria">
+      <Holidays>
+        <Fixed month="MAY" day="22" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="MGR" description="Marinha Grande">
+      <Holidays>
+        <!-- ASCENSION THURSDAY -->
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="NZR" description="Nazaré">
+      <Holidays>
+        <Fixed month="SEPTEMBER" day="8" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="OBD" description="Óbidos">
+      <Holidays>
+        <Fixed month="JANUARY" day="11" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="PGR" description="Pedrógão Grande">
+      <Holidays>
+        <Fixed month="JUNE" day="13" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="PNI" description="Peniche">
+      <Holidays>
+        <!-- Monday after the first Sunday of August -->
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="PBL" description="Pombal">
+      <Holidays>
+        <Fixed month="NOVEMBER" day="11" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="PMS" description="Porto de Mós">
+      <Holidays>
+        <Fixed month="JUNE" day="29" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
   </SubConfigurations>
-  <SubConfigurations hierarchy="VRS" description="Vila Real de Santo António">
-    <Holidays>
-      <Fixed month="MAY" day="13" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
+
+  <SubConfigurations hierarchy="11" description="Lissabon">
+    <Holidays/>
+
+    <SubConfigurations hierarchy="ALQ" description="Alenquer">
+      <Holidays>
+        <Fixed month="JUNE" day="2" descriptionPropertiesKey="CITY_DAY"/>
+        <!-- ASCENSION THURSDAY -->
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="AMD" description="Amadora">
+      <Holidays>
+        <Fixed month="SEPTEMBER" day="11" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="ARV" description="Arruda dos Vinhos">
+      <Holidays>
+        <!-- ASCENSION THURSDAY -->
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="AZB" description="Azambuja">
+      <Holidays>
+        <!-- ASCENSION THURSDAY -->
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="CSC" description="Cascais">
+      <Holidays>
+        <Fixed month="JUNE" day="13" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="LSB" description="Lisboa">
+      <Holidays>
+        <Fixed month="JUNE" day="13" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="LRS" description="Loures">
+      <Holidays>
+        <Fixed month="JULY" day="26" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="LNH" description="Lourinhã">
+      <Holidays>
+        <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="MFR" description="Mafra">
+      <Holidays>
+        <!-- ASCENSION THURSDAY -->
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="ODV" description="Odivelas">
+      <Holidays>
+        <Fixed month="NOVEMBER" day="19" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="OER" description="Oeiras">
+      <Holidays>
+        <Fixed month="JUNE" day="7" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="SNT" description="Sintra">
+      <Holidays>
+        <Fixed month="JUNE" day="29" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="SMA" description="Sobral de Monte Agraço">
+      <Holidays>
+        <!-- ASCENSION THURSDAY -->
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="TVD" description="Torres Vedras">
+      <Holidays>
+        <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="VFX" description="Vila Franca de Xira">
+      <Holidays>
+        <!-- ASCENSION THURSDAY -->
+      </Holidays>
+    </SubConfigurations>
   </SubConfigurations>
-  <SubConfigurations hierarchy="VVR" description="Vila Velha de Ródão">
-    <Holidays>
-      <!-- Monday after the fourth Sunday of August -->
-    </Holidays>
+
+  <SubConfigurations hierarchy="30" description="Madeira">
+    <Holidays/>
+
+    <SubConfigurations hierarchy="CLT" description="Calheta">
+      <Holidays>
+        <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="CML" description="Câmara de Lobos">
+      <Holidays>
+        <Fixed month="OCTOBER" day="16" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="FNC" description="Funchal">
+      <Holidays>
+        <Fixed month="AUGUST" day="21" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="MCH" description="Machico">
+      <Holidays>
+        <Fixed month="OCTOBER" day="9" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="PTS" description="Ponta do Sol">
+      <Holidays>
+        <Fixed month="SEPTEMBER" day="8" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="PMZ" description="Porto Moniz">
+      <Holidays>
+        <Fixed month="JULY" day="22" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="PST" description="Porto Santo">
+      <Holidays>
+        <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="RBR" description="Ribeira Brava">
+      <Holidays>
+        <Fixed month="JUNE" day="29" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="SCR" description="Santa Cruz">
+      <Holidays>
+        <Fixed month="JANUARY" day="15" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="STN" description="Santana">
+      <Holidays>
+        <Fixed month="MAY" day="25" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="SVC" description="São Vicente">
+      <Holidays>
+        <Fixed month="JANUARY" day="22" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
   </SubConfigurations>
-  <SubConfigurations hierarchy="VVD" description="Vila Verde">
-    <Holidays>
-      <Fixed month="JUNE" day="13" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
+
+  <SubConfigurations hierarchy="12" description="Portalegre">
+    <Holidays/>
+
+    <SubConfigurations hierarchy="ALT" description="Alter do Chão">
+      <Holidays>
+        <!-- ASCENSION THURSDAY -->
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="ARR" description="Arronches">
+      <Holidays>
+        <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="AVS" description="Avis">
+      <Holidays>
+        <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="CMR" description="Campo Maior">
+      <Holidays>
+        <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="CVD" description="Castelo de Vide">
+      <Holidays>
+        <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="CRT" description="Crato">
+      <Holidays>
+        <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="ELV" description="Elvas">
+      <Holidays>
+        <Fixed month="JANUARY" day="14" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="FTR" description="Fronteira">
+      <Holidays>
+        <Fixed month="APRIL" day="6" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="GAV" description="Gavião">
+      <Holidays>
+        <Fixed month="NOVEMBER" day="23" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="MRV" description="Marvão">
+      <Holidays>
+        <Fixed month="SEPTEMBER" day="8" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="MFT" description="Monforte">
+      <Holidays>
+        <!-- Second Monday after Easter -->
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="NIS" description="Nisa">
+      <Holidays>
+        <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="PSR" description="Ponte de Sor">
+      <Holidays>
+        <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="PTG" description="Portalegre">
+      <Holidays>
+        <Fixed month="MAY" day="23" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="SSL" description="Sousel">
+      <Holidays>
+        <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
+      </Holidays>
+    </SubConfigurations>
   </SubConfigurations>
-  <SubConfigurations hierarchy="VVC" description="Vila Viçosa">
-    <Holidays>
-      <Fixed month="AUGUST" day="16" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
+
+  <SubConfigurations hierarchy="13" description="Porto">
+    <Holidays/>
+
+    <SubConfigurations hierarchy="AMT" description="Amarante">
+      <Holidays>
+        <Fixed month="JULY" day="8" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="BAO" description="Baião">
+      <Holidays>
+        <Fixed month="AUGUST" day="24" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="FLG" description="Felgueiras">
+      <Holidays>
+        <Fixed month="JUNE" day="29" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="GDM" description="Gondomar">
+      <Holidays>
+        <!-- Monday after the first Sunday of October -->
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="LOU" description="Lousada">
+      <Holidays>
+        <Fixed month="JUNE" day="13" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="MAI" description="Maia">
+      <Holidays>
+        <!-- Monday after the second Sunday of June -->
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="MCN" description="Marco de Canaveses">
+      <Holidays>
+        <Fixed month="SEPTEMBER" day="8" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="MTS" description="Matosinhos">
+      <Holidays>
+        <!-- Tuesday after the Pentecost Sunday -->
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="PFR" description="Paços de Ferreira">
+      <Holidays>
+        <Fixed month="NOVEMBER" day="6" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="PRD" description="Paredes">
+      <Holidays>
+        <Fixed month="JUNE" day="20" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="PNF" description="Penafiel">
+      <Holidays>
+        <Fixed month="NOVEMBER" day="11" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="PRT" description="Porto">
+      <Holidays>
+        <Fixed month="JUNE" day="1" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="PVZ" description="Póvoa de Varzim">
+      <Holidays>
+        <Fixed month="JUNE" day="29" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="STS" description="Santo Tirso">
+      <Holidays>
+        <Fixed month="JULY" day="11" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="TRF" description="Trofa">
+      <Holidays>
+        <Fixed month="NOVEMBER" day="19" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="VLG" description="Valongo">
+      <Holidays>
+        <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="VCD" description="Vila do Conde">
+      <Holidays>
+        <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="VNG" description="Vila Nova de Gaia">
+      <Holidays>
+        <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
   </SubConfigurations>
-  <SubConfigurations hierarchy="VMS" description="Vimioso">
-    <Holidays>
-      <Fixed month="AUGUST" day="10" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
+
+  <SubConfigurations hierarchy="14" description="Santarém">
+    <Holidays/>
+
+    <SubConfigurations hierarchy="ABT" description="Abrantes">
+      <Holidays>
+        <Fixed month="JUNE" day="14" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="ACN" description="Alcanena">
+      <Holidays>
+        <!-- ASCENSION THURSDAY -->
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="ALR" description="Almeirim">
+      <Holidays>
+        <!-- ASCENSION THURSDAY -->
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="APC" description="Alpiarça">
+      <Holidays>
+        <Fixed month="APRIL" day="2" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="BNV" description="Benavente">
+      <Holidays>
+        <!-- ASCENSION THURSDAY -->
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="CTX" description="Cartaxo">
+      <Holidays>
+        <!-- ASCENSION THURSDAY -->
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="CHM" description="Chamusca">
+      <Holidays>
+        <!-- ASCENSION THURSDAY -->
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="CNS" description="Constância">
+      <Holidays>
+        <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="CCH" description="Coruche">
+      <Holidays>
+        <Fixed month="AUGUST" day="17" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="ENT" description="Entroncamento">
+      <Holidays>
+        <Fixed month="NOVEMBER" day="24" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="FZZ" description="Ferreira do Zêzere">
+      <Holidays>
+        <Fixed month="JUNE" day="13" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="GLG" description="Golegã">
+      <Holidays>
+        <!-- ASCENSION THURSDAY -->
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="MAC" description="Mação">
+      <Holidays>
+        <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="ORM" description="Ourém">
+      <Holidays>
+        <Fixed month="JUNE" day="20" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="RMR" description="Rio Maior">
+      <Holidays>
+        <Fixed month="NOVEMBER" day="6" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="SMG" description="Salvaterra de Magos">
+      <Holidays>
+        <!-- ASCENSION THURSDAY -->
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="STR" description="Santarém">
+      <Holidays>
+        <Fixed month="MARCH" day="19" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="SRD" description="Sardoal">
+      <Holidays>
+        <Fixed month="SEPTEMBER" day="22" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="TMR" description="Tomar">
+      <Holidays>
+        <Fixed month="MARCH" day="1" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="TNV" description="Torres Novas">
+      <Holidays>
+        <!-- ASCENSION THURSDAY -->
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="VNB" description="Vila Nova da Barquinha">
+      <Holidays>
+        <Fixed month="JUNE" day="13" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
   </SubConfigurations>
-  <SubConfigurations hierarchy="VNH" description="Vinhais">
-    <Holidays>
-      <Fixed month="MAY" day="20" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
+
+  <SubConfigurations hierarchy="15" description="Setúbal">
+    <Holidays/>
+
+    <SubConfigurations hierarchy="ASL" description="Alcácer do Sal">
+      <Holidays>
+        <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="ACH" description="Alcochete">
+      <Holidays>
+        <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="ALM" description="Almada">
+      <Holidays>
+        <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="BRR" description="Barreiro">
+      <Holidays>
+        <Fixed month="JUNE" day="28" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="GDL" description="Grândola">
+      <Holidays>
+        <Fixed month="OCTOBER" day="22" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="MTA" description="Moita">
+      <Holidays>
+        <!-- Tuesday after the second Sunday of September -->
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="MTJ" description="Montijo">
+      <Holidays>
+        <Fixed month="JUNE" day="29" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="PLM" description="Palmela">
+      <Holidays>
+        <Fixed month="JUNE" day="1" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="STC" description="Santiago do Cacém">
+      <Holidays>
+        <Fixed month="JULY" day="25" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="SXL" description="Seixal">
+      <Holidays>
+        <Fixed month="JUNE" day="29" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="SSB" description="Sesimbra">
+      <Holidays>
+        <Fixed month="MAY" day="4" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="STB" description="Setúbal">
+      <Holidays>
+        <Fixed month="SEPTEMBER" day="15" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="SNS" description="Sines">
+      <Holidays>
+        <Fixed month="NOVEMBER" day="24" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
   </SubConfigurations>
-  <SubConfigurations hierarchy="VIS" description="Viseu">
-    <Holidays>
-      <Fixed month="SEPTEMBER" day="21" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
+
+  <SubConfigurations hierarchy="16" description="Viana do Castelo">
+    <Holidays/>
+    <SubConfigurations hierarchy="AVV" description="Arcos de Valdevez">
+      <Holidays>
+        <Fixed month="JUNE" day="11" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="CMN" description="Caminha">
+      <Holidays>
+        <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="MLG" description="Melgaço">
+      <Holidays>
+        <!-- ASCENSION THURSDAY -->
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="MNC" description="Monção">
+      <Holidays>
+        <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="PCR" description="Paredes de Coura">
+      <Holidays>
+        <Fixed month="AUGUST" day="10" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="PTB" description="Ponte da Barca">
+      <Holidays>
+        <Fixed month="AUGUST" day="24" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="PTL" description="Ponte de Lima">
+      <Holidays>
+        <Fixed month="SEPTEMBER" day="20" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="VLC" description="Valença">
+      <Holidays>
+        <Fixed month="FEBRUARY" day="18" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="VCT" description="Viana do Castelo">
+      <Holidays>
+        <Fixed month="AUGUST" day="20" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="VNC" description="Vila Nova de Cerveira">
+      <Holidays>
+        <Fixed month="OCTOBER" day="1" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
   </SubConfigurations>
-  <SubConfigurations hierarchy="VIZ" description="Vizela">
-    <Holidays>
-      <Fixed month="MARCH" day="19" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
+
+  <SubConfigurations hierarchy="17" description="Vila Real">
+    <Holidays/>
+
+    <SubConfigurations hierarchy="ALJ" description="Alijó">
+      <Holidays>
+        <Fixed month="NOVEMBER" day="11" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="BTC" description="Boticas">
+      <Holidays>
+        <Fixed month="NOVEMBER" day="6" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="CHV" description="Chaves">
+      <Holidays>
+        <Fixed month="JULY" day="8" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="MSF" description="Mesão Frio">
+      <Holidays>
+        <Fixed month="NOVEMBER" day="30" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="MDB" description="Mondim de Basto">
+      <Holidays>
+        <Fixed month="JUNE" day="25" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="MTR" description="Montalegre">
+      <Holidays>
+        <Fixed month="JUNE" day="9" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="MUR" description="Murça">
+      <Holidays>
+        <Fixed month="MAY" day="8" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="PRG" description="Peso da Régua">
+      <Holidays>
+        <Fixed month="AUGUST" day="16" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="RPN" description="Ribeira de Pena">
+      <Holidays>
+        <Fixed month="AUGUST" day="16" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="SBS" description="Sabrosa">
+      <Holidays>
+        <Fixed month="SEPTEMBER" day="8" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="SMP" description="Santa Marta de Penaguião">
+      <Holidays>
+        <Fixed month="JANUARY" day="13" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="VPC" description="Valpaços">
+      <Holidays>
+        <Fixed month="NOVEMBER" day="6" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="VPA" description="Vila Pouca de Aguiar">
+      <Holidays>
+        <Fixed month="JUNE" day="22" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="VRL" description="Vila Real">
+      <Holidays>
+        <Fixed month="MAY" day="13" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
   </SubConfigurations>
-  <SubConfigurations hierarchy="VZL" description="Vouzela">
-    <Holidays>
-      <Fixed month="MAY" day="14" descriptionPropertiesKey="CITY_DAY"/>
-    </Holidays>
+
+  <SubConfigurations hierarchy="18" description="Viseu">
+    <Holidays/>
+
+    <SubConfigurations hierarchy="AMM" description="Armamar">
+      <Holidays>
+        <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="CRS" description="Carregal do Sal">
+      <Holidays>
+        <Fixed month="JUNE" day="13" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="CDR" description="Castro Daire">
+      <Holidays>
+        <Fixed month="JUNE" day="29" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="CNF" description="Cinfães">
+      <Holidays>
+        <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="LMG" description="Lamego">
+      <Holidays>
+        <Fixed month="SEPTEMBER" day="8" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="MGL" description="Mangualde">
+      <Holidays>
+        <Fixed month="SEPTEMBER" day="8" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="MBR" description="Moimenta da Beira">
+      <Holidays>
+        <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="MRT" description="Mortágua">
+      <Holidays>
+        <!-- ASCENSION THURSDAY -->
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="NLS" description="Nelas">
+      <Holidays>
+        <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="OFR" description="Oliveira de Frades">
+      <Holidays>
+        <Fixed month="OCTOBER" day="7" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="PCT" description="Penalva do Castelo">
+      <Holidays>
+        <Fixed month="JUNE" day="13" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="PND" description="Penedono">
+      <Holidays>
+        <Fixed month="JUNE" day="29" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="RSD" description="Resende">
+      <Holidays>
+        <Fixed month="SEPTEMBER" day="29" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="SCD" description="Santa Comba Dão">
+      <Holidays>
+        <Fixed month="MAY" day="3" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="SJP" description="São João da Pesqueira">
+      <Holidays>
+        <Fixed month="JUNE" day="13" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="SPS" description="São Pedro do Sul">
+      <Holidays>
+        <Fixed month="JUNE" day="29" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="SAT" description="Sátão">
+      <Holidays>
+        <Fixed month="AUGUST" day="20" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="SRN" description="Sernancelhe">
+      <Holidays>
+        <Fixed month="MAY" day="3" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="TBC" description="Tabuaço">
+      <Holidays>
+        <Fixed month="JUNE" day="24" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="TRC" description="Tarouca">
+      <Holidays>
+        <Fixed month="SEPTEMBER" day="29" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="TND" description="Tondela">
+      <Holidays>
+        <Fixed month="SEPTEMBER" day="16" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="VNP" description="Vila Nova de Paiva">
+      <Holidays>
+        <Fixed month="MARCH" day="2" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="VIS" description="Viseu">
+      <Holidays>
+        <Fixed month="SEPTEMBER" day="21" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="VZL" description="Vouzela">
+      <Holidays>
+        <Fixed month="MAY" day="14" descriptionPropertiesKey="CITY_DAY"/>
+      </Holidays>
+    </SubConfigurations>
   </SubConfigurations>
 </Configuration>
diff --git a/jollyday-core/src/main/resources/holidays/Holidays_us.xml b/jollyday-core/src/main/resources/holidays/Holidays_us.xml
index d339d61b5..029c88684 100644
--- a/jollyday-core/src/main/resources/holidays/Holidays_us.xml
+++ b/jollyday-core/src/main/resources/holidays/Holidays_us.xml
@@ -14,193 +14,156 @@
     <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">
+    <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="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"/>
+    <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>
+
   <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="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="SECOND" weekday="MONDAY" month="OCTOBER" validFrom="1934"
-                        descriptionPropertiesKey="COLUMBUS_DAY"/>
+      <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="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"/>
     </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"/>
+      <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="ar" description="Arkansas">
     <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"/>
+      <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="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"/>
+      <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 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"/>
+      <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"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="ct" description="Connecticut">
     <Holidays>
       <Fixed month="FEBRUARY" day="12" descriptionPropertiesKey="LINCOLN"/>
-      <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"/>
+      <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>
   </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"/>
+      <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"/>
     </Holidays>
   </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"/>
+      <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"/>
     </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"/>
+      <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"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="hi" description="Hawaii">
     <Holidays>
       <Fixed month="MARCH" day="26" descriptionPropertiesKey="KALANIANAOLE"/>
       <Fixed month="JUNE" day="11" descriptionPropertiesKey="KAMEHAMEHA"/>
-      <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"/>
+      <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"/>
     </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"/>
+      <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="il" description="Illinois">
     <Holidays>
       <Fixed month="FEBRUARY" day="12" descriptionPropertiesKey="LINCOLN"/>
-      <Fixed month="FEBRUARY" day="22" validFrom="1879" validTo="1967"
-                 descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
-      <RelativeToWeekdayInMonth weekday="TUESDAY" when="AFTER" descriptionPropertiesKey="ELECTION_DAY"
-                                    every="EVEN_YEARS">
+      <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="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"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="in" description="Indiana">
     <Holidays>
       <Fixed month="DECEMBER" day="24" descriptionPropertiesKey="CHRISTMAS_EVE"/>
@@ -210,55 +173,52 @@
       <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="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
       <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
       <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
     </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"/>
+      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="ks" description="Kansas">
     <Holidays>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986"
-                        descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
+      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
     </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"/>
+      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986" descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
       <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="la" description="Louisiana">
     <Holidays>
-      <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986"
-                        descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
+      <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"/>
     </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"/>
+      <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="md" description="Maryland">
     <Holidays>
       <Fixed month="FEBRUARY" day="22" validFrom="1879" validTo="1967" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
@@ -268,25 +228,19 @@
       <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"/>
+      <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="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"/>
+      <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="SECOND" weekday="MONDAY" month="OCTOBER" validFrom="1934"
-                        descriptionPropertiesKey="COLUMBUS_DAY"/>
+      <FixedWeekday which="SECOND" weekday="MONDAY" month="OCTOBER" validFrom="1934" descriptionPropertiesKey="COLUMBUS_DAY"/>
     </Holidays>
     <SubConfigurations hierarchy="sc" description="Suffolk County">
       <Holidays>
@@ -294,149 +248,125 @@
         <Fixed month="JUNE" day="17" descriptionPropertiesKey="BUNKER_HILL"/>
       </Holidays>
     </SubConfigurations>
+
     <SubConfigurations hierarchy="ca" description="Cambridge">
       <Holidays>
         <Fixed month="MARCH" day="17" descriptionPropertiesKey="EVACUATION"/>
       </Holidays>
     </SubConfigurations>
   </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" 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"/>
+      <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"/>
     </Holidays>
   </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"/>
+      <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="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"/>
+      <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"/>
     </Holidays>
   </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="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"/>
+      <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="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"/>
+      <Fixed month="FEBRUARY" day="22" validFrom="1879" validTo="1967" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
       <RelativeToWeekdayInMonth weekday="TUESDAY" when="AFTER" descriptionPropertiesKey="THANKSGIVING">
         <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="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="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"/>
+      <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"/>
+      <FixedWeekday which="SECOND" weekday="MONDAY" month="OCTOBER" validFrom="1934" descriptionPropertiesKey="COLUMBUS_DAY"/>
     </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"/>
+      <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"/>
     </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"/>
+      <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="nj" description="New Jersey">
     <Holidays>
       <Fixed month="FEBRUARY" day="12" descriptionPropertiesKey="LINCOLN"/>
-      <Fixed month="FEBRUARY" day="22" validFrom="1879" validTo="1967"
-                 descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
+      <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"/>
+      <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>
   </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"/>
+      <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"/>
     </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="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"/>
-      <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="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="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
     </Holidays>
     <SubConfigurations hierarchy="nyc" description="New York City">
@@ -445,11 +375,11 @@
       </Holidays>
     </SubConfigurations>
   </SubConfigurations>
+
   <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="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"/>
     </Holidays>
@@ -458,227 +388,184 @@
         <Fixed month="MAY" day="20" descriptionPropertiesKey="INDEPENDENCE_DAY"/>
       </Holidays>
     </SubConfigurations>
+
     <SubConfigurations hierarchy="me" description="Mecklenburg">
       <Holidays>
         <Fixed month="MAY" day="20" descriptionPropertiesKey="INDEPENDENCE_DAY"/>
       </Holidays>
     </SubConfigurations>
   </SubConfigurations>
+
   <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"/>
+      <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"/>
     </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"/>
+      <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="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"/>
+      <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="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"/>
+      <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="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"/>
+      <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="ri" description="Rhode Island">
     <Holidays>
       <FixedWeekday which="SECOND" weekday="MONDAY" month="AUGUST" descriptionPropertiesKey="VICTORY"/>
-      <FixedWeekday which="SECOND" weekday="MONDAY" month="OCTOBER" validFrom="1934"
-                        descriptionPropertiesKey="COLUMBUS_DAY"/>
+      <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="FEBRUARY" day="22" validFrom="1879" validTo="1967"
-                 descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
+      <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="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="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"/>
+      <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="tn" description="Tennesee">
     <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"/>
+      <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"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="tx" description="Texas">
     <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"/>
+      <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"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="ut" description="Utah">
     <Holidays>
       <Fixed month="JULY" day="24" descriptionPropertiesKey="PIONEER"/>
-      <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"/>
+      <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="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"/>
+      <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="SECOND" weekday="MONDAY" month="OCTOBER" validFrom="1934" descriptionPropertiesKey="COLUMBUS_DAY"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="va" description="Virginia">
     <Holidays>
-      <Fixed month="FEBRUARY" day="22" validFrom="1879" validTo="1967"
-                 descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
+      <Fixed month="FEBRUARY" day="22" validFrom="1879" validTo="1967" descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
       <RelativeToWeekdayInMonth weekday="FRIDAY" when="BEFORE" descriptionPropertiesKey="LEE_JACKSON">
-        <FixedWeekday which="THIRD" weekday="MONDAY" month="JANUARY" validFrom="1986"
-                          descriptionPropertiesKey="MARTIN_LUTHER_KING"/>
+        <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"/>
+      <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="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"/>
+      <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="dc" description="District of Columbia">
     <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"/>
+      <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="wv" description="West Virginia">
     <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"/>
+      <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">
     <Holidays>
-      <Fixed month="FEBRUARY" day="22" validFrom="1879" validTo="1967"
-                 descriptionPropertiesKey="WASHINGTONS_BIRTHDAY"/>
+      <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="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"/>
+      <FixedWeekday which="SECOND" weekday="MONDAY" month="OCTOBER" validFrom="1934" descriptionPropertiesKey="COLUMBUS_DAY"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="wy" description="Wyoming">
     <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"/>
+      <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>
 </Configuration>
diff --git a/jollyday-core/src/test/java/de/focus_shift/jollyday/core/HolidayCalendarTest.java b/jollyday-core/src/test/java/de/focus_shift/jollyday/core/HolidayCalendarTest.java
new file mode 100644
index 000000000..feb5a2bb8
--- /dev/null
+++ b/jollyday-core/src/test/java/de/focus_shift/jollyday/core/HolidayCalendarTest.java
@@ -0,0 +1,24 @@
+package de.focus_shift.jollyday.core;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.Locale;
+import java.util.Set;
+
+import static java.util.Arrays.stream;
+import static org.assertj.core.api.Assertions.assertThat;
+
+class HolidayCalendarTest {
+
+  private static final List<String> noneIso3166Countries = List.of("DJ_STOXX", "LME", "NYSE", "TARGET", "XK");
+
+  @Test
+  void ensureThatAllCountryAreISO3166Conform() {
+    final Set<String> isoCountries = Set.of(Locale.getISOCountries());
+
+    stream(HolidayCalendar.values())
+      .filter(holidayCalendar -> !noneIso3166Countries.contains(holidayCalendar.getId()))
+      .forEach(holidayCalendar -> assertThat(holidayCalendar.getId()).isIn(isoCountries));
+  }
+}
diff --git a/jollyday-tests/pom.xml b/jollyday-tests/pom.xml
index bdce0fdc8..5fcaa7c83 100644
--- a/jollyday-tests/pom.xml
+++ b/jollyday-tests/pom.xml
@@ -50,6 +50,12 @@
       <artifactId>jqwik</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.vitorsvieira</groupId>
+      <artifactId>scala-iso_2.12</artifactId>
+      <version>0.1.2</version>
+      <scope>test</scope>
+    </dependency>
 
     <!-- Logging -->
     <dependency>
diff --git a/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/CalendarHierarchyTest.java b/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/CalendarHierarchyTest.java
new file mode 100644
index 000000000..9742bd7a0
--- /dev/null
+++ b/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/CalendarHierarchyTest.java
@@ -0,0 +1,47 @@
+package de.focus_shift.jollyday.tests;
+
+import com.vitorsvieira.iso.CountrySubdivision;
+import com.vitorsvieira.iso.ISOCountry;
+import com.vitorsvieira.iso.ISOCountrySubdivision;
+import de.focus_shift.jollyday.core.HolidayCalendar;
+import de.focus_shift.jollyday.core.HolidayManager;
+import org.junit.jupiter.api.Test;
+import scala.collection.JavaConverters;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+
+import static de.focus_shift.jollyday.core.HolidayManager.getInstance;
+import static de.focus_shift.jollyday.core.ManagerParameters.create;
+import static java.util.stream.Collectors.toList;
+import static org.assertj.core.api.Assertions.assertThat;
+
+class CalendarHierarchyTest {
+
+  private static final List<String> noneIso3166Countries = List.of("DJ_STOXX", "LME", "NYSE", "TARGET", "XK", "FR");
+  private static final List<String> okSubdivisions = List.of("FI-01");
+
+  @Test
+  void ensureThatAllCountryAreISO3166Conform() {
+    Arrays.stream(HolidayCalendar.values())
+      .filter(holidayCalendar -> !noneIso3166Countries.contains(holidayCalendar.getId()))
+      .forEach(holidayCalendar -> {
+
+        final ISOCountry.EnumVal enumVal = ISOCountry.from(holidayCalendar.getId()).get();
+        final Collection<CountrySubdivision.EnumVal> subdivisionVector = JavaConverters.asJavaCollection(ISOCountrySubdivision.fromCountry(enumVal));
+        final List<String> subdivisions = subdivisionVector.stream()
+          .map(CountrySubdivision.EnumVal::toString)
+          .collect(toList());
+
+        final HolidayManager holidayManager = getInstance(create(holidayCalendar));
+        holidayManager.getCalendarHierarchy().getChildren().keySet()
+          .forEach(subdivision -> {
+            final String subdivisionWithCountry = holidayCalendar.getId() + "-" + subdivision.toUpperCase();
+            if(!okSubdivisions.contains(subdivisionWithCountry)) {
+              assertThat(subdivisionWithCountry).isIn(subdivisions);
+            }
+          });
+      });
+  }
+}
diff --git a/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/Iso3166Test.java b/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/Iso3166Test.java
new file mode 100644
index 000000000..3f6999dad
--- /dev/null
+++ b/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/Iso3166Test.java
@@ -0,0 +1,25 @@
+package de.focus_shift.jollyday.tests;
+
+import de.focus_shift.jollyday.core.HolidayCalendar;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.Locale;
+import java.util.Set;
+
+import static java.util.Arrays.stream;
+import static org.assertj.core.api.Assertions.assertThat;
+
+class Iso3166Test {
+
+  private static final List<String> noneIso3166Countries = List.of("DJ_STOXX", "LME", "NYSE", "TARGET", "XK");
+
+  @Test
+  void ensureThatAllCountryAreISO3166Conform() {
+    final Set<String> isoCountries = Set.of(Locale.getISOCountries());
+
+    stream(HolidayCalendar.values())
+      .filter(holidayCalendar -> !noneIso3166Countries.contains(holidayCalendar.getId()))
+      .forEach(holidayCalendar -> assertThat(holidayCalendar.getId()).isIn(isoCountries));
+  }
+}
diff --git a/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/country/HolidayITTest.java b/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/country/HolidayITTest.java
index 13572c865..ec5d30239 100644
--- a/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/country/HolidayITTest.java
+++ b/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/country/HolidayITTest.java
@@ -159,7 +159,7 @@ void ensuresThatWhitMondayIsNoPublicHolidayInItalyIsConfigured(@ForAll @YearRang
   @Property
   void ensuresThatWhitMondayInBZIsConfigured(@ForAll @YearRange Year year) {
     final HolidayManager holidayManager = HolidayManager.getInstance(create(ITALY));
-    final Set<Holiday> holidays = holidayManager.getHolidays(year.getValue(), "bz");
+    final Set<Holiday> holidays = holidayManager.getHolidays(year.getValue(), "32");
     assertThat(holidays)
       .isNotEmpty()
       .extracting(Holiday::getPropertiesKey)
diff --git a/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/country/HolidayLUTest.java b/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/country/HolidayLUTest.java
index f6bdb85d3..055d1e301 100644
--- a/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/country/HolidayLUTest.java
+++ b/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/country/HolidayLUTest.java
@@ -16,6 +16,7 @@
 import static de.focus_shift.jollyday.core.ManagerParameters.create;
 import static java.time.Month.AUGUST;
 import static java.time.Month.DECEMBER;
+import static java.time.Month.FEBRUARY;
 import static java.time.Month.JANUARY;
 import static java.time.Month.JUNE;
 import static java.time.Month.MAY;
@@ -134,4 +135,13 @@ void ensuresThatWhitMondayIsConfigured(@ForAll @YearRange Year year) {
       .extracting(Holiday::getPropertiesKey)
       .contains("christian.WHIT_MONDAY");
   }
+
+  @Property
+  void ensuresThatCarnivalForCityOfLuxemburgIsConfigured(@ForAll @YearRange Year year) {
+    final HolidayManager holidayManager = HolidayManager.getInstance(create(LUXEMBOURG));
+    final Set<Holiday> holidays = holidayManager.getHolidays(year.getValue(), "lu", "clu");
+    assertThat(holidays)
+      .isNotEmpty()
+      .contains(new Holiday(LocalDate.of(year.getValue(), FEBRUARY, 15), "CARNIVAL", OFFICIAL_HOLIDAY));
+  }
 }
diff --git a/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/country/HolidayNZTest.java b/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/country/HolidayNZTest.java
index c1697d465..6501701cb 100644
--- a/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/country/HolidayNZTest.java
+++ b/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/country/HolidayNZTest.java
@@ -11,6 +11,8 @@
 import java.time.LocalDate;
 import java.util.Set;
 
+import static de.focus_shift.jollyday.core.HolidayCalendar.NEW_ZEALAND;
+import static de.focus_shift.jollyday.core.ManagerParameters.*;
 import static org.assertj.core.api.Assertions.assertThat;
 
 class HolidayNZTest extends AbstractCountryTestBase {
@@ -19,8 +21,7 @@ class HolidayNZTest extends AbstractCountryTestBase {
   private static final int YEAR = 2018;
 
   private final CalendarUtil calendarUtil = new CalendarUtil();
-  private final HolidayManager holidayManager = HolidayManager
-    .getInstance(ManagerParameters.create(HolidayCalendar.NEW_ZEALAND));
+  private final HolidayManager holidayManager = HolidayManager.getInstance(create(NEW_ZEALAND));
 
   @Test
   void testManagerNZStructure() {
diff --git a/jollyday-tests/src/test/resources/holidays/Holidays_test_es_2010.xml b/jollyday-tests/src/test/resources/holidays/Holidays_test_es_2010.xml
index 0bae7dfe8..ae43163a7 100644
--- a/jollyday-tests/src/test/resources/holidays/Holidays_test_es_2010.xml
+++ b/jollyday-tests/src/test/resources/holidays/Holidays_test_es_2010.xml
@@ -14,6 +14,7 @@
     <Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS"/>
     <Fixed month="APRIL" day="2"/>
   </Holidays>
+
   <SubConfigurations hierarchy="an" description="Andalucia">
     <Holidays>
       <Fixed month="MARCH" day="1"/>
@@ -22,6 +23,7 @@
       <Fixed month="APRIL" day="1"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="ar" description="Aragon">
     <Holidays>
       <Fixed month="APRIL" day="23"/>
@@ -29,6 +31,7 @@
       <Fixed month="APRIL" day="1"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="ce" description="Ceuta">
     <Holidays>
       <Fixed month="AUGUST" day="15"/>
@@ -37,6 +40,7 @@
       <Fixed month="NOVEMBER" day="16"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="ml" description="Melilla">
     <Holidays>
       <Fixed month="MARCH" day="19"/>
@@ -45,6 +49,7 @@
       <Fixed month="NOVEMBER" day="16"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="cl" description="Castile and Leon">
     <Holidays>
       <Fixed month="MARCH" day="19"/>
@@ -53,6 +58,7 @@
       <Fixed month="APRIL" day="1"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="cm" description="Castile - La Mancha">
     <Holidays>
       <Fixed month="MARCH" day="19"/>
@@ -61,6 +67,7 @@
       <Fixed month="APRIL" day="1"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="cn" description="Canary Islands">
     <Holidays>
       <Fixed month="MAY" day="31"/>
@@ -68,6 +75,7 @@
       <Fixed month="APRIL" day="1"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="ct" description="Catalonia">
     <Holidays>
       <Fixed month="JUNE" day="24"/>
@@ -75,11 +83,13 @@
       <Fixed month="AUGUST" day="15"/>
       <Fixed month="APRIL" day="5"/>
     </Holidays>
+
     <SubConfigurations hierarchy="bcn" description="Barcelona">
       <Holidays>
       </Holidays>
     </SubConfigurations>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="ex" description="Extremadura">
     <Holidays>
       <Fixed month="MARCH" day="19"/>
@@ -97,6 +107,7 @@
       <Fixed month="APRIL" day="1"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="ib" description="Balearic Island">
     <Holidays>
       <Fixed month="MARCH" day="1"/>
@@ -105,6 +116,7 @@
       <Fixed month="APRIL" day="1"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="lo" description="La Rioja">
     <Holidays>
       <Fixed month="MARCH" day="19"/>
@@ -113,7 +125,8 @@
       <Fixed month="APRIL" day="1"/>
     </Holidays>
   </SubConfigurations>
-  <SubConfigurations hierarchy="m" description="Madrid">
+
+  <SubConfigurations hierarchy="md" description="Madrid">
     <Holidays>
       <Fixed month="MARCH" day="19"/>
       <Fixed month="AUGUST" day="15"/>
@@ -126,7 +139,8 @@
       </Holidays>
     </SubConfigurations>
   </SubConfigurations>
-  <SubConfigurations hierarchy="mu" description="Murcia">
+
+  <SubConfigurations hierarchy="mc" description="Murcia">
     <Holidays>
       <Fixed month="MARCH" day="19"/>
       <Fixed month="JUNE" day="9"/>
@@ -134,7 +148,8 @@
       <Fixed month="APRIL" day="1"/>
     </Holidays>
   </SubConfigurations>
-  <SubConfigurations hierarchy="na" description="Navarre">
+
+  <SubConfigurations hierarchy="nc" description="Navarre">
     <Holidays>
       <Fixed month="MARCH" day="19"/>
       <Fixed month="AUGUST" day="15"/>
@@ -142,13 +157,15 @@
       <Fixed month="APRIL" day="5"/>
     </Holidays>
   </SubConfigurations>
-  <SubConfigurations hierarchy="o" description="Asturias">
+
+  <SubConfigurations hierarchy="as" description="Asturias">
     <Holidays>
       <Fixed month="SEPTEMBER" day="8"/>
       <Fixed month="AUGUST" day="16"/>
       <Fixed month="APRIL" day="1"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="pv" description="Euskadi">
     <Holidays>
       <Fixed month="MARCH" day="19"/>
@@ -157,13 +174,15 @@
       <Fixed month="APRIL" day="5"/>
     </Holidays>
   </SubConfigurations>
-  <SubConfigurations hierarchy="s" description="Cantabria">
+
+  <SubConfigurations hierarchy="cb" description="Cantabria">
     <Holidays>
       <Fixed month="AUGUST" day="15"/>
       <Fixed month="SEPTEMBER" day="15"/>
       <Fixed month="APRIL" day="1"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="vc" description="Valencia">
     <Holidays>
       <Fixed month="MARCH" day="19"/>
diff --git a/jollyday-tests/src/test/resources/holidays/Holidays_test_fi_2010.xml b/jollyday-tests/src/test/resources/holidays/Holidays_test_fi_2010.xml
index 368d6d927..6872ba5f4 100644
--- a/jollyday-tests/src/test/resources/holidays/Holidays_test_fi_2010.xml
+++ b/jollyday-tests/src/test/resources/holidays/Holidays_test_fi_2010.xml
@@ -18,7 +18,8 @@
     <Fixed month="JUNE" day="26"/>
     <Fixed month="NOVEMBER" day="6"/>
   </Holidays>
-  <SubConfigurations hierarchy="ax" description="Aland">
+
+  <SubConfigurations hierarchy="01" description="Aland">
     <Holidays>
       <Fixed month="JUNE" day="9" descriptionPropertiesKey="SELF_GOVERNANCE"/>
     </Holidays>
diff --git a/jollyday-tests/src/test/resources/holidays/Holidays_test_fr_2010.xml b/jollyday-tests/src/test/resources/holidays/Holidays_test_fr_2010.xml
index 32e6fd2f0..7b0f447f8 100644
--- a/jollyday-tests/src/test/resources/holidays/Holidays_test_fr_2010.xml
+++ b/jollyday-tests/src/test/resources/holidays/Holidays_test_fr_2010.xml
@@ -16,45 +16,51 @@
     <Fixed month="MAY" day="13" descriptionPropertiesKey="christian.ASCENSION_DAY"/>
     <Fixed month="MAY" day="24" descriptionPropertiesKey="christian.WHIT_MONDAY"/>
   </Holidays>
-  <SubConfigurations hierarchy="ma"
-                     description="Martinique">
+
+  <SubConfigurations hierarchy="GES" description="Grand Est">
+    <Holidays/>
+    <SubConfigurations hierarchy="67" description="Bas-Rhin">
+      <Holidays>
+        <Fixed month="DECEMBER" day="26"/>
+        <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="68" description="Haut-Rhin">
+      <Holidays>
+        <Fixed month="DECEMBER" day="26"/>
+        <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
+      </Holidays>
+    </SubConfigurations>
+
+    <SubConfigurations hierarchy="57" description="Moselle">
+      <Holidays>
+        <Fixed month="DECEMBER" day="26"/>
+      </Holidays>
+    </SubConfigurations>
+  </SubConfigurations>
+
+  <SubConfigurations hierarchy="972" description="Martinique">
     <Holidays>
       <Fixed month="MAY" day="22"/>
     </Holidays>
   </SubConfigurations>
-  <SubConfigurations hierarchy="gu"
-                     description="Guadeloupe">
+
+  <SubConfigurations hierarchy="971" description="Guadeloupe">
     <Holidays>
       <Fixed month="MAY" day="27"/>
     </Holidays>
   </SubConfigurations>
-  <SubConfigurations hierarchy="gy" description="Guyane">
+
+  <SubConfigurations hierarchy="973" description="Guyane">
     <Holidays>
       <Fixed month="JUNE" day="10"/>
     </Holidays>
   </SubConfigurations>
-  <SubConfigurations hierarchy="lr"
-                     description="La Reunion">
+
+  <SubConfigurations hierarchy="974" description="La Reunion">
     <Holidays>
       <Fixed month="DECEMBER" day="20"/>
     </Holidays>
   </SubConfigurations>
-  <SubConfigurations hierarchy="br" description="Bas-Rhin">
-    <Holidays>
-      <Fixed month="DECEMBER" day="26"/>
-      <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="hr"
-                     description="Haut-Rhin">
-    <Holidays>
-      <Fixed month="DECEMBER" day="26"/>
-      <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
-    </Holidays>
-  </SubConfigurations>
-  <SubConfigurations hierarchy="mo" description="Moselle">
-    <Holidays>
-      <Fixed month="DECEMBER" day="26"/>
-    </Holidays>
-  </SubConfigurations>
 </Configuration>
diff --git a/jollyday-tests/src/test/resources/holidays/Holidays_test_nz_2018.xml b/jollyday-tests/src/test/resources/holidays/Holidays_test_nz_2018.xml
index fe7e29230..e3f7bdb85 100644
--- a/jollyday-tests/src/test/resources/holidays/Holidays_test_nz_2018.xml
+++ b/jollyday-tests/src/test/resources/holidays/Holidays_test_nz_2018.xml
@@ -25,66 +25,105 @@
     <!-- Boxing Day -->
     <Fixed month="DECEMBER" day="26" descriptionPropertiesKey="BOXING_DAY"/>
   </Holidays>
+
   <SubConfigurations hierarchy="auk" description="Auckland">
     <Holidays>
       <Fixed month="JANUARY" day="29" descriptionPropertiesKey="AUCKLAND_ANNIVERSARY"/>
     </Holidays>
   </SubConfigurations>
-  <SubConfigurations hierarchy="tki" description="Taranaki">
+
+  <SubConfigurations hierarchy="bop" description="Bay of Plenty">
     <Holidays>
-      <Fixed month="MARCH" day="12" descriptionPropertiesKey="TARANAKI_ANNIVERSARY"/>
+      <Fixed month="JANUARY" day="29" descriptionPropertiesKey="AUCKLAND_ANNIVERSARY"/>
     </Holidays>
   </SubConfigurations>
-  <SubConfigurations hierarchy="hkb" description="Hawke's Bay">
+
+  <SubConfigurations hierarchy="can" description="Canterbury">
     <Holidays>
-      <Fixed month="OCTOBER" day="19" descriptionPropertiesKey="HAWKES_BAY_ANNIVERSARY"/>
+      <Fixed month="SEPTEMBER" day="24" descriptionPropertiesKey="CANTERBURY_SOUTH_ANNIVERSARY"/>
     </Holidays>
   </SubConfigurations>
-  <SubConfigurations hierarchy="wgn" description="Wellington">
+
+  <SubConfigurations hierarchy="cit" description="Chatham Islands Territory">
     <Holidays>
-      <Fixed month="JANUARY" day="22" descriptionPropertiesKey="WELLINGTON_ANNIVERSARY"/>
+      <Fixed month="DECEMBER" day="3" descriptionPropertiesKey="CHATHAM_ISLANDS_ANNIVERSARY"/>
     </Holidays>
   </SubConfigurations>
-  <SubConfigurations hierarchy="mbh" description="Marlborough">
+
+  <SubConfigurations hierarchy="gis" description="Girborne">
     <Holidays>
-      <Fixed month="OCTOBER" day="29" descriptionPropertiesKey="MARLBOROUGH_ANNIVERSARY"/>
+      <Fixed month="JANUARY" day="29" descriptionPropertiesKey="AUCKLAND_ANNIVERSARY"/>
     </Holidays>
   </SubConfigurations>
-  <SubConfigurations hierarchy="nsn" description="Nelson">
+
+  <SubConfigurations hierarchy="hkb" description="Hawke's Bay">
     <Holidays>
-      <Fixed month="JANUARY" day="29" descriptionPropertiesKey="NELSON_ANNIVERSARY"/>
+      <Fixed month="OCTOBER" day="19" descriptionPropertiesKey="HAWKES_BAY_ANNIVERSARY"/>
     </Holidays>
   </SubConfigurations>
-  <SubConfigurations hierarchy="can" description="Canterbury">
+
+  <SubConfigurations hierarchy="mbh" description="Marlborough">
     <Holidays>
-      <!--
-      <Fixed month="NOVEMBER" day="16" descriptionPropertiesKey="CANTERBURY_ANNIVERSARY"/>
-      -->
+      <Fixed month="OCTOBER" day="29" descriptionPropertiesKey="MARLBOROUGH_ANNIVERSARY"/>
     </Holidays>
   </SubConfigurations>
-  <SubConfigurations hierarchy="cans" description="Canterbury (South)">
+
+  <SubConfigurations hierarchy="mwt" description="Manawatu-Wanganui">
     <Holidays>
-      <Fixed month="SEPTEMBER" day="24" descriptionPropertiesKey="CANTERBURY_SOUTH_ANNIVERSARY"/>
+      <Fixed month="JANUARY" day="22" descriptionPropertiesKey="WELLINGTON_ANNIVERSARY"/>
+      <Fixed month="JANUARY" day="29" descriptionPropertiesKey="AUCKLAND_ANNIVERSARY"/>
     </Holidays>
   </SubConfigurations>
-  <SubConfigurations hierarchy="wtc" description="Westland">
+
+  <SubConfigurations hierarchy="nsn" description="Nelson">
     <Holidays>
-      <Fixed month="DECEMBER" day="3" descriptionPropertiesKey="WESTLAND_ANNIVERSARY"/>
+      <Fixed month="JANUARY" day="29" descriptionPropertiesKey="NELSON_ANNIVERSARY"/>
+    </Holidays>
+  </SubConfigurations>
+
+  <SubConfigurations hierarchy="ntl" description="Northland">
+    <Holidays>
+      <Fixed month="JANUARY" day="29" descriptionPropertiesKey="AUCKLAND_ANNIVERSARY"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="ota" description="Otago">
     <Holidays>
       <Fixed month="MARCH" day="26" descriptionPropertiesKey="OTAGO_ANNIVERSARY"/>
     </Holidays>
   </SubConfigurations>
+
   <SubConfigurations hierarchy="stl" description="Southland">
     <Holidays>
       <Fixed month="APRIL" day="3" descriptionPropertiesKey="SOUTHLAND_ANNIVERSARY"/>
     </Holidays>
   </SubConfigurations>
-  <SubConfigurations hierarchy="cit" description="Chatham Islands">
+
+  <SubConfigurations hierarchy="tas" description="Tasman">
+    <Holidays/>
+  </SubConfigurations>
+
+  <SubConfigurations hierarchy="tki" description="Taranaki">
     <Holidays>
-      <Fixed month="DECEMBER" day="3" descriptionPropertiesKey="CHATHAM_ISLANDS_ANNIVERSARY"/>
+      <Fixed month="MARCH" day="12" descriptionPropertiesKey="TARANAKI_ANNIVERSARY"/>
+    </Holidays>
+  </SubConfigurations>
+
+  <SubConfigurations hierarchy="wgn" description="Wellington">
+    <Holidays>
+      <Fixed month="JANUARY" day="22" descriptionPropertiesKey="WELLINGTON_ANNIVERSARY"/>
+    </Holidays>
+  </SubConfigurations>
+
+  <SubConfigurations hierarchy="wko" description="Waikato">
+    <Holidays>
+      <Fixed month="JANUARY" day="29" descriptionPropertiesKey="AUCKLAND_ANNIVERSARY"/>
+    </Holidays>
+  </SubConfigurations>
+
+  <SubConfigurations hierarchy="wtc" description="Westland">
+    <Holidays>
+      <Fixed month="DECEMBER" day="3" descriptionPropertiesKey="WESTLAND_ANNIVERSARY"/>
     </Holidays>
   </SubConfigurations>
 </Configuration>