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/descriptions/country_descriptions.properties b/jollyday-core/src/main/resources/descriptions/country_descriptions.properties
index 61a37ed03..4c369a49d 100644
--- a/jollyday-core/src/main/resources/descriptions/country_descriptions.properties
+++ b/jollyday-core/src/main/resources/descriptions/country_descriptions.properties
@@ -11,15 +11,15 @@ country.description.aq        = Antarctica
 country.description.ar        = Argentina
 country.description.as        = American Samoa
 country.description.at        = Austria
-country.description.at.b      = Burgenland
-country.description.at.k      = Kärnten
-country.description.at.la     = Lower Austria
-country.description.at.s      = Salzburg
-country.description.at.st     = Steiermark
-country.description.at.t      = Tirol
-country.description.at.ua     = Upper Austria
-country.description.at.va     = Vorarlberg
-country.description.at.w      = Vienna
+country.description.at.1      = Burgenland
+country.description.at.2      = Kärnten
+country.description.at.3      = Lower Austria
+country.description.at.5      = Salzburg
+country.description.at.6      = Steiermark
+country.description.at.7      = Tirol
+country.description.at.4      = Upper Austria
+country.description.at.8      = Vorarlberg
+country.description.at.9      = Vienna
 country.description.au        = Australia
 country.description.au.act    = Australian Capital Territory
 country.description.au.nsw    = New South Wales
@@ -36,8 +36,8 @@ country.description.aw        = Aruba
 country.description.ax        = Aaland Islands
 country.description.az        = Azerbaijan
 country.description.ba        = Bosnia and Herzegowina
-country.description.ba.fbh    = Federation of Bosnia and Herzegovina
-country.description.ba.rs     = Republic of Srpska
+country.description.ba.bih    = Federation of Bosnia and Herzegovina
+country.description.ba.srp    = Republic of Srpska
 country.description.bb        = Barbados
 country.description.bd        = Bangladesh
 country.description.be        = Belgium
@@ -165,20 +165,42 @@ country.description.eg        = Egypt
 country.description.eh        = Western Sahara
 country.description.er        = Eritrea
 country.description.es        = Spain
+country.description.es.an     = Andalucia
+country.description.es.ar     = Aragon
+country.description.es.ce     = Ceuta
+country.description.es.ml     = Melilla
+country.description.es.cl     = Castile and Leon
+country.description.es.cm     = Castile - La Mancha
+country.description.es.cn     = Canary Islands
+country.description.es.ct     = Catalonia
+country.description.esb.cn    = Barcelona
+country.description.es.ex     = Extremadura
+country.description.es.ga     = Galicia
+country.description.es.ib     = Balearic Island
+country.description.es.lo     = La Rioja
+country.description.es.md     = Madrid
+country.description.es.md.mad = Madrid city
+country.description.es.mc     = Murcia
+country.description.es.nc     = Navarra
+country.description.es.as     = Asturias
+country.description.es.pv     = Euskadi
+country.description.es.cb     = Cantabria
+country.description.es.vc     = Valencia
 country.description.et        = Ethiopia
 country.description.fi        = Finland
+country.description.fi.01     = Åland
 country.description.fj        = Fiji
 country.description.fk        = Falkland Islands (Malvinas)
 country.description.fm        = Micronesia, Federated States Of
 country.description.fo        = Faroe Islands
 country.description.fr        = France
-country.description.fr.br     = Bas-Rhin
-country.description.fr.gu     = Guadeloupe
-country.description.fr.gy     = Guyane
-country.description.fr.hr     = Haut-Rhin
-country.description.fr.lr     = La Reunion
-country.description.fr.ma     = Martinique
-country.description.fr.mo     = Moselle
+country.description.fr.ges.67 = Bas-Rhin
+country.description.fr.971    = Guadeloupe
+country.description.fr.973    = Guyane
+country.description.fr.ges.68 = Haut-Rhin
+country.description.fr.974    = La Reunion
+country.description.fr.972    = Martinique
+country.description.fr.ges.57 = Moselle
 country.description.ga        = Gabon
 country.description.gb        = United Kingdom of Great Britain and Northern Ireland
 country.description.gb.eng    = England
@@ -230,7 +252,6 @@ country.description.in.jh     = Jhārkhand
 country.description.in.jk     = Jammu and Kashmīr
 country.description.in.ka     = Karnātaka
 country.description.in.kl     = Kerala
-country.description.in.la     = Ladākh
 country.description.in.ld     = Lakshadweep
 country.description.in.mh     = Mahārāshtra
 country.description.in.ml     = Meghālaya
@@ -243,7 +264,6 @@ country.description.in.pb     = Punjab
 country.description.in.py     = Puducherry
 country.description.in.rj     = Rājasthān
 country.description.in.sk     = Sikkim
-country.description.in.tg     = Telangāna
 country.description.in.tn     = Tamil Nādu
 country.description.in.tr     = Tripura
 country.description.in.up     = Uttar Pradesh
@@ -254,7 +274,7 @@ country.description.iq        = Iraq
 country.description.ir        = Iran (Islamic Republic Of)
 country.description.is        = Iceland
 country.description.it        = Italy
-country.description.it.bz     = South Tyrol
+country.description.it.32     = South Tyrol
 country.description.je        = Jersey
 country.description.jm        = Jamaica
 country.description.jo        = Jordan
@@ -279,15 +299,13 @@ country.description.lr        = Liberia
 country.description.ls        = Lesotho
 country.description.lt        = Lithuania
 country.description.lu        = Luxembourg
-country.description.lu.clu    = City of Luxembourg
+country.description.lu.lu.clu = City of Luxembourg
 country.description.lv        = Latvia
 country.description.ly        = Libyan Arab Jamahiriya
 country.description.ma        = Morocco
 country.description.mc        = Monaco
 country.description.md        = Moldova, Republic of
 country.description.md.ba     = Bălți
-country.description.md.bd     = Bender [Tighina]
-country.description.md.cu     = Chișinău
 country.description.me        = Montenegro
 country.description.mg        = Madagascar
 country.description.mh        = Marshall Islands
@@ -313,21 +331,42 @@ country.description.nc        = New Caledonia
 country.description.ne        = Niger
 country.description.nf        = Norfolk Island
 country.description.ng        = Nigeria
-country.description.ng.lag    = Lagos
+country.description.ng.la     = Lagos
 country.description.ni        = Nicaragua
 country.description.ni.bo     = Boaco
+country.description.ni.gr     = Granada
+country.description.ni.gr.na  = Nandaime
+country.description.ni.md     = Madriz
+country.description.ni.md.so  = Somoto
 country.description.ni.mn     = Managua
-country.description.ni.mo     = Moyogalpa
-country.description.ni.na     = Nandaime
-country.description.ni.ni     = Niquinohomo
-country.description.ni.om     = Ometepe
-country.description.ni.so     = Somoto
+country.description.ni.ms     = Masaya
+country.description.ni.ms.ni  = Niquinohomo
+country.description.ni.ri     = Rivas
+country.description.ni.ri.mo  = Moyogalpa
+country.description.ni.ri.om  = Ometepe
 country.description.nl        = Netherlands
 country.description.no        = Norway
 country.description.np        = Nepal
 country.description.nr        = Nauru
 country.description.nu        = Niue
 country.description.nz        = New Zealand
+country.description.nz.auk    = Auckland
+country.description.nz.bop    = Bay of Plenty
+country.description.nz.can    = Canterbury
+country.description.nz.cit    = Chatham Islands Territory
+country.description.nz.gis    = Gisborne
+country.description.nz.hkb    = Hawke's Bay
+country.description.nz.mbh    = Marlborough
+country.description.nz.mwt    = Manawatu-Wanganui
+country.description.nz.nsn    = Nelson
+country.description.nz.ntl    = Northland
+country.description.nz.ota    = Otago
+country.description.nz.stl    = Southland
+country.description.nz.tas    = Tasman
+country.description.nz.tki    = Taranaki
+country.description.nz.wgn    = Wellington
+country.description.nz.wko    = Waikato
+country.description.nz.wtc    = West Coast
 country.description.om        = Oman
 country.description.pa        = Panama
 country.description.pe        = Peru
@@ -341,74 +380,334 @@ country.description.pn        = Pitcairn
 country.description.pr        = Puerto Rico
 country.description.ps        = Palestinian Territory, Occupied
 country.description.pt        = Portugal
-country.description.pt.abf    = Albufeira
-country.description.pt.abt    = Abrantes
-country.description.pt.acb    = Alcobaça
-country.description.pt.ach    = Alcochete
-country.description.pt.acn    = Alcanena
-country.description.pt.act    = Alcoutim
-country.description.pt.adl    = Alandroal
-country.description.pt.adv    = Almodôvar
-country.description.pt.afe    = Alfândega da Fé
-country.description.pt.agb    = Aguiar da Beira
-country.description.pt.agd    = Águeda
-country.description.pt.agh    = Angra do Heroísmo
-country.description.pt.agn    = Arganil
-country.description.pt.ajt    = Aljustrel
-country.description.pt.ajz    = Aljezur
-country.description.pt.alb    = Albergaria-a-Velha
-country.description.pt.ald    = Almeida
-country.description.pt.alj    = Alijó
-country.description.pt.alm    = Almada
-country.description.pt.alq    = Alenquer
-country.description.pt.alr    = Almeirim
-country.description.pt.alt    = Alter do Chão
-country.description.pt.amd    = Amadora
-country.description.pt.amm    = Armamar
-country.description.pt.amr    = Amares
-country.description.pt.amt    = Amarante
-country.description.pt.and    = Anadia
-country.description.pt.ans    = Ansião
-country.description.pt.apc    = Alpiarça
-country.description.pt.arc    = Arouca
-country.description.pt.arl    = Arraiolos
-country.description.pt.arr    = Arronches
-country.description.pt.arv    = Arruda dos Vinhos
-country.description.pt.asl    = Alcácer do Sal
-country.description.pt.avr    = Aveiro
-country.description.pt.avs    = Avis
-country.description.pt.avt    = Alvito
-country.description.pt.avv    = Arcos de Valdevez
-country.description.pt.avz    = Alvaiázere
-country.description.pt.azb    = Azambuja
-country.description.pt.bao    = Baião
-country.description.pt.bbr    = Bombarral
-country.description.pt.bcl    = Barcelos
-country.description.pt.bgc    = Bragança
-country.description.pt.bja    = Beja
-country.description.pt.bmt    = Belmonte
-country.description.pt.bnv    = Benavente
-country.description.pt.brb    = Borba
-country.description.pt.brc    = Barrancos
-country.description.pt.brg    = Braga
-country.description.pt.brr    = Barreiro
-country.description.pt.btc    = Boticas
-country.description.pt.btl    = Batalha
-country.description.pt.cbc    = Cabeceiras de Basto
-country.description.pt.cdv    = Cadaval
-country.description.pt.cht    = Calheta (Açores)
-country.description.pt.cld    = Caldas da Rainha
-country.description.pt.clt    = Calheta (Madeira)
-country.description.pt.cml    = Câmara de Lobos
-country.description.pt.cmn    = Caminha
-country.description.pt.cmr    = Campo Maior
-country.description.pt.cnt    = Cantanhede
-country.description.pt.cpr    = Castanheira de Pera
-country.description.pt.crs    = Carregal do Sal
-country.description.pt.crz    = Carrazeda de Ansiães
-country.description.pt.csc    = Cascais
-country.description.pt.ctb    = Castelo Branco
-country.description.pt.ctx    = Cartaxo
+country.description.pt.01     = Aveiro
+country.description.pt.01.AGD = Águeda
+country.description.pt.01.ALB = Albergaria-a-Velha
+country.description.pt.01.AND = Anadia
+country.description.pt.01.ARC = Arouca
+country.description.pt.01.AVR = Aveiro
+country.description.pt.01.CPV = Castelo de Paiva
+country.description.pt.01.ESP = Espinho
+country.description.pt.01.ETR = Estarreja
+country.description.pt.01.ILH = Ílhavo
+country.description.pt.01.MLD = Mealhada
+country.description.pt.01.MRS = Murtosa
+country.description.pt.01.OAZ = Oliveira de Azeméis
+country.description.pt.01.VAC = Vale de Cambra
+country.description.pt.01.VGS = Vagos
+country.description.pt.01.SVV = Sever do Vouga
+country.description.pt.01.SJM = São João da Madeira
+country.description.pt.01.VFR = Santa Maria da Feira
+country.description.pt.01.OVR = Ovar
+country.description.pt.01.OBR = Oliveira do Bairro
+country.description.pt.20     = Azoren
+country.description.pt.20.VFC = Vila Franca do Campo
+country.description.pt.20.VPT = Vila do Porto
+country.description.pt.20.VLS = Velas
+country.description.pt.20.SRQ = São Roque do Pico
+country.description.pt.20.SCF = Santa Cruz das Flores
+country.description.pt.20.SCG = Santa Cruz da Graciosa
+country.description.pt.20.RGR = Ribeira Grande
+country.description.pt.20.VPV = Praia da Vitória
+country.description.pt.20.PVC = Povoação
+country.description.pt.20.PDL = Ponta Delgada
+country.description.pt.20.NRD = Nordeste
+country.description.pt.20.MAD = Madalena
+country.description.pt.20.LGP = Lajes do Pico
+country.description.pt.20.LGF = Lajes das Flores
+country.description.pt.20.LAG = Lagoa (Açores)
+country.description.pt.20.HRT = Horta
+country.description.pt.20.CRV = Corvo
+country.description.pt.20.CHT = Calheta (Açores)
+country.description.pt.20.AGH = Angra do Heroísmo
+country.description.pt.02     = Beja
+country.description.pt.02.VDG = Vidigueira
+country.description.pt.02.SRP = Serpa
+country.description.pt.02.ORQ = Ourique
+country.description.pt.02.ODM = Odemira
+country.description.pt.02.MRA = Moura
+country.description.pt.02.MTL = Mértola
+country.description.pt.02.FAL = Ferreira do Alentejo
+country.description.pt.02.CBA = Cuba
+country.description.pt.02.CVR = Castro Verde
+country.description.pt.02.BJA = Beja
+country.description.pt.02.BRC = Barrancos
+country.description.pt.02.AVT = Alvito
+country.description.pt.02.ADV = Almodôvar
+country.description.pt.02.AJT = Aljustrel
+country.description.pt.03     = Braga
+country.description.pt.03.AMR = Amares
+country.description.pt.03.ANS = Ansião
+country.description.pt.03.BCL = Barcelos
+country.description.pt.03.BRG = Braga
+country.description.pt.03.BGC = Bragança
+country.description.pt.03.CBC = Cabeceiras de Basto
+country.description.pt.03.CDV = Cadaval
+country.description.pt.03.CBT = Celorico de Basto
+country.description.pt.03.EPS = Esposende
+country.description.pt.03.FAF = Fafe
+country.description.pt.03.GMR = Guimarães
+country.description.pt.03.PVL = Póvoa de Lanhoso
+country.description.pt.03.TBR = Terras de Bouro
+country.description.pt.03.VRM = Vieira do Minho
+country.description.pt.03.VNF = Vila Nova de Famalicão
+country.description.pt.03.VVD = Vila Verde
+country.description.pt.03.VIZ = Vizela
+country.description.pt.04     = Bragança
+country.description.pt.04.AFE = Alfândega da Fé
+country.description.pt.04.CRZ = Carrazeda de Ansiães
+country.description.pt.04.FEC = Freixo de Espada à Cinta
+country.description.pt.04.MCD = Macedo de Cavaleiros
+country.description.pt.04.MDR = Miranda do Douro
+country.description.pt.04.MDL = Mirandela
+country.description.pt.04.MGD = Mogadouro
+country.description.pt.04.TMC = Torre de Moncorvo
+country.description.pt.04.VFL = Vila Flor
+country.description.pt.04.VMS = Vimioso
+country.description.pt.04.VNH = Vinhais
+country.description.pt.05     = Castelo Branco
+country.description.pt.05.BMT = Belmonte
+country.description.pt.05.CTB = Castelo Branco
+country.description.pt.05.CVL = Covilhã
+country.description.pt.05.FND = Fundão
+country.description.pt.05.IDN = Idanha-a-Nova
+country.description.pt.05.OLR = Oleiros
+country.description.pt.05.PNC = Penamacor
+country.description.pt.05.PNV = Proença-a-Nova
+country.description.pt.05.SRT = Sertã
+country.description.pt.05.VLR = Vila de Rei
+country.description.pt.05.VVR = Vila Velha de Ródão
+country.description.pt.06     = Coimbra
+country.description.pt.06.AGN = Arganil
+country.description.pt.06.CNT = Cantanhede
+country.description.pt.06.CBR = Coimbra
+country.description.pt.06.CDN = Condeixa-a-Nova
+country.description.pt.06.FIG = Figueira da Foz
+country.description.pt.06.GOI = Góis
+country.description.pt.06.LSA = Lousã
+country.description.pt.06.MIR = Mira
+country.description.pt.06.MCV = Miranda do Corvo
+country.description.pt.06.MMV = Montemor-o-Velho
+country.description.pt.06.OHP = Oliveira do Hospital
+country.description.pt.06.PPS = Pampilhosa da Serra
+country.description.pt.06.PCV = Penacova
+country.description.pt.06.PNL = Penela
+country.description.pt.06.SRE = Soure
+country.description.pt.06.TBU = Tábua
+country.description.pt.06.PRS = Vila Nova de Poiares
+country.description.pt.07     = Évora
+country.description.pt.07.ADL = Alandroal
+country.description.pt.07.ARL = Arraiolos
+country.description.pt.07.BRB = Borba
+country.description.pt.07.ETZ = Estremoz
+country.description.pt.07.EVR = Évora
+country.description.pt.07.MMN = Montemor-o-Novo
+country.description.pt.07.MOR = Mora
+country.description.pt.07.MOU = Mourão
+country.description.pt.07.PRL = Portel
+country.description.pt.07.RDD = Redondo
+country.description.pt.07.RMZ = Reguengos de Monsaraz
+country.description.pt.07.VND = Vendas Novas
+country.description.pt.07.VNT = Viana do Alentejo
+country.description.pt.07.VVC = Vila Viçosa
+country.description.pt.08     = Faro
+country.description.pt.08.ABF = Albufeira
+country.description.pt.08.ACT = Alcoutim
+country.description.pt.08.AJZ = Aljezur
+country.description.pt.08.CTM = Castro Marim
+country.description.pt.08.FAR = Faro
+country.description.pt.08.LGA = Lagoa
+country.description.pt.08.LGS = Lagos
+country.description.pt.08.LLE = Loulé
+country.description.pt.08.MCQ = Monchique
+country.description.pt.08.OLH = Olhão
+country.description.pt.08.PTM = Portimão
+country.description.pt.08.SBA = São Brás de Alportel
+country.description.pt.08.SLV = Silves
+country.description.pt.08.TVR = Tavira
+country.description.pt.08.VBP = Vila do Bispo
+country.description.pt.08.VRS = Vila Real de Santo António
+country.description.pt.09     = Guarda
+country.description.pt.09.AGB = Aguiar da Beira
+country.description.pt.09.ALD = Almeida
+country.description.pt.09.CLB = Celorico da Beira
+country.description.pt.09.FCR = Figueira de Castelo Rodrigo
+country.description.pt.09.FAG = Fornos de Algodres
+country.description.pt.09.GVA = Gouveia
+country.description.pt.09.GRD = Guarda
+country.description.pt.09.MTG = Manteigas
+country.description.pt.09.MED = Mêda
+country.description.pt.09.PNH = Pinhel
+country.description.pt.09.SBG = Sabugal
+country.description.pt.09.SEI = Seia
+country.description.pt.09.TCR = Trancoso
+country.description.pt.09.VLF = Vila Nova de Foz Côa
+country.description.pt.10     = Leiria
+country.description.pt.10.ACB = Alcobaça
+country.description.pt.10.AVZ = Alvaiázere
+country.description.pt.10.BTL = Batalha
+country.description.pt.10.BBR = Bombarral
+country.description.pt.10.CLD = Caldas da Rainha
+country.description.pt.10.CPR = Castanheira de Pera
+country.description.pt.10.FVN = Figueiró dos Vinhos
+country.description.pt.10.LRA = Leiria
+country.description.pt.10.MGR = Marinha Grande
+country.description.pt.10.NZR = Nazaré
+country.description.pt.10.OBD = Óbidos
+country.description.pt.10.PGR = Pedrógão Grande
+country.description.pt.10.PNI = Peniche
+country.description.pt.10.PBL = Pombal
+country.description.pt.10.PMS = Porto de Mós
+country.description.pt.11     = Lissabon
+country.description.pt.11.ALQ = Alenquer
+country.description.pt.11.AMD = Amadora
+country.description.pt.11.ARV = Arruda dos Vinhos
+country.description.pt.11.AZB = Azambuja
+country.description.pt.11.CSC = Cascais
+country.description.pt.11.LSB = Lisboa
+country.description.pt.11.LRS = Loures
+country.description.pt.11.LNH = Lourinhã
+country.description.pt.11.MFR = Mafra
+country.description.pt.11.ODV = Odivelas
+country.description.pt.11.OER = Oeiras
+country.description.pt.11.SNT = Sintra
+country.description.pt.11.SMA = Sobral de Monte Agraço
+country.description.pt.11.TVD = Torres Vedras
+country.description.pt.11.VFX = Vila Franca de Xira
+country.description.pt.30     = Madeira
+country.description.pt.30.CLT = Calheta
+country.description.pt.30.CML = Câmara de Lobos
+country.description.pt.30.FNC = Funchal
+country.description.pt.30.MCH = Machico
+country.description.pt.30.PTS = Ponta do Sol
+country.description.pt.30.PMZ = Porto Moniz
+country.description.pt.30.PST = Porto Santo
+country.description.pt.30.RBR = Ribeira Brava
+country.description.pt.30.SCR = Santa Cruz
+country.description.pt.30.STN = Santana
+country.description.pt.30.SVC = São Vicente
+country.description.pt.12     = Portalegre
+country.description.pt.12.ALT = Alter do Chão
+country.description.pt.12.ARR = Arronches
+country.description.pt.12.AVS = Avis
+country.description.pt.12.CMR = Campo Maior
+country.description.pt.12.CVD = Castelo de Vide
+country.description.pt.12.CRT = Crato
+country.description.pt.12.ELV = Elvas
+country.description.pt.12.FTR = Fronteira
+country.description.pt.12.GAV = Gavião
+country.description.pt.12.MRV = Marvão
+country.description.pt.12.MFT = Monforte
+country.description.pt.12.NIS = Nisa
+country.description.pt.12.PSR = Ponte de Sor
+country.description.pt.12.PTG = Portalegre
+country.description.pt.12.SSL = Sousel
+country.description.pt.13     = Porto
+country.description.pt.13.AMT = Amarante
+country.description.pt.13.BAO = Baião
+country.description.pt.13.FLG = Felgueiras
+country.description.pt.13.GDM = Gondomar
+country.description.pt.13.LOU = Lousada
+country.description.pt.13.MAI = Maia
+country.description.pt.13.MCN = Marco de Canaveses
+country.description.pt.13.MTS = Matosinhos
+country.description.pt.13.PFR = Paços de Ferreira
+country.description.pt.13.PRD = Paredes
+country.description.pt.13.PNF = Penafiel
+country.description.pt.13.PRT = Porto
+country.description.pt.13.PVZ = Póvoa de Varzim
+country.description.pt.13.STS = Santo Tirso
+country.description.pt.13.TRF = Trofa
+country.description.pt.13.VLG = Valongo
+country.description.pt.13.VCD = Vila do Conde
+country.description.pt.13.VNG = Vila Nova de Gaia
+country.description.pt.14     = Santarém
+country.description.pt.14.ABT = Abrantes
+country.description.pt.14.ACN = Alcanena
+country.description.pt.14.ALR = Almeirim
+country.description.pt.14.APC = Alpiarça
+country.description.pt.14.BNV = Benavente
+country.description.pt.14.CTX = Cartaxo
+country.description.pt.14.CHM = Chamusca
+country.description.pt.14.CNS = Constância
+country.description.pt.14.CCH = Coruche
+country.description.pt.14.ENT = Entroncamento
+country.description.pt.14.FZZ = Ferreira do Zêzere
+country.description.pt.14.GLG = Golegã
+country.description.pt.14.MAC = Mação
+country.description.pt.14.ORM = Ourém
+country.description.pt.14.RMR = Rio Maior
+country.description.pt.14.SMG = Salvaterra de Magos
+country.description.pt.14.STR = Santarém
+country.description.pt.14.SRD = Sardoal
+country.description.pt.14.TMR = Tomar
+country.description.pt.14.TNV = Torres Novas
+country.description.pt.14.VNB = Vila Nova da Barquinha
+country.description.pt.15     = Setúbal
+country.description.pt.15.ASL = Alcácer do Sal
+country.description.pt.15.ACH = Alcochete
+country.description.pt.15.ALM = Almada
+country.description.pt.15.BRR = Barreiro
+country.description.pt.15.GDL = Grândola
+country.description.pt.15.MTA = Moita
+country.description.pt.15.MTJ = Montijo
+country.description.pt.15.PLM = Palmela
+country.description.pt.15.STC = Santiago do Cacém
+country.description.pt.15.SXL = Seixal
+country.description.pt.15.SSB = Sesimbra
+country.description.pt.15.STB = Setúbal
+country.description.pt.15.SNS = Sines
+country.description.pt.16     = Viana do Castelo
+country.description.pt.16.AVV = Arcos de Valdevez
+country.description.pt.16.CMN = Caminha
+country.description.pt.16.MLG = Melgaço
+country.description.pt.16.MNC = Monção
+country.description.pt.16.PCR = Paredes de Coura
+country.description.pt.16.PTB = Ponte da Barca
+country.description.pt.16.PTL = Ponte de Lima
+country.description.pt.16.VLC = Valença
+country.description.pt.16.VCT = Viana do Castelo
+country.description.pt.16.VNC = Vila Nova de Cerveira
+country.description.pt.17     = Vila Real
+country.description.pt.17.ALJ = Alijó
+country.description.pt.17.BTC = Boticas
+country.description.pt.17.CHV = Chaves
+country.description.pt.17.MSF = Mesão Frio
+country.description.pt.17.MDB = Mondim de Basto
+country.description.pt.17.MTR = Montalegre
+country.description.pt.17.MUR = Murça
+country.description.pt.17.PRG = Peso da Régua
+country.description.pt.17.RPN = Ribeira de Pena
+country.description.pt.17.SBS = Sabrosa
+country.description.pt.17.SMP = Santa Marta de Penaguião
+country.description.pt.17.VPC = Valpaços
+country.description.pt.17.VPA = Vila Pouca de Aguiar
+country.description.pt.17.VRL = Vila Real
+country.description.pt.18     = Viseu
+country.description.pt.18.AMM = Armamar
+country.description.pt.18.CRS = Carregal do Sal
+country.description.pt.18.CDR = Castro Daire
+country.description.pt.18.CNF = Cinfães
+country.description.pt.18.LMG = Lamego
+country.description.pt.18.MGL = Mangualde
+country.description.pt.18.MBR = Moimenta da Beira
+country.description.pt.18.MRT = Mortágua
+country.description.pt.18.NLS = Nelas
+country.description.pt.18.OFR = Oliveira de Frades
+country.description.pt.18.PCT = Penalva do Castelo
+country.description.pt.18.PND = Penedono
+country.description.pt.18.RSD = Resende
+country.description.pt.18.SCD = Santa Comba Dão
+country.description.pt.18.SJP = São João da Pesqueira
+country.description.pt.18.SPS = São Pedro do Sul
+country.description.pt.18.SAT = Sátão
+country.description.pt.18.SRN = Sernancelhe
+country.description.pt.18.TBC = Tabuaço
+country.description.pt.18.TRC = Tarouca
+country.description.pt.18.TND = Tondela
+country.description.pt.18.VNP = Vila Nova de Paiva
+country.description.pt.18.VIS = Viseu
+country.description.pt.18.VZL = Vouzela
 country.description.pw        = Palau
 country.description.py        = Paraguay
 country.description.qa        = Qatar
diff --git a/jollyday-core/src/main/resources/descriptions/country_descriptions_de.properties b/jollyday-core/src/main/resources/descriptions/country_descriptions_de.properties
index e2d0d2b95..21616fa0e 100644
--- a/jollyday-core/src/main/resources/descriptions/country_descriptions_de.properties
+++ b/jollyday-core/src/main/resources/descriptions/country_descriptions_de.properties
@@ -1,530 +1,832 @@
-country.description.ad        = Andorra
-country.description.ae        = Vereinigte Arabische Emirate
-country.description.af        = Afghanistan
-country.description.ag        = Antigua und Barbuda
-country.description.ai        = Anguilla
-country.description.al        = Albanien
-country.description.am        = Armenien
-country.description.an        = Niederländische Antillen
-country.description.ao        = Angola
-country.description.aq        = Antarktis
-country.description.ar        = Argentinien
-country.description.as        = Amerikanisch Samoa
-country.description.at        = Österreich
-country.description.at.b      = Burgenland
-country.description.at.k      = Kärnten
-country.description.at.la     = Niederösterreich
-country.description.at.s      = Salzburg
-country.description.at.st     = Steiermark
-country.description.at.t      = Tirol
-country.description.at.ua     = Oberösterreich
-country.description.at.va     = Vorarlberg
-country.description.at.w      = Wien
-country.description.au        = Australien
-country.description.au.act    = Australisches Hauptstadt-Territorium
-country.description.au.nsw    = Neu Süd-Wales
-country.description.au.nt     = Nördliches Territorium
-country.description.au.qld    = Queensland
-country.description.au.qld.br = Brisbane Area
-country.description.au.sa     = Süd-Australien
-country.description.au.tas    = Tasmanien
-country.description.au.tas.ho = Hobard Area
-country.description.au.tas.nh = Non-Hobard Area
-country.description.au.vic    = Victoria
-country.description.au.wa     = West-Australien
-country.description.aw        = Aruba
-country.description.ax        = Öland Inseln
-country.description.az        = Aserbaidschan
-country.description.ba        = Bosnien und Herzegowina
-country.description.ba.fbh    = Föderation Bosnien und Herzigowina
-country.description.ba.rs     = Republik Srpska
-country.description.bb        = Barbados
-country.description.bd        = Bangladesch
-country.description.be        = Belgien
-country.description.bf        = Burkina Faso
-country.description.bg        = Bulgarien
-country.description.bh        = Bahrain
-country.description.bi        = Burundi
-country.description.bj        = Benin
-country.description.bm        = Bermuda
-country.description.bn        = Brunei Darussalam
-country.description.bo        = Bolivien
-country.description.br        = Brasilien
-country.description.br.go     = Goiás
-country.description.br.mg     = Minas Gerais
-country.description.br.mg.bh  = Belo Horizonte
-country.description.br.ms     = Mato Grosso do Sul
-country.description.br.ms.cg  = Campo Grande
-country.description.br.ms.do  = Dourados
-country.description.br.pb     = Paraíba
-country.description.br.pb.jpa = João Pessoa
-country.description.br.pe     = Pernambuco
-country.description.br.pr     = Parana
-country.description.br.pr.cu  = Curitiba
-country.description.br.rj     = Rio de Janeiro
-country.description.br.rj.crj = City of Rio de Janeiro
-country.description.br.rn     = Rio Grande do Norte
-country.description.br.rn.na  = Natal
-country.description.br.rs     = Rio Grande do Sul
-country.description.br.rs.sm  = Santa Maria
-country.description.br.sp     = Sao Paulo
-country.description.br.sp.csp = Sao Paulo Stadt
-country.description.bs        = Bahamas
-country.description.bt        = Bhutan
-country.description.bv        = Bouvetinsel
-country.description.bw        = Botsuana
-country.description.by        = Weißrussland
-country.description.bz        = Belize
-country.description.ca        = Kanada
-country.description.ca.ab     = Alberta
-country.description.ca.bc     = Britisch Columbia
-country.description.ca.mb     = Manitoba
-country.description.ca.nb     = New Brunswick
-country.description.ca.nl     = Neufundland und Labrador
-country.description.ca.ns     = Nova Scotia
-country.description.ca.nt     = Nordwest-Territorien
-country.description.ca.nu     = Nunavut
-country.description.ca.on     = Ontario
-country.description.ca.pe     = Prinz Edward Insel
-country.description.ca.qc     = Quebec
-country.description.ca.sk     = Saskatchewan
-country.description.ca.yt     = Yukon
-country.description.cc        = Kokosinseln
-country.description.cd        = Kongo, Dem. Rep.
-country.description.cf        = Zentralafrikanische Republik
-country.description.cg        = Kongo
-country.description.ch        = Schweiz
-country.description.ch.ag     = Aargau
-country.description.ch.ai     = Appenzell Innerrhoden
-country.description.ch.ar     = Appenzell Ausserrhoden
-country.description.ch.be     = Bern
-country.description.ch.bl     = Basel-Landschaft
-country.description.ch.bs     = Basel-Stadt
-country.description.ch.fr     = Freiburg
-country.description.ch.ge     = Genf
-country.description.ch.gl     = Glarus
-country.description.ch.gr     = Graubünden
-country.description.ch.ju     = Jura
-country.description.ch.lu     = Luzern
-country.description.ch.ne     = Neuenburg
-country.description.ch.nw     = Nidwalden
-country.description.ch.ow     = Obwalden
-country.description.ch.sg     = St.Gallen
-country.description.ch.sh     = Schaffhausen
-country.description.ch.so     = Solothurn
-country.description.ch.sz     = Schwyz
-country.description.ch.tg     = Thurgau
-country.description.ch.ti     = Tessin
-country.description.ch.ur     = Uri
-country.description.ch.vd     = Waadt
-country.description.ch.vs     = Wallis
-country.description.ch.zg     = Zug
-country.description.ch.zh     = Zürich
-country.description.ci        = Elfenbeinküste
-country.description.ck        = Cookinseln
-country.description.cl        = Chile
-country.description.cm        = Kamerun
-country.description.cn        = China
-country.description.co        = Kolumbien
-country.description.cr        = Costa Rica
-country.description.cu        = Kuba
-country.description.cv        = Kap Verde
-country.description.cx        = Weihnachtsinsel
-country.description.cy        = Zypern
-country.description.cz        = Tschechische Republik
-country.description.de        = Deutschland
-country.description.de.be     = Berlin
-country.description.de.bb     = Brandenburg
-country.description.de.bw     = Baden-Württemberg
-country.description.de.by     = Bayern
-country.description.de.by.ag  = Augsburg
-country.description.de.by.in  = Ingolstadt
-country.description.de.by.mu  = München
-country.description.de.by.re  = Regensburg
-country.description.de.by.wu  = Würzburg
-country.description.de.hb     = Bremen
-country.description.de.he     = Hessen
-country.description.de.hh     = Hamburg
-country.description.de.mv     = Mecklenburg-Vorpommern
-country.description.de.ni     = Niedersachsen
-country.description.de.nw     = Nordrhein-Westfalen
-country.description.de.rp     = Rheinland-Pfalz
-country.description.de.sh     = Schleswig-Holstein
-country.description.de.sl     = Saarland
-country.description.de.sn     = Sachsen
-country.description.de.st     = Sachsen-Anhalt
-country.description.de.th     = Thüringen
-country.description.dj        = Republik Dschibuti
-country.description.dk        = Dänemark
-country.description.dm        = Dominica
-country.description.do        = Dominikanische Republik
-country.description.dz        = Algerien
-country.description.ec        = Ecuador
-country.description.ee        = Estland
-country.description.eg        = Ägypten
-country.description.eh        = Westsahara
-country.description.er        = Eritrea
-country.description.es        = Spanien
-country.description.et        = Äthiopien
-country.description.fi        = Finnland
-country.description.fj        = Fidschi
-country.description.fk        = Falklandinseln
-country.description.fm        = Mikronesien, Föderierte Staaten von
-country.description.fo        = Färöer
-country.description.fr        = Frankreich
-country.description.fr.br     = Bas-Rhin
-country.description.fr.gu     = Guadeloupe
-country.description.fr.gy     = Guyane
-country.description.fr.hr     = Haut-Rhin
-country.description.fr.lr     = La Reunion
-country.description.fr.ma     = Martinique
-country.description.fr.mo     = Moselle
-country.description.ga        = Gabun
-country.description.gb        = Vereinigtes Königreich Großbritannien
-country.description.gb.eng    = England
-country.description.gb.nir    = Nordirland
-country.description.gb.sct    = Schottland
-country.description.gb.wls    = Wales
-country.description.gd        = Grenada
-country.description.ge        = Georgien
-country.description.gf        = Französisch Guiana
-country.description.gg        = Guernsey
-country.description.gh        = Ghana
-country.description.gi        = Gibraltar
-country.description.gl        = Grönland
-country.description.gm        = Gambia
-country.description.gn        = Guinea
-country.description.gp        = Guadeloupe
-country.description.gq        = Äquatorialguinea
-country.description.gr        = Griechenland
-country.description.gs        = Südgeorgien und die Südlichen Sandwichinseln
-country.description.gt        = Guatemala
-country.description.gu        = Guam
-country.description.gw        = Guinea-Bissau
-country.description.gy        = Guyana
-country.description.hk        = Hong Kong
-country.description.hm        = Heard Insel und McDonald Inseln
-country.description.hn        = Honduras
-country.description.hr        = Kroatien
-country.description.ht        = Haiti
-country.description.hu        = Ungarn
-country.description.id        = Indonesien
-country.description.ie        = Irland
-country.description.il        = Israel
-country.description.im        = Isle of Man
-country.description.in        = Indien
-country.description.in.an     = Andaman und Nicobar Islands
-country.description.in.ap     = Andhra Pradesh
-country.description.in.ar     = Arunachal Pradesh
-country.description.in.as     = Assam
-country.description.in.br     = Bihar
-country.description.in.ch     = Chandigarh
-country.description.in.ct     = Chhattisgarh
-country.description.in.dh     = Dadra und Nagar Haveli und Daman und Diu
-country.description.in.dl     = Delhi
-country.description.in.ga     = Goa
-country.description.in.gj     = Gujarat
-country.description.in.hp     = Himachal Pradesh
-country.description.in.hr     = Haryana
-country.description.in.jh     = Jharkhand
-country.description.in.jk     = Jammu und Kashmir
-country.description.in.ka     = Karnataka
-country.description.in.kl     = Kerala
-country.description.in.ld     = Lakshadweep
-country.description.in.mh     = Maharashtra
-country.description.in.ml     = Meghalaya
-country.description.in.mn     = Manipur
-country.description.in.mp     = Madhya Pradesh
-country.description.in.mz     = Mizoram
-country.description.in.nl     = Nagaland
-country.description.in.or     = Orissa
-country.description.in.pb     = Punjab
-country.description.in.py     = Puducherry
-country.description.in.rj     = Rajasthan
-country.description.in.sk     = Sikkim
-country.description.in.tn     = Tamil Nadu
-country.description.in.tr     = Tripura
-country.description.in.up     = Uttar Pradesh
-country.description.in.ut     = Uttarakhand
-country.description.in.wb     = West Bengal
-country.description.io        = Britische Territorien im Indischen Ozean
-country.description.iq        = Irak
-country.description.ir        = Iran, Islam. Rep.
-country.description.is        = Island
-country.description.it        = Italien
-country.description.it.bz     = Südtirol
-country.description.je        = Jersey
-country.description.jm        = Jamaika
-country.description.jo        = Jordanien
-country.description.jp        = Japan
-country.description.ke        = Kenia
-country.description.kg        = Kirgisistan
-country.description.kh        = Kambodscha
-country.description.ki        = Kiribati
-country.description.km        = Komoren
-country.description.kn        = St. Kitts und Nevis
-country.description.kp        = Korea, Dem. Volksrep.
-country.description.kr        = Korea, Rep.
-country.description.kw        = Kuwait
-country.description.ky        = Kaimaninseln
-country.description.kz        = Kasachstan
-country.description.la        = Laos, Dem. Volksrep.
-country.description.lb        = Libanon
-country.description.lc        = St. Lucia
-country.description.li        = Liechtenstein
-country.description.lk        = Sri Lanka
-country.description.lr        = Liberia
-country.description.ls        = Lesotho
-country.description.lt        = Litauen
-country.description.lu        = Luxemburg
-country.description.lu.clu    = Luxemburg Stadt
-country.description.lv        = Lettland
-country.description.ly        = Libysch-Arabische Dschamahirija
-country.description.ma        = Marokko
-country.description.mc        = Monaco
-country.description.md        = Moldau, Rep.
-country.description.md.ba     = Balti
-country.description.md.cu     = Chisinau
-country.description.me        = Montenegro
-country.description.mg        = Madagaskar
-country.description.mh        = Marshallinseln
-country.description.mk        = Nordmazedonien
-country.description.ml        = Mali
-country.description.mm        = Myanmar
-country.description.mn        = Mongolei
-country.description.mo        = Macao
-country.description.mp        = Nördliche Marianen
-country.description.mq        = Martinique
-country.description.mr        = Mauretanien
-country.description.ms        = Montserrat
-country.description.mt        = Malta
-country.description.mu        = Mauritius
-country.description.mv        = Malediven
-country.description.mw        = Malawi
-country.description.mx        = Mexiko
-country.description.mx.pue    = Puebla
-country.description.my        = Malaysia
-country.description.mz        = Mosambik
-country.description.na        = Namibia
-country.description.nc        = Neukaledonien
-country.description.ne        = Niger
-country.description.nf        = Norfolk Insel
-country.description.ng        = Nigeria
-country.description.ng.lag    = Lagos
-country.description.ni        = Nicaragua
-country.description.ni.bo     = Boaco
-country.description.ni.mn     = Managua
-country.description.ni.mo     = Moyogalpa
-country.description.ni.na     = Nandaime
-country.description.ni.ni     = Niquinohomo
-country.description.ni.om     = Ometepe
-country.description.ni.so     = Somoto
-country.description.nl        = Niederlande
-country.description.no        = Norwegen
-country.description.np        = Nepal
-country.description.nr        = Nauru
-country.description.nu        = Niue
-country.description.nz        = Neuseeland
-country.description.om        = Oman
-country.description.pa        = Panama
-country.description.pe        = Peru
-country.description.pf        = Französisch Polynesien
-country.description.pg        = Papua-Neuguinea
-country.description.ph        = Philippinen
-country.description.pk        = Pakistan
-country.description.pl        = Polen
-country.description.pm        = Saint Pierre und Miquelon
-country.description.pn        = Pitcairn
-country.description.pr        = Puerto Rico
-country.description.ps        = Palästinische Gebiete
-country.description.pt        = Portugal
-country.description.pt.abf    = Albufeira
-country.description.pt.abt    = Abrantes
-country.description.pt.acb    = Alcobaça
-country.description.pt.ach    = Alcochete
-country.description.pt.acn    = Alcanena
-country.description.pt.act    = Alcoutim
-country.description.pt.adl    = Alandroal
-country.description.pt.adv    = Almodôvar
-country.description.pt.afe    = Alfândega da Fé
-country.description.pt.agb    = Aguiar da Beira
-country.description.pt.agd    = Águeda
-country.description.pt.agh    = Angra do Heroísmo
-country.description.pt.agn    = Arganil
-country.description.pt.ajt    = Aljustrel
-country.description.pt.ajz    = Aljezur
-country.description.pt.alb    = Albergaria-a-Velha
-country.description.pt.ald    = Almeida
-country.description.pt.alj    = Alijó
-country.description.pt.alm    = Almada
-country.description.pt.alq    = Alenquer
-country.description.pt.alr    = Almeirim
-country.description.pt.alt    = Alter do Chão
-country.description.pt.amd    = Amadora
-country.description.pt.amm    = Armamar
-country.description.pt.amr    = Amares
-country.description.pt.amt    = Amarante
-country.description.pt.and    = Anadia
-country.description.pt.ans    = Ansião
-country.description.pt.apc    = Alpiarça
-country.description.pt.arc    = Arouca
-country.description.pt.arl    = Arraiolos
-country.description.pt.arr    = Arronches
-country.description.pt.arv    = Arruda dos Vinhos
-country.description.pt.asl    = Alcácer do Sal
-country.description.pt.avr    = Aveiro
-country.description.pt.avs    = Avis
-country.description.pt.avt    = Alvito
-country.description.pt.avv    = Arcos de Valdevez
-country.description.pt.avz    = Alvaiázere
-country.description.pt.azb    = Azambuja
-country.description.pt.bao    = Baião
-country.description.pt.bbr    = Bombarral
-country.description.pt.bcl    = Barcelos
-country.description.pt.bgc    = Bragança
-country.description.pt.bja    = Beja
-country.description.pt.bmt    = Belmonte
-country.description.pt.bnv    = Benavente
-country.description.pt.brb    = Borba
-country.description.pt.brc    = Barrancos
-country.description.pt.brg    = Braga
-country.description.pt.brr    = Barreiro
-country.description.pt.btc    = Boticas
-country.description.pt.btl    = Batalha
-country.description.pt.cbc    = Cabeceiras de Basto
-country.description.pt.cdv    = Cadaval
-country.description.pt.cht    = Calheta (Açores)
-country.description.pt.cld    = Caldas da Rainha
-country.description.pt.clt    = Calheta (Madeira)
-country.description.pt.cml    = Câmara de Lobos
-country.description.pt.cmn    = Caminha
-country.description.pt.cmr    = Campo Maior
-country.description.pt.cnt    = Cantanhede
-country.description.pt.cpr    = Castanheira de Pera
-country.description.pt.crs    = Carregal do Sal
-country.description.pt.crz    = Carrazeda de Ansiães
-country.description.pt.csc    = Cascais
-country.description.pt.ctb    = Castelo Branco
-country.description.pt.ctx    = Cartaxo
-country.description.pw        = Palau
-country.description.py        = Paraguay
-country.description.qa        = Katar
-country.description.re        = Réunion
-country.description.ro        = Rumänien
-country.description.rs        = Serbien
-country.description.ru        = Russische Föderation
-country.description.rw        = Ruanda
-country.description.sa        = Saudi-Arabien
-country.description.sb        = Salomonen
-country.description.sc        = Seychellen
-country.description.sd        = Sudan
-country.description.se        = Schweden
-country.description.sg        = Singapur
-country.description.sh        = Saint Helena
-country.description.si        = Slowenien
-country.description.sj        = Svalbard und Jan Mayen
-country.description.sk        = Slowakei
-country.description.sl        = Sierra Leone
-country.description.sm        = San Marino
-country.description.sn        = Senegal
-country.description.so        = Somalia
-country.description.sr        = Suriname
-country.description.ss        = Süd-Sudan
-country.description.st        = São Tomé und Príncipe
-country.description.sv        = El Salvador
-country.description.sx        = Saint Martin (Dutch part)
-country.description.sy        = Syrien, Arab. Rep.
-country.description.sz        = Swasiland
-country.description.target    = Trans-European Automated Real-time Gross settlement Express Transfer system closing dates
-country.description.tc        = Turks- und Caicosinseln
-country.description.td        = Tschad
-country.description.tf        = Französische Südgebiete
-country.description.tg        = Togo
-country.description.th        = Thailand
-country.description.tj        = Tadschikistan
-country.description.tk        = Tokelau
-country.description.tl        = Timor-Leste
-country.description.tm        = Turkmenistan
-country.description.tn        = Tunesien
-country.description.to        = Tonga
-country.description.tr        = Türkei
-country.description.tt        = Trinidad und Tobago
-country.description.tv        = Tuvalu
-country.description.tw        = Taiwan
-country.description.tz        = Tansania, Vereinigte Rep.
-country.description.ua        = Ukraine
-country.description.ug        = Uganda
-country.description.um        = United States Minor Outlying Islands
-country.description.us        = Vereinigte Staaten von Amerika
-country.description.us.ak     = Alaska
-country.description.us.al     = Alabama
-country.description.us.ar     = Arkansas
-country.description.us.az     = Arizona
-country.description.us.be     = Berkeley
-country.description.us.ca     = Kalifornien
-country.description.us.co     = Colorado
-country.description.us.ct     = Connecticut
-country.description.us.dc     = District of Columbia
-country.description.us.de     = Delaware
-country.description.us.fl     = Florida
-country.description.us.ga     = Georgia
-country.description.us.hi     = Hawaii
-country.description.us.ia     = Iowa
-country.description.us.id     = Idaho
-country.description.us.il     = Illinois
-country.description.us.in     = Indiana
-country.description.us.ks     = Kansas
-country.description.us.ky     = Kentucky
-country.description.us.la     = Louisiana
-country.description.us.ma     = Massachusetts
-country.description.us.md     = Maryland
-country.description.us.me     = Maine
-country.description.us.mi     = Michigan
-country.description.us.mn     = Minnesota
-country.description.us.mo     = Missouri
-country.description.us.ms     = Mississippi
-country.description.us.mt     = Montana
-country.description.us.nc     = North Carolina
-country.description.us.nc.ce  = Charlotte
-country.description.us.nc.me  = Mecklenburg
-country.description.us.nd     = North Dakota
-country.description.us.ne     = Nebraska
-country.description.us.nh     = New Hampshire
-country.description.us.nj     = New Jersey
-country.description.us.nm     = New Mexico
-country.description.us.nv     = Nevada
-country.description.us.ny     = New York
-country.description.us.ny.nyc = New York City
-country.description.us.oh     = Ohio
-country.description.us.ok     = Oklahoma
-country.description.us.or     = Oregon
-country.description.us.pa     = Pennsylvania
-country.description.us.ri     = Rhode Island
-country.description.us.sc     = South Carolina
-country.description.us.sd     = South Dakota
-country.description.us.tn     = Tennesee
-country.description.us.tx     = Texas
-country.description.us.ut     = Utah
-country.description.us.va     = Virginia
-country.description.us.vt     = Vermont
-country.description.us.wa     = Washington
-country.description.us.wi     = Wisconsin
-country.description.us.wv     = West Virginia
-country.description.us.wy     = Wyoming
-country.description.uy        = Uruguay
-country.description.uz        = Usbekistan
-country.description.va        = Heiliger Stuhl
-country.description.vc        = St. Vincent und die Grenadinen
-country.description.ve        = Venezuela
-country.description.vg        = Britische Jungferninseln
-country.description.vi        = Amerikanische Jungferninseln
-country.description.vn        = Vietnam
-country.description.vu        = Vanuatu
-country.description.wf        = Wallis und Futuna
-country.description.ws        = Samoa
-country.description.ye        = Jemen
-country.description.xk        = Kosovo
-country.description.yt        = Mayotte
-country.description.za        = Südafrika
-country.description.zm        = Sambia
-country.description.zw        = Simbabwe
+country.description.ad         = Andorra
+country.description.ae         = Vereinigte Arabische Emirate
+country.description.af         = Afghanistan
+country.description.ag         = Antigua und Barbuda
+country.description.ai         = Anguilla
+country.description.al         = Albanien
+country.description.am         = Armenien
+country.description.an         = Niederländische Antillen
+country.description.ao         = Angola
+country.description.aq         = Antarktis
+country.description.ar         = Argentinien
+country.description.as         = Amerikanisch Samoa
+country.description.at         = Österreich
+country.description.at.1       = Burgenland
+country.description.at.2       = Kärnten
+country.description.at.3       = Niederösterreich
+country.description.at.5       = Salzburg
+country.description.at.6       = Steiermark
+country.description.at.7       = Tirol
+country.description.at.4       = Oberösterreich
+country.description.at.8       = Vorarlberg
+country.description.at.9       = Wien
+country.description.au         = Australien
+country.description.au.act     = Australisches Hauptstadt-Territorium
+country.description.au.nsw     = Neu Süd-Wales
+country.description.au.nt      = Nördliches Territorium
+country.description.au.qld     = Queensland
+country.description.au.qld.br  = Brisbane Area
+country.description.au.sa      = Süd-Australien
+country.description.au.tas     = Tasmanien
+country.description.au.tas.ho  = Hobard Area
+country.description.au.tas.nh  = Non-Hobard Area
+country.description.au.vic     = Victoria
+country.description.au.wa      = West-Australien
+country.description.aw         = Aruba
+country.description.ax         = Öland Inseln
+country.description.az         = Aserbaidschan
+country.description.ba         = Bosnien und Herzegowina
+country.description.ba.bih     = Föderation Bosnien und Herzigowina
+country.description.ba.srp     = Republik Srpska
+country.description.bb         = Barbados
+country.description.bd         = Bangladesch
+country.description.be         = Belgien
+country.description.bf         = Burkina Faso
+country.description.bg         = Bulgarien
+country.description.bh         = Bahrain
+country.description.bi         = Burundi
+country.description.bj         = Benin
+country.description.bm         = Bermuda
+country.description.bn         = Brunei Darussalam
+country.description.bo         = Bolivien
+country.description.br         = Brasilien
+country.description.br.go      = Goiás
+country.description.br.mg      = Minas Gerais
+country.description.br.mg.bh   = Belo Horizonte
+country.description.br.ms      = Mato Grosso do Sul
+country.description.br.ms.cg   = Campo Grande
+country.description.br.ms.do   = Dourados
+country.description.br.pb      = Paraíba
+country.description.br.pb.jpa  = João Pessoa
+country.description.br.pe      = Pernambuco
+country.description.br.pr      = Parana
+country.description.br.pr.cu   = Curitiba
+country.description.br.rj      = Rio de Janeiro
+country.description.br.rj.crj  = City of Rio de Janeiro
+country.description.br.rn      = Rio Grande do Norte
+country.description.br.rn.na   = Natal
+country.description.br.rs      = Rio Grande do Sul
+country.description.br.rs.sm   = Santa Maria
+country.description.br.sp      = Sao Paulo
+country.description.br.sp.csp  = Sao Paulo Stadt
+country.description.bs         = Bahamas
+country.description.bt         = Bhutan
+country.description.bv         = Bouvetinsel
+country.description.bw         = Botsuana
+country.description.by         = Weißrussland
+country.description.bz         = Belize
+country.description.ca         = Kanada
+country.description.ca.ab      = Alberta
+country.description.ca.bc      = Britisch Columbia
+country.description.ca.mb      = Manitoba
+country.description.ca.nb      = New Brunswick
+country.description.ca.nl      = Neufundland und Labrador
+country.description.ca.ns      = Nova Scotia
+country.description.ca.nt      = Nordwest-Territorien
+country.description.ca.nu      = Nunavut
+country.description.ca.on      = Ontario
+country.description.ca.pe      = Prinz Edward Insel
+country.description.ca.qc      = Quebec
+country.description.ca.sk      = Saskatchewan
+country.description.ca.yt      = Yukon
+country.description.cc         = Kokosinseln
+country.description.cd         = Kongo, Dem. Rep.
+country.description.cf         = Zentralafrikanische Republik
+country.description.cg         = Kongo
+country.description.ch         = Schweiz
+country.description.ch.ag      = Aargau
+country.description.ch.ai      = Appenzell Innerrhoden
+country.description.ch.ar      = Appenzell Ausserrhoden
+country.description.ch.be      = Bern
+country.description.ch.bl      = Basel-Landschaft
+country.description.ch.bs      = Basel-Stadt
+country.description.ch.fr      = Freiburg
+country.description.ch.ge      = Genf
+country.description.ch.gl      = Glarus
+country.description.ch.gr      = Graubünden
+country.description.ch.ju      = Jura
+country.description.ch.lu      = Luzern
+country.description.ch.ne      = Neuenburg
+country.description.ch.nw      = Nidwalden
+country.description.ch.ow      = Obwalden
+country.description.ch.sg      = St.Gallen
+country.description.ch.sh      = Schaffhausen
+country.description.ch.so      = Solothurn
+country.description.ch.sz      = Schwyz
+country.description.ch.tg      = Thurgau
+country.description.ch.ti      = Tessin
+country.description.ch.ur      = Uri
+country.description.ch.vd      = Waadt
+country.description.ch.vs      = Wallis
+country.description.ch.zg      = Zug
+country.description.ch.zh      = Zürich
+country.description.ci         = Elfenbeinküste
+country.description.ck         = Cookinseln
+country.description.cl         = Chile
+country.description.cm         = Kamerun
+country.description.cn         = China
+country.description.co         = Kolumbien
+country.description.cr         = Costa Rica
+country.description.cu         = Kuba
+country.description.cv         = Kap Verde
+country.description.cx         = Weihnachtsinsel
+country.description.cy         = Zypern
+country.description.cz         = Tschechische Republik
+country.description.de         = Deutschland
+country.description.de.be      = Berlin
+country.description.de.bb      = Brandenburg
+country.description.de.bw      = Baden-Württemberg
+country.description.de.by      = Bayern
+country.description.de.by.ag   = Augsburg
+country.description.de.by.in   = Ingolstadt
+country.description.de.by.mu   = München
+country.description.de.by.re   = Regensburg
+country.description.de.by.wu   = Würzburg
+country.description.de.hb      = Bremen
+country.description.de.he      = Hessen
+country.description.de.hh      = Hamburg
+country.description.de.mv      = Mecklenburg-Vorpommern
+country.description.de.ni      = Niedersachsen
+country.description.de.nw      = Nordrhein-Westfalen
+country.description.de.rp      = Rheinland-Pfalz
+country.description.de.sh      = Schleswig-Holstein
+country.description.de.sl      = Saarland
+country.description.de.sn      = Sachsen
+country.description.de.st      = Sachsen-Anhalt
+country.description.de.th      = Thüringen
+country.description.dj         = Republik Dschibuti
+country.description.dk         = Dänemark
+country.description.dm         = Dominica
+country.description.do         = Dominikanische Republik
+country.description.dz         = Algerien
+country.description.ec         = Ecuador
+country.description.ee         = Estland
+country.description.eg         = Ägypten
+country.description.eh         = Westsahara
+country.description.er         = Eritrea
+country.description.es         = Spanien
+country.description.es.an      = Andalusien
+country.description.es.ar      = Aragonien
+country.description.es.ce      = Ceuta
+country.description.es.ml      = Melilla
+country.description.es.cl      = Kastilien und Leon
+country.description.es.cm      = Kastilien - La Mancha
+country.description.es.cn      = Kanarische Inseln
+country.description.es.ct      = Katalonien
+country.description.esb.cn     = Barcelona
+country.description.es.ex      = Extremadura
+country.description.es.ga      = Galicien
+country.description.es.ib      = Balearische Insel
+country.description.es.lo      = La Rioja
+country.description.es.md      = Madrid
+country.description.es.md.mad  = Madrid Stadt
+country.description.es.mc      = Murcia
+country.description.es.nc      = Navarra
+country.description.es.as      = Asturien
+country.description.es.pv      = Euskadi
+country.description.es.cb      = Kantabrien
+country.description.es.vc      = Valencia
+country.description.et         = Äthiopien
+country.description.fi         = Finnland
+country.description.fi.01      = Åland
+country.description.fj         = Fidschi
+country.description.fk         = Falklandinseln
+country.description.fm         = Mikronesien, Föderierte Staaten von
+country.description.fo         = Färöer
+country.description.fr         = Frankreich
+country.description.fr.ges.67  = Bas-Rhin
+country.description.fr.971     = Guadeloupe
+country.description.fr.973     = Guyane
+country.description.fr.ges.68  = Haut-Rhin
+country.description.fr.974     = La Reunion
+country.description.fr.972     = Martinique
+country.description.fr.ges.57  = Moselle
+country.description.ga         = Gabun
+country.description.gb         = Vereinigtes Königreich Großbritannien
+country.description.gb.eng     = England
+country.description.gb.nir     = Nordirland
+country.description.gb.sct     = Schottland
+country.description.gb.wls     = Wales
+country.description.gd         = Grenada
+country.description.ge         = Georgien
+country.description.gf         = Französisch Guiana
+country.description.gg         = Guernsey
+country.description.gh         = Ghana
+country.description.gi         = Gibraltar
+country.description.gl         = Grönland
+country.description.gm         = Gambia
+country.description.gn         = Guinea
+country.description.gp         = Guadeloupe
+country.description.gq         = Äquatorialguinea
+country.description.gr         = Griechenland
+country.description.gs         = Südgeorgien und die Südlichen Sandwichinseln
+country.description.gt         = Guatemala
+country.description.gu         = Guam
+country.description.gw         = Guinea-Bissau
+country.description.gy         = Guyana
+country.description.hk         = Hong Kong
+country.description.hm         = Heard Insel und McDonald Inseln
+country.description.hn         = Honduras
+country.description.hr         = Kroatien
+country.description.ht         = Haiti
+country.description.hu         = Ungarn
+country.description.id         = Indonesien
+country.description.ie         = Irland
+country.description.il         = Israel
+country.description.im         = Isle of Man
+country.description.in         = Indien
+country.description.in.an      = Andaman und Nicobar Islands
+country.description.in.ap      = Andhra Pradesh
+country.description.in.ar      = Arunachal Pradesh
+country.description.in.as      = Assam
+country.description.in.br      = Bihar
+country.description.in.ch      = Chandigarh
+country.description.in.ct      = Chhattisgarh
+country.description.in.dh      = Dadra und Nagar Haveli und Daman und Diu
+country.description.in.dl      = Delhi
+country.description.in.ga      = Goa
+country.description.in.gj      = Gujarat
+country.description.in.hp      = Himachal Pradesh
+country.description.in.hr      = Haryana
+country.description.in.jh      = Jharkhand
+country.description.in.jk      = Jammu und Kashmir
+country.description.in.ka      = Karnataka
+country.description.in.kl      = Kerala
+country.description.in.ld      = Lakshadweep
+country.description.in.mh      = Maharashtra
+country.description.in.ml      = Meghalaya
+country.description.in.mn      = Manipur
+country.description.in.mp      = Madhya Pradesh
+country.description.in.mz      = Mizoram
+country.description.in.nl      = Nagaland
+country.description.in.or      = Orissa
+country.description.in.pb      = Punjab
+country.description.in.py      = Puducherry
+country.description.in.rj      = Rajasthan
+country.description.in.sk      = Sikkim
+country.description.in.tn      = Tamil Nadu
+country.description.in.tr      = Tripura
+country.description.in.up      = Uttar Pradesh
+country.description.in.ut      = Uttarakhand
+country.description.in.wb      = West Bengal
+country.description.io         = Britische Territorien im Indischen Ozean
+country.description.iq         = Irak
+country.description.ir         = Iran, Islam. Rep.
+country.description.is         = Island
+country.description.it         = Italien
+country.description.it.32      = Südtirol
+country.description.je         = Jersey
+country.description.jm         = Jamaika
+country.description.jo         = Jordanien
+country.description.jp         = Japan
+country.description.ke         = Kenia
+country.description.kg         = Kirgisistan
+country.description.kh         = Kambodscha
+country.description.ki         = Kiribati
+country.description.km         = Komoren
+country.description.kn         = St. Kitts und Nevis
+country.description.kp         = Korea, Dem. Volksrep.
+country.description.kr         = Korea, Rep.
+country.description.kw         = Kuwait
+country.description.ky         = Kaimaninseln
+country.description.kz         = Kasachstan
+country.description.la         = Laos, Dem. Volksrep.
+country.description.lb         = Libanon
+country.description.lc         = St. Lucia
+country.description.li         = Liechtenstein
+country.description.lk         = Sri Lanka
+country.description.lr         = Liberia
+country.description.ls         = Lesotho
+country.description.lt         = Litauen
+country.description.lu         = Luxemburg
+country.description.lu.lu.clu  = Luxemburg Stadt
+country.description.lv         = Lettland
+country.description.ly         = Libysch-Arabische Dschamahirija
+country.description.ma         = Marokko
+country.description.mc         = Monaco
+country.description.md         = Moldau, Rep.
+country.description.md.ba      = Balti
+country.description.me         = Montenegro
+country.description.mg         = Madagaskar
+country.description.mh         = Marshallinseln
+country.description.mk         = Nordmazedonien
+country.description.ml         = Mali
+country.description.mm         = Myanmar
+country.description.mn         = Mongolei
+country.description.mo         = Macao
+country.description.mp         = Nördliche Marianen
+country.description.mq         = Martinique
+country.description.mr         = Mauretanien
+country.description.ms         = Montserrat
+country.description.mt         = Malta
+country.description.mu         = Mauritius
+country.description.mv         = Malediven
+country.description.mw         = Malawi
+country.description.mx         = Mexiko
+country.description.mx.pue     = Puebla
+country.description.my         = Malaysia
+country.description.mz         = Mosambik
+country.description.na         = Namibia
+country.description.nc         = Neukaledonien
+country.description.ne         = Niger
+country.description.nf         = Norfolk Insel
+country.description.ng         = Nigeria
+country.description.ng.la      = Lagos
+country.description.ni         = Nicaragua
+country.description.ni.bo      = Boaco
+country.description.ni.gr      = Granada
+country.description.ni.gr.na   = Nandaime
+country.description.ni.md      = Madriz
+country.description.ni.md.so   = Somoto
+country.description.ni.mn      = Managua
+country.description.ni.ms      = Masaya
+country.description.ni.ms.ni   = Niquinohomo
+country.description.ni.ri      = Rivas
+country.description.ni.ri.mo   = Moyogalpa
+country.description.ni.ri.om   = Ometepe
+country.description.nl         = Niederlande
+country.description.no         = Norwegen
+country.description.np         = Nepal
+country.description.nr         = Nauru
+country.description.nu         = Niue
+country.description.nz         = Neuseeland
+country.description.nz.auk     = Auckland
+country.description.nz.bop     = Bay of Plenty
+country.description.nz.can     = Canterbury
+country.description.nz.cit     = Chatham Islands Territorium
+country.description.nz.gis     = Gisborne
+country.description.nz.hkb     = Hawke's Bay
+country.description.nz.mbh     = Marlborough
+country.description.nz.mwt     = Manawatu-Wanganui
+country.description.nz.nsn     = Nelson
+country.description.nz.ntl     = Nordland
+country.description.nz.ota     = Otago
+country.description.nz.stl     = Südland
+country.description.nz.tas     = Tasmanien
+country.description.nz.tki     = Taranaki
+country.description.nz.wgn     = Wellington
+country.description.nz.wko     = Waikato
+country.description.nz.wtc     = Westküste
+country.description.om         = Oman
+country.description.pa         = Panama
+country.description.pe         = Peru
+country.description.pf         = Französisch Polynesien
+country.description.pg         = Papua-Neuguinea
+country.description.ph         = Philippinen
+country.description.pk         = Pakistan
+country.description.pl         = Polen
+country.description.pm         = Saint Pierre und Miquelon
+country.description.pn         = Pitcairn
+country.description.pr         = Puerto Rico
+country.description.ps         = Palästinische Gebiete
+country.description.pt         = Portugal
+country.description.pt.01      = Aveiro
+country.description.pt.01.AGD  = Águeda
+country.description.pt.01.ALB  = Albergaria-a-Velha
+country.description.pt.01.AND  = Anadia
+country.description.pt.01.ARC  = Arouca
+country.description.pt.01.AVR  = Aveiro
+country.description.pt.01.CPV  = Castelo de Paiva
+country.description.pt.01.ESP  = Espinho
+country.description.pt.01.ETR  = Estarreja
+country.description.pt.01.ILH  = Ílhavo
+country.description.pt.01.MLD  = Mealhada
+country.description.pt.01.MRS  = Murtosa
+country.description.pt.01.OAZ  = Oliveira de Azeméis
+country.description.pt.01.VAC  = Vale de Cambra
+country.description.pt.01.VGS  = Vagos
+country.description.pt.01.SVV  = Sever do Vouga
+country.description.pt.01.SJM  = São João da Madeira
+country.description.pt.01.VFR  = Santa Maria da Feira
+country.description.pt.01.OVR  = Ovar
+country.description.pt.01.OBR  = Oliveira do Bairro
+country.description.pt.20      = Azoren
+country.description.pt.20.VFC  = Vila Franca do Campo
+country.description.pt.20.VPT  = Vila do Porto
+country.description.pt.20.VLS  = Velas
+country.description.pt.20.SRQ  = São Roque do Pico
+country.description.pt.20.SCF  = Santa Cruz das Flores
+country.description.pt.20.SCG  = Santa Cruz da Graciosa
+country.description.pt.20.RGR  = Ribeira Grande
+country.description.pt.20.VPV  = Praia da Vitória
+country.description.pt.20.PVC  = Povoação
+country.description.pt.20.PDL  = Ponta Delgada
+country.description.pt.20.NRD  = Nordeste
+country.description.pt.20.MAD  = Madalena
+country.description.pt.20.LGP  = Lajes do Pico
+country.description.pt.20.LGF  = Lajes das Flores
+country.description.pt.20.LAG  = Lagoa (Açores)
+country.description.pt.20.HRT  = Horta
+country.description.pt.20.CRV  = Corvo
+country.description.pt.20.CHT  = Calheta (Açores)
+country.description.pt.20.AGH  = Angra do Heroísmo
+country.description.pt.02      = Beja
+country.description.pt.02.VDG  = Vidigueira
+country.description.pt.02.SRP  = Serpa
+country.description.pt.02.ORQ  = Ourique
+country.description.pt.02.ODM  = Odemira
+country.description.pt.02.MRA  = Moura
+country.description.pt.02.MTL  = Mértola
+country.description.pt.02.FAL  = Ferreira do Alentejo
+country.description.pt.02.CBA  = Kuba
+country.description.pt.02.CVR  = Castro Verde
+country.description.pt.02.BJA  = Beja
+country.description.pt.02.BRC  = Barrancos
+country.description.pt.02.AVT  = Alvito
+country.description.pt.02.ADV  = Almodôvar
+country.description.pt.02.AJT  = Aljustrel
+country.description.pt.03      = Braga
+country.description.pt.03.AMR  = Amares
+country.description.pt.03.ANS  = Ansião
+country.description.pt.03.BCL  = Barcelos
+country.description.pt.03.BRG  = Braga
+country.description.pt.03.BGC  = Bragança
+country.description.pt.03.CBC  = Cabeceiras de Basto
+country.description.pt.03.CDV  = Cadaval
+country.description.pt.03.CBT  = Celorico de Basto
+country.description.pt.03.EPS  = Esposende
+country.description.pt.03.FAF  = Fafe
+country.description.pt.03.GMR  = Guimarães
+country.description.pt.03.PVL  = Póvoa de Lanhoso
+country.description.pt.03.TBR  = Terras de Bouro
+country.description.pt.03.VRM  = Vieira do Minho
+country.description.pt.03.VNF  = Vila Nova de Famalicão
+country.description.pt.03.VVD  = Vila Verde
+country.description.pt.03.VIZ  = Vizela
+country.description.pt.04      = Bragança
+country.description.pt.04.AFE  = Alfândega da Fé
+country.description.pt.04.CRZ  = Carrazeda de Ansiães
+country.description.pt.04.FEC  = Freixo de Espada à Cinta
+country.description.pt.04.MCD  = Macedo de Cavaleiros
+country.description.pt.04.MDR  = Miranda do Douro
+country.description.pt.04.MDL  = Mirandela
+country.description.pt.04.MGD  = Mogadouro
+country.description.pt.04.TMC  = Torre de Moncorvo
+country.description.pt.04.VFL  = Vila Flor
+country.description.pt.04.VMS  = Vimioso
+country.description.pt.04.VNH = Vinhais
+country.description.pt.05      = Castelo Branco
+country.description.pt.05.BMT  = Belmonte
+country.description.pt.05.CTB  = Castelo Branco
+country.description.pt.05.CVL  = Covilhã
+country.description.pt.05.FND  = Fundão
+country.description.pt.05.IDN  = Idanha-a-Nova
+country.description.pt.05.OLR  = Oleiros
+country.description.pt.05.PNC  = Penamacor
+country.description.pt.05.PNV  = Proença-a-Nova
+country.description.pt.05.SRT  = Sertã
+country.description.pt.05.VLR  = Vila de Rei
+country.description.pt.05.VVR  = Vila Velha de Ródão
+country.description.pt.06      = Coimbra
+country.description.pt.06.AGN  = Arganil
+country.description.pt.06.CNT  = Cantanhede
+country.description.pt.06.CBR  = Coimbra
+country.description.pt.06.CDN  = Condeixa-a-Nova
+country.description.pt.06.FIG  = Figueira da Foz
+country.description.pt.06.GOI  = Góis
+country.description.pt.06.LSA  = Lousã
+country.description.pt.06.MIR  = Mira
+country.description.pt.06.MCV  = Miranda do Corvo
+country.description.pt.06.MMV  = Montemor-o-Velho
+country.description.pt.06.OHP  = Oliveira do Hospital
+country.description.pt.06.PPS  = Pampilhosa da Serra
+country.description.pt.06.PCV  = Penacova
+country.description.pt.06.PNL  = Penela
+country.description.pt.06.SRE  = Soure
+country.description.pt.06.TBU  = Tábua
+country.description.pt.06.PRS  = Vila Nova de Poiares
+country.description.pt.07      = Évora
+country.description.pt.07.ADL  = Alandroal
+country.description.pt.07.ARL  = Arraiolos
+country.description.pt.07.BRB  = Borba
+country.description.pt.07.ETZ  = Estremoz
+country.description.pt.07.EVR  = Évora
+country.description.pt.07.MMN  = Montemor-o-Novo
+country.description.pt.07.MOR  = Mora
+country.description.pt.07.MOU  = Mourão
+country.description.pt.07.PRL  = Portel
+country.description.pt.07.RDD  = Redondo
+country.description.pt.07.RMZ  = Reguengos de Monsaraz
+country.description.pt.07.VND  = Vendas Novas
+country.description.pt.07.VNT  = Viana do Alentejo
+country.description.pt.07.VVC  = Vila Viçosa
+country.description.pt.08      = Faro
+country.description.pt.08.ABF  = Albufeira
+country.description.pt.08.ACT  = Alcoutim
+country.description.pt.08.AJZ  = Aljezur
+country.description.pt.08.CTM  = Castro Marim
+country.description.pt.08.FAR  = Faro
+country.description.pt.08.LGA  = Lagoa
+country.description.pt.08.LGS  = Lagos
+country.description.pt.08.LLE  = Loulé
+country.description.pt.08.MCQ  = Monchique
+country.description.pt.08.OLH  = Olhão
+country.description.pt.08.PTM  = Portimão
+country.description.pt.08.SBA  = São Brás de Alportel
+country.description.pt.08.SLV  = Silves
+country.description.pt.08.TVR  = Tavira
+country.description.pt.08.VBP  = Vila do Bispo
+country.description.pt.08.VRS  = Vila Real de Santo António
+country.description.pt.09      = Guarda
+country.description.pt.09.AGB  = Aguiar da Beira
+country.description.pt.09.ALD  = Almeida
+country.description.pt.09.CLB  = Celorico da Beira
+country.description.pt.09.FCR  = Figueira de Castelo Rodrigo
+country.description.pt.09.FAG  = Fornos de Algodres
+country.description.pt.09.GVA  = Gouveia
+country.description.pt.09.GRD  = Guarda
+country.description.pt.09.MTG  = Manteigas
+country.description.pt.09.MED  = Mêda
+country.description.pt.09.PNH  = Pinhel
+country.description.pt.09.SBG  = Sabugal
+country.description.pt.09.SEI  = Seia
+country.description.pt.09.TCR  = Trancoso
+country.description.pt.09.VLF  = Vila Nova de Foz Côa
+country.description.pt.10      = Leiria
+country.description.pt.10.ACB  = Alcobaça
+country.description.pt.10.AVZ  = Alvaiázere
+country.description.pt.10.BTL  = Batalha
+country.description.pt.10.BBR  = Bombarral
+country.description.pt.10.CLD  = Caldas da Rainha
+country.description.pt.10.CPR  = Castanheira de Pera
+country.description.pt.10.FVN  = Figueiró dos Vinhos
+country.description.pt.10.LRA  = Leiria
+country.description.pt.10.MGR  = Marinha Grande
+country.description.pt.10.NZR  = Nazaré
+country.description.pt.10.OBD  = Óbidos
+country.description.pt.10.PGR  = Pedrógão Grande
+country.description.pt.10.PNI  = Peniche
+country.description.pt.10.PBL  = Pombal
+country.description.pt.10.PMS  = Porto de Mós
+country.description.pt.11      = Lissabon
+country.description.pt.11.ALQ  = Alenquer
+country.description.pt.11.AMD  = Amadora
+country.description.pt.11.ARV  = Arruda dos Vinhos
+country.description.pt.11.AZB  = Azambuja
+country.description.pt.11.CSC  = Cascais
+country.description.pt.11.LSB  = Lisboa
+country.description.pt.11.LRS  = Loures
+country.description.pt.11.LNH  = Lourinhã
+country.description.pt.11.MFR  = Mafra
+country.description.pt.11.ODV  = Odivelas
+country.description.pt.11.OER  = Oeiras
+country.description.pt.11.SNT  = Sintra
+country.description.pt.11.SMA  = Sobral de Monte Agraço
+country.description.pt.11.TVD  = Torres Vedras
+country.description.pt.11.VFX  = Vila Franca de Xira
+country.description.pt.30      = Madeira
+country.description.pt.30.CLT  = Calheta
+country.description.pt.30.CML  = Câmara de Lobos
+country.description.pt.30.FNC  = Funchal
+country.description.pt.30.MCH  = Machico
+country.description.pt.30.PTS  = Ponta do Sol
+country.description.pt.30.PMZ  = Porto Moniz
+country.description.pt.30.PST  = Porto Santo
+country.description.pt.30.RBR  = Ribeira Brava
+country.description.pt.30.SCR  = Santa Cruz
+country.description.pt.30.STN  = Santana
+country.description.pt.30.SVC  = São Vicente
+country.description.pt.12      = Portalegre
+country.description.pt.12.ALT  = Alter do Chão
+country.description.pt.12.ARR  = Arronches
+country.description.pt.12.AVS  = Avis
+country.description.pt.12.CMR  = Campo Maior
+country.description.pt.12.CVD  = Castelo de Vide
+country.description.pt.12.CRT  = Crato
+country.description.pt.12.ELV  = Elvas
+country.description.pt.12.FTR  = Fronteira
+country.description.pt.12.GAV  = Gavião
+country.description.pt.12.MRV  = Marvão
+country.description.pt.12.MFT  = Monforte
+country.description.pt.12.NIS  = Nisa
+country.description.pt.12.PSR  = Ponte de Sor
+country.description.pt.12.PTG  = Portalegre
+country.description.pt.12.SSL  = Sousel
+country.description.pt.13      = Porto
+country.description.pt.13.AMT  = Amarante
+country.description.pt.13.BAO  = Baião
+country.description.pt.13.FLG  = Felgueiras
+country.description.pt.13.GDM  = Gondomar
+country.description.pt.13.LOU  = Lousada
+country.description.pt.13.MAI  = Maia
+country.description.pt.13.MCN  = Marco de Canaveses
+country.description.pt.13.MTS  = Matosinhos
+country.description.pt.13.PFR  = Paços de Ferreira
+country.description.pt.13.PRD  = Paredes
+country.description.pt.13.PNF  = Penafiel
+country.description.pt.13.PRT  = Porto
+country.description.pt.13.PVZ  = Póvoa de Varzim
+country.description.pt.13.STS  = Santo Tirso
+country.description.pt.13.TRF  = Trofa
+country.description.pt.13.VLG = Valongo
+country.description.pt.13.VCD  = Vila do Conde
+country.description.pt.13.VNG  = Vila Nova de Gaia
+country.description.pt.14      = Santarém
+country.description.pt.14.ABT  = Abrantes
+country.description.pt.14.ACN  = Alcanena
+country.description.pt.14.ALR  = Almeirim
+country.description.pt.14.APC  = Alpiarça
+country.description.pt.14.BNV  = Benavente
+country.description.pt.14.CTX  = Cartaxo
+country.description.pt.14.CHM  = Chamusca
+country.description.pt.14.CNS  = Constância
+country.description.pt.14.CCH  = Coruche
+country.description.pt.14.ENT  = Entroncamento
+country.description.pt.14.FZZ  = Ferreira do Zêzere
+country.description.pt.14.GLG  = Golegã
+country.description.pt.14.MAC  = Mação
+country.description.pt.14.ORM  = Ourém
+country.description.pt.14.RMR  = Rio Maior
+country.description.pt.14.SMG  = Salvaterra de Magos
+country.description.pt.14.STR  = Santarém
+country.description.pt.14.SRD  = Sardoal
+country.description.pt.14.TMR  = Tomar
+country.description.pt.14.TNV  = Torres Novas
+country.description.pt.14.VNB  = Vila Nova da Barquinha
+country.description.pt.15      = Setúbal
+country.description.pt.15.ASL  = Alcácer do Sal
+country.description.pt.15.ACH  = Alcochete
+country.description.pt.15.ALM  = Almada
+country.description.pt.15.BRR  = Barreiro
+country.description.pt.15.GDL  = Grândola
+country.description.pt.15.MTA  = Moita
+country.description.pt.15.MTJ  = Montijo
+country.description.pt.15.PLM  = Palmela
+country.description.pt.15.STC  = Santiago do Cacém
+country.description.pt.15.SXL  = Seixal
+country.description.pt.15.SSB  = Sesimbra
+country.description.pt.15.STB  = Setúbal
+country.description.pt.15.SNS  = Sines
+country.description.pt.16      = Viana do Castelo
+country.description.pt.16.AVV  = Arcos de Valdevez
+country.description.pt.16.CMN  = Caminha
+country.description.pt.16.MLG  = Melgaço
+country.description.pt.16.MNC  = Monção
+country.description.pt.16.PCR  = Paredes de Coura
+country.description.pt.16.PTB  = Ponte da Barca
+country.description.pt.16.PTL  = Ponte de Lima
+country.description.pt.16.VLC  = Valença
+country.description.pt.16.VCT  = Viana do Castelo
+country.description.pt.16.VNC  = Vila Nova de Cerveira
+country.description.pt.17      = Vila Real
+country.description.pt.17.ALJ  = Alijó
+country.description.pt.17.BTC  = Boticas
+country.description.pt.17.CHV  = Chaves
+country.description.pt.17.MSF  = Mesão Frio
+country.description.pt.17.MDB  = Mondim de Basto
+country.description.pt.17.MTR  = Montalegre
+country.description.pt.17.MUR  = Murça
+country.description.pt.17.PRG  = Peso da Régua
+country.description.pt.17.RPN  = Ribeira de Pena
+country.description.pt.17.SBS  = Sabrosa
+country.description.pt.17.SMP  = Santa Marta de Penaguião
+country.description.pt.17.VPC  = Valpaços
+country.description.pt.17.VPA  = Vila Pouca de Aguiar
+country.description.pt.17.VRL  = Vila Real
+country.description.pt.18      = Viseu
+country.description.pt.18.AMM  = Armamar
+country.description.pt.18.CRS  = Carregal do Sal
+country.description.pt.18.CDR  = Castro Daire
+country.description.pt.18.CNF  = Cinfães
+country.description.pt.18.LMG  = Lamego
+country.description.pt.18.MGL  = Mangualde
+country.description.pt.18.MBR  = Moimenta da Beira
+country.description.pt.18.MRT  = Mortágua
+country.description.pt.18.NLS  = Nelas
+country.description.pt.18.OFR  = Oliveira de Frades
+country.description.pt.18.PCT  = Penalva do Castelo
+country.description.pt.18.PND  = Penedono
+country.description.pt.18.RSD  = Resende
+country.description.pt.18.SCD  = Santa Comba Dão
+country.description.pt.18.SJP  = São João da Pesqueira
+country.description.pt.18.SPS  = São Pedro do Sul
+country.description.pt.18.SAT  = Sátão
+country.description.pt.18.SRN  = Sernancelhe
+country.description.pt.18.TBC  = Tabuaço
+country.description.pt.18.TRC  = Tarouca
+country.description.pt.18.TND  = Tondela
+country.description.pt.18.VNP  = Vila Nova de Paiva
+country.description.pt.18.VIS  = Viseu
+country.description.pt.18.VZL  = Vouzela
+country.description.pw         = Palau
+country.description.py         = Paraguay
+country.description.qa         = Katar
+country.description.re         = Réunion
+country.description.ro         = Rumänien
+country.description.rs         = Serbien
+country.description.ru         = Russische Föderation
+country.description.rw         = Ruanda
+country.description.sa         = Saudi-Arabien
+country.description.sb         = Salomonen
+country.description.sc         = Seychellen
+country.description.sd         = Sudan
+country.description.se         = Schweden
+country.description.sg         = Singapur
+country.description.sh         = Saint Helena
+country.description.si         = Slowenien
+country.description.sj         = Svalbard und Jan Mayen
+country.description.sk         = Slowakei
+country.description.sl         = Sierra Leone
+country.description.sm         = San Marino
+country.description.sn         = Senegal
+country.description.so         = Somalia
+country.description.sr         = Suriname
+country.description.ss         = Süd-Sudan
+country.description.st         = São Tomé und Príncipe
+country.description.sv         = El Salvador
+country.description.sx         = Saint Martin (Dutch part)
+country.description.sy         = Syrien, Arab. Rep.
+country.description.sz         = Swasiland
+country.description.target     = Trans-European Automated Real-time Gross settlement Express Transfer system closing dates
+country.description.tc         = Turks- und Caicosinseln
+country.description.td         = Tschad
+country.description.tf         = Französische Südgebiete
+country.description.tg         = Togo
+country.description.th         = Thailand
+country.description.tj         = Tadschikistan
+country.description.tk         = Tokelau
+country.description.tl         = Timor-Leste
+country.description.tm         = Turkmenistan
+country.description.tn         = Tunesien
+country.description.to         = Tonga
+country.description.tr         = Türkei
+country.description.tt         = Trinidad und Tobago
+country.description.tv         = Tuvalu
+country.description.tw         = Taiwan
+country.description.tz         = Tansania, Vereinigte Rep.
+country.description.ua         = Ukraine
+country.description.ug         = Uganda
+country.description.um         = United States Minor Outlying Islands
+country.description.us         = Vereinigte Staaten von Amerika
+country.description.us.ak      = Alaska
+country.description.us.al      = Alabama
+country.description.us.ar      = Arkansas
+country.description.us.az      = Arizona
+country.description.us.be      = Berkeley
+country.description.us.ca      = Kalifornien
+country.description.us.co      = Colorado
+country.description.us.ct      = Connecticut
+country.description.us.dc      = District of Columbia
+country.description.us.de      = Delaware
+country.description.us.fl      = Florida
+country.description.us.ga      = Georgia
+country.description.us.hi      = Hawaii
+country.description.us.ia      = Iowa
+country.description.us.id      = Idaho
+country.description.us.il      = Illinois
+country.description.us.in      = Indiana
+country.description.us.ks      = Kansas
+country.description.us.ky      = Kentucky
+country.description.us.la      = Louisiana
+country.description.us.ma      = Massachusetts
+country.description.us.md      = Maryland
+country.description.us.me      = Maine
+country.description.us.mi      = Michigan
+country.description.us.mn      = Minnesota
+country.description.us.mo      = Missouri
+country.description.us.ms      = Mississippi
+country.description.us.mt      = Montana
+country.description.us.nc      = North Carolina
+country.description.us.nc.ce   = Charlotte
+country.description.us.nc.me   = Mecklenburg
+country.description.us.nd      = North Dakota
+country.description.us.ne      = Nebraska
+country.description.us.nh      = New Hampshire
+country.description.us.nj      = New Jersey
+country.description.us.nm      = New Mexico
+country.description.us.nv      = Nevada
+country.description.us.ny      = New York
+country.description.us.ny.nyc  = New York City
+country.description.us.oh      = Ohio
+country.description.us.ok      = Oklahoma
+country.description.us.or      = Oregon
+country.description.us.pa      = Pennsylvania
+country.description.us.ri      = Rhode Island
+country.description.us.sc      = South Carolina
+country.description.us.sd      = South Dakota
+country.description.us.tn      = Tennesee
+country.description.us.tx      = Texas
+country.description.us.ut      = Utah
+country.description.us.va      = Virginia
+country.description.us.vt      = Vermont
+country.description.us.wa      = Washington
+country.description.us.wi      = Wisconsin
+country.description.us.wv      = West Virginia
+country.description.us.wy      = Wyoming
+country.description.uy         = Uruguay
+country.description.uz         = Usbekistan
+country.description.va         = Heiliger Stuhl
+country.description.vc         = St. Vincent und die Grenadinen
+country.description.ve         = Venezuela
+country.description.vg         = Britische Jungferninseln
+country.description.vi         = Amerikanische Jungferninseln
+country.description.vn         = Vietnam
+country.description.vu         = Vanuatu
+country.description.wf         = Wallis und Futuna
+country.description.ws         = Samoa
+country.description.ye         = Jemen
+country.description.xk         = Kosovo
+country.description.yt         = Mayotte
+country.description.za         = Südafrika
+country.description.zm         = Sambia
+country.description.zw         = Simbabwe
diff --git a/jollyday-core/src/main/resources/descriptions/country_descriptions_el.properties b/jollyday-core/src/main/resources/descriptions/country_descriptions_el.properties
index 7b4702bfb..4fd3e3aae 100644
--- a/jollyday-core/src/main/resources/descriptions/country_descriptions_el.properties
+++ b/jollyday-core/src/main/resources/descriptions/country_descriptions_el.properties
@@ -11,15 +11,15 @@ country.description.aq        = Ανταρκτική
 country.description.ar        = Αργεντινή
 country.description.as        = Αμερικανική Σαμόα
 country.description.at        = Αυστρία
-country.description.at.b      = Μπούργκενλαντ
-country.description.at.k      = Καρινθία
-country.description.at.la     = Κάτω Αυστρία
-country.description.at.s      = Σάλτσμπουργκ
-country.description.at.st     = Στυρία
-country.description.at.t      = Τιρόλο
-country.description.at.ua     = Άνω Αυστρία
-country.description.at.va     = Φόραρλμπεργκ
-country.description.at.w      = Βιέννη
+country.description.at.1      = Μπούργκενλαντ
+country.description.at.2      = Καρινθία
+country.description.at.3      = Κάτω Αυστρία
+country.description.at.5      = Σάλτσμπουργκ
+country.description.at.6      = Στυρία
+country.description.at.7      = Τιρόλο
+country.description.at.4      = Άνω Αυστρία
+country.description.at.8      = Φόραρλμπεργκ
+country.description.at.9      = Βιέννη
 country.description.au        = Αυστραλία
 country.description.au.act    = Επικράτεια Αυστραλιανής Πρωτεύουσας
 country.description.au.nsw    = Νέα Νότια Ουαλία
@@ -36,8 +36,8 @@ country.description.aw        = Αρούμπα
 country.description.ax        = Νήσοι Άλαντ
 country.description.az        = Αζερμπαϊτζάν
 country.description.ba        = Βοσνία Ερζεγοβίνη
-country.description.ba.fbh    = Ομοσπονδία της Βοσνίας-Ερζεγοβίνης
-country.description.ba.rs     = Σερβική Δημοκρατία
+country.description.ba.bih    = Ομοσπονδία της Βοσνίας-Ερζεγοβίνης
+country.description.ba.srp    = Σερβική Δημοκρατία
 country.description.bb        = Μπαρμπέιντος
 country.description.bd        = Μπαγκλαντές
 country.description.be        = Βέλγιο
@@ -165,20 +165,42 @@ country.description.eg        = Αίγυπτος
 country.description.eh        = Δυτική Σαχάρα
 country.description.er        = Ερυθραία
 country.description.es        = Ισπανία
+country.description.es.an     = Ανδαλουσία
+country.description.es.ar     = Αραγονία
+country.description.es.ce     = Ceuta
+country.description.es.ml     = Melilla
+country.description.es.cl     = Καστίλλη και Λεόν
+country.description.es.cm     = Καστίλη - La Mancha
+country.description.es.cn     = Κανάρια Νησιά
+country.description.es.ct     = Καταλονία
+country.description.esb.cn    = Βαρκελώνη
+country.description.es.ex     = Extremadura
+country.description.es.ga     = Γαλικία
+country.description.es.ib     = Βαλεαρίδες Νήσοι
+country.description.es.lo     = La Rioja
+country.description.es.md     = Μαδρίτη
+country.description.es.md.mad = Μαδρίτη
+country.description.es.mc     = Murcia
+country.description.es.nc     = Navarra
+country.description.es.as     = Asturias
+country.description.es.pv     = Euskadi
+country.description.es.cb     = Cantabria
+country.description.es.vc     = Valencia
 country.description.et        = Αιθιοπία
 country.description.fi        = Φινλανδία
+country.description.fi.01     = Åland
 country.description.fj        = Φίτζι
 country.description.fk        = Φώλκλαντ (Μαλβίνες)
 country.description.fm        = Μικρονησία
 country.description.fo        = Νησιά Φερόες
 country.description.fr        = Γαλλία
-country.description.fr.br     = Bas-Rhin
-country.description.fr.gu     = Γουαδελούπη
-country.description.fr.gy     = Guyane
-country.description.fr.hr     = Haut-Rhin
-country.description.fr.lr     = Ρεουνιόν
-country.description.fr.ma     = Μαρτινίκα
-country.description.fr.mo     = Moselle
+country.description.fr.ges.67 = Bas-Rhin
+country.description.fr.971    = Γουαδελούπη
+country.description.fr.973    = Guyane
+country.description.fr.ges.68 = Haut-Rhin
+country.description.fr.974    = Ρεουνιόν
+country.description.fr.972    = Μαρτινίκα
+country.description.fr.ges.57 = Moselle
 country.description.ga        = Γκαμπόν
 country.description.gb        = Ηνωμένο Βασίλειο της Μεγάλης Βρετανίας
 country.description.gb.eng    = Αγγλία
@@ -252,7 +274,7 @@ country.description.iq        = Ιράκ
 country.description.ir        = Ιράν
 country.description.is        = Ισλανδία
 country.description.it        = Ιταλία
-country.description.it.bz     = Νότιο Τιρόλο
+country.description.it.32     = Νότιο Τιρόλο
 country.description.je        = Τζέρσεϊ
 country.description.jm        = Τζαμάικα
 country.description.jo        = Ιορδανία
@@ -277,14 +299,13 @@ country.description.lr        = Λιβερία
 country.description.ls        = Λεσότο
 country.description.lt        = Λιθουανία
 country.description.lu        = Λουξεμβούργο
-country.description.lu.clu    = Πόλη του Λουξεμβούργου
+country.description.lu.lu.clu = Πόλη του Λουξεμβούργου
 country.description.lv        = Λετονία
 country.description.ly        = Λιβυκή Αραβική Τζαμαχιρία
 country.description.ma        = Μαρόκο
 country.description.mc        = Μονακό
 country.description.md        = Δημοκρατία της Μολδαβίας
 country.description.md.ba     = Μπαλτί
-country.description.md.cu     = Κισινάου
 country.description.me        = Μαυροβούνιο
 country.description.mg        = Μαδαγασκάρη
 country.description.mh        = Νησιά Μάρσαλ
@@ -310,21 +331,42 @@ country.description.nc        = Νέα Καληδονία
 country.description.ne        = Νίγηρας
 country.description.nf        = Νησί Νόρφολκ
 country.description.ng        = Νιγηρία
-country.description.ng.lag    = Λάγος
+country.description.ng.la     = Λάγος
 country.description.ni        = Νικαράγουα
 country.description.ni.bo     = Boaco
-country.description.ni.mn     = Μανάγκουα
-country.description.ni.mo     = Moyogalpa
-country.description.ni.na     = Nandaime
-country.description.ni.ni     = Niquinohomo
-country.description.ni.om     = Ometepe
-country.description.ni.so     = Σομότο
+country.description.ni.gr     = Granada
+country.description.ni.gr.na  = Nandaime
+country.description.ni.md     = Madriz
+country.description.ni.md.so  = Somoto
+country.description.ni.mn     = Managua
+country.description.ni.ms     = Masaya
+country.description.ni.ms.ni  = Niquinohomo
+country.description.ni.ri     = Rivas
+country.description.ni.ri.mo  = Moyogalpa
+country.description.ni.ri.om  = Ometepe
 country.description.nl        = Ολλανδία
 country.description.no        = Νορβηγία
 country.description.np        = Νεπάλ
 country.description.nr        = Ναουρού
 country.description.nu        = Νιούε
 country.description.nz        = Νέα Ζηλανδία
+country.description.nz.auk    = Όκλαντ
+country.description.nz.bop    = Κόλπος του Πλέντυ (Bay of Plenty)
+country.description.nz.can    = Canterbury
+country.description.nz.cit    = Chatham Islands Territory
+country.description.nz.gis    = Gisborne
+country.description.nz.hkb    = Hawke's Bay
+country.description.nz.mbh    = Marlborough
+country.description.nz.mwt    = Manawatu-Wanganui
+country.description.nz.nsn    = Nelson
+country.description.nz.ntl    = Northland
+country.description.nz.ota    = Otago
+country.description.nz.stl    = Southland
+country.description.nz.tas    = Tasman
+country.description.nz.tki    = Taranaki
+country.description.nz.wgn    = Wellington
+country.description.nz.wko    = Waikato
+country.description.nz.wtc    = West Coast
 country.description.om        = Ομάν
 country.description.pa        = Παναμάς
 country.description.pe        = Περού
@@ -338,74 +380,334 @@ country.description.pn        = Νήσοι Πίτκαιρν
 country.description.pr        = Πουέρτο Ρίκο
 country.description.ps        = Παλαιστινιακά Εδάφη, Kατοικημένα
 country.description.pt        = Πορτογαλία
-country.description.pt.abf    = Αλμπουφέιρα
-country.description.pt.abt    = Abrantes
-country.description.pt.acb    = Αλκοκάμπανα
-country.description.pt.ach    = Alcochete
-country.description.pt.acn    = Alcanena
-country.description.pt.act    = Alcoutim
-country.description.pt.adl    = Alandroal
-country.description.pt.adv    = Almodôvar
-country.description.pt.afe    = Alfândega da Fé
-country.description.pt.agb    = Aguiar da Beira
-country.description.pt.agd    = Águeda
-country.description.pt.agh    = Angra do Heroi'smo
-country.description.pt.agn    = Arganil
-country.description.pt.ajt    = Aljustrel
-country.description.pt.ajz    = Aljezur
-country.description.pt.alb    = Albergaria-a-Velha
-country.description.pt.ald    = Almeida
-country.description.pt.alj    = Alijó
-country.description.pt.alm    = Almada
-country.description.pt.alq    = Alenquer
-country.description.pt.alr    = Almeirim
-country.description.pt.alt    = Alter do Chaśo
-country.description.pt.amd    = Amadora
-country.description.pt.amm    = Armamar
-country.description.pt.amr    = Amares
-country.description.pt.amt    = Amarante
-country.description.pt.and    = Anadia
-country.description.pt.ans    = Ansiao
-country.description.pt.apc    = Alpiarca
-country.description.pt.arc    = Arouca
-country.description.pt.arl    = Arraiolos
-country.description.pt.arr    = Arronches
-country.description.pt.arv    = Arruda dos Vinhos
-country.description.pt.asl    = Alcacer do Sal
-country.description.pt.avr    = Aveiro
-country.description.pt.avs    = Avis
-country.description.pt.avt    = Alvito
-country.description.pt.avv    = Arcos de Valdevez
-country.description.pt.avz    = Alvaiázere
-country.description.pt.azb    = Azambuja
-country.description.pt.bao    = Baião
-country.description.pt.bbr    = Bombarral
-country.description.pt.bcl    = Barcelos
-country.description.pt.bgc    = Bragança
-country.description.pt.bja    = Beja
-country.description.pt.bmt    = Belmonte
-country.description.pt.bnv    = Benavente
-country.description.pt.brb    = Borba
-country.description.pt.brc    = Barrancos
-country.description.pt.brg    = Μπράγκα
-country.description.pt.brr    = Barreiro
-country.description.pt.btc    = Boticas
-country.description.pt.btl    = Batalha
-country.description.pt.cbc    = Cabeceiras de Basto
-country.description.pt.cdv    = Cadaval
-country.description.pt.cht    = Calheta (Açores)
-country.description.pt.cld    = Caldas da Rainha
-country.description.pt.clt    = Calheta (Madeira)
-country.description.pt.cml    = Câmara de Lobos
-country.description.pt.cmn    = Caminha
-country.description.pt.cmr    = Campo Maior
-country.description.pt.cnt    = Cantanhede
-country.description.pt.cpr    = Castanheira de Pera
-country.description.pt.crs    = Carregal do Sal
-country.description.pt.crz    = Carrazeda de Ansiaśes
-country.description.pt.csc    = Cascais
-country.description.pt.ctb    = Castelo Branco
-country.description.pt.ctx    = Cartaxo
+country.description.pt.01     = Aveiro
+country.description.pt.01.AGD = Águeda
+country.description.pt.01.ALB = Albergaria-a-Velha
+country.description.pt.01.AND = Anadia
+country.description.pt.01.ARC = Arouca
+country.description.pt.01.AVR = Aveiro
+country.description.pt.01.CPV = Castelo de Paiva
+country.description.pt.01.ESP = Espinho
+country.description.pt.01.ETR = Estarreja
+country.description.pt.01.ILH = Ílhavo
+country.description.pt.01.MLD = Mealhada
+country.description.pt.01.MRS = Murtosa
+country.description.pt.01.OAZ = Oliveira de Azeméis
+country.description.pt.01.VAC = Vale de Cambra
+country.description.pt.01.VGS = Vagos
+country.description.pt.01.SVV = Sever do Vouga
+country.description.pt.01.SJM = São João da Madeira
+country.description.pt.01.VFR = Santa Maria da Feira
+country.description.pt.01.OVR = Ovar
+country.description.pt.01.OBR = Oliveira do Bairro
+country.description.pt.20     = Azoren
+country.description.pt.20.VFC = Vila Franca do Campo
+country.description.pt.20.VPT = Vila do Porto
+country.description.pt.20.VLS = Velas
+country.description.pt.20.SRQ = São Roque do Pico
+country.description.pt.20.SCF = Santa Cruz das Flores
+country.description.pt.20.SCG = Santa Cruz da Graciosa
+country.description.pt.20.RGR = Ribeira Grande
+country.description.pt.20.VPV = Praia da Vitória
+country.description.pt.20.PVC = Povoação
+country.description.pt.20.PDL = Ponta Delgada
+country.description.pt.20.NRD = Nordeste
+country.description.pt.20.MAD = Madalena
+country.description.pt.20.LGP = Lajes do Pico
+country.description.pt.20.LGF = Lajes das Flores
+country.description.pt.20.LAG = Lagoa (Açores)
+country.description.pt.20.HRT = Horta
+country.description.pt.20.CRV = Corvo
+country.description.pt.20.CHT = Calheta (Açores)
+country.description.pt.20.AGH = Angra do Heroísmo
+country.description.pt.02     = Beja
+country.description.pt.02.VDG = Vidigueira
+country.description.pt.02.SRP = Serpa
+country.description.pt.02.ORQ = Ourique
+country.description.pt.02.ODM = Odemira
+country.description.pt.02.MRA = Moura
+country.description.pt.02.MTL = Mértola
+country.description.pt.02.FAL = Ferreira do Alentejo
+country.description.pt.02.CBA = Cuba
+country.description.pt.02.CVR = Castro Verde
+country.description.pt.02.BJA = Beja
+country.description.pt.02.BRC = Barrancos
+country.description.pt.02.AVT = Alvito
+country.description.pt.02.ADV = Almodôvar
+country.description.pt.02.AJT = Aljustrel
+country.description.pt.03     = Braga
+country.description.pt.03.AMR = Amares
+country.description.pt.03.ANS = Ansião
+country.description.pt.03.BCL = Barcelos
+country.description.pt.03.BRG = Braga
+country.description.pt.03.BGC = Bragança
+country.description.pt.03.CBC = Cabeceiras de Basto
+country.description.pt.03.CDV = Cadaval
+country.description.pt.03.CBT = Celorico de Basto
+country.description.pt.03.EPS = Esposende
+country.description.pt.03.FAF = Fafe
+country.description.pt.03.GMR = Guimarães
+country.description.pt.03.PVL = Póvoa de Lanhoso
+country.description.pt.03.TBR = Terras de Bouro
+country.description.pt.03.VRM = Vieira do Minho
+country.description.pt.03.VNF = Vila Nova de Famalicão
+country.description.pt.03.VVD = Vila Verde
+country.description.pt.03.VIZ = Vizela
+country.description.pt.04     = Bragança
+country.description.pt.04.AFE = Alfândega da Fé
+country.description.pt.04.CRZ = Carrazeda de Ansiães
+country.description.pt.04.FEC = Freixo de Espada à Cinta
+country.description.pt.04.MCD = Macedo de Cavaleiros
+country.description.pt.04.MDR = Miranda do Douro
+country.description.pt.04.MDL = Mirandela
+country.description.pt.04.MGD = Mogadouro
+country.description.pt.04.TMC = Torre de Moncorvo
+country.description.pt.04.VFL = Vila Flor
+country.description.pt.04.VMS = Vimioso
+country.description.pt.04.VNH = Vinhais
+country.description.pt.05     = Castelo Branco
+country.description.pt.05.BMT = Belmonte
+country.description.pt.05.CTB = Castelo Branco
+country.description.pt.05.CVL = Covilhã
+country.description.pt.05.FND = Fundão
+country.description.pt.05.IDN = Idanha-a-Nova
+country.description.pt.05.OLR = Oleiros
+country.description.pt.05.PNC = Penamacor
+country.description.pt.05.PNV = Proença-a-Nova
+country.description.pt.05.SRT = Sertã
+country.description.pt.05.VLR = Vila de Rei
+country.description.pt.05.VVR = Vila Velha de Ródão
+country.description.pt.06     = Coimbra
+country.description.pt.06.AGN = Arganil
+country.description.pt.06.CNT = Cantanhede
+country.description.pt.06.CBR = Coimbra
+country.description.pt.06.CDN = Condeixa-a-Nova
+country.description.pt.06.FIG = Figueira da Foz
+country.description.pt.06.GOI = Góis
+country.description.pt.06.LSA = Lousã
+country.description.pt.06.MIR = Mira
+country.description.pt.06.MCV = Miranda do Corvo
+country.description.pt.06.MMV = Montemor-o-Velho
+country.description.pt.06.OHP = Oliveira do Hospital
+country.description.pt.06.PPS = Pampilhosa da Serra
+country.description.pt.06.PCV = Penacova
+country.description.pt.06.PNL = Penela
+country.description.pt.06.SRE = Soure
+country.description.pt.06.TBU = Tábua
+country.description.pt.06.PRS = Vila Nova de Poiares
+country.description.pt.07     = Évora
+country.description.pt.07.ADL = Alandroal
+country.description.pt.07.ARL = Arraiolos
+country.description.pt.07.BRB = Borba
+country.description.pt.07.ETZ = Estremoz
+country.description.pt.07.EVR = Évora
+country.description.pt.07.MMN = Montemor-o-Novo
+country.description.pt.07.MOR = Mora
+country.description.pt.07.MOU = Mourão
+country.description.pt.07.PRL = Portel
+country.description.pt.07.RDD = Redondo
+country.description.pt.07.RMZ = Reguengos de Monsaraz
+country.description.pt.07.VND = Vendas Novas
+country.description.pt.07.VNT = Viana do Alentejo
+country.description.pt.07.VVC = Vila Viçosa
+country.description.pt.08     = Faro
+country.description.pt.08.ABF = Albufeira
+country.description.pt.08.ACT = Alcoutim
+country.description.pt.08.AJZ = Aljezur
+country.description.pt.08.CTM = Castro Marim
+country.description.pt.08.FAR = Faro
+country.description.pt.08.LGA = Lagoa
+country.description.pt.08.LGS = Lagos
+country.description.pt.08.LLE = Loulé
+country.description.pt.08.MCQ = Monchique
+country.description.pt.08.OLH = Olhão
+country.description.pt.08.PTM = Portimão
+country.description.pt.08.SBA = São Brás de Alportel
+country.description.pt.08.SLV = Silves
+country.description.pt.08.TVR = Tavira
+country.description.pt.08.VBP = Vila do Bispo
+country.description.pt.08.VRS = Vila Real de Santo António
+country.description.pt.09     = Guarda
+country.description.pt.09.AGB = Aguiar da Beira
+country.description.pt.09.ALD = Almeida
+country.description.pt.09.CLB = Celorico da Beira
+country.description.pt.09.FCR = Figueira de Castelo Rodrigo
+country.description.pt.09.FAG = Fornos de Algodres
+country.description.pt.09.GVA = Gouveia
+country.description.pt.09.GRD = Guarda
+country.description.pt.09.MTG = Manteigas
+country.description.pt.09.MED = Mêda
+country.description.pt.09.PNH = Pinhel
+country.description.pt.09.SBG = Sabugal
+country.description.pt.09.SEI = Seia
+country.description.pt.09.TCR = Trancoso
+country.description.pt.09.VLF = Vila Nova de Foz Côa
+country.description.pt.10     = Leiria
+country.description.pt.10.ACB = Alcobaça
+country.description.pt.10.AVZ = Alvaiázere
+country.description.pt.10.BTL = Batalha
+country.description.pt.10.BBR = Bombarral
+country.description.pt.10.CLD = Caldas da Rainha
+country.description.pt.10.CPR = Castanheira de Pera
+country.description.pt.10.FVN = Figueiró dos Vinhos
+country.description.pt.10.LRA = Leiria
+country.description.pt.10.MGR = Marinha Grande
+country.description.pt.10.NZR = Nazaré
+country.description.pt.10.OBD = Óbidos
+country.description.pt.10.PGR = Pedrógão Grande
+country.description.pt.10.PNI = Peniche
+country.description.pt.10.PBL = Pombal
+country.description.pt.10.PMS = Porto de Mós
+country.description.pt.11     = Lissabon
+country.description.pt.11.ALQ = Alenquer
+country.description.pt.11.AMD = Amadora
+country.description.pt.11.ARV = Arruda dos Vinhos
+country.description.pt.11.AZB = Azambuja
+country.description.pt.11.CSC = Cascais
+country.description.pt.11.LSB = Lisboa
+country.description.pt.11.LRS = Loures
+country.description.pt.11.LNH = Lourinhã
+country.description.pt.11.MFR = Mafra
+country.description.pt.11.ODV = Odivelas
+country.description.pt.11.OER = Oeiras
+country.description.pt.11.SNT = Sintra
+country.description.pt.11.SMA = Sobral de Monte Agraço
+country.description.pt.11.TVD = Torres Vedras
+country.description.pt.11.VFX = Vila Franca de Xira
+country.description.pt.30     = Madeira
+country.description.pt.30.CLT = Calheta
+country.description.pt.30.CML = Câmara de Lobos
+country.description.pt.30.FNC = Funchal
+country.description.pt.30.MCH = Machico
+country.description.pt.30.PTS = Ponta do Sol
+country.description.pt.30.PMZ = Porto Moniz
+country.description.pt.30.PST = Porto Santo
+country.description.pt.30.RBR = Ribeira Brava
+country.description.pt.30.SCR = Santa Cruz
+country.description.pt.30.STN = Santana
+country.description.pt.30.SVC = São Vicente
+country.description.pt.12     = Portalegre
+country.description.pt.12.ALT = Alter do Chão
+country.description.pt.12.ARR = Arronches
+country.description.pt.12.AVS = Avis
+country.description.pt.12.CMR = Campo Maior
+country.description.pt.12.CVD = Castelo de Vide
+country.description.pt.12.CRT = Crato
+country.description.pt.12.ELV = Elvas
+country.description.pt.12.FTR = Fronteira
+country.description.pt.12.GAV = Gavião
+country.description.pt.12.MRV = Marvão
+country.description.pt.12.MFT = Monforte
+country.description.pt.12.NIS = Nisa
+country.description.pt.12.PSR = Ponte de Sor
+country.description.pt.12.PTG = Portalegre
+country.description.pt.12.SSL = Sousel
+country.description.pt.13     = Porto
+country.description.pt.13.AMT = Amarante
+country.description.pt.13.BAO = Baião
+country.description.pt.13.FLG = Felgueiras
+country.description.pt.13.GDM = Gondomar
+country.description.pt.13.LOU = Lousada
+country.description.pt.13.MAI = Maia
+country.description.pt.13.MCN = Marco de Canaveses
+country.description.pt.13.MTS = Matosinhos
+country.description.pt.13.PFR = Paços de Ferreira
+country.description.pt.13.PRD = Paredes
+country.description.pt.13.PNF = Penafiel
+country.description.pt.13.PRT = Porto
+country.description.pt.13.PVZ = Póvoa de Varzim
+country.description.pt.13.STS = Santo Tirso
+country.description.pt.13.TRF = Trofa
+country.description.pt.13.VLG = Valongo
+country.description.pt.13.VCD = Vila do Conde
+country.description.pt.13.VNG = Vila Nova de Gaia
+country.description.pt.14     = Santarém
+country.description.pt.14.ABT = Abrantes
+country.description.pt.14.ACN = Alcanena
+country.description.pt.14.ALR = Almeirim
+country.description.pt.14.APC = Alpiarça
+country.description.pt.14.BNV = Benavente
+country.description.pt.14.CTX = Cartaxo
+country.description.pt.14.CHM = Chamusca
+country.description.pt.14.CNS = Constância
+country.description.pt.14.CCH = Coruche
+country.description.pt.14.ENT = Entroncamento
+country.description.pt.14.FZZ = Ferreira do Zêzere
+country.description.pt.14.GLG = Golegã
+country.description.pt.14.MAC = Mação
+country.description.pt.14.ORM = Ourém
+country.description.pt.14.RMR = Rio Maior
+country.description.pt.14.SMG = Salvaterra de Magos
+country.description.pt.14.STR = Santarém
+country.description.pt.14.SRD = Sardoal
+country.description.pt.14.TMR = Tomar
+country.description.pt.14.TNV = Torres Novas
+country.description.pt.14.VNB = Vila Nova da Barquinha
+country.description.pt.15     = Setúbal
+country.description.pt.15.ASL = Alcácer do Sal
+country.description.pt.15.ACH = Alcochete
+country.description.pt.15.ALM = Almada
+country.description.pt.15.BRR = Barreiro
+country.description.pt.15.GDL = Grândola
+country.description.pt.15.MTA = Moita
+country.description.pt.15.MTJ = Montijo
+country.description.pt.15.PLM = Palmela
+country.description.pt.15.STC = Santiago do Cacém
+country.description.pt.15.SXL = Seixal
+country.description.pt.15.SSB = Sesimbra
+country.description.pt.15.STB = Setúbal
+country.description.pt.15.SNS = Sines
+country.description.pt.16     = Viana do Castelo
+country.description.pt.16.AVV = Arcos de Valdevez
+country.description.pt.16.CMN = Caminha
+country.description.pt.16.MLG = Melgaço
+country.description.pt.16.MNC = Monção
+country.description.pt.16.PCR = Paredes de Coura
+country.description.pt.16.PTB = Ponte da Barca
+country.description.pt.16.PTL = Ponte de Lima
+country.description.pt.16.VLC = Valença
+country.description.pt.16.VCT = Viana do Castelo
+country.description.pt.16.VNC = Vila Nova de Cerveira
+country.description.pt.17     = Vila Real
+country.description.pt.17.ALJ = Alijó
+country.description.pt.17.BTC = Boticas
+country.description.pt.17.CHV = Chaves
+country.description.pt.17.MSF = Mesão Frio
+country.description.pt.17.MDB = Mondim de Basto
+country.description.pt.17.MTR = Montalegre
+country.description.pt.17.MUR = Murça
+country.description.pt.17.PRG = Peso da Régua
+country.description.pt.17.RPN = Ribeira de Pena
+country.description.pt.17.SBS = Sabrosa
+country.description.pt.17.SMP = Santa Marta de Penaguião
+country.description.pt.17.VPC = Valpaços
+country.description.pt.17.VPA = Vila Pouca de Aguiar
+country.description.pt.17.VRL = Vila Real
+country.description.pt.18     = Viseu
+country.description.pt.18.AMM = Armamar
+country.description.pt.18.CRS = Carregal do Sal
+country.description.pt.18.CDR = Castro Daire
+country.description.pt.18.CNF = Cinfães
+country.description.pt.18.LMG = Lamego
+country.description.pt.18.MGL = Mangualde
+country.description.pt.18.MBR = Moimenta da Beira
+country.description.pt.18.MRT = Mortágua
+country.description.pt.18.NLS = Nelas
+country.description.pt.18.OFR = Oliveira de Frades
+country.description.pt.18.PCT = Penalva do Castelo
+country.description.pt.18.PND = Penedono
+country.description.pt.18.RSD = Resende
+country.description.pt.18.SCD = Santa Comba Dão
+country.description.pt.18.SJP = São João da Pesqueira
+country.description.pt.18.SPS = São Pedro do Sul
+country.description.pt.18.SAT = Sátão
+country.description.pt.18.SRN = Sernancelhe
+country.description.pt.18.TBC = Tabuaço
+country.description.pt.18.TRC = Tarouca
+country.description.pt.18.TND = Tondela
+country.description.pt.18.VNP = Vila Nova de Paiva
+country.description.pt.18.VIS = Viseu
+country.description.pt.18.VZL = Vouzela
 country.description.pw        = Παλάου
 country.description.py        = Παραγουάη
 country.description.qa        = Κατάρ
diff --git a/jollyday-core/src/main/resources/descriptions/country_descriptions_fr.properties b/jollyday-core/src/main/resources/descriptions/country_descriptions_fr.properties
index 03489377e..6c0668b36 100644
--- a/jollyday-core/src/main/resources/descriptions/country_descriptions_fr.properties
+++ b/jollyday-core/src/main/resources/descriptions/country_descriptions_fr.properties
@@ -1,530 +1,832 @@
-country.description.ad        = Andorre
-country.description.ae        = Emirats Arabes Unis
-country.description.af        = Afghanistan
-country.description.ag        = Antigua-et-Barbuda
-country.description.ai        = Anguilla
-country.description.al        = Albanie
-country.description.am        = Arménie
-country.description.an        = Antilles néerlandaises
-country.description.ao        = Angola
-country.description.aq        = Antarctique
-country.description.ar        = Argentine
-country.description.as        = Samoa américaines
-country.description.at        = Autriche
-country.description.at.b      = Burgenland
-country.description.at.k      = Kärnten
-country.description.at.la     = Basse-Autriche
-country.description.at.s      = Salzbourg
-country.description.at.st     = Styrie
-country.description.at.t      = Tirol
-country.description.at.ua     = Haute-Autriche
-country.description.at.va     = Vorarlberg
-country.description.at.w      = Vienne
-country.description.au        = Australie
-country.description.au.act    = Territoire de la capitale australienne
-country.description.au.nsw    = Nouvelle-Galles du Sud
-country.description.au.nt     = Territoire du Nord
-country.description.au.qld    = Queensland
-country.description.au.qld.br = Brisbane Area
-country.description.au.sa     = Australie-Méridionale
-country.description.au.tas    = Tasmanie
-country.description.au.tas.ho = Hobard Area
-country.description.au.tas.nh = Non-Hobard Area
-country.description.au.vic    = Victoria
-country.description.au.wa     = Australie de l'Ouest
-country.description.aw        = Aruba
-country.description.ax        = Îles d'Aaland
-country.description.az        = Azerbaïdjan
-country.description.ba        = Bosnie et Herzegowie
-country.description.ba.fbh    = Fédération de Bosnie et d'Herzegowie
-country.description.ba.rs     = République de Srpska
-country.description.bb        = Barbades
-country.description.bd        = Bangladesh
-country.description.be        = Belgique
-country.description.bf        = Burkina Faso
-country.description.bg        = Bulgarie
-country.description.bh        = Bahrein
-country.description.bi        = Burundi
-country.description.bj        = Bénin
-country.description.bm        = Bermudes
-country.description.bn        = Darussalam de Brunei
-country.description.bo        = Bolivie
-country.description.br        = Brésil
-country.description.br.go     = Goiás
-country.description.br.mg     = Minas Gerais
-country.description.br.mg.bh  = Belo Horizonte
-country.description.br.ms     = Mato Grosso do Sul
-country.description.br.ms.cg  = Campo Grande
-country.description.br.ms.do  = Dourados
-country.description.br.pb     = Paraíba
-country.description.br.pb.jpa = João Pessoa
-country.description.br.pe     = Pernambuco
-country.description.br.pr     = Parana
-country.description.br.pr.cu  = Curitiba
-country.description.br.rj     = Rio de Janeiro
-country.description.br.rj.crj = City of Rio de Janeiro
-country.description.br.rn     = Rio Grande do Norte
-country.description.br.rn.na  = Natal
-country.description.br.rs     = Rio Grande do Sul
-country.description.br.rs.sm  = Santa Maria
-country.description.br.sp     = Sao Paulo
-country.description.br.sp.csp = City of Sao Paulo
-country.description.bs        = Bahamas
-country.description.bt        = Bhutan
-country.description.bv        = Île de Bouvet
-country.description.bw        = Botswana
-country.description.by        = Biélarus
-country.description.bz        = Bélize
-country.description.ca        = Canada
-country.description.ca.ab     = Alberta
-country.description.ca.bc     = Columbia britannique
-country.description.ca.mb     = Manitoba
-country.description.ca.nb     = Nouveau Brunswick
-country.description.ca.nl     = Terre-neuve et labrador
-country.description.ca.ns     = Nouvelle-Écosse
-country.description.ca.nt     = Territoires du Nord-ouest
-country.description.ca.nu     = Nunavut
-country.description.ca.on     = Ontario
-country.description.ca.pe     = Île du Prince Édouard
-country.description.ca.qc     = Québec
-country.description.ca.sk     = Saskatchewan
-country.description.ca.yt     = Yukon
-country.description.cc        = îles Cocos
-country.description.cd        = Congo, République Démocratique (ex-Zaïre)
-country.description.cf        = République Centrafricaine
-country.description.cg        = Le Congo, la République de
-country.description.ch        = Suisse
-country.description.ch.ag     = Argovie
-country.description.ch.ai     = Appenzell Rhodes-Intérieures
-country.description.ch.ar     = Appenzell Rhodes-Extérieures
-country.description.ch.be     = Berne
-country.description.ch.bl     = Bâle-Campagne
-country.description.ch.bs     = Ville de Bâle
-country.description.ch.fr     = Fribourg
-country.description.ch.ge     = Genève
-country.description.ch.gl     = Glaris
-country.description.ch.gr     = Grisons
-country.description.ch.ju     = Jura
-country.description.ch.lu     = Lucerne
-country.description.ch.ne     = Neuchâtel
-country.description.ch.nw     = Nidwalden
-country.description.ch.ow     = Obwalden
-country.description.ch.sg     = Saint-Gall
-country.description.ch.sh     = Schaffhouse
-country.description.ch.so     = Soleure
-country.description.ch.sz     = Schwyz
-country.description.ch.tg     = Thurgovie
-country.description.ch.ti     = Tessin
-country.description.ch.ur     = Uri
-country.description.ch.vd     = Vaud
-country.description.ch.vs     = Valais
-country.description.ch.zg     = Zoug
-country.description.ch.zh     = Zurich
-country.description.ci        = Côte d´Ivoire
-country.description.ck        = Îles Cook
-country.description.cl        = Chili
-country.description.cm        = Cameroon
-country.description.cn        = Chine
-country.description.co        = Colombie
-country.description.cr        = Costa Rica
-country.description.cu        = Cuba
-country.description.cv        = Cap-Vert
-country.description.cx        = Christmas, Île
-country.description.cy        = Chypre
-country.description.cz        = Tchèque, République
-country.description.de        = Allemagne
-country.description.de.be     = Berlin
-country.description.de.bb     = Brandebourg
-country.description.de.bw     = Bade-Wurtemberg
-country.description.de.by     = Bavière
-country.description.de.by.ag  = Augsburg
-country.description.de.by.in  = Ingolstadt
-country.description.de.by.mu  = Munich
-country.description.de.by.re  = Regensburg
-country.description.de.by.wu  = Würzburg
-country.description.de.hb     = Brême
-country.description.de.he     = Hesse
-country.description.de.hh     = Hambourg
-country.description.de.mv     = Mecklembourg-Poméranie antérieure
-country.description.de.ni     = Basse Saxe
-country.description.de.nw     = Rhénanie-du-Nord - Westphalie
-country.description.de.rp     = Rheinland-Pfalz
-country.description.de.sh     = Schleswig-Holstein
-country.description.de.sl     = Sarre
-country.description.de.sn     = Saxe
-country.description.de.st     = Saxe-Anhalt
-country.description.de.th     = Thuringe
-country.description.dj        = Djibouti
-country.description.dk        = Danemark
-country.description.dm        = Dominique
-country.description.do        = Dominicaine, République
-country.description.dz        = Algérie
-country.description.ec        = Équateur
-country.description.ee        = Estonie
-country.description.eg        = Égypte
-country.description.eh        = Sahara Occidental
-country.description.er        = Érythrée
-country.description.es        = Espagne
-country.description.et        = Éthiopie
-country.description.fi        = Finlande
-country.description.fj        = Fidji
-country.description.fk        = Falkland, Îles (Malvinas)
-country.description.fm        = Micronésie, États Fédérés de
-country.description.fo        = Féroé, Îles
-country.description.fr        = France
-country.description.fr.br     = Bas-Rhin
-country.description.fr.gu     = Guadeloupe
-country.description.fr.gy     = Guyane
-country.description.fr.hr     = Haut-Rhin
-country.description.fr.lr     = la Réunion
-country.description.fr.ma     = Martinique
-country.description.fr.mo     = Moselle
-country.description.ga        = Gabon
-country.description.gb        = Royaume-Uni de la Grande-Bretagne
-country.description.gb.eng    = Angleterre
-country.description.gb.nir    = Irlande du Nord
-country.description.gb.sct    = Ecosse
-country.description.gb.wls    = Pays de Galles
-country.description.gd        = Grenade
-country.description.ge        = Géorgie
-country.description.gf        = Guyane Française
-country.description.gg        = Guernesey
-country.description.gh        = Ghana
-country.description.gi        = Gibraltar
-country.description.gl        = Groenland
-country.description.gm        = Gambie
-country.description.gn        = Guinée
-country.description.gp        = Guadeloupe
-country.description.gq        = Guinée Équatoriale
-country.description.gr        = Grèce
-country.description.gs        = Géorgie du Sud-et-Les Îles Sandwich du Sud
-country.description.gt        = Guatemala
-country.description.gu        = Guam
-country.description.gw        = Guinée-Bissau
-country.description.gy        = Guyana
-country.description.hk        = Hong Kong
-country.description.hm        = Heard-et-Îles Macdonald, Île
-country.description.hn        = Honduras
-country.description.hr        = Croatie
-country.description.ht        = Haïti
-country.description.hu        = Hongrie
-country.description.id        = Indonésie
-country.description.ie        = Irlande
-country.description.il        = Israël
-country.description.im        = Île de Man
-country.description.in        = Inde
-country.description.in.an     = Andaman et Îles de Nicobar
-country.description.in.ap     = Andhra Pradesh
-country.description.in.ar     = Arunachal Pradesh
-country.description.in.as     = Assam
-country.description.in.br     = Bihar
-country.description.in.ch     = Chandigarh
-country.description.in.ct     = Chhattisgarh
-country.description.in.dh     = Dadra et Nagar Haveli et Daman et Diu
-country.description.in.dl     = Delhi
-country.description.in.ga     = Goa
-country.description.in.gj     = Gujarat
-country.description.in.hp     = Himachal Pradesh
-country.description.in.hr     = Haryana
-country.description.in.jh     = Jharkhand
-country.description.in.jk     = Jammu-et-Cachemire
-country.description.in.ka     = Karnataka
-country.description.in.kl     = Kerala
-country.description.in.ld     = Lakshadweep
-country.description.in.mh     = Maharashtra
-country.description.in.ml     = Meghalaya
-country.description.in.mn     = Manipur
-country.description.in.mp     = Madhya Pradesh
-country.description.in.mz     = Mizoram
-country.description.in.nl     = Nagaland
-country.description.in.or     = Orissa
-country.description.in.pb     = Punjab
-country.description.in.py     = Territoire de Pondichéry
-country.description.in.rj     = Rajasthan
-country.description.in.sk     = Sikkim
-country.description.in.tn     = Tamil Nadu
-country.description.in.tr     = Tripura
-country.description.in.up     = Uttar Pradesh
-country.description.in.ut     = Uttaranchal
-country.description.in.wb     = Bengale occidental
-country.description.io        = Océan Indien, Territoire Britannique de L'
-country.description.iq        = Iraq
-country.description.ir        = Iran, République Islamique D'
-country.description.is        = Islande
-country.description.it        = Italie
-country.description.it.bz     = Tyrol sud
-country.description.je        = Jersey
-country.description.jm        = Jamaïque
-country.description.jo        = Jordanie
-country.description.jp        = Japon
-country.description.ke        = Kenya
-country.description.kg        = Kirghizistan
-country.description.kh        = Cambodge
-country.description.ki        = Kiribati
-country.description.km        = Comores
-country.description.kn        = Saint-Kitts-et-Nevis
-country.description.kp        = Corée, République Populaire Démocratique de
-country.description.kr        = Corée, République de
-country.description.kw        = Koweït
-country.description.ky        = Caïmans, Îles
-country.description.kz        = Kazakhstan
-country.description.la        = lao, République Démocratique Populaire
-country.description.lb        = Liban
-country.description.lc        = Sainte-Lucie
-country.description.li        = Liechtenstein
-country.description.lk        = Sri lanka
-country.description.lr        = Libéria
-country.description.ls        = Lesotho
-country.description.lt        = Lituanie
-country.description.lu        = Luxembourg
-country.description.lu.clu    = City of Luxembourg
-country.description.lv        = Lettonie
-country.description.ly        = Libye
-country.description.ma        = Maroc
-country.description.mc        = Monaco
-country.description.md        = Moldova, République de
-country.description.md.ba     = Balti
-country.description.md.cu     = Chisinau
-country.description.me        = Monténégro
-country.description.mg        = Madagascar
-country.description.mh        = Marshall, Îles
-country.description.mk        = Macédoine du Nord
-country.description.ml        = Mali
-country.description.mm        = Myanmar
-country.description.mn        = Mongolie
-country.description.mo        = Macao
-country.description.mp        = Mariannes du Nord, Îles
-country.description.mq        = Martinique
-country.description.mr        = Mauritanie
-country.description.ms        = Montserrat
-country.description.mt        = Malte
-country.description.mu        = Maurice
-country.description.mv        = Maldives
-country.description.mw        = Malawi
-country.description.mx        = Mexique
-country.description.mx.pue    = Puebla
-country.description.my        = Malaisie
-country.description.mz        = Mozambique
-country.description.na        = Namibie
-country.description.nc        = Nouvelle-Calédonie
-country.description.ne        = Niger
-country.description.nf        = Norfolk, Île
-country.description.ng        = Nigéria
-country.description.ng.lag    = Lagos
-country.description.ni        = Nicaragua
-country.description.ni.bo     = Boaco
-country.description.ni.mn     = Managua
-country.description.ni.mo     = Moyogalpa
-country.description.ni.na     = Nandaime
-country.description.ni.ni     = Niquinohomo
-country.description.ni.om     = Ometepe
-country.description.ni.so     = Somoto
-country.description.nl        = Pays-Bas
-country.description.no        = Norvège
-country.description.np        = Népal
-country.description.nr        = Nauru
-country.description.nu        = Niué
-country.description.nz        = Nouvelle-Zélande
-country.description.om        = Oman
-country.description.pa        = Panama
-country.description.pe        = Pérou
-country.description.pf        = Polynésie Française
-country.description.pg        = Papouasie-Nouvelle-Guinée
-country.description.ph        = Philippines
-country.description.pk        = Pakistan
-country.description.pl        = Pologne
-country.description.pm        = Saint-Pierre-et-Miquelon
-country.description.pn        = Pitcairn
-country.description.pr        = Porto Rico
-country.description.ps        = Palestinien Occupé, Territoire
-country.description.pt        = Portugal
-country.description.pt.abf    = Albufeira
-country.description.pt.abt    = Abrantes
-country.description.pt.acb    = Alcobaça
-country.description.pt.ach    = Alcochete
-country.description.pt.acn    = Alcanena
-country.description.pt.act    = Alcoutim
-country.description.pt.adl    = Alandroal
-country.description.pt.adv    = Almodôvar
-country.description.pt.afe    = Alfândega da Fé
-country.description.pt.agb    = Aguiar da Beira
-country.description.pt.agd    = Águeda
-country.description.pt.agh    = Angra do Heroísmo
-country.description.pt.agn    = Arganil
-country.description.pt.ajt    = Aljustrel
-country.description.pt.ajz    = Aljezur
-country.description.pt.alb    = Albergaria-a-Velha
-country.description.pt.ald    = Almeida
-country.description.pt.alj    = Alijó
-country.description.pt.alm    = Almada
-country.description.pt.alq    = Alenquer
-country.description.pt.alr    = Almeirim
-country.description.pt.alt    = Alter do Chão
-country.description.pt.amd    = Amadora
-country.description.pt.amm    = Armamar
-country.description.pt.amr    = Amares
-country.description.pt.amt    = Amarante
-country.description.pt.and    = Anadia
-country.description.pt.ans    = Ansião
-country.description.pt.apc    = Alpiarça
-country.description.pt.arc    = Arouca
-country.description.pt.arl    = Arraiolos
-country.description.pt.arr    = Arronches
-country.description.pt.arv    = Arruda dos Vinhos
-country.description.pt.asl    = Alcácer do Sal
-country.description.pt.avr    = Aveiro
-country.description.pt.avs    = Avis
-country.description.pt.avt    = Alvito
-country.description.pt.avv    = Arcos de Valdevez
-country.description.pt.avz    = Alvaiázere
-country.description.pt.azb    = Azambuja
-country.description.pt.bao    = Baião
-country.description.pt.bbr    = Bombarral
-country.description.pt.bcl    = Barcelos
-country.description.pt.bgc    = Bragança
-country.description.pt.bja    = Beja
-country.description.pt.bmt    = Belmonte
-country.description.pt.bnv    = Benavente
-country.description.pt.brb    = Borba
-country.description.pt.brc    = Barrancos
-country.description.pt.brg    = Braga
-country.description.pt.brr    = Barreiro
-country.description.pt.btc    = Boticas
-country.description.pt.btl    = Batalha
-country.description.pt.cbc    = Cabeceiras de Basto
-country.description.pt.cdv    = Cadaval
-country.description.pt.cht    = Calheta (Açores)
-country.description.pt.cld    = Caldas da Rainha
-country.description.pt.clt    = Calheta (Madeira)
-country.description.pt.cml    = Câmara de Lobos
-country.description.pt.cmn    = Caminha
-country.description.pt.cmr    = Campo Maior
-country.description.pt.cnt    = Cantanhede
-country.description.pt.cpr    = Castanheira de Pera
-country.description.pt.crs    = Carregal do Sal
-country.description.pt.crz    = Carrazeda de Ansiães
-country.description.pt.csc    = Cascais
-country.description.pt.ctb    = Castelo Branco
-country.description.pt.ctx    = Cartaxo
-country.description.pw        = Palaos
-country.description.py        = Paraguay
-country.description.qa        = Qatar
-country.description.re        = Réunion
-country.description.ro        = Roumanie
-country.description.rs        = Serbie
-country.description.ru        = Russie, Fédération de
-country.description.rw        = Rwanda
-country.description.sa        = Arabie Saoudite
-country.description.sb        = Salomon, Îles
-country.description.sc        = Seychelles
-country.description.sd        = Soudan
-country.description.se        = Suède
-country.description.sg        = Singapour
-country.description.sh        = Sainte-Hélène, Ascension et Tristan Da Cunha
-country.description.si        = Slovénie
-country.description.sj        = Svalbard et Île Jan Mayen
-country.description.sk        = Slovaquie
-country.description.sl        = Sierra Leone
-country.description.sm        = Saint-Marin
-country.description.sn        = Sénégal
-country.description.so        = Somalie
-country.description.sr        = Suriname
-country.description.ss        = Soudan du Sud
-country.description.st        = Sao Tomé-et-Principe
-country.description.sv        = El Salvador
-country.description.sx        = Saint-Martin (Partie Néerlandaise)
-country.description.sy        = Syrienne, République Arabe
-country.description.sz        = Swaziland
-country.description.target    = Trans-European Automated Real-time Gross settlement Express Transfer system closing dates
-country.description.tc        = Turks-et-Caïcos, Îles
-country.description.td        = Tchad
-country.description.tf        = Terres Australes Françaises
-country.description.tg        = Togo
-country.description.th        = Thaïlande
-country.description.tj        = Tadjikistan
-country.description.tk        = Tokelau
-country.description.tl        = Timor-Leste
-country.description.tm        = Turkménistan
-country.description.tn        = Tunisie
-country.description.to        = Tonga
-country.description.tr        = Turquie
-country.description.tt        = Trinité-et-Tobago
-country.description.tv        = Tuvalu
-country.description.tw        = Taïwan, Province de Chine
-country.description.tz        = Tanzanie, République-Unie de
-country.description.ua        = Ukraine
-country.description.ug        = Ouganda
-country.description.um        = Îles Mineures Éloignées des États-Unis
-country.description.us        = États-Unis
-country.description.us.ak     = Alaska
-country.description.us.al     = Alabama
-country.description.us.ar     = Arkansas
-country.description.us.az     = Arizona
-country.description.us.be     = Berkeley
-country.description.us.ca     = Californie
-country.description.us.co     = Colorado
-country.description.us.ct     = Connecticut
-country.description.us.dc     = Districte de Columbia
-country.description.us.de     = Delaware
-country.description.us.fl     = Floride
-country.description.us.ga     = Georgie
-country.description.us.hi     = Hawaii
-country.description.us.ia     = Iowa
-country.description.us.id     = Idaho
-country.description.us.il     = Illinois
-country.description.us.in     = Indiana
-country.description.us.ks     = Kansas
-country.description.us.ky     = Kentucky
-country.description.us.la     = Louisiane
-country.description.us.ma     = Massachusetts
-country.description.us.md     = Maryland
-country.description.us.me     = Maine
-country.description.us.mi     = Michigan
-country.description.us.mn     = Minnesota
-country.description.us.mo     = Missouri
-country.description.us.ms     = Mississippi
-country.description.us.mt     = Montana
-country.description.us.nc     = Caroline du Nord
-country.description.us.nc.ce  = Charlotte
-country.description.us.nc.me  = Mecklenburg
-country.description.us.nd     = Dakota du Nord
-country.description.us.ne     = Nebraska
-country.description.us.nh     = New Hampshire
-country.description.us.nj     = New Jersey
-country.description.us.nm     = Nouveau Mexique
-country.description.us.nv     = Névada
-country.description.us.ny     = New York
-country.description.us.ny.nyc = Ville de New York
-country.description.us.oh     = Ohio
-country.description.us.ok     = Oklahoma
-country.description.us.or     = Orégon
-country.description.us.pa     = Pensylvanie
-country.description.us.ri     = Rhode Island
-country.description.us.sc     = Caroline du Sud
-country.description.us.sd     = Dakota du Sud
-country.description.us.tn     = Tennesee
-country.description.us.tx     = Texas
-country.description.us.ut     = Utah
-country.description.us.va     = Virginie
-country.description.us.vt     = Vermont
-country.description.us.wa     = Washington
-country.description.us.wi     = Wisconsin
-country.description.us.wv     = Virginie de lOuest
-country.description.us.wy     = Wyoming
-country.description.uy        = Uruguay
-country.description.uz        = Ouzbékistan
-country.description.va        = Saint-Siège (État de la Cité du Vatican)
-country.description.vc        = Saint-Vincent-et-Les Grenadines
-country.description.ve        = Venezuela, République Bolivarienne du
-country.description.vg        = Îles Vierges Britanniques
-country.description.vi        = Îles Vierges des États-Unis
-country.description.vn        = Viet Nam
-country.description.vu        = Vanuatu
-country.description.wf        = Wallis et Futuna
-country.description.ws        = Samoa
-country.description.ye        = Yémen
-country.description.xk        = Kosovo
-country.description.yt        = Mayotte
-country.description.za        = Afrique du Sud
-country.description.zm        = Zambie
-country.description.zw        = Zimbabwe
+country.description.ad         = Andorre
+country.description.ae         = Emirats Arabes Unis
+country.description.af         = Afghanistan
+country.description.ag         = Antigua-et-Barbuda
+country.description.ai         = Anguilla
+country.description.al         = Albanie
+country.description.am         = Arménie
+country.description.an         = Antilles néerlandaises
+country.description.ao         = Angola
+country.description.aq         = Antarctique
+country.description.ar         = Argentine
+country.description.as         = Samoa américaines
+country.description.at         = Autriche
+country.description.at.1       = Burgenland
+country.description.at.2       = Kärnten
+country.description.at.3       = Basse-Autriche
+country.description.at.5       = Salzbourg
+country.description.at.6       = Styrie
+country.description.at.7       = Tirol
+country.description.at.4       = Haute-Autriche
+country.description.at.8       = Vorarlberg
+country.description.at.9       = Vienne
+country.description.au         = Australie
+country.description.au.act     = Territoire de la capitale australienne
+country.description.au.nsw     = Nouvelle-Galles du Sud
+country.description.au.nt      = Territoire du Nord
+country.description.au.qld     = Queensland
+country.description.au.qld.br  = Brisbane Area
+country.description.au.sa      = Australie-Méridionale
+country.description.au.tas     = Tasmanie
+country.description.au.tas.ho  = Hobard Area
+country.description.au.tas.nh  = Non-Hobard Area
+country.description.au.vic     = Victoria
+country.description.au.wa      = Australie de l'Ouest
+country.description.aw         = Aruba
+country.description.ax         = Îles d'Aaland
+country.description.az         = Azerbaïdjan
+country.description.ba         = Bosnie et Herzegowie
+country.description.ba.bih     = Fédération de Bosnie et d'Herzegowie
+country.description.ba.srp     = République de Srpska
+country.description.bb         = Barbades
+country.description.bd         = Bangladesh
+country.description.be         = Belgique
+country.description.bf         = Burkina Faso
+country.description.bg         = Bulgarie
+country.description.bh         = Bahrein
+country.description.bi         = Burundi
+country.description.bj         = Bénin
+country.description.bm         = Bermudes
+country.description.bn         = Darussalam de Brunei
+country.description.bo         = Bolivie
+country.description.br         = Brésil
+country.description.br.go      = Goiás
+country.description.br.mg      = Minas Gerais
+country.description.br.mg.bh   = Belo Horizonte
+country.description.br.ms      = Mato Grosso do Sul
+country.description.br.ms.cg   = Campo Grande
+country.description.br.ms.do   = Dourados
+country.description.br.pb      = Paraíba
+country.description.br.pb.jpa  = João Pessoa
+country.description.br.pe      = Pernambuco
+country.description.br.pr      = Parana
+country.description.br.pr.cu   = Curitiba
+country.description.br.rj      = Rio de Janeiro
+country.description.br.rj.crj  = City of Rio de Janeiro
+country.description.br.rn      = Rio Grande do Norte
+country.description.br.rn.na   = Natal
+country.description.br.rs      = Rio Grande do Sul
+country.description.br.rs.sm   = Santa Maria
+country.description.br.sp      = Sao Paulo
+country.description.br.sp.csp  = City of Sao Paulo
+country.description.bs         = Bahamas
+country.description.bt         = Bhutan
+country.description.bv         = Île de Bouvet
+country.description.bw         = Botswana
+country.description.by         = Biélarus
+country.description.bz         = Bélize
+country.description.ca         = Canada
+country.description.ca.ab      = Alberta
+country.description.ca.bc      = Columbia britannique
+country.description.ca.mb      = Manitoba
+country.description.ca.nb      = Nouveau Brunswick
+country.description.ca.nl      = Terre-neuve et labrador
+country.description.ca.ns      = Nouvelle-Écosse
+country.description.ca.nt      = Territoires du Nord-ouest
+country.description.ca.nu      = Nunavut
+country.description.ca.on      = Ontario
+country.description.ca.pe      = Île du Prince Édouard
+country.description.ca.qc      = Québec
+country.description.ca.sk      = Saskatchewan
+country.description.ca.yt      = Yukon
+country.description.cc         = îles Cocos
+country.description.cd         = Congo, République Démocratique (ex-Zaïre)
+country.description.cf         = République Centrafricaine
+country.description.cg         = Le Congo, la République de
+country.description.ch         = Suisse
+country.description.ch.ag      = Argovie
+country.description.ch.ai      = Appenzell Rhodes-Intérieures
+country.description.ch.ar      = Appenzell Rhodes-Extérieures
+country.description.ch.be      = Berne
+country.description.ch.bl      = Bâle-Campagne
+country.description.ch.bs      = Ville de Bâle
+country.description.ch.fr      = Fribourg
+country.description.ch.ge      = Genève
+country.description.ch.gl      = Glaris
+country.description.ch.gr      = Grisons
+country.description.ch.ju      = Jura
+country.description.ch.lu      = Lucerne
+country.description.ch.ne      = Neuchâtel
+country.description.ch.nw      = Nidwalden
+country.description.ch.ow      = Obwalden
+country.description.ch.sg      = Saint-Gall
+country.description.ch.sh      = Schaffhouse
+country.description.ch.so      = Soleure
+country.description.ch.sz      = Schwyz
+country.description.ch.tg      = Thurgovie
+country.description.ch.ti      = Tessin
+country.description.ch.ur      = Uri
+country.description.ch.vd      = Vaud
+country.description.ch.vs      = Valais
+country.description.ch.zg      = Zoug
+country.description.ch.zh      = Zurich
+country.description.ci         = Côte d´Ivoire
+country.description.ck         = Îles Cook
+country.description.cl         = Chili
+country.description.cm         = Cameroon
+country.description.cn         = Chine
+country.description.co         = Colombie
+country.description.cr         = Costa Rica
+country.description.cu         = Cuba
+country.description.cv         = Cap-Vert
+country.description.cx         = Christmas, Île
+country.description.cy         = Chypre
+country.description.cz         = Tchèque, République
+country.description.de         = Allemagne
+country.description.de.be      = Berlin
+country.description.de.bb      = Brandebourg
+country.description.de.bw      = Bade-Wurtemberg
+country.description.de.by      = Bavière
+country.description.de.by.ag   = Augsburg
+country.description.de.by.in   = Ingolstadt
+country.description.de.by.mu   = Munich
+country.description.de.by.re   = Regensburg
+country.description.de.by.wu   = Würzburg
+country.description.de.hb      = Brême
+country.description.de.he      = Hesse
+country.description.de.hh      = Hambourg
+country.description.de.mv      = Mecklembourg-Poméranie antérieure
+country.description.de.ni      = Basse Saxe
+country.description.de.nw      = Rhénanie-du-Nord - Westphalie
+country.description.de.rp      = Rheinland-Pfalz
+country.description.de.sh      = Schleswig-Holstein
+country.description.de.sl      = Sarre
+country.description.de.sn      = Saxe
+country.description.de.st      = Saxe-Anhalt
+country.description.de.th      = Thuringe
+country.description.dj         = Djibouti
+country.description.dk         = Danemark
+country.description.dm         = Dominique
+country.description.do         = Dominicaine, République
+country.description.dz         = Algérie
+country.description.ec         = Équateur
+country.description.ee         = Estonie
+country.description.eg         = Égypte
+country.description.eh         = Sahara Occidental
+country.description.er         = Érythrée
+country.description.es         = Espagne
+country.description.es.an      = Andalousie
+country.description.es.ar      = Aragon
+country.description.es.ce      = Ceuta
+country.description.es.ml      = Melilla
+country.description.es.cl      = Castille et Léon
+country.description.es.cm      = Castille - La Mancha
+country.description.es.cn      = Îles Canaries
+country.description.es.ct      = Catalogne
+country.description.esb.cn     = Barcelone
+country.description.es.ex      = Estrémadure
+country.description.es.ga      = Galice
+country.description.es.ib      = Îles Baléares
+country.description.es.lo      = La Rioja
+country.description.es.md      = Madrid
+country.description.es.md.mad  = Madrid city
+country.description.es.mc      = Murcie
+country.description.es.nc      = Navarre
+country.description.es.as      = Asturias
+country.description.es.pv      = Euskadi
+country.description.es.cb      = Cantabrie
+country.description.es.vc      = Valence
+country.description.et         = Éthiopie
+country.description.fi         = Finlande
+country.description.fi.01      = Åland
+country.description.fj         = Fidji
+country.description.fk         = Falkland, Îles (Malvinas)
+country.description.fm         = Micronésie, États Fédérés de
+country.description.fo         = Féroé, Îles
+country.description.fr         = France
+country.description.fr.ges.67  = Bas-Rhin
+country.description.fr.971     = Guadeloupe
+country.description.fr.973     = Guyane
+country.description.fr.ges.68  = Haut-Rhin
+country.description.fr.974     = la Réunion
+country.description.fr.972     = Martinique
+country.description.fr.ges.57  = Moselle
+country.description.ga         = Gabon
+country.description.gb         = Royaume-Uni de la Grande-Bretagne
+country.description.gb.eng     = Angleterre
+country.description.gb.nir     = Irlande du Nord
+country.description.gb.sct     = Ecosse
+country.description.gb.wls     = Pays de Galles
+country.description.gd         = Grenade
+country.description.ge         = Géorgie
+country.description.gf         = Guyane Française
+country.description.gg         = Guernesey
+country.description.gh         = Ghana
+country.description.gi         = Gibraltar
+country.description.gl         = Groenland
+country.description.gm         = Gambie
+country.description.gn         = Guinée
+country.description.gp         = Guadeloupe
+country.description.gq         = Guinée Équatoriale
+country.description.gr         = Grèce
+country.description.gs         = Géorgie du Sud-et-Les Îles Sandwich du Sud
+country.description.gt         = Guatemala
+country.description.gu         = Guam
+country.description.gw         = Guinée-Bissau
+country.description.gy         = Guyana
+country.description.hk         = Hong Kong
+country.description.hm         = Heard-et-Îles Macdonald, Île
+country.description.hn         = Honduras
+country.description.hr         = Croatie
+country.description.ht         = Haïti
+country.description.hu         = Hongrie
+country.description.id         = Indonésie
+country.description.ie         = Irlande
+country.description.il         = Israël
+country.description.im         = Île de Man
+country.description.in         = Inde
+country.description.in.an      = Andaman et Îles de Nicobar
+country.description.in.ap      = Andhra Pradesh
+country.description.in.ar      = Arunachal Pradesh
+country.description.in.as      = Assam
+country.description.in.br      = Bihar
+country.description.in.ch      = Chandigarh
+country.description.in.ct      = Chhattisgarh
+country.description.in.dh      = Dadra et Nagar Haveli et Daman et Diu
+country.description.in.dl      = Delhi
+country.description.in.ga      = Goa
+country.description.in.gj      = Gujarat
+country.description.in.hp      = Himachal Pradesh
+country.description.in.hr      = Haryana
+country.description.in.jh      = Jharkhand
+country.description.in.jk      = Jammu-et-Cachemire
+country.description.in.ka      = Karnataka
+country.description.in.kl      = Kerala
+country.description.in.ld      = Lakshadweep
+country.description.in.mh      = Maharashtra
+country.description.in.ml      = Meghalaya
+country.description.in.mn      = Manipur
+country.description.in.mp      = Madhya Pradesh
+country.description.in.mz      = Mizoram
+country.description.in.nl      = Nagaland
+country.description.in.or      = Orissa
+country.description.in.pb      = Punjab
+country.description.in.py      = Territoire de Pondichéry
+country.description.in.rj      = Rajasthan
+country.description.in.sk      = Sikkim
+country.description.in.tn      = Tamil Nadu
+country.description.in.tr      = Tripura
+country.description.in.up      = Uttar Pradesh
+country.description.in.ut      = Uttaranchal
+country.description.in.wb      = Bengale occidental
+country.description.io         = Océan Indien, Territoire Britannique de L'
+country.description.iq         = Iraq
+country.description.ir         = Iran, République Islamique D'
+country.description.is         = Islande
+country.description.it         = Italie
+country.description.it.32      = Tyrol sud
+country.description.je         = Jersey
+country.description.jm         = Jamaïque
+country.description.jo         = Jordanie
+country.description.jp         = Japon
+country.description.ke         = Kenya
+country.description.kg         = Kirghizistan
+country.description.kh         = Cambodge
+country.description.ki         = Kiribati
+country.description.km         = Comores
+country.description.kn         = Saint-Kitts-et-Nevis
+country.description.kp         = Corée, République Populaire Démocratique de
+country.description.kr         = Corée, République de
+country.description.kw         = Koweït
+country.description.ky         = Caïmans, Îles
+country.description.kz         = Kazakhstan
+country.description.la         = lao, République Démocratique Populaire
+country.description.lb         = Liban
+country.description.lc         = Sainte-Lucie
+country.description.li         = Liechtenstein
+country.description.lk         = Sri lanka
+country.description.lr         = Libéria
+country.description.ls         = Lesotho
+country.description.lt         = Lituanie
+country.description.lu         = Luxembourg
+country.description.lu.lu.clu  = City of Luxembourg
+country.description.lv         = Lettonie
+country.description.ly         = Libye
+country.description.ma         = Maroc
+country.description.mc         = Monaco
+country.description.md         = Moldova, République de
+country.description.md.ba      = Balti
+country.description.me         = Monténégro
+country.description.mg         = Madagascar
+country.description.mh         = Marshall, Îles
+country.description.mk         = Macédoine du Nord
+country.description.ml         = Mali
+country.description.mm         = Myanmar
+country.description.mn         = Mongolie
+country.description.mo         = Macao
+country.description.mp         = Mariannes du Nord, Îles
+country.description.mq         = Martinique
+country.description.mr         = Mauritanie
+country.description.ms         = Montserrat
+country.description.mt         = Malte
+country.description.mu         = Maurice
+country.description.mv         = Maldives
+country.description.mw         = Malawi
+country.description.mx         = Mexique
+country.description.mx.pue     = Puebla
+country.description.my         = Malaisie
+country.description.mz         = Mozambique
+country.description.na         = Namibie
+country.description.nc         = Nouvelle-Calédonie
+country.description.ne         = Niger
+country.description.nf         = Norfolk, Île
+country.description.ng         = Nigéria
+country.description.ng.la      = Lagos
+country.description.ni         = Nicaragua
+country.description.ni.bo      = Boaco
+country.description.ni.gr      = Granada
+country.description.ni.gr.na   = Nandaime
+country.description.ni.md      = Madriz
+country.description.ni.md.so   = Somoto
+country.description.ni.mn      = Managua
+country.description.ni.ms      = Masaya
+country.description.ni.ms.ni   = Niquinohomo
+country.description.ni.ri      = Rivas
+country.description.ni.ri.mo   = Moyogalpa
+country.description.ni.ri.om   = Ometepe
+country.description.nl         = Pays-Bas
+country.description.no         = Norvège
+country.description.np         = Népal
+country.description.nr         = Nauru
+country.description.nu         = Niué
+country.description.nz         = Nouvelle-Zélande
+country.description.nz.auk     = Auckland
+country.description.nz.bop     = Baie de Plenty
+country.description.nz.can     = Canterbury
+country.description.nz.cit     = Territoire des îles Chatham
+country.description.nz.gis     = Gisborne
+country.description.nz.hkb     = Hawke's Bay
+country.description.nz.mbh     = Marlborough
+country.description.nz.mwt     = Manawatu-Wanganui
+country.description.nz.nsn     = Nelson
+country.description.nz.ntl     = Northland
+country.description.nz.ota     = Otago
+country.description.nz.stl     = Southland
+country.description.nz.tas     = Tasman
+country.description.nz.tki     = Taranaki
+country.description.nz.wgn     = Wellington
+country.description.nz.wko     = Waikato
+country.description.nz.wtc     = Côte Ouest
+country.description.om         = Oman
+country.description.pa         = Panama
+country.description.pe         = Pérou
+country.description.pf         = Polynésie Française
+country.description.pg         = Papouasie-Nouvelle-Guinée
+country.description.ph         = Philippines
+country.description.pk         = Pakistan
+country.description.pl         = Pologne
+country.description.pm         = Saint-Pierre-et-Miquelon
+country.description.pn         = Pitcairn
+country.description.pr         = Porto Rico
+country.description.ps         = Palestinien Occupé, Territoire
+country.description.pt = Portugal
+country.description.pt.01      = Aveiro
+country.description.pt.01.AGD  = Águeda
+country.description.pt.01.ALB  = Albergaria-a-Velha
+country.description.pt.01.AND  = Anadia
+country.description.pt.01.ARC  = Arouca
+country.description.pt.01.AVR  = Aveiro
+country.description.pt.01.CPV  = Castelo de Paiva
+country.description.pt.01.ESP  = Espinho
+country.description.pt.01.ETR  = Estarreja
+country.description.pt.01.ILH  = Ílhavo
+country.description.pt.01.MLD  = Mealhada
+country.description.pt.01.MRS  = Murtosa
+country.description.pt.01.OAZ  = Oliveira de Azeméis
+country.description.pt.01.VAC  = Vale de Cambra
+country.description.pt.01.VGS  = Vagos
+country.description.pt.01.SVV  = Sever do Vouga
+country.description.pt.01.SJM  = São João da Madeira
+country.description.pt.01.VFR  = Santa Maria da Feira
+country.description.pt.01.OVR  = Ovar
+country.description.pt.01.OBR  = Oliveira do Bairro
+country.description.pt.20      = Azoren
+country.description.pt.20.VFC  = Vila Franca do Campo
+country.description.pt.20.VPT  = Vila do Porto
+country.description.pt.20.VLS  = Velas
+country.description.pt.20.SRQ  = São Roque do Pico
+country.description.pt.20.SCF  = Santa Cruz das Flores
+country.description.pt.20.SCG  = Santa Cruz da Graciosa
+country.description.pt.20.RGR  = Ribeira Grande
+country.description.pt.20.VPV  = Praia da Vitória
+country.description.pt.20.PVC  = Povoação
+country.description.pt.20.PDL  = Ponta Delgada
+country.description.pt.20.NRD  = Nordeste
+country.description.pt.20.MAD  = Madalena
+country.description.pt.20.LGP  = Lajes do Pico
+country.description.pt.20.LGF  = Lajes das Flores
+country.description.pt.20.LAG  = Lagoa (Açores)
+country.description.pt.20.HRT  = Horta
+country.description.pt.20.CRV  = Corvo
+country.description.pt.20.CHT  = Calheta (Açores)
+country.description.pt.20.AGH  = Angra do Heroísmo
+country.description.pt.02      = Beja
+country.description.pt.02.VDG  = Vidigueira
+country.description.pt.02.SRP  = Serpa
+country.description.pt.02.ORQ  = Ourique
+country.description.pt.02.ODM  = Odemira
+country.description.pt.02.MRA  = Moura
+country.description.pt.02.MTL  = Mértola
+country.description.pt.02.FAL  = Ferreira do Alentejo
+country.description.pt.02.CBA  = Cuba
+country.description.pt.02.CVR  = Castro Verde
+country.description.pt.02.BJA  = Beja
+country.description.pt.02.BRC  = Barrancos
+country.description.pt.02.AVT  = Alvito
+country.description.pt.02.ADV  = Almodôvar
+country.description.pt.02.AJT  = Aljustrel
+country.description.pt.03      = Braga
+country.description.pt.03.AMR  = Amares
+country.description.pt.03.ANS  = Ansião
+country.description.pt.03.BCL  = Barcelos
+country.description.pt.03.BRG  = Braga
+country.description.pt.03.BGC  = Bragança
+country.description.pt.03.CBC  = Cabeceiras de Basto
+country.description.pt.03.CDV  = Cadaval
+country.description.pt.03.CBT  = Celorico de Basto
+country.description.pt.03.EPS  = Esposende
+country.description.pt.03.FAF  = Fafe
+country.description.pt.03.GMR  = Guimarães
+country.description.pt.03.PVL  = Póvoa de Lanhoso
+country.description.pt.03.TBR  = Terras de Bouro
+country.description.pt.03.VRM  = Vieira do Minho
+country.description.pt.03.VNF  = Vila Nova de Famalicão
+country.description.pt.03.VVD  = Vila Verde
+country.description.pt.03.VIZ  = Vizela
+country.description.pt.04      = Bragança
+country.description.pt.04.AFE  = Alfândega da Fé
+country.description.pt.04.CRZ  = Carrazeda de Ansiães
+country.description.pt.04.FEC  = Freixo de Espada à Cinta
+country.description.pt.04.MCD  = Macedo de Cavaleiros
+country.description.pt.04.MDR  = Miranda do Douro
+country.description.pt.04.MDL  = Mirandela
+country.description.pt.04.MGD  = Mogadouro
+country.description.pt.04.TMC  = Torre de Moncorvo
+country.description.pt.04.VFL  = Vila Flor
+country.description.pt.04.VMS  = Vimioso
+country.description.pt.04.VNH  = Vinhais
+country.description.pt.05      = Castelo Branco
+country.description.pt.05.BMT  = Belmonte
+country.description.pt.05.CTB  = Castelo Branco
+country.description.pt.05.CVL  = Covilhã
+country.description.pt.05.FND  = Fundão
+country.description.pt.05.IDN  = Idanha-a-Nova
+country.description.pt.05.OLR  = Oleiros
+country.description.pt.05.PNC  = Penamacor
+country.description.pt.05.PNV  = Proença-a-Nova
+country.description.pt.05.SRT  = Sertã
+country.description.pt.05.VLR  = Vila de Rei
+country.description.pt.05.VVR  = Vila Velha de Ródão
+country.description.pt.06      = Coimbra
+country.description.pt.06.AGN  = Arganil
+country.description.pt.06.CNT  = Cantanhede
+country.description.pt.06.CBR  = Coimbra
+country.description.pt.06.CDN  = Condeixa-a-Nova
+country.description.pt.06.FIG  = Figueira da Foz
+country.description.pt.06.GOI  = Góis
+country.description.pt.06.LSA  = Lousã
+country.description.pt.06.MIR  = Mira
+country.description.pt.06.MCV  = Miranda do Corvo
+country.description.pt.06.MMV  = Montemor-o-Velho
+country.description.pt.06.OHP  = Oliveira do Hospital
+country.description.pt.06.PPS  = Pampilhosa da Serra
+country.description.pt.06.PCV  = Penacova
+country.description.pt.06.PNL  = Penela
+country.description.pt.06.SRE  = Soure
+country.description.pt.06.TBU  = Tábua
+country.description.pt.06.PRS  = Vila Nova de Poiares
+country.description.pt.07      = Évora
+country.description.pt.07.ADL  = Alandroal
+country.description.pt.07.ARL  = Arraiolos
+country.description.pt.07.BRB  = Borba
+country.description.pt.07.ETZ  = Estremoz
+country.description.pt.07.EVR  = Évora
+country.description.pt.07.MMN  = Montemor-o-Novo
+country.description.pt.07.MOR  = Mora
+country.description.pt.07.MOU  = Mourão
+country.description.pt.07.PRL  = Portel
+country.description.pt.07.RDD  = Redondo
+country.description.pt.07.RMZ  = Reguengos de Monsaraz
+country.description.pt.07.VND  = Vendas Novas
+country.description.pt.07.VNT  = Viana do Alentejo
+country.description.pt.07.VVC  = Vila Viçosa
+country.description.pt.08      = Faro
+country.description.pt.08.ABF  = Albufeira
+country.description.pt.08.ACT  = Alcoutim
+country.description.pt.08.AJZ  = Aljezur
+country.description.pt.08.CTM  = Castro Marim
+country.description.pt.08.FAR  = Faro
+country.description.pt.08.LGA  = Lagoa
+country.description.pt.08.LGS  = Lagos
+country.description.pt.08.LLE  = Loulé
+country.description.pt.08.MCQ  = Monchique
+country.description.pt.08.OLH  = Olhão
+country.description.pt.08.PTM  = Portimão
+country.description.pt.08.SBA  = São Brás de Alportel
+country.description.pt.08.SLV  = Silves
+country.description.pt.08.TVR  = Tavira
+country.description.pt.08.VBP  = Vila do Bispo
+country.description.pt.08.VRS  = Vila Real de Santo António
+country.description.pt.09      = Guarda
+country.description.pt.09.AGB  = Aguiar da Beira
+country.description.pt.09.ALD  = Almeida
+country.description.pt.09.CLB  = Celorico da Beira
+country.description.pt.09.FCR  = Figueira de Castelo Rodrigo
+country.description.pt.09.FAG  = Fornos de Algodres
+country.description.pt.09.GVA  = Gouveia
+country.description.pt.09.GRD  = Guarda
+country.description.pt.09.MTG  = Manteigas
+country.description.pt.09.MED  = Mêda
+country.description.pt.09.PNH  = Pinhel
+country.description.pt.09.SBG  = Sabugal
+country.description.pt.09.SEI  = Seia
+country.description.pt.09.TCR  = Trancoso
+country.description.pt.09.VLF  = Vila Nova de Foz Côa
+country.description.pt.10      = Leiria
+country.description.pt.10.ACB  = Alcobaça
+country.description.pt.10.AVZ  = Alvaiázere
+country.description.pt.10.BTL  = Batalha
+country.description.pt.10.BBR  = Bombarral
+country.description.pt.10.CLD  = Caldas da Rainha
+country.description.pt.10.CPR  = Castanheira de Pera
+country.description.pt.10.FVN  = Figueiró dos Vinhos
+country.description.pt.10.LRA  = Leiria
+country.description.pt.10.MGR  = Marinha Grande
+country.description.pt.10.NZR  = Nazaré
+country.description.pt.10.OBD  = Óbidos
+country.description.pt.10.PGR  = Pedrógão Grande
+country.description.pt.10.PNI  = Peniche
+country.description.pt.10.PBL  = Pombal
+country.description.pt.10.PMS  = Porto de Mós
+country.description.pt.11      = Lissabon
+country.description.pt.11.ALQ  = Alenquer
+country.description.pt.11.AMD  = Amadora
+country.description.pt.11.ARV  = Arruda dos Vinhos
+country.description.pt.11.AZB  = Azambuja
+country.description.pt.11.CSC  = Cascais
+country.description.pt.11.LSB  = Lisboa
+country.description.pt.11.LRS  = Loures
+country.description.pt.11.LNH  = Lourinhã
+country.description.pt.11.MFR  = Mafra
+country.description.pt.11.ODV  = Odivelas
+country.description.pt.11.OER  = Oeiras
+country.description.pt.11.SNT  = Sintra
+country.description.pt.11.SMA  = Sobral de Monte Agraço
+country.description.pt.11.TVD  = Torres Vedras
+country.description.pt.11.VFX  = Vila Franca de Xira
+country.description.pt.30      = Madère
+country.description.pt.30.CLT  = Calheta
+country.description.pt.30.CML  = Câmara de Lobos
+country.description.pt.30.FNC  = Funchal
+country.description.pt.30.MCH  = Machico
+country.description.pt.30.PTS  = Ponta do Sol
+country.description.pt.30.PMZ  = Porto Moniz
+country.description.pt.30.PST  = Porto Santo
+country.description.pt.30.RBR  = Ribeira Brava
+country.description.pt.30.SCR  = Santa Cruz
+country.description.pt.30.STN  = Santana
+country.description.pt.30.SVC  = São Vicente
+country.description.pt.12      = Portalegre
+country.description.pt.12.ALT  = Alter do Chão
+country.description.pt.12.ARR  = Arronches
+country.description.pt.12.AVS  = Avis
+country.description.pt.12.CMR  = Campo Maior
+country.description.pt.12.CVD  = Castelo de Vide
+country.description.pt.12.CRT  = Crato
+country.description.pt.12.ELV  = Elvas
+country.description.pt.12.FTR  = Fronteira
+country.description.pt.12.GAV  = Gavião
+country.description.pt.12.MRV  = Marvão
+country.description.pt.12.MFT  = Monforte
+country.description.pt.12.NIS  = Nisa
+country.description.pt.12.PSR  = Ponte de Sor
+country.description.pt.12.PTG  = Portalegre
+country.description.pt.12.SSL  = Sousel
+country.description.pt.13      = Porto
+country.description.pt.13.AMT  = Amarante
+country.description.pt.13.BAO  = Baião
+country.description.pt.13.FLG  = Felgueiras
+country.description.pt.13.GDM  = Gondomar
+country.description.pt.13.LOU  = Lousada
+country.description.pt.13.MAI  = Maia
+country.description.pt.13.MCN  = Marco de Canaveses
+country.description.pt.13.MTS  = Matosinhos
+country.description.pt.13.PFR  = Paços de Ferreira
+country.description.pt.13.PRD  = Paredes
+country.description.pt.13.PNF  = Penafiel
+country.description.pt.13.PRT  = Porto
+country.description.pt.13.PVZ  = Póvoa de Varzim
+country.description.pt.13.STS  = Santo Tirso
+country.description.pt.13.TRF  = Trofa
+country.description.pt.13.VLG  = Valongo
+country.description.pt.13.VCD  = Vila do Conde
+country.description.pt.13.VNG  = Vila Nova de Gaia
+country.description.pt.14      = Santarém
+country.description.pt.14.ABT  = Abrantes
+country.description.pt.14.ACN  = Alcanena
+country.description.pt.14.ALR  = Almeirim
+country.description.pt.14.APC  = Alpiarça
+country.description.pt.14.BNV  = Benavente
+country.description.pt.14.CTX  = Cartaxo
+country.description.pt.14.CHM  = Chamusca
+country.description.pt.14.CNS  = Constância
+country.description.pt.14.CCH  = Coruche
+country.description.pt.14.ENT  = Entroncamento
+country.description.pt.14.FZZ  = Ferreira do Zêzere
+country.description.pt.14.GLG  = Golegã
+country.description.pt.14.MAC  = Mação
+country.description.pt.14.ORM  = Ourém
+country.description.pt.14.RMR  = Rio Maior
+country.description.pt.14.SMG  = Salvaterra de Magos
+country.description.pt.14.STR  = Santarém
+country.description.pt.14.SRD  = Sardoal
+country.description.pt.14.TMR  = Tomar
+country.description.pt.14.TNV  = Torres Novas
+country.description.pt.14.VNB  = Vila Nova da Barquinha
+country.description.pt.15      = Setúbal
+country.description.pt.15.ASL  = Alcácer do Sal
+country.description.pt.15.ACH  = Alcochete
+country.description.pt.15.ALM  = Almada
+country.description.pt.15.BRR  = Barreiro
+country.description.pt.15.GDL  = Grândola
+country.description.pt.15.MTA  = Moita
+country.description.pt.15.MTJ  = Montijo
+country.description.pt.15.PLM  = Palmela
+country.description.pt.15.STC  = Santiago do Cacém
+country.description.pt.15.SXL  = Seixal
+country.description.pt.15.SSB  = Sesimbra
+country.description.pt.15.STB  = Setúbal
+country.description.pt.15.SNS  = Sines
+country.description.pt.16      = Viana do Castelo
+country.description.pt.16.AVV  = Arcos de Valdevez
+country.description.pt.16.CMN  = Caminha
+country.description.pt.16.MLG  = Melgaço
+country.description.pt.16.MNC  = Monção
+country.description.pt.16.PCR  = Paredes de Coura
+country.description.pt.16.PTB  = Ponte da Barca
+country.description.pt.16.PTL  = Ponte de Lima
+country.description.pt.16.VLC  = Valença
+country.description.pt.16.VCT  = Viana do Castelo
+country.description.pt.16.VNC  = Vila Nova de Cerveira
+country.description.pt.17      = Vila Real
+country.description.pt.17.ALJ  = Alijó
+country.description.pt.17.BTC  = Boticas
+country.description.pt.17.CHV  = Chaves
+country.description.pt.17.MSF  = Mesão Frio
+country.description.pt.17.MDB  = Mondim de Basto
+country.description.pt.17.MTR  = Montalegre
+country.description.pt.17.MUR  = Murça
+country.description.pt.17.PRG  = Peso da Régua
+country.description.pt.17.RPN  = Ribeira de Pena
+country.description.pt.17.SBS  = Sabrosa
+country.description.pt.17.SMP  = Santa Marta de Penaguião
+country.description.pt.17.VPC  = Valpaços
+country.description.pt.17.VPA  = Vila Pouca de Aguiar
+country.description.pt.17.VRL  = Vila Real
+country.description.pt.18      = Viseu
+country.description.pt.18.AMM  = Armamar
+country.description.pt.18.CRS  = Carregal do Sal
+country.description.pt.18.CDR  = Castro Daire
+country.description.pt.18.CNF  = Cinfães
+country.description.pt.18.LMG  = Lamego
+country.description.pt.18.MGL  = Mangualde
+country.description.pt.18.MBR  = Moimenta da Beira
+country.description.pt.18.MRT  = Mortágua
+country.description.pt.18.NLS  = Nelas
+country.description.pt.18.OFR  = Oliveira de Frades
+country.description.pt.18.PCT  = Penalva do Castelo
+country.description.pt.18.PND  = Penedono
+country.description.pt.18.RSD  = Resende
+country.description.pt.18.SCD  = Santa Comba Dão
+country.description.pt.18.SJP  = São João da Pesqueira
+country.description.pt.18.SPS  = São Pedro do Sul
+country.description.pt.18.SAT  = Sátão
+country.description.pt.18.SRN  = Sernancelhe
+country.description.pt.18.TBC  = Tabuaço
+country.description.pt.18.TRC  = Tarouca
+country.description.pt.18.TND  = Tondela
+country.description.pt.18.VNP  = Vila Nova de Paiva
+country.description.pt.18.VIS  = Viseu
+country.description.pt.18.VZL  = Vouzela
+country.description.pw         = Palaos
+country.description.py         = Paraguay
+country.description.qa         = Qatar
+country.description.re         = Réunion
+country.description.ro         = Roumanie
+country.description.rs         = Serbie
+country.description.ru         = Russie, Fédération de
+country.description.rw         = Rwanda
+country.description.sa         = Arabie Saoudite
+country.description.sb         = Salomon, Îles
+country.description.sc         = Seychelles
+country.description.sd         = Soudan
+country.description.se         = Suède
+country.description.sg         = Singapour
+country.description.sh         = Sainte-Hélène, Ascension et Tristan Da Cunha
+country.description.si         = Slovénie
+country.description.sj         = Svalbard et Île Jan Mayen
+country.description.sk         = Slovaquie
+country.description.sl         = Sierra Leone
+country.description.sm         = Saint-Marin
+country.description.sn         = Sénégal
+country.description.so         = Somalie
+country.description.sr         = Suriname
+country.description.ss         = Soudan du Sud
+country.description.st         = Sao Tomé-et-Principe
+country.description.sv         = El Salvador
+country.description.sx         = Saint-Martin (Partie Néerlandaise)
+country.description.sy         = Syrienne, République Arabe
+country.description.sz         = Swaziland
+country.description.target     = Trans-European Automated Real-time Gross settlement Express Transfer system closing dates
+country.description.tc         = Turks-et-Caïcos, Îles
+country.description.td         = Tchad
+country.description.tf         = Terres Australes Françaises
+country.description.tg         = Togo
+country.description.th         = Thaïlande
+country.description.tj         = Tadjikistan
+country.description.tk         = Tokelau
+country.description.tl         = Timor-Leste
+country.description.tm         = Turkménistan
+country.description.tn         = Tunisie
+country.description.to         = Tonga
+country.description.tr         = Turquie
+country.description.tt         = Trinité-et-Tobago
+country.description.tv         = Tuvalu
+country.description.tw         = Taïwan, Province de Chine
+country.description.tz         = Tanzanie, République-Unie de
+country.description.ua         = Ukraine
+country.description.ug         = Ouganda
+country.description.um         = Îles Mineures Éloignées des États-Unis
+country.description.us         = États-Unis
+country.description.us.ak      = Alaska
+country.description.us.al      = Alabama
+country.description.us.ar      = Arkansas
+country.description.us.az      = Arizona
+country.description.us.be      = Berkeley
+country.description.us.ca      = Californie
+country.description.us.co      = Colorado
+country.description.us.ct      = Connecticut
+country.description.us.dc      = Districte de Columbia
+country.description.us.de      = Delaware
+country.description.us.fl      = Floride
+country.description.us.ga      = Georgie
+country.description.us.hi      = Hawaii
+country.description.us.ia      = Iowa
+country.description.us.id      = Idaho
+country.description.us.il      = Illinois
+country.description.us.in      = Indiana
+country.description.us.ks      = Kansas
+country.description.us.ky      = Kentucky
+country.description.us.la      = Louisiane
+country.description.us.ma      = Massachusetts
+country.description.us.md      = Maryland
+country.description.us.me      = Maine
+country.description.us.mi      = Michigan
+country.description.us.mn      = Minnesota
+country.description.us.mo      = Missouri
+country.description.us.ms      = Mississippi
+country.description.us.mt      = Montana
+country.description.us.nc      = Caroline du Nord
+country.description.us.nc.ce   = Charlotte
+country.description.us.nc.me   = Mecklenburg
+country.description.us.nd      = Dakota du Nord
+country.description.us.ne      = Nebraska
+country.description.us.nh      = New Hampshire
+country.description.us.nj      = New Jersey
+country.description.us.nm      = Nouveau Mexique
+country.description.us.nv      = Névada
+country.description.us.ny      = New York
+country.description.us.ny.nyc  = Ville de New York
+country.description.us.oh      = Ohio
+country.description.us.ok      = Oklahoma
+country.description.us.or      = Orégon
+country.description.us.pa      = Pensylvanie
+country.description.us.ri      = Rhode Island
+country.description.us.sc      = Caroline du Sud
+country.description.us.sd      = Dakota du Sud
+country.description.us.tn      = Tennesee
+country.description.us.tx      = Texas
+country.description.us.ut      = Utah
+country.description.us.va      = Virginie
+country.description.us.vt      = Vermont
+country.description.us.wa      = Washington
+country.description.us.wi      = Wisconsin
+country.description.us.wv      = Virginie de lOuest
+country.description.us.wy      = Wyoming
+country.description.uy         = Uruguay
+country.description.uz         = Ouzbékistan
+country.description.va         = Saint-Siège (État de la Cité du Vatican)
+country.description.vc         = Saint-Vincent-et-Les Grenadines
+country.description.ve         = Venezuela, République Bolivarienne du
+country.description.vg         = Îles Vierges Britanniques
+country.description.vi         = Îles Vierges des États-Unis
+country.description.vn         = Viet Nam
+country.description.vu         = Vanuatu
+country.description.wf         = Wallis et Futuna
+country.description.ws         = Samoa
+country.description.ye         = Yémen
+country.description.xk         = Kosovo
+country.description.yt         = Mayotte
+country.description.za         = Afrique du Sud
+country.description.zm         = Zambie
+country.description.zw         = Zimbabwe
diff --git a/jollyday-core/src/main/resources/descriptions/country_descriptions_nl.properties b/jollyday-core/src/main/resources/descriptions/country_descriptions_nl.properties
index 8651b9e76..5d9738cfd 100644
--- a/jollyday-core/src/main/resources/descriptions/country_descriptions_nl.properties
+++ b/jollyday-core/src/main/resources/descriptions/country_descriptions_nl.properties
@@ -11,15 +11,15 @@ country.description.aq        = Antarctica
 country.description.ar        = Argentina
 country.description.as        = American Samoa
 country.description.at        = Austria
-country.description.at.b      = Burgenland
-country.description.at.k      = Kärnten
-country.description.at.la     = Lower Austria
-country.description.at.s      = Salzburg
-country.description.at.st     = Steiermark
-country.description.at.t      = Tirol
-country.description.at.ua     = Upper Austria
-country.description.at.va     = Vorarlberg
-country.description.at.w      = Vienna
+country.description.at.1      = Burgenland
+country.description.at.2      = Kärnten
+country.description.at.3      = Lower Austria
+country.description.at.5      = Salzburg
+country.description.at.6      = Steiermark
+country.description.at.7      = Tirol
+country.description.at.4      = Upper Austria
+country.description.at.8      = Vorarlberg
+country.description.at.9      = Vienna
 country.description.au        = Australia
 country.description.au.act    = Australian Capital Territory
 country.description.au.nsw    = New South Wales
@@ -36,8 +36,8 @@ country.description.aw        = Aruba
 country.description.ax        = Aaland Islands
 country.description.az        = Azerbaijan
 country.description.ba        = Bosnia and Herzegowina
-country.description.ba.fbh    = Federation of Bosnia and Herzegovina
-country.description.ba.rs     = Republic of Srpska
+country.description.ba.bih    = Federation of Bosnia and Herzegovina
+country.description.ba.srp    = Republic of Srpska
 country.description.bb        = Barbados
 country.description.bd        = Bangladesh
 country.description.be        = Belgium
@@ -164,21 +164,43 @@ country.description.ee        = Estonia
 country.description.eg        = Egypt
 country.description.eh        = Western Sahara
 country.description.er        = Eritrea
-country.description.es        = Spain
+country.description.es        = Spanje
+country.description.es.an     = Andalusië
+country.description.es.ar     = Aragón
+country.description.es.ce     = Ceuta
+country.description.es.ml     = Melilla
+country.description.es.cl     = Castilië en Leon
+country.description.es.cm     = Castilië-La Mancha
+country.description.es.cn     = Canarische Eilanden
+country.description.es.ct     = Catalonië
+country.description.esb.cn    = Barcelona
+country.description.es.ex     = Extremadura
+country.description.es.ga     = Galicië
+country.description.es.ib     = Balearen
+country.description.es.lo     = La Rioja
+country.description.es.md     = Madrid
+country.description.es.md.mad = Madrid stad
+country.description.es.mc     = Murcia
+country.description.es.nc     = Navarra
+country.description.es.as     = Asturias
+country.description.es.pv     = Euskadi
+country.description.es.cb     = Cantabrië
+country.description.es.vc     = Valencia
 country.description.et        = Ethiopia
 country.description.fi        = Finland
+country.description.fi.01     = Åland
 country.description.fj        = Fiji
 country.description.fk        = Falkland Islands (Malvinas)
 country.description.fm        = Micronesia, Federated States Of
 country.description.fo        = Faroe Islands
 country.description.fr        = France
-country.description.fr.br     = Bas-Rhin
-country.description.fr.gu     = Guadeloupe
-country.description.fr.gy     = Guyane
-country.description.fr.hr     = Haut-Rhin
-country.description.fr.lr     = La Reunion
-country.description.fr.ma     = Martinique
-country.description.fr.mo     = Moselle
+country.description.fr.ges.67 = Bas-Rhin
+country.description.fr.971    = Guadeloupe
+country.description.fr.973    = Guyane
+country.description.fr.ges.68 = Haut-Rhin
+country.description.fr.974    = La Reunion
+country.description.fr.972    = Martinique
+country.description.fr.ges.57 = Moselle
 country.description.ga        = Gabon
 country.description.gb        = United Kingdom of Great Britain
 country.description.gb.eng    = England
@@ -252,7 +274,7 @@ country.description.iq        = Iraq
 country.description.ir        = Iran (Islamic Republic Of)
 country.description.is        = Iceland
 country.description.it        = Italy
-country.description.it.bz     = South Tyrol
+country.description.it.32     = South Tyrol
 country.description.je        = Jersey
 country.description.jm        = Jamaica
 country.description.jo        = Jordan
@@ -277,14 +299,13 @@ country.description.lr        = Liberia
 country.description.ls        = Lesotho
 country.description.lt        = Lithuania
 country.description.lu        = Luxembourg
-country.description.lu.clu    = City of Luxembourg
+country.description.lu.lu.clu = City of Luxembourg
 country.description.lv        = Latvia
 country.description.ly        = Libyan Arab Jamahiriya
 country.description.ma        = Morocco
 country.description.mc        = Monaco
 country.description.md        = Moldova, Republic Of
 country.description.md.ba     = Balti
-country.description.md.cu     = Chisinau
 country.description.me        = Montenegro
 country.description.mg        = Madagascar
 country.description.mh        = Marshall Islands
@@ -310,21 +331,42 @@ country.description.nc        = New Caledonia
 country.description.ne        = Niger
 country.description.nf        = Norfolk Island
 country.description.ng        = Nigeria
-country.description.ng.lag    = Lagos
+country.description.ng.la     = Lagos
 country.description.ni        = Nicaragua
 country.description.ni.bo     = Boaco
+country.description.ni.gr     = Granada
+country.description.ni.gr.na  = Nandaime
+country.description.ni.md     = Madriz
+country.description.ni.md.so  = Somoto
 country.description.ni.mn     = Managua
-country.description.ni.mo     = Moyogalpa
-country.description.ni.na     = Nandaime
-country.description.ni.ni     = Niquinohomo
-country.description.ni.om     = Ometepe
-country.description.ni.so     = Somoto
+country.description.ni.ms     = Masaya
+country.description.ni.ms.ni  = Niquinohomo
+country.description.ni.ri     = Rivas
+country.description.ni.ri.mo  = Moyogalpa
+country.description.ni.ri.om  = Ometepe
 country.description.nl        = Netherlands
 country.description.no        = Norway
 country.description.np        = Nepal
 country.description.nr        = Nauru
 country.description.nu        = Niue
-country.description.nz        = New Zealand
+country.description.nz        = Nieuw-Zeeland
+country.description.nz.auk    = Auckland
+country.description.nz.bop    = Bay of Plenty
+country.description.nz.can    = Canterbury
+country.description.nz.cit    = Chatham Islands Territory
+country.description.nz.gis    = Gisborne
+country.description.nz.hkb    = Hawke's Bay
+country.description.nz.mbh    = Marlborough
+country.description.nz.mwt    = Manawatu-Wanganui
+country.description.nz.nsn    = Nelson
+country.description.nz.ntl    = Northland
+country.description.nz.ota    = Otago
+country.description.nz.stl    = Southland
+country.description.nz.tas    = Tasman
+country.description.nz.tki    = Taranaki
+country.description.nz.wgn    = Wellington
+country.description.nz.wko    = Waikato
+country.description.nz.wtc    = West Coast
 country.description.om        = Oman
 country.description.pa        = Panama
 country.description.pe        = Peru
@@ -338,74 +380,334 @@ country.description.pn        = Pitcairn
 country.description.pr        = Puerto Rico
 country.description.ps        = Palestinian Territory, Occupied
 country.description.pt        = Portugal
-country.description.pt.abf    = Albufeira
-country.description.pt.abt    = Abrantes
-country.description.pt.acb    = Alcobaça
-country.description.pt.ach    = Alcochete
-country.description.pt.acn    = Alcanena
-country.description.pt.act    = Alcoutim
-country.description.pt.adl    = Alandroal
-country.description.pt.adv    = Almodôvar
-country.description.pt.afe    = Alfândega da Fé
-country.description.pt.agb    = Aguiar da Beira
-country.description.pt.agd    = Águeda
-country.description.pt.agh    = Angra do Heroísmo
-country.description.pt.agn    = Arganil
-country.description.pt.ajt    = Aljustrel
-country.description.pt.ajz    = Aljezur
-country.description.pt.alb    = Albergaria-a-Velha
-country.description.pt.ald    = Almeida
-country.description.pt.alj    = Alijó
-country.description.pt.alm    = Almada
-country.description.pt.alq    = Alenquer
-country.description.pt.alr    = Almeirim
-country.description.pt.alt    = Alter do Chão
-country.description.pt.amd    = Amadora
-country.description.pt.amm    = Armamar
-country.description.pt.amr    = Amares
-country.description.pt.amt    = Amarante
-country.description.pt.and    = Anadia
-country.description.pt.ans    = Ansião
-country.description.pt.apc    = Alpiarça
-country.description.pt.arc    = Arouca
-country.description.pt.arl    = Arraiolos
-country.description.pt.arr    = Arronches
-country.description.pt.arv    = Arruda dos Vinhos
-country.description.pt.asl    = Alcácer do Sal
-country.description.pt.avr    = Aveiro
-country.description.pt.avs    = Avis
-country.description.pt.avt    = Alvito
-country.description.pt.avv    = Arcos de Valdevez
-country.description.pt.avz    = Alvaiázere
-country.description.pt.azb    = Azambuja
-country.description.pt.bao    = Baião
-country.description.pt.bbr    = Bombarral
-country.description.pt.bcl    = Barcelos
-country.description.pt.bgc    = Bragança
-country.description.pt.bja    = Beja
-country.description.pt.bmt    = Belmonte
-country.description.pt.bnv    = Benavente
-country.description.pt.brb    = Borba
-country.description.pt.brc    = Barrancos
-country.description.pt.brg    = Braga
-country.description.pt.brr    = Barreiro
-country.description.pt.btc    = Boticas
-country.description.pt.btl    = Batalha
-country.description.pt.cbc    = Cabeceiras de Basto
-country.description.pt.cdv    = Cadaval
-country.description.pt.cht    = Calheta (Açores)
-country.description.pt.cld    = Caldas da Rainha
-country.description.pt.clt    = Calheta (Madeira)
-country.description.pt.cml    = Câmara de Lobos
-country.description.pt.cmn    = Caminha
-country.description.pt.cmr    = Campo Maior
-country.description.pt.cnt    = Cantanhede
-country.description.pt.cpr    = Castanheira de Pera
-country.description.pt.crs    = Carregal do Sal
-country.description.pt.crz    = Carrazeda de Ansiães
-country.description.pt.csc    = Cascais
-country.description.pt.ctb    = Castelo Branco
-country.description.pt.ctx    = Cartaxo
+country.description.pt.01     = Aveiro
+country.description.pt.01.AGD = Águeda
+country.description.pt.01.ALB = Albergaria-a-Velha
+country.description.pt.01.AND = Anadia
+country.description.pt.01.ARC = Arouca
+country.description.pt.01.AVR = Aveiro
+country.description.pt.01.CPV = Castelo de Paiva
+country.description.pt.01.ESP = Espinho
+country.description.pt.01.ETR = Estarreja
+country.description.pt.01.ILH = Ílhavo
+country.description.pt.01.MLD = Mealhada
+country.description.pt.01.MRS = Murtosa
+country.description.pt.01.OAZ = Oliveira de Azeméis
+country.description.pt.01.VAC = Vale de Cambra
+country.description.pt.01.VGS = Vagos
+country.description.pt.01.SVV = Sever do Vouga
+country.description.pt.01.SJM = São João da Madeira
+country.description.pt.01.VFR = Santa Maria da Feira
+country.description.pt.01.OVR = Ovar
+country.description.pt.01.OBR = Oliveira do Bairro
+country.description.pt.20     = Azoren
+country.description.pt.20.VFC = Vila Franca do Campo
+country.description.pt.20.VPT = Vila do Porto
+country.description.pt.20.VLS = Velas
+country.description.pt.20.SRQ = São Roque do Pico
+country.description.pt.20.SCF = Santa Cruz das Flores
+country.description.pt.20.SCG = Santa Cruz da Graciosa
+country.description.pt.20.RGR = Ribeira Grande
+country.description.pt.20.VPV = Praia da Vitória
+country.description.pt.20.PVC = Povoação
+country.description.pt.20.PDL = Ponta Delgada
+country.description.pt.20.NRD = Nordeste
+country.description.pt.20.MAD = Madalena
+country.description.pt.20.LGP = Lajes do Pico
+country.description.pt.20.LGF = Lajes das Flores
+country.description.pt.20.LAG = Lagoa (Azoren)
+country.description.pt.20.HRT = Horta
+country.description.pt.20.CRV = Corvo
+country.description.pt.20.CHT = Calheta (Azoren)
+country.description.pt.20.AGH = Angra do Heroísmo
+country.description.pt.02     = Beja
+country.description.pt.02.VDG = Vidigueira
+country.description.pt.02.SRP = Serpa
+country.description.pt.02.ORQ = Ourique
+country.description.pt.02.ODM = Odemira
+country.description.pt.02.MRA = Moura
+country.description.pt.02.MTL = Mértola
+country.description.pt.02.FAL = Ferreira do Alentejo
+country.description.pt.02.CBA = Cuba
+country.description.pt.02.CVR = Castro Verde
+country.description.pt.02.BJA = Beja
+country.description.pt.02.BRC = Barrancos
+country.description.pt.02.AVT = Alvito
+country.description.pt.02.ADV = Almodôvar
+country.description.pt.02.AJT = Aljustrel
+country.description.pt.03     = Braga
+country.description.pt.03.AMR = Amares
+country.description.pt.03.ANS = Ansião
+country.description.pt.03.BCL = Barcelos
+country.description.pt.03.BRG = Braga
+country.description.pt.03.BGC = Bragança
+country.description.pt.03.CBC = Cabeceiras de Basto
+country.description.pt.03.CDV = Cadaval
+country.description.pt.03.CBT = Celorico de Basto
+country.description.pt.03.EPS = Esposende
+country.description.pt.03.FAF = Fafe
+country.description.pt.03.GMR = Guimarães
+country.description.pt.03.PVL = Póvoa de Lanhoso
+country.description.pt.03.TBR = Terras de Bouro
+country.description.pt.03.VRM = Vieira do Minho
+country.description.pt.03.VNF = Vila Nova de Famalicão
+country.description.pt.03.VVD = Vila Verde
+country.description.pt.03.VIZ = Vizela
+country.description.pt.04     = Bragança
+country.description.pt.04.AFE = Alfândega da Fé
+country.description.pt.04.CRZ = Carrazeda de Ansiães
+country.description.pt.04.FEC = Freixo de Espada à Cinta
+country.description.pt.04.MCD = Macedo de Cavaleiros
+country.description.pt.04.MDR = Miranda do Douro
+country.description.pt.04.MDL = Mirandela
+country.description.pt.04.MGD = Mogadouro
+country.description.pt.04.TMC = Torre de Moncorvo
+country.description.pt.04.VFL = Vila Flor
+country.description.pt.04.VMS = Vimioso
+country.description.pt.04.VNH = Vinhais
+country.description.pt.05     = Castelo Branco
+country.description.pt.05.BMT = Belmonte
+country.description.pt.05.CTB = Castelo Branco
+country.description.pt.05.CVL = Covilhã
+country.description.pt.05.FND = Fundão
+country.description.pt.05.IDN = Idanha-a-Nova
+country.description.pt.05.OLR = Oleiros
+country.description.pt.05.PNC = Penamacor
+country.description.pt.05.PNV = Proença-a-Nova
+country.description.pt.05.SRT = Sertã
+country.description.pt.05.VLR = Vila de Rei
+country.description.pt.05.VVR = Vila Velha de Ródão
+country.description.pt.06     = Coimbra
+country.description.pt.06.AGN = Arganil
+country.description.pt.06.CNT = Cantanhede
+country.description.pt.06.CBR = Coimbra
+country.description.pt.06.CDN = Condeixa-a-Nova
+country.description.pt.06.FIG = Figueira da Foz
+country.description.pt.06.GOI = Góis
+country.description.pt.06.LSA = Lousã
+country.description.pt.06.MIR = Mira
+country.description.pt.06.MCV = Miranda do Corvo
+country.description.pt.06.MMV = Montemor-o-Velho
+country.description.pt.06.OHP = Oliveira do Hospital
+country.description.pt.06.PPS = Pampilhosa da Serra
+country.description.pt.06.PCV = Penacova
+country.description.pt.06.PNL = Penela
+country.description.pt.06.SRE = Soure
+country.description.pt.06.TBU = Tábua
+country.description.pt.06.PRS = Vila Nova de Poiares
+country.description.pt.07     = Évora
+country.description.pt.07.ADL = Alandroal
+country.description.pt.07.ARL = Arraiolos
+country.description.pt.07.BRB = Borba
+country.description.pt.07.ETZ = Estremoz
+country.description.pt.07.EVR = Évora
+country.description.pt.07.MMN = Montemor-o-Novo
+country.description.pt.07.MOR = Mora
+country.description.pt.07.MOU = Mourão
+country.description.pt.07.PRL = Portel
+country.description.pt.07.RDD = Redondo
+country.description.pt.07.RMZ = Reguengos de Monsaraz
+country.description.pt.07.VND = Vendas Novas
+country.description.pt.07.VNT = Viana do Alentejo
+country.description.pt.07.VVC = Vila Viçosa
+country.description.pt.08     = Faro
+country.description.pt.08.ABF = Albufeira
+country.description.pt.08.ACT = Alcoutim
+country.description.pt.08.AJZ = Aljezur
+country.description.pt.08.CTM = Castro Marim
+country.description.pt.08.FAR = Faro
+country.description.pt.08.LGA = Lagoa
+country.description.pt.08.LGS = Lagos
+country.description.pt.08.LLE = Loulé
+country.description.pt.08.MCQ = Monchique
+country.description.pt.08.OLH = Olhão
+country.description.pt.08.PTM = Portimão
+country.description.pt.08.SBA = São Brás de Alportel
+country.description.pt.08.SLV = Silves
+country.description.pt.08.TVR = Tavira
+country.description.pt.08.VBP = Vila do Bispo
+country.description.pt.08.VRS = Vila Real de Santo António
+country.description.pt.09     = Guarda
+country.description.pt.09.AGB = Aguiar da Beira
+country.description.pt.09.ALD = Almeida
+country.description.pt.09.CLB = Celorico da Beira
+country.description.pt.09.FCR = Figueira de Castelo Rodrigo
+country.description.pt.09.FAG = Fornos de Algodres
+country.description.pt.09.GVA = Gouveia
+country.description.pt.09.GRD = Guarda
+country.description.pt.09.MTG = Manteigas
+country.description.pt.09.MED = Mêda
+country.description.pt.09.PNH = Pinhel
+country.description.pt.09.SBG = Sabugal
+country.description.pt.09.SEI = Seia
+country.description.pt.09.TCR = Trancoso
+country.description.pt.09.VLF = Vila Nova de Foz Côa
+country.description.pt.10     = Leiria
+country.description.pt.10.ACB = Alcobaça
+country.description.pt.10.AVZ = Alvaiázere
+country.description.pt.10.BTL = Batalha
+country.description.pt.10.BBR = Bombarral
+country.description.pt.10.CLD = Caldas da Rainha
+country.description.pt.10.CPR = Castanheira de Pera
+country.description.pt.10.FVN = Figueiró dos Vinhos
+country.description.pt.10.LRA = Leiria
+country.description.pt.10.MGR = Marinha Grande
+country.description.pt.10.NZR = Nazaré
+country.description.pt.10.OBD = Óbidos
+country.description.pt.10.PGR = Pedrógão Grande
+country.description.pt.10.PNI = Peniche
+country.description.pt.10.PBL = Pombal
+country.description.pt.10.PMS = Porto de Mós
+country.description.pt.11     = Lissabon
+country.description.pt.11.ALQ = Alenquer
+country.description.pt.11.AMD = Amadora
+country.description.pt.11.ARV = Arruda dos Vinhos
+country.description.pt.11.AZB = Azambuja
+country.description.pt.11.CSC = Cascais
+country.description.pt.11.LSB = Lisboa
+country.description.pt.11.LRS = Loures
+country.description.pt.11.LNH = Lourinhã
+country.description.pt.11.MFR = Mafra
+country.description.pt.11.ODV = Odivelas
+country.description.pt.11.OER = Oeiras
+country.description.pt.11.SNT = Sintra
+country.description.pt.11.SMA = Sobral de Monte Agraço
+country.description.pt.11.TVD = Torres Vedras
+country.description.pt.11.VFX = Vila Franca de Xira
+country.description.pt.30     = Madeira
+country.description.pt.30.CLT = Calheta
+country.description.pt.30.CML = Câmara de Lobos
+country.description.pt.30.FNC = Funchal
+country.description.pt.30.MCH = Machico
+country.description.pt.30.PTS = Ponta do Sol
+country.description.pt.30.PMZ = Porto Moniz
+country.description.pt.30.PST = Porto Santo
+country.description.pt.30.RBR = Ribeira Brava
+country.description.pt.30.SCR = Santa Cruz
+country.description.pt.30.STN = Santana
+country.description.pt.30.SVC = São Vicente
+country.description.pt.12     = Portalegre
+country.description.pt.12.ALT = Alter do Chão
+country.description.pt.12.ARR = Arronches
+country.description.pt.12.AVS = Avis
+country.description.pt.12.CMR = Campo Maior
+country.description.pt.12.CVD = Castelo de Vide
+country.description.pt.12.CRT = Crato
+country.description.pt.12.ELV = Elvas
+country.description.pt.12.FTR = Fronteira
+country.description.pt.12.GAV = Gavião
+country.description.pt.12.MRV = Marvão
+country.description.pt.12.MFT = Monforte
+country.description.pt.12.NIS = Nisa
+country.description.pt.12.PSR = Ponte de Sor
+country.description.pt.12.PTG = Portalegre
+country.description.pt.12.SSL = Sousel
+country.description.pt.13     = Porto
+country.description.pt.13.AMT = Amarante
+country.description.pt.13.BAO = Baião
+country.description.pt.13.FLG = Felgueiras
+country.description.pt.13.GDM = Gondomar
+country.description.pt.13.LOU = Lousada
+country.description.pt.13.MAI = Maia
+country.description.pt.13.MCN = Marco de Canaveses
+country.description.pt.13.MTS = Matosinhos
+country.description.pt.13.PFR = Paços de Ferreira
+country.description.pt.13.PRD = Paredes
+country.description.pt.13.PNF = Penafiel
+country.description.pt.13.PRT = Porto
+country.description.pt.13.PVZ = Póvoa de Varzim
+country.description.pt.13.STS = Santo Tirso
+country.description.pt.13.TRF = Trofa
+country.description.pt.13.VLG = Valongo
+country.description.pt.13.VCD = Vila do Conde
+country.description.pt.13.VNG = Vila Nova de Gaia
+country.description.pt.14     = Santarém
+country.description.pt.14.ABT = Abrantes
+country.description.pt.14.ACN = Alcanena
+country.description.pt.14.ALR = Almeirim
+country.description.pt.14.APC = Alpiarça
+country.description.pt.14.BNV = Benavente
+country.description.pt.14.CTX = Cartaxo
+country.description.pt.14.CHM = Chamusca
+country.description.pt.14.CNS = Constância
+country.description.pt.14.CCH = Coruche
+country.description.pt.14.ENT = Entroncamento
+country.description.pt.14.FZZ = Ferreira do Zêzere
+country.description.pt.14.GLG = Golegã
+country.description.pt.14.MAC = Mação
+country.description.pt.14.ORM = Ourém
+country.description.pt.14.RMR = Rio Maior
+country.description.pt.14.SMG = Salvaterra de Magos
+country.description.pt.14.STR = Santarém
+country.description.pt.14.SRD = Sardoal
+country.description.pt.14.TMR = Tomar
+country.description.pt.14.TNV = Torres Novas
+country.description.pt.14.VNB = Vila Nova da Barquinha
+country.description.pt.15     = Setúbal
+country.description.pt.15.ASL = Alcácer do Sal
+country.description.pt.15.ACH = Alcochete
+country.description.pt.15.ALM = Almada
+country.description.pt.15.BRR = Barreiro
+country.description.pt.15.GDL = Grândola
+country.description.pt.15.MTA = Moita
+country.description.pt.15.MTJ = Montijo
+country.description.pt.15.PLM = Palmela
+country.description.pt.15.STC = Santiago do Cacém
+country.description.pt.15.SXL = Seixal
+country.description.pt.15.SSB = Sesimbra
+country.description.pt.15.STB = Setúbal
+country.description.pt.15.SNS = Sines
+country.description.pt.16     = Viana do Castelo
+country.description.pt.16.AVV = Arcos de Valdevez
+country.description.pt.16.CMN = Caminha
+country.description.pt.16.MLG = Melgaço
+country.description.pt.16.MNC = Monção
+country.description.pt.16.PCR = Paredes de Coura
+country.description.pt.16.PTB = Ponte da Barca
+country.description.pt.16.PTL = Ponte de Lima
+country.description.pt.16.VLC = Valença
+country.description.pt.16.VCT = Viana do Castelo
+country.description.pt.16.VNC = Vila Nova de Cerveira
+country.description.pt.17     = Vila Real
+country.description.pt.17.ALJ = Alijó
+country.description.pt.17.BTC = Boticas
+country.description.pt.17.CHV = Chaves
+country.description.pt.17.MSF = Mesão Frio
+country.description.pt.17.MDB = Mondim de Basto
+country.description.pt.17.MTR = Montalegre
+country.description.pt.17.MUR = Murça
+country.description.pt.17.PRG = Peso da Régua
+country.description.pt.17.RPN = Ribeira de Pena
+country.description.pt.17.SBS = Sabrosa
+country.description.pt.17.SMP = Santa Marta de Penaguião
+country.description.pt.17.VPC = Valpaços
+country.description.pt.17.VPA = Vila Pouca de Aguiar
+country.description.pt.17.VRL = Vila Real
+country.description.pt.18     = Viseu
+country.description.pt.18.AMM = Armamar
+country.description.pt.18.CRS = Carregal do Sal
+country.description.pt.18.CDR = Castro Daire
+country.description.pt.18.CNF = Cinfães
+country.description.pt.18.LMG = Lamego
+country.description.pt.18.MGL = Mangualde
+country.description.pt.18.MBR = Moimenta da Beira
+country.description.pt.18.MRT = Mortágua
+country.description.pt.18.NLS = Nelas
+country.description.pt.18.OFR = Oliveira de Frades
+country.description.pt.18.PCT = Penalva do Castelo
+country.description.pt.18.PND = Penedono
+country.description.pt.18.RSD = Resende
+country.description.pt.18.SCD = Santa Comba Dão
+country.description.pt.18.SJP = São João da Pesqueira
+country.description.pt.18.SPS = São Pedro do Sul
+country.description.pt.18.SAT = Sátão
+country.description.pt.18.SRN = Sernancelhe
+country.description.pt.18.TBC = Tabuaço
+country.description.pt.18.TRC = Tarouca
+country.description.pt.18.TND = Tondela
+country.description.pt.18.VNP = Vila Nova de Paiva
+country.description.pt.18.VIS = Viseu
+country.description.pt.18.VZL = Vouzela
 country.description.pw        = Palau
 country.description.py        = Paraguay
 country.description.qa        = Qatar
diff --git a/jollyday-core/src/main/resources/descriptions/country_descriptions_pt.properties b/jollyday-core/src/main/resources/descriptions/country_descriptions_pt.properties
index 67ec9aa64..56611968b 100644
--- a/jollyday-core/src/main/resources/descriptions/country_descriptions_pt.properties
+++ b/jollyday-core/src/main/resources/descriptions/country_descriptions_pt.properties
@@ -1,530 +1,832 @@
-country.description.ad        = Andorra
-country.description.ae        = Emirados Árabes Unidos
-country.description.af        = Afeganistão
-country.description.ag        = Antígua e Barbuda
-country.description.ai        = Anguilha
-country.description.al        = Albânia
-country.description.am        = Arménia
-country.description.an        = Antilhas Neerlandesas
-country.description.ao        = Angola
-country.description.aq        = Antárctica
-country.description.ar        = Argentina
-country.description.as        = Samoa Americana
-country.description.at        = Áustria
-country.description.at.b      = Burgenland
-country.description.at.k      = Kärnten
-country.description.at.la     = Lower Austria
-country.description.at.s      = Salzburg
-country.description.at.st     = Steiermark
-country.description.at.t      = Tirol
-country.description.at.ua     = Upper Austria
-country.description.at.va     = Vorarlberg
-country.description.at.w      = Vienna
-country.description.au        = Austrália
-country.description.au.act    = Território da Capital Australiana
-country.description.au.nsw    = Nova Gales do Sul
-country.description.au.nt     = Território do Norte
-country.description.au.qld    = Queensland
-country.description.au.qld.br = Brisbane Area
-country.description.au.sa     = Austrália Meridional
-country.description.au.tas    = Tasmânia
-country.description.au.tas.ho = Hobard Area
-country.description.au.tas.nh = Non-Hobard Area
-country.description.au.vic    = Vitória
-country.description.au.wa     = Austrália Ocidental
-country.description.aw        = Aruba
-country.description.ax        = Ilhas Aland
-country.description.az        = Azerbaijão
-country.description.ba        = Bósnia e Herzegóvina
-country.description.ba.fbh    = Federação Bósnia e Herzegóvina
-country.description.ba.rs     = República da Sérvia
-country.description.bb        = Barbados
-country.description.bd        = Bangladeche
-country.description.be        = Bélgica
-country.description.bf        = Burquina Fasso
-country.description.bg        = Bulgária
-country.description.bh        = Reino do Barém
-country.description.bi        = Burúndi
-country.description.bj        = República do Benim
-country.description.bm        = Ilhas Bermudas
-country.description.bn        = Brunei
-country.description.bo        = Bolívia
-country.description.br        = Brasil
-country.description.br.go     = Goiás
-country.description.br.mg     = Minas Gerais
-country.description.br.mg.bh  = Belo Horizonte
-country.description.br.ms     = Mato Grosso do Sul
-country.description.br.ms.cg  = Campo Grande
-country.description.br.ms.do  = Dourados
-country.description.br.pb     = Paraíba
-country.description.br.pb.jpa = João Pessoa
-country.description.br.pe     = Pernambuco
-country.description.br.pr     = Parana
-country.description.br.pr.cu  = Curitiba
-country.description.br.rj     = Rio de Janeiro
-country.description.br.rj.crj = City of Rio de Janeiro
-country.description.br.rn     = Rio Grande do Norte
-country.description.br.rn.na  = Natal
-country.description.br.rs     = Rio Grande do Sul
-country.description.br.rs.sm  = Santa Maria
-country.description.br.sp     = Sao Paulo
-country.description.br.sp.csp = City of Sao Paulo
-country.description.bs        = Baamas
-country.description.bt        = Reino do Butão
-country.description.bv        = Ilha Bouvet
-country.description.bw        = Botsuana
-country.description.by        = Bielorrússia
-country.description.bz        = Belize
-country.description.ca        = Canadá
-country.description.ca.ab     = Alberta
-country.description.ca.bc     = Colúmbia Britânica
-country.description.ca.mb     = Manitoba
-country.description.ca.nb     = New Brunswick
-country.description.ca.nl     = Newfoundland and Labrador
-country.description.ca.ns     = Nova Escócia
-country.description.ca.nt     = Northwest Territories
-country.description.ca.nu     = Nunavut
-country.description.ca.on     = Ontário
-country.description.ca.pe     = Ilha do Princípe Eduardo
-country.description.ca.qc     = Quebeque
-country.description.ca.sk     = Saskatchewan
-country.description.ca.yt     = Yukon
-country.description.cc        = Ilhas Cocos (Keeling)
-country.description.cd        = República Democrática do Congo (anterior Zaire)
-country.description.cf        = República Centro-Africana
-country.description.cg        = República do Congo
-country.description.ch        = Suíca
-country.description.ch.ag     = Aargau
-country.description.ch.ai     = Appenzell Innerrhoden
-country.description.ch.ar     = Appenzell Ausserrhoden
-country.description.ch.be     = Berna
-country.description.ch.bl     = Basel-Country
-country.description.ch.bs     = Basel-City
-country.description.ch.fr     = Fribourg
-country.description.ch.ge     = Geneva
-country.description.ch.gl     = Glarus
-country.description.ch.gr     = Graubænden
-country.description.ch.ju     = Jura
-country.description.ch.lu     = Lucerne
-country.description.ch.ne     = Neuchatel
-country.description.ch.nw     = Nidwalden
-country.description.ch.ow     = Obwalden
-country.description.ch.sg     = St.Gallen
-country.description.ch.sh     = Schaffhausen
-country.description.ch.so     = Solothurn
-country.description.ch.sz     = Schwyz
-country.description.ch.tg     = Thurgau
-country.description.ch.ti     = Ticino
-country.description.ch.ur     = Uri
-country.description.ch.vd     = Vaud
-country.description.ch.vs     = Valais
-country.description.ch.zg     = Zug
-country.description.ch.zh     = Zurique
-country.description.ci        = Costa do Marfim
-country.description.ck        = Ilhas Cook
-country.description.cl        = Chile
-country.description.cm        = Camarões
-country.description.cn        = China
-country.description.co        = Colômbia
-country.description.cr        = Costa Rica
-country.description.cu        = Cuba
-country.description.cv        = Cabo Verde
-country.description.cx        = Ilha  do Natal
-country.description.cy        = Chipre
-country.description.cz        = República Checa
-country.description.de        = Alemanha
-country.description.de.be     = Berlin
-country.description.de.bb     = Brandenburgo
-country.description.de.bw     = Baden-Wörtemberg
-country.description.de.by     = Bavária
-country.description.de.by.ag  = Augsburg
-country.description.de.by.in  = Ingolstadt
-country.description.de.by.mu  = Munich
-country.description.de.by.re  = Regensburg
-country.description.de.by.wu  = Würzburg
-country.description.de.hb     = Bremen
-country.description.de.he     = Hesse
-country.description.de.hh     = Hamburgo
-country.description.de.mv     = Mecklenburg-Vorpommern
-country.description.de.ni     = Lower Saxony
-country.description.de.nw     = North Rhine-Westphalia
-country.description.de.rp     = Rhineland-Palatinate
-country.description.de.sh     = Schleswig-Holstein
-country.description.de.sl     = Saarland
-country.description.de.sn     = Saxony
-country.description.de.st     = Saxony-Anhalt
-country.description.de.th     = Thuringia
-country.description.dj        = Jibuti
-country.description.dk        = Dinamarca
-country.description.dm        = Domínica
-country.description.do        = República Dominicana
-country.description.dz        = Algéria
-country.description.ec        = Equador
-country.description.ee        = Estónia
-country.description.eg        = Egipto
-country.description.eh        = Saara Ocidental
-country.description.er        = Eritreia
-country.description.es        = Espanha
-country.description.et        = Etiópia
-country.description.fi        = Finlândia
-country.description.fj        = Fiji
-country.description.fk        = Ilhas Malvinas
-country.description.fm        = Estados federados da Micronésia
-country.description.fo        = Ilhas Faroé
-country.description.fr        = França
-country.description.fr.br     = Bas-Rhin
-country.description.fr.gu     = Guadalupe
-country.description.fr.gy     = Guiana Francesa
-country.description.fr.hr     = Haut-Rhin
-country.description.fr.lr     = Reunião
-country.description.fr.ma     = Martinica
-country.description.fr.mo     = Moselle
-country.description.ga        = Gabão
-country.description.gb        = Reino Unido da Grâ-Bretanha
-country.description.gb.eng    = Inglaterra
-country.description.gb.nir    = Irlanda do Norte
-country.description.gb.sct    = Escócia
-country.description.gb.wls    = Gales
-country.description.gd        = Granada
-country.description.ge        = Geórgia
-country.description.gf        = Guiana Francesa
-country.description.gg        = Guernsey
-country.description.gh        = Gana
-country.description.gi        = Gibraltar
-country.description.gl        = Gronelândia
-country.description.gm        = Gâmbia
-country.description.gn        = Guiné
-country.description.gp        = Guadalupe
-country.description.gq        = Guiné Equatorial
-country.description.gr        = Grécia
-country.description.gs        = Ilhas Geórgia do Sul e Sanduíche do Sul
-country.description.gt        = Guatemala
-country.description.gu        = Guão
-country.description.gw        = Guiné-Bissau
-country.description.gy        = Guiana
-country.description.hk        = Honguecongue
-country.description.hm        = Ilhas Heard e Ilhas McDonald
-country.description.hn        = Honduras
-country.description.hr        = Croácia
-country.description.ht        = Haiti
-country.description.hu        = Hungria
-country.description.id        = Indonésia
-country.description.ie        = Irlanda
-country.description.il        = Israel
-country.description.im        = Ilha de Man
-country.description.in        = Índia
-country.description.in.an     = Andaman and Nicobar Islands
-country.description.in.ap     = Andhra Pradesh
-country.description.in.ar     = Arunachal Pradesh
-country.description.in.as     = Assam
-country.description.in.br     = Bihar
-country.description.in.ch     = Chandigarh
-country.description.in.ct     = Chhattisgarh
-country.description.in.dh     = Dadra and Nagar Haveli and Daman and Diu
-country.description.in.dl     = Déli
-country.description.in.ga     = Goa
-country.description.in.gj     = Gujarat
-country.description.in.hp     = Himachal Pradesh
-country.description.in.hr     = Haryana
-country.description.in.jh     = Jharkhand
-country.description.in.jk     = Jammu and Kashmir
-country.description.in.ka     = Karnataka
-country.description.in.kl     = Kerala
-country.description.in.ld     = Lakshadweep
-country.description.in.mh     = Maharashtra
-country.description.in.ml     = Meghalaya
-country.description.in.mn     = Manipur
-country.description.in.mp     = Madhya Pradesh
-country.description.in.mz     = Mizoram
-country.description.in.nl     = Nagaland
-country.description.in.or     = Orissa
-country.description.in.pb     = Punjab
-country.description.in.py     = Puducherry
-country.description.in.rj     = Rajasthan
-country.description.in.sk     = Sikkim
-country.description.in.tn     = Tamil Nadu
-country.description.in.tr     = Tripura
-country.description.in.up     = Uttar Pradesh
-country.description.in.ut     = Uttarakhand
-country.description.in.wb     = West Bengal
-country.description.io        = Território Britânico do Oceano Índico
-country.description.iq        = Iraque
-country.description.ir        = Irão
-country.description.is        = Islândia
-country.description.it        = Itália
-country.description.it.bz     = Tirol do Sul
-country.description.je        = Jérsia
-country.description.jm        = Jamaica
-country.description.jo        = Jordânia
-country.description.jp        = Japão
-country.description.ke        = Quénia
-country.description.kg        = Quirguizistão
-country.description.kh        = Camboja
-country.description.ki        = Kiribati
-country.description.km        = Comores
-country.description.kn        = São Cristóvão e Neves
-country.description.kp        = Coreia do Norte
-country.description.kr        = Coreia do Sul
-country.description.kw        = Cuaite
-country.description.ky        = Ilhas Caimão
-country.description.kz        = Cazaquistão
-country.description.la        = Laos
-country.description.lb        = Líbano
-country.description.lc        = Santa Lúcia
-country.description.li        = Listenstaine
-country.description.lk        = Sri Lanca
-country.description.lr        = Libéria
-country.description.ls        = Lesoto
-country.description.lt        = Lituânia
-country.description.lu        = Luxemburgo
-country.description.lu.clu    = City of Luxembourg
-country.description.lv        = Letónia
-country.description.ly        = Líbia
-country.description.ma        = Marrocos
-country.description.mc        = Mónaco
-country.description.md        = Moldávia
-country.description.md.ba     = Balti
-country.description.md.cu     = Quichinau
-country.description.me        = Montenegro
-country.description.mg        = Madagáscar
-country.description.mh        = Ilhas Marshall
-country.description.mk        = Macedónia do Norte
-country.description.ml        = Mali
-country.description.mm        = Mianmar
-country.description.mn        = Mongólia
-country.description.mo        = Macau
-country.description.mp        = Ilhas Marianas do Norte
-country.description.mq        = Martinica
-country.description.mr        = Mauritânia
-country.description.ms        = Monserrate
-country.description.mt        = Malta
-country.description.mu        = Maurícias
-country.description.mv        = Maldivas
-country.description.mw        = Maláui
-country.description.mx        = México
-country.description.mx.pue    = Puebla
-country.description.my        = Malásia
-country.description.mz        = Moçambique
-country.description.na        = Namíbia
-country.description.nc        = Nova Caledónia
-country.description.ne        = Níger
-country.description.nf        = Ilha Norfolk
-country.description.ng        = Nigéria
-country.description.ng.lag    = Lagos
-country.description.ni        = Nicarágua
-country.description.ni.bo     = Boaco
-country.description.ni.mn     = Managua
-country.description.ni.mo     = Moyogalpa
-country.description.ni.na     = Nandaime
-country.description.ni.ni     = Niquinohomo
-country.description.ni.om     = Ometepe
-country.description.ni.so     = Somoto
-country.description.nl        = Países Baixos
-country.description.no        = Noruega
-country.description.np        = Nepal
-country.description.nr        = Nauru
-country.description.nu        = Niue
-country.description.nz        = Nova Zelândia
-country.description.om        = Omã
-country.description.pa        = Panamá
-country.description.pe        = Peru
-country.description.pf        = Polinésia Francesa
-country.description.pg        = Papua Nova Guiné
-country.description.ph        = Filipinas
-country.description.pk        = Paquistão
-country.description.pl        = Polónia
-country.description.pm        = São Pedro e Miquelão
-country.description.pn        = Ilhas Pitcairn
-country.description.pr        = Porto Rico
-country.description.ps        = Terrítórios Ocupados Palestinianos
-country.description.pt        = Portugal
-country.description.pt.abf    = Albufeira
-country.description.pt.abt    = Abrantes
-country.description.pt.acb    = Alcobaça
-country.description.pt.ach    = Alcochete
-country.description.pt.acn    = Alcanena
-country.description.pt.act    = Alcoutim
-country.description.pt.adl    = Alandroal
-country.description.pt.adv    = Almodôvar
-country.description.pt.afe    = Alfândega da Fé
-country.description.pt.agb    = Aguiar da Beira
-country.description.pt.agd    = Águeda
-country.description.pt.agh    = Angra do Heroísmo
-country.description.pt.agn    = Arganil
-country.description.pt.ajt    = Aljustrel
-country.description.pt.ajz    = Aljezur
-country.description.pt.alb    = Albergaria-a-Velha
-country.description.pt.ald    = Almeida
-country.description.pt.alj    = Alijó
-country.description.pt.alm    = Almada
-country.description.pt.alq    = Alenquer
-country.description.pt.alr    = Almeirim
-country.description.pt.alt    = Alter do Chão
-country.description.pt.amd    = Amadora
-country.description.pt.amm    = Armamar
-country.description.pt.amr    = Amares
-country.description.pt.amt    = Amarante
-country.description.pt.and    = Anadia
-country.description.pt.ans    = Ansião
-country.description.pt.apc    = Alpiarça
-country.description.pt.arc    = Arouca
-country.description.pt.arl    = Arraiolos
-country.description.pt.arr    = Arronches
-country.description.pt.arv    = Arruda dos Vinhos
-country.description.pt.asl    = Alcácer do Sal
-country.description.pt.avr    = Aveiro
-country.description.pt.avs    = Avis
-country.description.pt.avt    = Alvito
-country.description.pt.avv    = Arcos de Valdevez
-country.description.pt.avz    = Alvaiázere
-country.description.pt.azb    = Azambuja
-country.description.pt.bao    = Baião
-country.description.pt.bbr    = Bombarral
-country.description.pt.bcl    = Barcelos
-country.description.pt.bgc    = Bragança
-country.description.pt.bja    = Beja
-country.description.pt.bmt    = Belmonte
-country.description.pt.bnv    = Benavente
-country.description.pt.brb    = Borba
-country.description.pt.brc    = Barrancos
-country.description.pt.brg    = Braga
-country.description.pt.brr    = Barreiro
-country.description.pt.btc    = Boticas
-country.description.pt.btl    = Batalha
-country.description.pt.cbc    = Cabeceiras de Basto
-country.description.pt.cdv    = Cadaval
-country.description.pt.cht    = Calheta (Açores)
-country.description.pt.cld    = Caldas da Rainha
-country.description.pt.clt    = Calheta (Madeira)
-country.description.pt.cml    = Câmara de Lobos
-country.description.pt.cmn    = Caminha
-country.description.pt.cmr    = Campo Maior
-country.description.pt.cnt    = Cantanhede
-country.description.pt.cpr    = Castanheira de Pera
-country.description.pt.crs    = Carregal do Sal
-country.description.pt.crz    = Carrazeda de Ansiães
-country.description.pt.csc    = Cascais
-country.description.pt.ctb    = Castelo Branco
-country.description.pt.ctx    = Cartaxo
-country.description.pw        = Palau
-country.description.py        = Paraguai
-country.description.qa        = Catar
-country.description.re        = Reunião
-country.description.ro        = Roménia
-country.description.rs        = Sérvia e Montenegro
-country.description.ru        = Federação Russa
-country.description.rw        = Ruanda
-country.description.sa        = Arábia Saudita
-country.description.sb        = Ilhas Salomão
-country.description.sc        = Seicheles
-country.description.sd        = Sudão
-country.description.se        = Suécia
-country.description.sg        = Singapura
-country.description.sh        = Santa Helena
-country.description.si        = Eslovénia
-country.description.sj        = Esvalbarda e Ilhas Jan Mayen
-country.description.sk        = Eslováquia
-country.description.sl        = Serra Leoa
-country.description.sm        = São Marino
-country.description.sn        = Senegal
-country.description.so        = Somália
-country.description.sr        = Surinão
-country.description.ss        = South Sudan
-country.description.st        = São Tomé e Príncipe
-country.description.sv        = Salvador
-country.description.sx        = Saint Martin (Dutch part)
-country.description.sy        = Síria
-country.description.sz        = Suazilândia
-country.description.target    = Trans-European Automated Real-time Gross settlement Express Transfer system closing dates
-country.description.tc        = Ilhas Turcas e Caicos
-country.description.td        = Chade
-country.description.tf        = French Southern Territories
-country.description.tg        = Togo
-country.description.th        = Tailândia
-country.description.tj        = Tajiquistão
-country.description.tk        = Toquelau
-country.description.tl        = Timor-Leste
-country.description.tm        = Turquemenistão
-country.description.tn        = Tunísia
-country.description.to        = Tonga
-country.description.tr        = Turquia
-country.description.tt        = Trinidade e Tobago
-country.description.tv        = Tuvalu
-country.description.tw        = Formosa
-country.description.tz        = Tanzânia
-country.description.ua        = Ucrânia
-country.description.ug        = Uganda
-country.description.um        = United States Minor Outlying Islands
-country.description.us        = Estados Unidos da América
-country.description.us.ak     = Alaska
-country.description.us.al     = Alabama
-country.description.us.ar     = Arkansas
-country.description.us.az     = Arizona
-country.description.us.be     = Berkeley
-country.description.us.ca     = Califórnia
-country.description.us.co     = Colorado
-country.description.us.ct     = Connecticut
-country.description.us.dc     = Distrito da Colúmbia
-country.description.us.de     = Delaware
-country.description.us.fl     = Flórida
-country.description.us.ga     = Georgia
-country.description.us.hi     = Hawaii
-country.description.us.ia     = Iowa
-country.description.us.id     = Idaho
-country.description.us.il     = Illinois
-country.description.us.in     = Indiana
-country.description.us.ks     = Kansas
-country.description.us.ky     = Kentucky
-country.description.us.la     = Louisiana
-country.description.us.ma     = Massachusetts
-country.description.us.md     = Maryland
-country.description.us.me     = Maine
-country.description.us.mi     = Michigan
-country.description.us.mn     = Minnesota
-country.description.us.mo     = Missouri
-country.description.us.ms     = Mississippi
-country.description.us.mt     = Montana
-country.description.us.nc     = North Carolina
-country.description.us.nc.ce  = Charlotte
-country.description.us.nc.me  = Mecklenburg
-country.description.us.nd     = North Dakota
-country.description.us.ne     = Nebraska
-country.description.us.nh     = New Hampshire
-country.description.us.nj     = New Jersey
-country.description.us.nm     = New Mexico
-country.description.us.nv     = Nevada
-country.description.us.ny     = New York
-country.description.us.ny.nyc = New York City
-country.description.us.oh     = Ohio
-country.description.us.ok     = Oklahoma
-country.description.us.or     = Oregon
-country.description.us.pa     = Pennsylvania
-country.description.us.ri     = Rhode Island
-country.description.us.sc     = South Carolina
-country.description.us.sd     = South Dakota
-country.description.us.tn     = Tennesee
-country.description.us.tx     = Texas
-country.description.us.ut     = Utah
-country.description.us.va     = Virginia
-country.description.us.vt     = Vermont
-country.description.us.wa     = Washington
-country.description.us.wi     = Wisconsin
-country.description.us.wv     = West Virginia
-country.description.us.wy     = Wyoming
-country.description.uy        = Uruguai
-country.description.uz        = Usbequistão
-country.description.va        = Cidade do Vaticano
-country.description.vc        = São Vicente e Granadinas
-country.description.ve        = Venezuela
-country.description.vg        = Ilhas Virgens Britânicas
-country.description.vi        = Ilhas Virgens Americanas
-country.description.vn        = Vietname
-country.description.vu        = Vanuatu
-country.description.wf        = Wallis e Futuna
-country.description.ws        = Samoa
-country.description.ye        = Iémen
-country.description.xk        = kosovo
-country.description.yt        = Maiote
-country.description.za        = África do Sul
-country.description.zm        = Zâmbia
-country.description.zw        = Zimbabué
+country.description.ad           = Andorra
+country.description.ae           = Emirados Árabes Unidos
+country.description.af           = Afeganistão
+country.description.ag           = Antígua e Barbuda
+country.description.ai           = Anguilha
+country.description.al           = Albânia
+country.description.am           = Arménia
+country.description.an           = Antilhas Neerlandesas
+country.description.ao           = Angola
+country.description.aq           = Antárctica
+country.description.ar           = Argentina
+country.description.as           = Samoa Americana
+country.description.at           = Áustria
+country.description.at.1         = Burgenland
+country.description.at.2         = Kärnten
+country.description.at.3         = Lower Austria
+country.description.at.5         = Salzburg
+country.description.at.6         = Steiermark
+country.description.at.7         = Tirol
+country.description.at.4         = Upper Austria
+country.description.at.8         = Vorarlberg
+country.description.at.9         = Vienna
+country.description.au           = Austrália
+country.description.au.act       = Território da Capital Australiana
+country.description.au.nsw       = Nova Gales do Sul
+country.description.au.nt        = Território do Norte
+country.description.au.qld       = Queensland
+country.description.au.qld.br    = Brisbane Area
+country.description.au.sa        = Austrália Meridional
+country.description.au.tas       = Tasmânia
+country.description.au.tas.ho    = Hobard Area
+country.description.au.tas.nh    = Non-Hobard Area
+country.description.au.vic       = Vitória
+country.description.au.wa        = Austrália Ocidental
+country.description.aw           = Aruba
+country.description.ax           = Ilhas Aland
+country.description.az           = Azerbaijão
+country.description.ba           = Bósnia e Herzegóvina
+country.description.ba.bih       = Federação Bósnia e Herzegóvina
+country.description.ba.srp       = República da Sérvia
+country.description.bb           = Barbados
+country.description.bd           = Bangladeche
+country.description.be           = Bélgica
+country.description.bf           = Burquina Fasso
+country.description.bg           = Bulgária
+country.description.bh           = Reino do Barém
+country.description.bi           = Burúndi
+country.description.bj           = República do Benim
+country.description.bm           = Ilhas Bermudas
+country.description.bn           = Brunei
+country.description.bo           = Bolívia
+country.description.br           = Brasil
+country.description.br.go        = Goiás
+country.description.br.mg        = Minas Gerais
+country.description.br.mg.bh     = Belo Horizonte
+country.description.br.ms        = Mato Grosso do Sul
+country.description.br.ms.cg     = Campo Grande
+country.description.br.ms.do     = Dourados
+country.description.br.pb        = Paraíba
+country.description.br.pb.jpa    = João Pessoa
+country.description.br.pe        = Pernambuco
+country.description.br.pr        = Parana
+country.description.br.pr.cu     = Curitiba
+country.description.br.rj        = Rio de Janeiro
+country.description.br.rj.crj    = City of Rio de Janeiro
+country.description.br.rn        = Rio Grande do Norte
+country.description.br.rn.na     = Natal
+country.description.br.rs        = Rio Grande do Sul
+country.description.br.rs.sm     = Santa Maria
+country.description.br.sp        = Sao Paulo
+country.description.br.sp.csp    = City of Sao Paulo
+country.description.bs           = Baamas
+country.description.bt           = Reino do Butão
+country.description.bv           = Ilha Bouvet
+country.description.bw           = Botsuana
+country.description.by           = Bielorrússia
+country.description.bz           = Belize
+country.description.ca           = Canadá
+country.description.ca.ab        = Alberta
+country.description.ca.bc        = Colúmbia Britânica
+country.description.ca.mb        = Manitoba
+country.description.ca.nb        = New Brunswick
+country.description.ca.nl        = Newfoundland and Labrador
+country.description.ca.ns        = Nova Escócia
+country.description.ca.nt        = Northwest Territories
+country.description.ca.nu        = Nunavut
+country.description.ca.on        = Ontário
+country.description.ca.pe        = Ilha do Princípe Eduardo
+country.description.ca.qc        = Quebeque
+country.description.ca.sk        = Saskatchewan
+country.description.ca.yt        = Yukon
+country.description.cc           = Ilhas Cocos (Keeling)
+country.description.cd           = República Democrática do Congo (anterior Zaire)
+country.description.cf           = República Centro-Africana
+country.description.cg           = República do Congo
+country.description.ch           = Suíca
+country.description.ch.ag        = Aargau
+country.description.ch.ai        = Appenzell Innerrhoden
+country.description.ch.ar        = Appenzell Ausserrhoden
+country.description.ch.be        = Berna
+country.description.ch.bl        = Basel-Country
+country.description.ch.bs        = Basel-City
+country.description.ch.fr        = Fribourg
+country.description.ch.ge        = Geneva
+country.description.ch.gl        = Glarus
+country.description.ch.gr        = Graubænden
+country.description.ch.ju        = Jura
+country.description.ch.lu        = Lucerne
+country.description.ch.ne        = Neuchatel
+country.description.ch.nw        = Nidwalden
+country.description.ch.ow        = Obwalden
+country.description.ch.sg        = St.Gallen
+country.description.ch.sh        = Schaffhausen
+country.description.ch.so        = Solothurn
+country.description.ch.sz        = Schwyz
+country.description.ch.tg        = Thurgau
+country.description.ch.ti        = Ticino
+country.description.ch.ur        = Uri
+country.description.ch.vd        = Vaud
+country.description.ch.vs        = Valais
+country.description.ch.zg        = Zug
+country.description.ch.zh        = Zurique
+country.description.ci           = Costa do Marfim
+country.description.ck           = Ilhas Cook
+country.description.cl           = Chile
+country.description.cm           = Camarões
+country.description.cn           = China
+country.description.co           = Colômbia
+country.description.cr           = Costa Rica
+country.description.cu           = Cuba
+country.description.cv           = Cabo Verde
+country.description.cx           = Ilha  do Natal
+country.description.cy           = Chipre
+country.description.cz           = República Checa
+country.description.de           = Alemanha
+country.description.de.be        = Berlin
+country.description.de.bb        = Brandenburgo
+country.description.de.bw        = Baden-Wörtemberg
+country.description.de.by        = Bavária
+country.description.de.by.ag     = Augsburg
+country.description.de.by.in     = Ingolstadt
+country.description.de.by.mu     = Munich
+country.description.de.by.re     = Regensburg
+country.description.de.by.wu     = Würzburg
+country.description.de.hb        = Bremen
+country.description.de.he        = Hesse
+country.description.de.hh        = Hamburgo
+country.description.de.mv        = Mecklenburg-Vorpommern
+country.description.de.ni        = Lower Saxony
+country.description.de.nw        = North Rhine-Westphalia
+country.description.de.rp        = Rhineland-Palatinate
+country.description.de.sh        = Schleswig-Holstein
+country.description.de.sl        = Saarland
+country.description.de.sn        = Saxony
+country.description.de.st        = Saxony-Anhalt
+country.description.de.th        = Thuringia
+country.description.dj           = Jibuti
+country.description.dk           = Dinamarca
+country.description.dm           = Domínica
+country.description.do           = República Dominicana
+country.description.dz           = Algéria
+country.description.ec           = Equador
+country.description.ee           = Estónia
+country.description.eg           = Egipto
+country.description.eh           = Saara Ocidental
+country.description.er           = Eritreia
+country.description.es           = Espanha
+country.description.es.an        = Andaluzia
+country.description.es.ar        = Aragão
+country.description.es.ce        = Ceuta
+country.description.es.ml        = Melilha
+country.description.es.cl        = Castela e Leão
+country.description.es.cm        = Castela - La Mancha
+country.description.es.cn        = Ilhas Canárias
+country.description.es.ct        = Catalunha
+country.description.esb.cn       = Barcelona
+country.description.es.ex        = Extremadura
+country.description.es.ga        = Galiza
+country.description.es.ib        = Ilhas Baleares
+country.description.es.lo        = La Rioja
+country.description.es.md        = Madrid
+country.description.es.md.mad    = Cidade de Madrid
+country.description.es.mc        = Múrcia
+country.description.es.nc        = Navarra
+country.description.es.as        = Astúrias
+country.description.es.pv        = Euskadi
+country.description.es.cb        = Cantabria
+country.description.es.vc        = Valência
+country.description.et           = Etiópia
+country.description.fi           = Finlândia
+country.description.fi.01        = Åland
+country.description.fj           = Fiji
+country.description.fk           = Ilhas Malvinas
+country.description.fm           = Estados federados da Micronésia
+country.description.fo           = Ilhas Faroé
+country.description.fr           = França
+country.description.fr.ges.67    = Bas-Rhin
+country.description.fr.971       = Guadalupe
+country.description.fr.973       = Guiana Francesa
+country.description.fr.ges.68    = Haut-Rhin
+country.description.fr.974       = Reunião
+country.description.fr.972       = Martinica
+country.description.fr.ges.57    = Moselle
+country.description.ga           = Gabão
+country.description.gb           = Reino Unido da Grâ-Bretanha
+country.description.gb.eng       = Inglaterra
+country.description.gb.nir       = Irlanda do Norte
+country.description.gb.sct       = Escócia
+country.description.gb.wls       = Gales
+country.description.gd           = Granada
+country.description.ge           = Geórgia
+country.description.gf           = Guiana Francesa
+country.description.gg           = Guernsey
+country.description.gh           = Gana
+country.description.gi           = Gibraltar
+country.description.gl           = Gronelândia
+country.description.gm           = Gâmbia
+country.description.gn           = Guiné
+country.description.gp           = Guadalupe
+country.description.gq           = Guiné Equatorial
+country.description.gr           = Grécia
+country.description.gs           = Ilhas Geórgia do Sul e Sanduíche do Sul
+country.description.gt           = Guatemala
+country.description.gu           = Guão
+country.description.gw           = Guiné-Bissau
+country.description.gy           = Guiana
+country.description.hk           = Honguecongue
+country.description.hm           = Ilhas Heard e Ilhas McDonald
+country.description.hn           = Honduras
+country.description.hr           = Croácia
+country.description.ht           = Haiti
+country.description.hu           = Hungria
+country.description.id           = Indonésia
+country.description.ie           = Irlanda
+country.description.il           = Israel
+country.description.im           = Ilha de Man
+country.description.in           = Índia
+country.description.in.an        = Andaman and Nicobar Islands
+country.description.in.ap        = Andhra Pradesh
+country.description.in.ar        = Arunachal Pradesh
+country.description.in.as        = Assam
+country.description.in.br        = Bihar
+country.description.in.ch        = Chandigarh
+country.description.in.ct        = Chhattisgarh
+country.description.in.dh        = Dadra and Nagar Haveli and Daman and Diu
+country.description.in.dl        = Déli
+country.description.in.ga        = Goa
+country.description.in.gj        = Gujarat
+country.description.in.hp        = Himachal Pradesh
+country.description.in.hr        = Haryana
+country.description.in.jh        = Jharkhand
+country.description.in.jk        = Jammu and Kashmir
+country.description.in.ka        = Karnataka
+country.description.in.kl        = Kerala
+country.description.in.ld        = Lakshadweep
+country.description.in.mh        = Maharashtra
+country.description.in.ml        = Meghalaya
+country.description.in.mn        = Manipur
+country.description.in.mp        = Madhya Pradesh
+country.description.in.mz        = Mizoram
+country.description.in.nl        = Nagaland
+country.description.in.or        = Orissa
+country.description.in.pb        = Punjab
+country.description.in.py        = Puducherry
+country.description.in.rj        = Rajasthan
+country.description.in.sk        = Sikkim
+country.description.in.tn        = Tamil Nadu
+country.description.in.tr        = Tripura
+country.description.in.up        = Uttar Pradesh
+country.description.in.ut        = Uttarakhand
+country.description.in.wb        = West Bengal
+country.description.io           = Território Britânico do Oceano Índico
+country.description.iq           = Iraque
+country.description.ir           = Irão
+country.description.is           = Islândia
+country.description.it           = Itália
+country.description.it.32        = Tirol do Sul
+country.description.je           = Jérsia
+country.description.jm           = Jamaica
+country.description.jo           = Jordânia
+country.description.jp           = Japão
+country.description.ke           = Quénia
+country.description.kg           = Quirguizistão
+country.description.kh           = Camboja
+country.description.ki           = Kiribati
+country.description.km           = Comores
+country.description.kn           = São Cristóvão e Neves
+country.description.kp           = Coreia do Norte
+country.description.kr           = Coreia do Sul
+country.description.kw           = Cuaite
+country.description.ky           = Ilhas Caimão
+country.description.kz           = Cazaquistão
+country.description.la           = Laos
+country.description.lb           = Líbano
+country.description.lc           = Santa Lúcia
+country.description.li           = Listenstaine
+country.description.lk           = Sri Lanca
+country.description.lr           = Libéria
+country.description.ls           = Lesoto
+country.description.lt           = Lituânia
+country.description.lu           = Luxemburgo
+country.description.lu.lu.clu    = City of Luxembourg
+country.description.lv           = Letónia
+country.description.ly           = Líbia
+country.description.ma           = Marrocos
+country.description.mc           = Mónaco
+country.description.md           = Moldávia
+country.description.md.ba        = Balti
+country.description.me           = Montenegro
+country.description.mg           = Madagáscar
+country.description.mh           = Ilhas Marshall
+country.description.mk           = Macedónia do Norte
+country.description.ml           = Mali
+country.description.mm           = Mianmar
+country.description.mn           = Mongólia
+country.description.mo           = Macau
+country.description.mp           = Ilhas Marianas do Norte
+country.description.mq           = Martinica
+country.description.mr           = Mauritânia
+country.description.ms           = Monserrate
+country.description.mt           = Malta
+country.description.mu           = Maurícias
+country.description.mv           = Maldivas
+country.description.mw           = Maláui
+country.description.mx           = México
+country.description.mx.pue       = Puebla
+country.description.my           = Malásia
+country.description.mz           = Moçambique
+country.description.na           = Namíbia
+country.description.nc           = Nova Caledónia
+country.description.ne           = Níger
+country.description.nf           = Ilha Norfolk
+country.description.ng           = Nigéria
+country.description.ng.la        = Lagos
+country.description.ni           = Nicarágua
+country.description.ni.bo        = Boaco
+country.description.ni.gr        = Granada
+country.description.ni.gr.na     = Nandaime
+country.description.ni.md        = Madriz
+country.description.ni.md.so     = Somoto
+country.description.ni.mn        = Manágua
+country.description.ni.ms        = Masaya
+country.description.ni.ms.ni     = Niquinohomo
+country.description.ni.ri        = Rivas
+country.description.ni.ri.mo     = Moyogalpa
+country.description.ni.ri.om     = Ometepe
+country.description.nl           = Países Baixos
+country.description.no           = Noruega
+country.description.np           = Nepal
+country.description.nr           = Nauru
+country.description.nu           = Niue
+country.description.nz           = Nova Zelândia
+country.description.nz.auk       = Auckland
+country.description.nz.bop       = Baía de Plenty
+country.description.nz.can       = Canterbury
+country.description.nz.cit       = Território das Ilhas Chatham
+country.description.nz.gis       = Gisborne
+country.description.nz.hkb       = Baía de Hawke
+country.description.nz.mbh       = Marlborough
+country.description.nz.mwt       = Manawatu-Wanganui
+country.description.nz.nsn       = Nelson
+country.description.nz.ntl       = Northland
+country.description.nz.ota       = Otago
+country.description.nz.stl       = Southland
+country.description.nz.tas       = Tasmânia
+country.description.nz.tki       = Taranaki
+country.description.nz.wgn       = Wellington
+country.description.nz.wko       = Waikato
+country.description.nz.wtc       = Costa Oeste
+country.description.om           = Omã
+country.description.pa           = Panamá
+country.description.pe           = Peru
+country.description.pf           = Polinésia Francesa
+country.description.pg           = Papua Nova Guiné
+country.description.ph           = Filipinas
+country.description.pk           = Paquistão
+country.description.pl           = Polónia
+country.description.pm           = São Pedro e Miquelão
+country.description.pn           = Ilhas Pitcairn
+country.description.pr           = Porto Rico
+country.description.ps           = Terrítórios Ocupados Palestinianos
+country.description.pt           = Portugal
+country.description.pt.01        = Aveiro
+country.description.pt.01.AGD    = Águeda
+country.description.pt.01.ALB    = Albergaria-a-Velha
+country.description.pt.01.AND    = Anadia
+country.description.pt.01.ARC    = Arouca
+country.description.pt.01.AVR    = Aveiro
+country.description.pt.01.CPV    = Castelo de Paiva
+country.description.pt.01.ESP    = Espinho
+country.description.pt.01.ETR    = Estarreja
+country.description.pt.01.ILH    = Ílhavo
+country.description.pt.01.MLD    = Mealhada
+country.description.pt.01.MRS    = Murtosa
+country.description.pt.01.OAZ    = Oliveira de Azeméis
+country.description.pt.01.VAC    = Vale de Cambra
+country.description.pt.01.VGS    = Vagos
+country.description.pt.01.SVV    = Sever do Vouga
+country.description.pt.01.SJM    = São João da Madeira
+country.description.pt.01.VFR    = Santa Maria da Feira
+country.description.pt.01.OVR    = Ovar
+country.description.pt.01.OBR    = Oliveira do Bairro
+country.description.pt.20        = Azoren
+country.description.pt.20.VFC    = Vila Franca do Campo
+country.description.pt.20.VPT    = Vila do Porto
+country.description.pt.20.VLS    = Velas
+country.description.pt.20.SRQ    = São Roque do Pico
+country.description.pt.20.SCF    = Santa Cruz das Flores
+country.description.pt.20.SCG    = Santa Cruz da Graciosa
+country.description.pt.20.RGR    = Ribeira Grande
+country.description.pt.20.VPV    = Praia da Vitória
+country.description.pt.20.PVC    = Povoação
+country.description.pt.20.PDL    = Ponta Delgada
+country.description.pt.20.NRD    = Nordeste
+country.description.pt.20.MAD    = Madalena
+country.description.pt.20.LGP    = Lajes do Pico
+country.description.pt.20.LGF    = Lajes das Flores
+country.description.pt.20.LAG    = Lagoa (Açores)
+country.description.pt.20.HRT    = Horta
+country.description.pt.20.CRV    = Corvo
+country.description.pt.20.CHT    = Calheta (Açores)
+country.description.pt.20.AGH    = Angra do Heroísmo
+country.description.pt.02        = Beja
+country.description.pt.02.VDG    = Vidigueira
+country.description.pt.02.SRP    = Serpa
+country.description.pt.02.ORQ    = Ourique
+country.description.pt.02.ODM    = Odemira
+country.description.pt.02.MRA    = Moura
+country.description.pt.02.MTL    = Mértola
+country.description.pt.02.FAL    = Ferreira do Alentejo
+country.description.pt.02.CBA    = Cuba
+country.description.pt.02.CVR    = Castro Verde
+country.description.pt.02.BJA    = Beja
+country.description.pt.02.BRC    = Barrancos
+country.description.pt.02.AVT    = Alvito
+country.description.pt.02.ADV    = Almodôvar
+country.description.pt.02.AJT    = Aljustrel
+country.description.pt.03     = Braga
+country.description.pt.03.AMR    = Amares
+country.description.pt.03.ANS    = Ansião
+country.description.pt.03.BCL    = Barcelos
+country.description.pt.03.BRG    = Braga
+country.description.pt.03.BGC    = Bragança
+country.description.pt.03.CBC    = Cabeceiras de Basto
+country.description.pt.03.CDV    = Cadaval
+country.description.pt.03.CBT    = Celorico de Basto
+country.description.pt.03.EPS    = Esposende
+country.description.pt.03.FAF = Fafe
+country.description.pt.03.GMR    = Guimarães
+country.description.pt.03.PVL    = Póvoa de Lanhoso
+country.description.pt.03.TBR    = Terras de Bouro
+country.description.pt.03.VRM    = Vieira do Minho
+country.description.pt.03.VNF    = Vila Nova de Famalicão
+country.description.pt.03.VVD    = Vila Verde
+country.description.pt.03.VIZ    = Vizela
+country.description.pt.04        = Bragança
+country.description.pt.04.AFE    = Alfândega da Fé
+country.description.pt.04.CRZ    = Carrazeda de Ansiães
+country.description.pt.04.FEC    = Freixo de Espada à Cinta
+country.description.pt.04.MCD    = Macedo de Cavaleiros
+country.description.pt.04.MDR    = Miranda do Douro
+country.description.pt.04.MDL    = Mirandela
+country.description.pt.04.MGD    = Mogadouro
+country.description.pt.04.TMC    = Torre de Moncorvo
+country.description.pt.04.VFL    = Vila Flor
+country.description.pt.04.VMS    = Vimioso
+country.description.pt.04.VNH    = Vinhais
+country.description.pt.05        = Castelo Branco
+country.description.pt.05.BMT    = Belmonte
+country.description.pt.05.CTB    = Castelo Branco
+country.description.pt.05.CVL    = Covilhã
+country.description.pt.05.FND    = Fundão
+country.description.pt.05.IDN    = Idanha-a-Nova
+country.description.pt.05.OLR    = Oleiros
+country.description.pt.05.PNC    = Penamacor
+country.description.pt.05.PNV    = Proença-a-Nova
+country.description.pt.05.SRT    = Sertã
+country.description.pt.05.VLR    = Vila de Rei
+country.description.pt.05.VVR    = Vila Velha de Ródão
+country.description.pt.06        = Coimbra
+country.description.pt.06.AGN    = Arganil
+country.description.pt.06.CNT    = Cantanhede
+country.description.pt.06.CBR    = Coimbra
+country.description.pt.06.CDN    = Condeixa-a-Nova
+country.description.pt.06.FIG    = Figueira da Foz
+country.description.pt.06.GOI    = Góis
+country.description.pt.06.LSA    = Lousã
+country.description.pt.06.MIR    = Mira
+country.description.pt.06.MCV    = Miranda do Corvo
+country.description.pt.06.MMV    = Montemor-o-Velho
+country.description.pt.06.OHP    = Oliveira do Hospital
+country.description.pt.06.PPS    = Pampilhosa da Serra
+country.description.pt.06.PCV    = Penacova
+country.description.pt.06.PNL    = Penela
+country.description.pt.06.SRE    = Soure
+country.description.pt.06.TBU    = Tábua
+country.description.pt.06.PRS    = Vila Nova de Poiares
+country.description.pt.07        = Évora
+country.description.pt.07.ADL    = Alandroal
+country.description.pt.07.ARL    = Arraiolos
+country.description.pt.07.BRB    = Borba
+country.description.pt.07.ETZ    = Estremoz
+country.description.pt.07.EVR    = Évora
+country.description.pt.07.MMN    = Montemor-o-Novo
+country.description.pt.07.MOR    = Mora
+country.description.pt.07.MOU    = Mourão
+country.description.pt.07.PRL    = Portel
+country.description.pt.07.RDD    = Redondo
+country.description.pt.07.RMZ    = Reguengos de Monsaraz
+country.description.pt.07.VND    = Vendas Novas
+country.description.pt.07.VNT    = Viana do Alentejo
+country.description.pt.07.VVC    = Vila Viçosa
+country.description.pt.08        = Faro
+country.description.pt.08.ABF    = Albufeira
+country.description.pt.08.ACT    = Alcoutim
+country.description.pt.08.AJZ    = Aljezur
+country.description.pt.08.CTM    = Castro Marim
+country.description.pt.08.FAR    = Faro
+country.description.pt.08.LGA    = Lagoa
+country.description.pt.08.LGS    = Lagos
+country.description.pt.08.LLE    = Loulé
+country.description.pt.08.MCQ    = Monchique
+country.description.pt.08.OLH    = Olhão
+country.description.pt.08.PTM    = Portimão
+country.description.pt.08.SBA    = São Brás de Alportel
+country.description.pt.08.SLV    = Silves
+country.description.pt.08.TVR    = Tavira
+country.description.pt.08.VBP    = Vila do Bispo
+country.description.pt.08.VRS    = Vila Real de Santo António
+country.description.pt.09        = Guarda
+country.description.pt.09.AGB    = Aguiar da Beira
+country.description.pt.09.ALD    = Almeida
+country.description.pt.09.CLB    = Celorico da Beira
+country.description.pt.09.FCR    = Figueira de Castelo Rodrigo
+country.description.pt.09.FAG    = Fornos de Algodres
+country.description.pt.09.GVA    = Gouveia
+country.description.pt.09.GRD    = Guarda
+country.description.pt.09.MTG    = Manteigas
+country.description.pt.09.MED    = Mêda
+country.description.pt.09.PNH    = Pinhel
+country.description.pt.09.SBG    = Sabugal
+country.description.pt.09.SEI    = Seia
+country.description.pt.09.TCR    = Trancoso
+country.description.pt.09.VLF    = Vila Nova de Foz Côa
+country.description.pt.10        = Leiria
+country.description.pt.10.ACB    = Alcobaça
+country.description.pt.10.AVZ    = Alvaiázere
+country.description.pt.10.BTL    = Batalha
+country.description.pt.10.BBR    = Bombarral
+country.description.pt.10.CLD    = Caldas da Rainha
+country.description.pt.10.CPR    = Castanheira de Pera
+country.description.pt.10.FVN    = Figueiró dos Vinhos
+country.description.pt.10.LRA    = Leiria
+country.description.pt.10.MGR    = Marinha Grande
+country.description.pt.10.NZR    = Nazaré
+country.description.pt.10.OBD    = Óbidos
+country.description.pt.10.PGR    = Pedrógão Grande
+country.description.pt.10.PNI    = Peniche
+country.description.pt.10.PBL    = Pombal
+country.description.pt.10.PMS    = Porto de Mós
+country.description.pt.11     = Lissabon
+country.description.pt.11.ALQ    = Alenquer
+country.description.pt.11.AMD    = Amadora
+country.description.pt.11.ARV    = Arruda dos Vinhos
+country.description.pt.11.AZB    = Azambuja
+country.description.pt.11.CSC    = Cascais
+country.description.pt.11.LSB    = Lisboa
+country.description.pt.11.LRS    = Loures
+country.description.pt.11.LNH    = Lourinhã
+country.description.pt.11.MFR    = Mafra
+country.description.pt.11.ODV    = Odivelas
+country.description.pt.11.OER    = Oeiras
+country.description.pt.11.SNT    = Sintra
+country.description.pt.11.SMA    = Sobral de Monte Agraço
+country.description.pt.11.TVD    = Torres Vedras
+country.description.pt.11.VFX    = Vila Franca de Xira
+country.description.pt.30        = Madeira
+country.description.pt.30.CLT    = Calheta
+country.description.pt.30.CML    = Câmara de Lobos
+country.description.pt.30.FNC    = Funchal
+country.description.pt.30.MCH    = Machico
+country.description.pt.30.PTS    = Ponta do Sol
+country.description.pt.30.PMZ    = Porto Moniz
+country.description.pt.30.PST    = Porto Santo
+country.description.pt.30.RBR    = Ribeira Brava
+country.description.pt.30.SCR    = Santa Cruz
+country.description.pt.30.STN    = Santana
+country.description.pt.30.SVC    = São Vicente
+country.description.pt.12        = Portalegre
+country.description.pt.12.ALT    = Alter do Chão
+country.description.pt.12.ARR    = Arronches
+country.description.pt.12.AVS    = Avis
+country.description.pt.12.CMR    = Campo Maior
+country.description.pt.12.CVD    = Castelo de Vide
+country.description.pt.12.CRT    = Crato
+country.description.pt.12.ELV    = Elvas
+country.description.pt.12.FTR    = Fronteira
+country.description.pt.12.GAV    = Gavião
+country.description.pt.12.MRV    = Marvão
+country.description.pt.12.MFT    = Monforte
+country.description.pt.12.NIS    = Nisa
+country.description.pt.12.PSR    = Ponte de Sor
+country.description.pt.12.PTG    = Portalegre
+country.description.pt.12.SSL    = Sousel
+country.description.pt.13        = Porto
+country.description.pt.13.AMT    = Amarante
+country.description.pt.13.BAO    = Baião
+country.description.pt.13.FLG    = Felgueiras
+country.description.pt.13.GDM    = Gondomar
+country.description.pt.13.LOU    = Lousada
+country.description.pt.13.MAI    = Maia
+country.description.pt.13.MCN    = Marco de Canaveses
+country.description.pt.13.MTS    = Matosinhos
+country.description.pt.13.PFR    = Paços de Ferreira
+country.description.pt.13.PRD    = Paredes
+country.description.pt.13.PNF    = Penafiel
+country.description.pt.13.PRT    = Porto
+country.description.pt.13.PVZ    = Póvoa de Varzim
+country.description.pt.13.STS    = Santo Tirso
+country.description.pt.13.TRF    = Trofa
+country.description.pt.13.VLG    = Valongo
+country.description.pt.13.VCD    = Vila do Conde
+country.description.pt.13.VNG    = Vila Nova de Gaia
+country.description.pt.14        = Santarém
+country.description.pt.14.ABT    = Abrantes
+country.description.pt.14.ACN    = Alcanena
+country.description.pt.14.ALR    = Almeirim
+country.description.pt.14.APC    = Alpiarça
+country.description.pt.14.BNV    = Benavente
+country.description.pt.14.CTX    = Cartaxo
+country.description.pt.14.CHM    = Chamusca
+country.description.pt.14.CNS    = Constância
+country.description.pt.14.CCH    = Coruche
+country.description.pt.14.ENT    = Entroncamento
+country.description.pt.14.FZZ    = Ferreira do Zêzere
+country.description.pt.14.GLG    = Golegã
+country.description.pt.14.MAC    = Mação
+country.description.pt.14.ORM    = Ourém
+country.description.pt.14.RMR    = Rio Maior
+country.description.pt.14.SMG    = Salvaterra de Magos
+country.description.pt.14.STR    = Santarém
+country.description.pt.14.SRD    = Sardoal
+country.description.pt.14.TMR    = Tomar
+country.description.pt.14.TNV    = Torres Novas
+country.description.pt.14.VNB    = Vila Nova da Barquinha
+country.description.pt.15        = Setúbal
+country.description.pt.15.ASL    = Alcácer do Sal
+country.description.pt.15.ACH    = Alcochete
+country.description.pt.15.ALM    = Almada
+country.description.pt.15.BRR    = Barreiro
+country.description.pt.15.GDL    = Grândola
+country.description.pt.15.MTA    = Moita
+country.description.pt.15.MTJ    = Montijo
+country.description.pt.15.PLM    = Palmela
+country.description.pt.15.STC    = Santiago do Cacém
+country.description.pt.15.SXL    = Seixal
+country.description.pt.15.SSB    = Sesimbra
+country.description.pt.15.STB    = Setúbal
+country.description.pt.15.SNS    = Sines
+country.description.pt.16        = Viana do Castelo
+country.description.pt.16.AVV    = Arcos de Valdevez
+country.description.pt.16.CMN    = Caminha
+country.description.pt.16.MLG    = Melgaço
+country.description.pt.16.MNC    = Monção
+country.description.pt.16.PCR    = Paredes de Coura
+country.description.pt.16.PTB    = Ponte da Barca
+country.description.pt.16.PTL    = Ponte de Lima
+country.description.pt.16.VLC    = Valença
+country.description.pt.16.VCT    = Viana do Castelo
+country.description.pt.16.VNC    = Vila Nova de Cerveira
+country.description.pt.17        = Vila Real
+country.description.pt.17.ALJ    = Alijó
+country.description.pt.17.BTC    = Boticas
+country.description.pt.17.CHV    = Chaves
+country.description.pt.17.MSF    = Mesão Frio
+country.description.pt.17.MDB    = Mondim de Basto
+country.description.pt.17.MTR    = Montalegre
+country.description.pt.17.MUR    = Murça
+country.description.pt.17.PRG    = Peso da Régua
+country.description.pt.17.RPN    = Ribeira de Pena
+country.description.pt.17.SBS    = Sabrosa
+country.description.pt.17.SMP    = Santa Marta de Penaguião
+country.description.pt.17.VPC    = Valpaços
+country.description.pt.17.VPA    = Vila Pouca de Aguiar
+country.description.pt.17.VRL    = Vila Real
+country.description.pt.18        = Viseu
+country.description.pt.18.AMM    = Armamar
+country.description.pt.18.CRS    = Carregal do Sal
+country.description.pt.18.CDR    = Castro Daire
+country.description.pt.18.CNF    = Cinfães
+country.description.pt.18.LMG    = Lamego
+country.description.pt.18.MGL    = Mangualde
+country.description.pt.18.MBR    = Moimenta da Beira
+country.description.pt.18.MRT    = Mortágua
+country.description.pt.18.NLS    = Nelas
+country.description.pt.18.OFR    = Oliveira de Frades
+country.description.pt.18.PCT    = Penalva do Castelo
+country.description.pt.18.PND    = Penedono
+country.description.pt.18.RSD    = Resende
+country.description.pt.18.SCD    = Santa Comba Dão
+country.description.pt.18.SJP    = São João da Pesqueira
+country.description.pt.18.SPS    = São Pedro do Sul
+country.description.pt.18.SAT    = Sátão
+country.description.pt.18.SRN    = Sernancelhe
+country.description.pt.18.TBC    = Tabuaço
+country.description.pt.18.TRC    = Tarouca
+country.description.pt.18.TND    = Tondela
+country.description.pt.18.VNP    = Vila Nova de Paiva
+country.description.pt.18.VIS    = Viseu
+country.description.pt.18.VZL    = Vouzela
+country.description.pw           = Palau
+country.description.py           = Paraguai
+country.description.qa           = Catar
+country.description.re           = Reunião
+country.description.ro           = Roménia
+country.description.rs           = Sérvia e Montenegro
+country.description.ru           = Federação Russa
+country.description.rw           = Ruanda
+country.description.sa           = Arábia Saudita
+country.description.sb           = Ilhas Salomão
+country.description.sc           = Seicheles
+country.description.sd           = Sudão
+country.description.se           = Suécia
+country.description.sg           = Singapura
+country.description.sh           = Santa Helena
+country.description.si           = Eslovénia
+country.description.sj           = Esvalbarda e Ilhas Jan Mayen
+country.description.sk           = Eslováquia
+country.description.sl           = Serra Leoa
+country.description.sm           = São Marino
+country.description.sn           = Senegal
+country.description.so           = Somália
+country.description.sr           = Surinão
+country.description.ss           = South Sudan
+country.description.st           = São Tomé e Príncipe
+country.description.sv           = Salvador
+country.description.sx           = Saint Martin (Dutch part)
+country.description.sy           = Síria
+country.description.sz           = Suazilândia
+country.description.target       = Trans-European Automated Real-time Gross settlement Express Transfer system closing dates
+country.description.tc           = Ilhas Turcas e Caicos
+country.description.td           = Chade
+country.description.tf           = French Southern Territories
+country.description.tg           = Togo
+country.description.th           = Tailândia
+country.description.tj           = Tajiquistão
+country.description.tk           = Toquelau
+country.description.tl           = Timor-Leste
+country.description.tm           = Turquemenistão
+country.description.tn           = Tunísia
+country.description.to           = Tonga
+country.description.tr           = Turquia
+country.description.tt           = Trinidade e Tobago
+country.description.tv           = Tuvalu
+country.description.tw           = Formosa
+country.description.tz           = Tanzânia
+country.description.ua           = Ucrânia
+country.description.ug           = Uganda
+country.description.um           = United States Minor Outlying Islands
+country.description.us           = Estados Unidos da América
+country.description.us.ak        = Alaska
+country.description.us.al        = Alabama
+country.description.us.ar        = Arkansas
+country.description.us.az        = Arizona
+country.description.us.be        = Berkeley
+country.description.us.ca        = Califórnia
+country.description.us.co        = Colorado
+country.description.us.ct        = Connecticut
+country.description.us.dc        = Distrito da Colúmbia
+country.description.us.de        = Delaware
+country.description.us.fl        = Flórida
+country.description.us.ga        = Georgia
+country.description.us.hi        = Hawaii
+country.description.us.ia        = Iowa
+country.description.us.id        = Idaho
+country.description.us.il        = Illinois
+country.description.us.in        = Indiana
+country.description.us.ks        = Kansas
+country.description.us.ky        = Kentucky
+country.description.us.la        = Louisiana
+country.description.us.ma        = Massachusetts
+country.description.us.md        = Maryland
+country.description.us.me        = Maine
+country.description.us.mi        = Michigan
+country.description.us.mn        = Minnesota
+country.description.us.mo        = Missouri
+country.description.us.ms        = Mississippi
+country.description.us.mt        = Montana
+country.description.us.nc        = North Carolina
+country.description.us.nc.ce     = Charlotte
+country.description.us.nc.me     = Mecklenburg
+country.description.us.nd        = North Dakota
+country.description.us.ne        = Nebraska
+country.description.us.nh        = New Hampshire
+country.description.us.nj        = New Jersey
+country.description.us.nm        = New Mexico
+country.description.us.nv        = Nevada
+country.description.us.ny        = New York
+country.description.us.ny.nyc    = New York City
+country.description.us.oh        = Ohio
+country.description.us.ok        = Oklahoma
+country.description.us.or        = Oregon
+country.description.us.pa        = Pennsylvania
+country.description.us.ri        = Rhode Island
+country.description.us.sc        = South Carolina
+country.description.us.sd        = South Dakota
+country.description.us.tn        = Tennesee
+country.description.us.tx        = Texas
+country.description.us.ut        = Utah
+country.description.us.va        = Virginia
+country.description.us.vt        = Vermont
+country.description.us.wa        = Washington
+country.description.us.wi        = Wisconsin
+country.description.us.wv        = West Virginia
+country.description.us.wy        = Wyoming
+country.description.uy           = Uruguai
+country.description.uz           = Usbequistão
+country.description.va           = Cidade do Vaticano
+country.description.vc           = São Vicente e Granadinas
+country.description.ve           = Venezuela
+country.description.vg           = Ilhas Virgens Britânicas
+country.description.vi           = Ilhas Virgens Americanas
+country.description.vn           = Vietname
+country.description.vu           = Vanuatu
+country.description.wf           = Wallis e Futuna
+country.description.ws           = Samoa
+country.description.ye           = Iémen
+country.description.xk           = kosovo
+country.description.yt           = Maiote
+country.description.za           = África do Sul
+country.description.zm           = Zâmbia
+country.description.zw           = Zimbabué
diff --git a/jollyday-core/src/main/resources/descriptions/country_descriptions_sv.properties b/jollyday-core/src/main/resources/descriptions/country_descriptions_sv.properties
index b1f2f398e..200f92ada 100644
--- a/jollyday-core/src/main/resources/descriptions/country_descriptions_sv.properties
+++ b/jollyday-core/src/main/resources/descriptions/country_descriptions_sv.properties
@@ -11,15 +11,15 @@ country.description.aq        = Antarctica
 country.description.ar        = Argentina
 country.description.as        = American Samoa
 country.description.at        = Austria
-country.description.at.b      = Burgenland
-country.description.at.k      = Kärnten
-country.description.at.la     = Lower Austria
-country.description.at.s      = Salzburg
-country.description.at.st     = Steiermark
-country.description.at.t      = Tirol
-country.description.at.ua     = Upper Austria
-country.description.at.va     = Vorarlberg
-country.description.at.w      = Vienna
+country.description.at.1      = Burgenland
+country.description.at.2      = Kärnten
+country.description.at.3      = Lower Austria
+country.description.at.5      = Salzburg
+country.description.at.6      = Steiermark
+country.description.at.7      = Tirol
+country.description.at.4      = Upper Austria
+country.description.at.8      = Vorarlberg
+country.description.at.9      = Vienna
 country.description.au        = Australia
 country.description.au.act    = Australian Capital Territory
 country.description.au.nsw    = New South Wales
@@ -36,8 +36,8 @@ country.description.aw        = Aruba
 country.description.ax        = Aaland Islands
 country.description.az        = Azerbaijan
 country.description.ba        = Bosnia and Herzegowina
-country.description.ba.fbh    = Federation of Bosnia and Herzegovina
-country.description.ba.rs     = Republic of Srpska
+country.description.ba.bih    = Federation of Bosnia and Herzegovina
+country.description.ba.srp    = Republic of Srpska
 country.description.bb        = Barbados
 country.description.bd        = Bangladesh
 country.description.be        = Belgium
@@ -164,21 +164,43 @@ country.description.ee        = Estonia
 country.description.eg        = Egypt
 country.description.eh        = Western Sahara
 country.description.er        = Eritrea
-country.description.es        = Spain
+country.description.es        = Spanien
+country.description.es.an     = Andalusien
+country.description.es.ar     = Aragonien
+country.description.es.ce     = Ceuta
+country.description.es.ml     = Melilla
+country.description.es.cl     = Kastilien och Leon
+country.description.es.cm     = Kastilien - La Mancha
+country.description.es.cn     = Kanarieöarna
+country.description.es.ct     = Katalonien
+country.description.esb.cn    = Barcelona
+country.description.es.ex     = Extremadura
+country.description.es.ga     = Galicien
+country.description.es.ib     = Balearerna
+country.description.es.lo     = La Rioja
+country.description.es.md     = Madrid
+country.description.es.md.mad = Madrid stad
+country.description.es.mc     = Murcia
+country.description.es.nc     = Navarra
+country.description.es.as     = Asturien
+country.description.es.pv     = Euskadi
+country.description.es.cb     = Kantabrien
+country.description.es.vc     = Valencia
 country.description.et        = Ethiopia
 country.description.fi        = Finland
+country.description.fi.01     = Åland
 country.description.fj        = Fiji
 country.description.fk        = Falkland Islands (Malvinas)
 country.description.fm        = Micronesia, Federated States Of
 country.description.fo        = Faroe Islands
 country.description.fr        = France
-country.description.fr.br     = Bas-Rhin
-country.description.fr.gu     = Guadeloupe
-country.description.fr.gy     = Guyane
-country.description.fr.hr     = Haut-Rhin
-country.description.fr.lr     = La Reunion
-country.description.fr.ma     = Martinique
-country.description.fr.mo     = Moselle
+country.description.fr.ges.67 = Bas-Rhin
+country.description.fr.971    = Guadeloupe
+country.description.fr.973    = Guyane
+country.description.fr.ges.68 = Haut-Rhin
+country.description.fr.974    = La Reunion
+country.description.fr.972    = Martinique
+country.description.fr.ges.57 = Moselle
 country.description.ga        = Gabon
 country.description.gb        = United Kingdom of Great Britain
 country.description.gb.eng    = England
@@ -252,7 +274,7 @@ country.description.iq        = Iraq
 country.description.ir        = Iran (Islamic Republic Of)
 country.description.is        = Iceland
 country.description.it        = Italy
-country.description.it.bz     = South Tyrol
+country.description.it.32     = South Tyrol
 country.description.je        = Jersey
 country.description.jm        = Jamaica
 country.description.jo        = Jordan
@@ -277,14 +299,13 @@ country.description.lr        = Liberia
 country.description.ls        = Lesotho
 country.description.lt        = Lithuania
 country.description.lu        = Luxembourg
-country.description.lu.clu    = City of Luxembourg
+country.description.lu.lu.clu = City of Luxembourg
 country.description.lv        = Latvia
 country.description.ly        = Libyan Arab Jamahiriya
 country.description.ma        = Morocco
 country.description.mc        = Monaco
 country.description.md        = Moldova, Republic Of
 country.description.md.ba     = Balti
-country.description.md.cu     = Chisinau
 country.description.me        = Montenegro
 country.description.mg        = Madagascar
 country.description.mh        = Marshall Islands
@@ -310,21 +331,42 @@ country.description.nc        = New Caledonia
 country.description.ne        = Niger
 country.description.nf        = Norfolk Island
 country.description.ng        = Nigeria
-country.description.ng.lag    = Lagos
+country.description.ng.la     = Lagos
 country.description.ni        = Nicaragua
 country.description.ni.bo     = Boaco
+country.description.ni.gr     = Granada
+country.description.ni.gr.na  = Nandaime
+country.description.ni.md     = Madriz
+country.description.ni.md.so  = Somoto
 country.description.ni.mn     = Managua
-country.description.ni.mo     = Moyogalpa
-country.description.ni.na     = Nandaime
-country.description.ni.ni     = Niquinohomo
-country.description.ni.om     = Ometepe
-country.description.ni.so     = Somoto
+country.description.ni.ms     = Masaya
+country.description.ni.ms.ni  = Niquinohomo
+country.description.ni.ri     = Rivas
+country.description.ni.ri.mo  = Moyogalpa
+country.description.ni.ri.om  = Ometepe
 country.description.nl        = Netherlands
 country.description.no        = Norway
 country.description.np        = Nepal
 country.description.nr        = Nauru
 country.description.nu        = Niue
-country.description.nz        = New Zealand
+country.description.nz        = Nya Zeeland
+country.description.nz.auk    = Auckland
+country.description.nz.bop    = Bay of Plenty
+country.description.nz.can    = Canterbury
+country.description.nz.cit    = Chatham Islands Territory
+country.description.nz.gis    = Gisborne
+country.description.nz.hkb    = Hawke's Bay
+country.description.nz.mbh    = Marlborough
+country.description.nz.mwt    = Manawatu-Wanganui
+country.description.nz.nsn    = Nelson
+country.description.nz.ntl    = Northland
+country.description.nz.ota    = Otago
+country.description.nz.stl    = Southland
+country.description.nz.tas    = Tasmanien
+country.description.nz.tki    = Taranaki
+country.description.nz.wgn    = Wellington
+country.description.nz.wko    = Waikato
+country.description.nz.wtc    = Västkusten
 country.description.om        = Oman
 country.description.pa        = Panama
 country.description.pe        = Peru
@@ -337,75 +379,335 @@ country.description.pm        = Saint Pierre And Miquelon
 country.description.pn        = Pitcairn
 country.description.pr        = Puerto Rico
 country.description.ps        = Palestinian Territory, Occupied
-country.description.pt        = Portugal
-country.description.pt.abf    = Albufeira
-country.description.pt.abt    = Abrantes
-country.description.pt.acb    = Alcobaça
-country.description.pt.ach    = Alcochete
-country.description.pt.acn    = Alcanena
-country.description.pt.act    = Alcoutim
-country.description.pt.adl    = Alandroal
-country.description.pt.adv    = Almodôvar
-country.description.pt.afe    = Alfândega da Fé
-country.description.pt.agb    = Aguiar da Beira
-country.description.pt.agd    = Águeda
-country.description.pt.agh    = Angra do Heroísmo
-country.description.pt.agn    = Arganil
-country.description.pt.ajt    = Aljustrel
-country.description.pt.ajz    = Aljezur
-country.description.pt.alb    = Albergaria-a-Velha
-country.description.pt.ald    = Almeida
-country.description.pt.alj    = Alijó
-country.description.pt.alm    = Almada
-country.description.pt.alq    = Alenquer
-country.description.pt.alr    = Almeirim
-country.description.pt.alt    = Alter do Chão
-country.description.pt.amd    = Amadora
-country.description.pt.amm    = Armamar
-country.description.pt.amr    = Amares
-country.description.pt.amt    = Amarante
-country.description.pt.and    = Anadia
-country.description.pt.ans    = Ansião
-country.description.pt.apc    = Alpiarça
-country.description.pt.arc    = Arouca
-country.description.pt.arl    = Arraiolos
-country.description.pt.arr    = Arronches
-country.description.pt.arv    = Arruda dos Vinhos
-country.description.pt.asl    = Alcácer do Sal
-country.description.pt.avr    = Aveiro
-country.description.pt.avs    = Avis
-country.description.pt.avt    = Alvito
-country.description.pt.avv    = Arcos de Valdevez
-country.description.pt.avz    = Alvaiázere
-country.description.pt.azb    = Azambuja
-country.description.pt.bao    = Baião
-country.description.pt.bbr    = Bombarral
-country.description.pt.bcl    = Barcelos
-country.description.pt.bgc    = Bragança
-country.description.pt.bja    = Beja
-country.description.pt.bmt    = Belmonte
-country.description.pt.bnv    = Benavente
-country.description.pt.brb    = Borba
-country.description.pt.brc    = Barrancos
-country.description.pt.brg    = Braga
-country.description.pt.brr    = Barreiro
-country.description.pt.btc    = Boticas
-country.description.pt.btl    = Batalha
-country.description.pt.cbc    = Cabeceiras de Basto
-country.description.pt.cdv    = Cadaval
-country.description.pt.cht    = Calheta (Açores)
-country.description.pt.cld    = Caldas da Rainha
-country.description.pt.clt    = Calheta (Madeira)
-country.description.pt.cml    = Câmara de Lobos
-country.description.pt.cmn    = Caminha
-country.description.pt.cmr    = Campo Maior
-country.description.pt.cnt    = Cantanhede
-country.description.pt.cpr    = Castanheira de Pera
-country.description.pt.crs    = Carregal do Sal
-country.description.pt.crz    = Carrazeda de Ansiães
-country.description.pt.csc    = Cascais
-country.description.pt.ctb    = Castelo Branco
-country.description.pt.ctx    = Cartaxo
+country.description.pt = Portugal
+country.description.pt.01 = Aveiro
+country.description.pt.01.AGD = Águeda
+country.description.pt.01.ALB = Albergaria-a-Velha
+country.description.pt.01.AND = Anadia
+country.description.pt.01.ARC = Arouca
+country.description.pt.01.AVR = Aveiro
+country.description.pt.01.CPV = Castelo de Paiva
+country.description.pt.01.ESP = Espinho
+country.description.pt.01.ETR = Estarreja
+country.description.pt.01.ILH = Ílhavo
+country.description.pt.01.MLD = Mealhada
+country.description.pt.01.MRS = Murtosa
+country.description.pt.01.OAZ = Oliveira de Azeméis
+country.description.pt.01.VAC = Vale de Cambra
+country.description.pt.01.VGS = Vagos
+country.description.pt.01.SVV = Sever do Vouga
+country.description.pt.01.SJM = São João da Madeira
+country.description.pt.01.VFR = Santa Maria da Feira
+country.description.pt.01.OVR = Ovar
+country.description.pt.01.OBR = Oliveira do Bairro
+country.description.pt.20 = Azoren
+country.description.pt.20.VFC = Vila Franca do Campo
+country.description.pt.20.VPT = Vila do Porto
+country.description.pt.20.VLS = Velas
+country.description.pt.20.SRQ = São Roque do Pico
+country.description.pt.20.SCF = Santa Cruz das Flores
+country.description.pt.20.SCG = Santa Cruz da Graciosa
+country.description.pt.20.RGR = Ribeira Grande
+country.description.pt.20.VPV = Praia da Vitória
+country.description.pt.20.PVC = Povoação
+country.description.pt.20.PDL = Ponta Delgada
+country.description.pt.20.NRD = Nordeste
+country.description.pt.20.MAD = Madalena
+country.description.pt.20.LGP = Lajes do Pico
+country.description.pt.20.LGF = Lajes das Flores
+country.description.pt.20.LAG = Lagoa (Açores)
+country.description.pt.20.HRT = Horta
+country.description.pt.20.CRV = Corvo
+country.description.pt.20.CHT = Calheta (Açores)
+country.description.pt.20.AGH = Angra do Heroísmo
+country.description.pt.02 = Beja
+country.description.pt.02.VDG = Vidigueira
+country.description.pt.02.SRP = Serpa
+country.description.pt.02.ORQ = Ourique
+country.description.pt.02.ODM = Odemira
+country.description.pt.02.MRA = Moura
+country.description.pt.02.MTL = Mértola
+country.description.pt.02.FAL = Ferreira do Alentejo
+country.description.pt.02.CBA = Cuba
+country.description.pt.02.CVR = Castro Verde
+country.description.pt.02.BJA = Beja
+country.description.pt.02.BRC = Barrancos
+country.description.pt.02.AVT = Alvito
+country.description.pt.02.ADV = Almodôvar
+country.description.pt.02.AJT = Aljustrel
+country.description.pt.03 = Braga
+country.description.pt.03.AMR = Amares
+country.description.pt.03.ANS = Ansião
+country.description.pt.03.BCL = Barcelos
+country.description.pt.03.BRG = Braga
+country.description.pt.03.BGC = Bragança
+country.description.pt.03.CBC = Cabeceiras de Basto
+country.description.pt.03.CDV = Cadaval
+country.description.pt.03.CBT = Celorico de Basto
+country.description.pt.03.EPS = Esposende
+country.description.pt.03.FAF = Fafe
+country.description.pt.03.GMR = Guimarães
+country.description.pt.03.PVL = Póvoa de Lanhoso
+country.description.pt.03.TBR = Terras de Bouro
+country.description.pt.03.VRM = Vieira do Minho
+country.description.pt.03.VNF = Vila Nova de Famalicão
+country.description.pt.03.VVD = Vila Verde
+country.description.pt.03.VIZ = Vizela
+country.description.pt.04 = Bragança
+country.description.pt.04.AFE = Alfândega da Fé
+country.description.pt.04.CRZ = Carrazeda de Ansiães
+country.description.pt.04.FEC = Freixo de Espada à Cinta
+country.description.pt.04.MCD = Macedo de Cavaleiros
+country.description.pt.04.MDR = Miranda do Douro
+country.description.pt.04.MDL = Mirandela
+country.description.pt.04.MGD = Mogadouro
+country.description.pt.04.TMC = Torre de Moncorvo
+country.description.pt.04.VFL = Vila Flor
+country.description.pt.04.VMS = Vimioso
+country.description.pt.04.VNH = Vinhais
+country.description.pt.05 = Castelo Branco
+country.description.pt.05.BMT = Belmonte
+country.description.pt.05.CTB = Castelo Branco
+country.description.pt.05.CVL = Covilhã
+country.description.pt.05.FND = Fundão
+country.description.pt.05.IDN = Idanha-a-Nova
+country.description.pt.05.OLR = Oleiros
+country.description.pt.05.PNC = Penamacor
+country.description.pt.05.PNV = Proença-a-Nova
+country.description.pt.05.SRT = Sertã
+country.description.pt.05.VLR = Vila de Rei
+country.description.pt.05.VVR = Vila Velha de Ródão
+country.description.pt.06 = Coimbra
+country.description.pt.06.AGN = Arganil
+country.description.pt.06.CNT = Cantanhede
+country.description.pt.06.CBR = Coimbra
+country.description.pt.06.CDN = Condeixa-a-Nova
+country.description.pt.06.FIG = Figueira da Foz
+country.description.pt.06.GOI = Góis
+country.description.pt.06.LSA = Lousã
+country.description.pt.06.MIR = Mira
+country.description.pt.06.MCV = Miranda do Corvo
+country.description.pt.06.MMV = Montemor-o-Velho
+country.description.pt.06.OHP = Oliveira do Hospital
+country.description.pt.06.PPS = Pampilhosa da Serra
+country.description.pt.06.PCV = Penacova
+country.description.pt.06.PNL = Penela
+country.description.pt.06.SRE = Soure
+country.description.pt.06.TBU = Tábua
+country.description.pt.06.PRS = Vila Nova de Poiares
+country.description.pt.07 = Évora
+country.description.pt.07.ADL = Alandroal
+country.description.pt.07.ARL = Arraiolos
+country.description.pt.07.BRB = Borba
+country.description.pt.07.ETZ = Estremoz
+country.description.pt.07.EVR = Évora
+country.description.pt.07.MMN = Montemor-o-Novo
+country.description.pt.07.MOR = Mora
+country.description.pt.07.MOU = Mourão
+country.description.pt.07.PRL = Portel
+country.description.pt.07.RDD = Redondo
+country.description.pt.07.RMZ = Reguengos de Monsaraz
+country.description.pt.07.VND = Vendas Novas
+country.description.pt.07.VNT = Viana do Alentejo
+country.description.pt.07.VVC = Vila Viçosa
+country.description.pt.08 = Faro
+country.description.pt.08.ABF = Albufeira
+country.description.pt.08.ACT = Alcoutim
+country.description.pt.08.AJZ = Aljezur
+country.description.pt.08.CTM = Castro Marim
+country.description.pt.08.FAR = Faro
+country.description.pt.08.LGA = Lagoa
+country.description.pt.08.LGS = Lagos
+country.description.pt.08.LLE = Loulé
+country.description.pt.08.MCQ = Monchique
+country.description.pt.08.OLH = Olhão
+country.description.pt.08.PTM = Portimão
+country.description.pt.08.SBA = São Brás de Alportel
+country.description.pt.08.SLV = Silves
+country.description.pt.08.TVR = Tavira
+country.description.pt.08.VBP = Vila do Bispo
+country.description.pt.08.VRS = Vila Real de Santo António
+country.description.pt.09 = Guarda
+country.description.pt.09.AGB = Aguiar da Beira
+country.description.pt.09.ALD = Almeida
+country.description.pt.09.CLB = Celorico da Beira
+country.description.pt.09.FCR = Figueira de Castelo Rodrigo
+country.description.pt.09.FAG = Fornos de Algodres
+country.description.pt.09.GVA = Gouveia
+country.description.pt.09.GRD = Guarda
+country.description.pt.09.MTG = Manteigas
+country.description.pt.09.MED = Mêda
+country.description.pt.09.PNH = Pinhel
+country.description.pt.09.SBG = Sabugal
+country.description.pt.09.SEI = Seia
+country.description.pt.09.TCR = Trancoso
+country.description.pt.09.VLF = Vila Nova de Foz Côa
+country.description.pt.10 = Leiria
+country.description.pt.10.ACB = Alcobaça
+country.description.pt.10.AVZ = Alvaiázere
+country.description.pt.10.BTL = Batalha
+country.description.pt.10.BBR = Bombarral
+country.description.pt.10.CLD = Caldas da Rainha
+country.description.pt.10.CPR = Castanheira de Pera
+country.description.pt.10.FVN = Figueiró dos Vinhos
+country.description.pt.10.LRA = Leiria
+country.description.pt.10.MGR = Marinha Grande
+country.description.pt.10.NZR = Nazaré
+country.description.pt.10.OBD = Óbidos
+country.description.pt.10.PGR = Pedrógão Grande
+country.description.pt.10.PNI = Peniche
+country.description.pt.10.PBL = Pombal
+country.description.pt.10.PMS = Porto de Mós
+country.description.pt.11 = Lissabon
+country.description.pt.11.ALQ = Alenquer
+country.description.pt.11.AMD = Amadora
+country.description.pt.11.ARV = Arruda dos Vinhos
+country.description.pt.11.AZB = Azambuja
+country.description.pt.11.CSC = Cascais
+country.description.pt.11.LSB = Lisboa
+country.description.pt.11.LRS = Loures
+country.description.pt.11.LNH = Lourinhã
+country.description.pt.11.MFR = Mafra
+country.description.pt.11.ODV = Odivelas
+country.description.pt.11.OER = Oeiras
+country.description.pt.11.SNT = Sintra
+country.description.pt.11.SMA = Sobral de Monte Agraço
+country.description.pt.11.TVD = Torres Vedras
+country.description.pt.11.VFX = Vila Franca de Xira
+country.description.pt.30 = Madeira
+country.description.pt.30.CLT = Calheta
+country.description.pt.30.CML = Câmara de Lobos
+country.description.pt.30.FNC = Funchal
+country.description.pt.30.MCH = Machico
+country.description.pt.30.PTS = Ponta do Sol
+country.description.pt.30.PMZ = Porto Moniz
+country.description.pt.30.PST = Porto Santo
+country.description.pt.30.RBR = Ribeira Brava
+country.description.pt.30.SCR = Santa Cruz
+country.description.pt.30.STN = Santana
+country.description.pt.30.SVC = São Vicente
+country.description.pt.12 = Portalegre
+country.description.pt.12.ALT = Alter do Chão
+country.description.pt.12.ARR = Arronches
+country.description.pt.12.AVS = Avis
+country.description.pt.12.CMR = Campo Maior
+country.description.pt.12.CVD = Castelo de Vide
+country.description.pt.12.CRT = Crato
+country.description.pt.12.ELV = Elvas
+country.description.pt.12.FTR = Fronteira
+country.description.pt.12.GAV = Gavião
+country.description.pt.12.MRV = Marvão
+country.description.pt.12.MFT = Monforte
+country.description.pt.12.NIS = Nisa
+country.description.pt.12.PSR = Ponte de Sor
+country.description.pt.12.PTG = Portalegre
+country.description.pt.12.SSL = Sousel
+country.description.pt.13 = Porto
+country.description.pt.13.AMT = Amarante
+country.description.pt.13.BAO = Baião
+country.description.pt.13.FLG = Felgueiras
+country.description.pt.13.GDM = Gondomar
+country.description.pt.13.LOU = Lousada
+country.description.pt.13.MAI = Maia
+country.description.pt.13.MCN = Marco de Canaveses
+country.description.pt.13.MTS = Matosinhos
+country.description.pt.13.PFR = Paços de Ferreira
+country.description.pt.13.PRD = Paredes
+country.description.pt.13.PNF = Penafiel
+country.description.pt.13.PRT = Porto
+country.description.pt.13.PVZ = Póvoa de Varzim
+country.description.pt.13.STS = Santo Tirso
+country.description.pt.13.TRF = Trofa
+country.description.pt.13.VLG = Valongo
+country.description.pt.13.VCD = Vila do Conde
+country.description.pt.13.VNG = Vila Nova de Gaia
+country.description.pt.14 = Santarém
+country.description.pt.14.ABT = Abrantes
+country.description.pt.14.ACN = Alcanena
+country.description.pt.14.ALR = Almeirim
+country.description.pt.14.APC = Alpiarça
+country.description.pt.14.BNV = Benavente
+country.description.pt.14.CTX = Cartaxo
+country.description.pt.14.CHM = Chamusca
+country.description.pt.14.CNS = Constância
+country.description.pt.14.CCH = Coruche
+country.description.pt.14.ENT = Entroncamento
+country.description.pt.14.FZZ = Ferreira do Zêzere
+country.description.pt.14.GLG = Golegã
+country.description.pt.14.MAC = Mação
+country.description.pt.14.ORM = Ourém
+country.description.pt.14.RMR = Rio Maior
+country.description.pt.14.SMG = Salvaterra de Magos
+country.description.pt.14.STR = Santarém
+country.description.pt.14.SRD = Sardoal
+country.description.pt.14.TMR = Tomar
+country.description.pt.14.TNV = Torres Novas
+country.description.pt.14.VNB = Vila Nova da Barquinha
+country.description.pt.15 = Setúbal
+country.description.pt.15.ASL = Alcácer do Sal
+country.description.pt.15.ACH = Alcochete
+country.description.pt.15.ALM = Almada
+country.description.pt.15.BRR = Barreiro
+country.description.pt.15.GDL = Grândola
+country.description.pt.15.MTA = Moita
+country.description.pt.15.MTJ = Montijo
+country.description.pt.15.PLM = Palmela
+country.description.pt.15.STC = Santiago do Cacém
+country.description.pt.15.SXL = Seixal
+country.description.pt.15.SSB = Sesimbra
+country.description.pt.15.STB = Setúbal
+country.description.pt.15.SNS = Sines
+country.description.pt.16 = Viana do Castelo
+country.description.pt.16.AVV = Arcos de Valdevez
+country.description.pt.16.CMN = Caminha
+country.description.pt.16.MLG = Melgaço
+country.description.pt.16.MNC = Monção
+country.description.pt.16.PCR = Paredes de Coura
+country.description.pt.16.PTB = Ponte da Barca
+country.description.pt.16.PTL = Ponte de Lima
+country.description.pt.16.VLC = Valença
+country.description.pt.16.VCT = Viana do Castelo
+country.description.pt.16.VNC = Vila Nova de Cerveira
+country.description.pt.17 = Vila Real
+country.description.pt.17.ALJ = Alijó
+country.description.pt.17.BTC = Boticas
+country.description.pt.17.CHV = Chaves
+country.description.pt.17.MSF = Mesão Frio
+country.description.pt.17.MDB = Mondim de Basto
+country.description.pt.17.MTR = Montalegre
+country.description.pt.17.MUR = Murça
+country.description.pt.17.PRG = Peso da Régua
+country.description.pt.17.RPN = Ribeira de Pena
+country.description.pt.17.SBS = Sabrosa
+country.description.pt.17.SMP = Santa Marta de Penaguião
+country.description.pt.17.VPC = Valpaços
+country.description.pt.17.VPA = Vila Pouca de Aguiar
+country.description.pt.17.VRL = Vila Real
+country.description.pt.18 = Viseu
+country.description.pt.18.AMM = Armamar
+country.description.pt.18.CRS = Carregal do Sal
+country.description.pt.18.CDR = Castro Daire
+country.description.pt.18.CNF = Cinfães
+country.description.pt.18.LMG = Lamego
+country.description.pt.18.MGL = Mangualde
+country.description.pt.18.MBR = Moimenta da Beira
+country.description.pt.18.MRT = Mortágua
+country.description.pt.18.NLS = Nelas
+country.description.pt.18.OFR = Oliveira de Frades
+country.description.pt.18.PCT = Penalva do Castelo
+country.description.pt.18.PND = Penedono
+country.description.pt.18.RSD = Resende
+country.description.pt.18.SCD = Santa Comba Dão
+country.description.pt.18.SJP = São João da Pesqueira
+country.description.pt.18.SPS = São Pedro do Sul
+country.description.pt.18.SAT = Sátão
+country.description.pt.18.SRN = Sernancelhe
+country.description.pt.18.TBC = Tabuaço
+country.description.pt.18.TRC = Tarouca
+country.description.pt.18.TND = Tondela
+country.description.pt.18.VNP = Vila Nova de Paiva
+country.description.pt.18.VIS = Viseu
+country.description.pt.18.VZL = Vouzela
 country.description.pw        = Palau
 country.description.py        = Paraguay
 country.description.qa        = Qatar
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..1a31317e8 100644
--- a/jollyday-core/src/main/resources/holidays/Holidays_es.xml
+++ b/jollyday-core/src/main/resources/holidays/Holidays_es.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="JANUARY" day="6" descriptionPropertiesKey="EPIPHANY"/>
@@ -15,6 +16,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 +28,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 +39,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 +48,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 +57,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 +66,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 +75,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 +83,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 +97,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 +108,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 +118,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 +127,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 +136,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 +150,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 +161,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 +170,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 +181,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 +191,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 +208,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..eeada4ab1 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_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..81902f98d 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">
     <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="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>