diff --git a/lib/modules/Calendar.pmod/events/regional b/lib/modules/Calendar.pmod/events/regional
index 6d50baf3ed1f9d7faafb40ca7b3d4ba0d1ba3c42..853685bbfe625f63d5991a929d00cf620e676f51 100644
--- a/lib/modules/Calendar.pmod/events/regional
+++ b/lib/modules/Calendar.pmod/events/regional
@@ -1,6 +1,6 @@
 ### Calendar module
 ### Event definition file
-### $Id: regional,v 1.2 2000/09/02 15:05:34 mirar Exp $
+### $Id: regional,v 1.3 2000/09/02 16:14:01 mirar Exp $
 
 ### ====================================================================================================
 
@@ -42,6 +42,11 @@
 ###	Julian_Easter <offset>
 ###		- Fixed or Easter relative day according to the Julian calendar
 ###
+###	Islamic_Fixed <month> <date>
+###	Jewish_Fixed <month> <date>
+###	Coptic_Fixed <month> <date>
+###		- Fixed dates according to the Islamic, Jewish or Coptic calendar
+###
 ###	Null <arguments ignored>
 ###		- Null event; made to register but not implement events
 ###
@@ -76,1019 +81,1022 @@
 
 # western gregorian calendar events
 
-  Event "new year"                      - "New Year's Day"                 Fixed Jan  1
-  Event "new year 2d"                   - "New Year"                       Fixed Jan  1  2 days
-  Event "new years eve"                 - "New Year's Eve"                 Fixed Dec 31
-  Event "may day"                       - "May Day"                        Fixed May  1
+  Event "new year"                - "New Year's Day"          Fixed Jan  1        
+  Event "new year 2d"             - "New Year"                Fixed Jan  1  2 days
+  Event "new years eve"           - "New Year's Eve"          Fixed Dec 31        
+  Event "may day"                 - "May Day"                 Fixed May  1        
 
-  Event "monday"                        - "Mon"                            Weekday Mon
-  Event "tuesday"                       - "Tue"                            Weekday Tue
-  Event "wednesday"                     - "Wed"                            Weekday Wed
-  Event "thursday"                      - "Thu"                            Weekday Thu
-  Event "friday"                        - "Fri"                            Weekday Fri
-  Event "saturday"                      - "Sat"                            Weekday Sat
-  Event "sunday"                        - "Sun"                            Weekday Sun
+  Event "monday"                  - "Mon"                     Weekday Mon         
+  Event "tuesday"                 - "Tue"                     Weekday Tue         
+  Event "wednesday"               - "Wed"                     Weekday Wed         
+  Event "thursday"                - "Thu"                     Weekday Thu         
+  Event "friday"                  - "Fri"                     Weekday Fri         
+  Event "saturday"                - "Sat"                     Weekday Sat         
+  Event "sunday"                  - "Sun"                     Weekday Sun         
 
 # chinese calendar events
 
-  Event "chinese/new year"              - "Chinese New Year"               Null
+  Event "chinese/new year"        - "Chinese New Year"        Null                
 
 # politic events
 
-  Event "africa"                        - "Africa Day"                     Fixed May 25
-  Event "anzac"                         - "ANZAC Day"                      Fixed Apr 25
-  Event "arab league"                   - "Arab League Day"                Fixed Mar 22
-  Event "armistice"                     - "Armistice Day"                  Fixed Nov 11
-  Event "columbus"                      - "Columbus Day"                   Fixed Oct 12
-  Event "kwanzaa"                       - "Kwanzaa"                        Fixed Dec 26
-  Event "labor"                         - "Labor Day"                      Fixed May  1
-  Event "labor 2"                       - "2nd day of Labor"               Fixed May  2
-  Event "un"                            - "UN Day"                         Fixed Oct 24
-  Event "unity"                         - "Unity Day"                      Fixed Feb 22
+  Event "africa"                  - "Africa Day"              Fixed May 25        
+  Event "anzac"                   - "ANZAC Day"               Fixed Apr 25        
+  Event "arab league"             - "Arab League Day"         Fixed Mar 22        
+  Event "armistice"               - "Armistice Day"           Fixed Nov 11        
+  Event "columbus"                - "Columbus Day"            Fixed Oct 12        
+  Event "kwanzaa"                 - "Kwanzaa"                 Fixed Dec 26        
+  Event "labor"                   - "Labor Day"               Fixed May  1        
+  Event "labor 2"                 - "2nd day of Labor"        Fixed May  2        
+  Event "un"                      - "UN Day"                  Fixed Oct 24        
+  Event "unity"                   - "Unity Day"               Fixed Feb 22        
 
 
 # feast events
 
-  Event "family"                        - "Family Day"                     Fixed Dec 25
-  Event "halloween"                     - "Halloween"                      Fixed Oct 31
-  Event "mardi gras"                    - "Mardi Gras"                     Easter -47
-  Event "mardi gras 2"                  - "Mardi Gras"                     Easter -46
+  Event "family"                  - "Family Day"              Fixed Dec 25        
+  Event "halloween"               - "Halloween"               Fixed Oct 31        
+  Event "mardi gras"              - "Mardi Gras"              Easter -47          
+  Event "mardi gras 2"            - "Mardi Gras"              Easter -46          
 
-  Event "fathers"                       - "Father's Day"                   WDRel Jun Sun 3rd
-  Event "mothers"                       - "Mother's Day"                   WDRel May Sun 2nd
-  Event "womens"                        - "Int. Women's Day"               Fixed Mar  8
+  Event "fathers"                 - "Father's Day"            WDRel Jun Sun 3rd   
+  Event "mothers"                 - "Mother's Day"            WDRel May Sun 2nd   
+  Event "womens"                  - "Int. Women's Day"        Fixed Mar  8        
 
 # astronomical events
 
-  Event "perseid meteor shower"         - "Perseid Meteor Shower"          Fixed Aug 11
+  Event "perseid meteor shower"   - "Perseid Meteor Shower"   Fixed Aug 11        
 
 # ====================================================================================================
 
 # caribbean (political) events
 
 Region "caribbean"
-  Event "caribbean/caricom"             - "CARICOM Day"                    WDRel Jul Mon 1st
-  Event "caribbean/schoelcher"          - "Schoelcher Day"                 Fixed Jul 21
-  Event "caribbean/emancipation"        - "Emancipation Day"               WDRel Aug Mon 1st
+  Event "caribbean/caricom"       - "CARICOM Day"             WDRel Jul Mon 1st
+  Event "caribbean/schoelcher"    - "Schoelcher Day"          Fixed Jul 21     
+  Event "caribbean/emancipation"  - "Emancipation Day"        WDRel Aug Mon 1st
 
 # ====================================================================================================
 
 # western (catholic, protestantic) christian church
 Region "christianity"
-  Event "c/circumcision"                - "Feast of the Circumcision"      Fixed Jan  1
-  Event "c/epiphany"                    - "Epiphany"                       Fixed Jan  6
-  Event "c/candlemas"                   - "Candlemas"                      Fixed Feb  2
-  Event "c/presentation"                - "Presentation"                   Fixed Feb  2
-  Event "c/shrove sunday"               - "Shrove Sunday"                  Easter -49
-  Event "c/rose monday"                 - "Rose Monday"                    Easter -48
-  Event "c/shrove monday"               - "Shrove Monday"                  Easter -48
-  Event "c/fat tuesday"                 - "Fat Tuesday"                    Easter -47
-  Event "c/shrove tuesday"              - "Shrove Tuesday"                 Easter -47
-  Event "c/ash wednesday"               - "Ash wednesday"                  Easter -46
-  Event "c/annunciation"                - "Annunciation"                   Fixed Mar 25
-  Event "c/palm sunday"                 - "Palm Sunday"                    Easter -7
-  Event "c/holy thursday"               - "Holy Thursday"                  Easter -3
-  Event "c/maundy thursday"             - "Maundy Thursday"                Easter -3
-  Event "c/good friday"                 - "Good Friday"                    Easter -2
-  Event "c/holy friday"                 - "Holy Friday"                    Easter -2
-  Event "c/holy saturday"               - "Holy Saturday"                  Easter -1
-  Event "c/easter eve"                  - "Easter Eve"                     Easter -1
-  Event "c/easter"                      - "Easter"                         Easter +0
-  Event "c/easter monday"               - "Easter Monday"                  Easter +1
-  Event "c/rogation sunday"             - "Rogation Sunday"                Easter +35
-  Event "c/ascension"                   - "Ascension"                      Easter +39
-  Event "c/pentecost eve"               - "Pentecost Eve"                  Easter +48
-  Event "c/whitsunday"                  - "Whitsunday"                     Easter +49
-  Event "c/pentecost"                   - "Pentecost"                      Easter +49
-  Event "c/pentecost monday"            - "Pentecost Monday"               Easter +50
-  Event "c/whitmonday"                  - "Whitmonday"                     Easter +50
-  Event "c/trinity"                     - "Trinity"                        Easter +56
-  Event "c/corpus christi"              - "Corpus Christi"                 Easter +60
-  Event "c/transfiguration"             - "Transfiguration"                Fixed Aug  6
-  Event "c/assumption"                  - "Assumption Day"                 Fixed Aug 15
-  Event "c/nativity of mary"            - "Nativity of Mary"               Fixed Sep  8
-  Event "c/all saints"                  - "All Saints Day"                 Fixed Nov  1
-  Event "c/all souls"                   - "All Souls Day"                  Fixed Nov  2
-  Event "c/advent 1"                    - "Advent 1"                       WDRel Dec 24 Sun -4 excl
-  Event "c/immaculate conception"       - "Immaculate Conception"          Fixed Dec  8
-  Event "c/advent 2"                    - "Advent 2"                       WDRel Dec 24 Sun -3 excl
-  Event "c/advent 3"                    - "Advent 3"                       WDRel Dec 24 Sun -2 excl
-  Event "c/advent 4"                    - "Advent 4"                       WDRel Dec 24 Sun -1 excl
-  Event "c/christmas eve"               - "Christmas Eve"                  Fixed Dec 24
-  Event "c/christmas"                   - "Christmas Day"                  Fixed Dec 25
-  Event "c/christmas2d"                 - "Christmas"                      Fixed Dec 25  2 days
-  Event "c/boxing"                      - "Boxing Day"                     Fixed Dec 26
-  Event "c/childermas"                  - "Childermas"                     Fixed Dec 28
-
-  Event "catholic church/baptism of christ"  - "Feast of the Baptism of Christ" Fixed Jan 13
-  Event "catholic church/christ the king"  - "Feast of Christ the King"    WDRel Oct  1 Sun -1
-  Event "catholic church/gaurdian angles"  - "Feast of the Gaurdian Angles" Fixed Oct  2
-  Event "catholic church/transfiguration"  - "Transfiguration"             Fixed Aug  6
-
-  Event "saints/basil"                  - "St. Basil"                      Fixed Jan  1
-  Event "saints/blaise"                 - "St. Blaise"                     Fixed Feb  3
-  Event "saints/cyril & methodius"      - "St Cyril & Methodius"           Fixed Jul  5
-  Event "saints/david"                  - "St. David"                      Fixed Mar  1
-  Event "saints/demetrios"              - "St. Demetrios"                  Fixed Oct 26
-  Event "saints/devote"                 - "St. Devote"                     Fixed Jan 27
-  Event "saints/john the baptist"       - "St. John the Baptist"           Fixed Jun 24
-  Event "saints/joseph"                 - "St. Joseph"                     Fixed Mar 19
-  Event "saints/joseph the worker"      - "St. Joseph the Worker"          Fixed May  1
-  Event "saints/lucy"                   - "St. Lucy"                       Fixed Dec 13
-  Event "saints/mary mother"            - "Mary, Mother of God"            Fixed Jan  1
-  Event "saints/patrick"                - "St. Patrick"                    Fixed Mar 17
-  Event "saints/paul"                   - "St. Paul"                       Fixed Jun 29
-  Event "saints/peter"                  - "St. Peter"                      Fixed Jun 29
-  Event "saints/stephen"                - "St. Stephen"                    Fixed Dec 26
-  Event "saints/valentine"              - "St. Valentine"                  Fixed Feb 14
+  Event "c/circumcision"                    - "Feast of the Circumcision"      Fixed Jan  1            
+  Event "c/epiphany"                        - "Epiphany"                       Fixed Jan  6            
+  Event "c/candlemas"                       - "Candlemas"                      Fixed Feb  2            
+  Event "c/presentation"                    - "Presentation"                   Fixed Feb  2            
+  Event "c/shrove sunday"                   - "Shrove Sunday"                  Easter -49              
+  Event "c/rose monday"                     - "Rose Monday"                    Easter -48              
+  Event "c/shrove monday"                   - "Shrove Monday"                  Easter -48              
+  Event "c/fat tuesday"                     - "Fat Tuesday"                    Easter -47              
+  Event "c/shrove tuesday"                  - "Shrove Tuesday"                 Easter -47              
+  Event "c/ash wednesday"                   - "Ash wednesday"                  Easter -46              
+  Event "c/annunciation"                    - "Annunciation"                   Fixed Mar 25            
+  Event "c/palm sunday"                     - "Palm Sunday"                    Easter -7               
+  Event "c/holy thursday"                   - "Holy Thursday"                  Easter -3               
+  Event "c/maundy thursday"                 - "Maundy Thursday"                Easter -3               
+  Event "c/good friday"                     - "Good Friday"                    Easter -2               
+  Event "c/holy friday"                     - "Holy Friday"                    Easter -2               
+  Event "c/holy saturday"                   - "Holy Saturday"                  Easter -1               
+  Event "c/easter eve"                      - "Easter Eve"                     Easter -1               
+  Event "c/easter"                          - "Easter"                         Easter +0               
+  Event "c/easter monday"                   - "Easter Monday"                  Easter +1               
+  Event "c/rogation sunday"                 - "Rogation Sunday"                Easter +35              
+  Event "c/ascension"                       - "Ascension"                      Easter +39              
+  Event "c/pentecost eve"                   - "Pentecost Eve"                  Easter +48              
+  Event "c/whitsunday"                      - "Whitsunday"                     Easter +49              
+  Event "c/pentecost"                       - "Pentecost"                      Easter +49              
+  Event "c/pentecost monday"                - "Pentecost Monday"               Easter +50              
+  Event "c/whitmonday"                      - "Whitmonday"                     Easter +50              
+  Event "c/trinity"                         - "Trinity"                        Easter +56              
+  Event "c/corpus christi"                  - "Corpus Christi"                 Easter +60              
+  Event "c/transfiguration"                 - "Transfiguration"                Fixed Aug  6            
+  Event "c/assumption"                      - "Assumption Day"                 Fixed Aug 15            
+  Event "c/nativity of mary"                - "Nativity of Mary"               Fixed Sep  8            
+  Event "c/all saints"                      - "All Saints Day"                 Fixed Nov  1            
+  Event "c/all souls"                       - "All Souls Day"                  Fixed Nov  2            
+  Event "c/advent 1"                        - "Advent 1"                       WDRel Dec 24 Sun -4 excl
+  Event "c/immaculate conception"           - "Immaculate Conception"          Fixed Dec  8            
+  Event "c/advent 2"                        - "Advent 2"                       WDRel Dec 24 Sun -3 excl
+  Event "c/advent 3"                        - "Advent 3"                       WDRel Dec 24 Sun -2 excl
+  Event "c/advent 4"                        - "Advent 4"                       WDRel Dec 24 Sun -1 excl
+  Event "c/christmas eve"                   - "Christmas Eve"                  Fixed Dec 24            
+  Event "c/christmas"                       - "Christmas Day"                  Fixed Dec 25            
+  Event "c/christmas2d"                     - "Christmas"                      Fixed Dec 25  2 days    
+  Event "c/boxing"                          - "Boxing Day"                     Fixed Dec 26            
+  Event "c/childermas"                      - "Childermas"                     Fixed Dec 28            
+
+  Event "catholic church/baptism of christ" - "Feast of the Baptism of Christ" Fixed Jan 13            
+  Event "catholic church/christ the king"   - "Feast of Christ the King"       WDRel Oct  1 Sun -1     
+  Event "catholic church/gaurdian angles"   - "Feast of the Gaurdian Angles"   Fixed Oct  2            
+  Event "catholic church/transfiguration"   - "Transfiguration"                Fixed Aug  6            
+
+  Event "saints/basil"                      - "St. Basil"                      Fixed Jan  1            
+  Event "saints/blaise"                     - "St. Blaise"                     Fixed Feb  3            
+  Event "saints/cyril & methodius"          - "St Cyril & Methodius"           Fixed Jul  5            
+  Event "saints/david"                      - "St. David"                      Fixed Mar  1            
+  Event "saints/demetrios"                  - "St. Demetrios"                  Fixed Oct 26            
+  Event "saints/devote"                     - "St. Devote"                     Fixed Jan 27            
+  Event "saints/john the baptist"           - "St. John the Baptist"           Fixed Jun 24            
+  Event "saints/joseph"                     - "St. Joseph"                     Fixed Mar 19            
+  Event "saints/joseph the worker"          - "St. Joseph the Worker"          Fixed May  1            
+  Event "saints/lucy"                       - "St. Lucy"                       Fixed Dec 13            
+  Event "saints/mary mother"                - "Mary, Mother of God"            Fixed Jan  1            
+  Event "saints/patrick"                    - "St. Patrick"                    Fixed Mar 17            
+  Event "saints/paul"                       - "St. Paul"                       Fixed Jun 29            
+  Event "saints/peter"                      - "St. Peter"                      Fixed Jun 29            
+  Event "saints/stephen"                    - "St. Stephen"                    Fixed Dec 26            
+  Event "saints/valentine"                  - "St. Valentine"                  Fixed Feb 14            
 
 # christian orthodox church 
 # almost same as normal christian, but based on the julian calendar
 Region "orthodox"
-  Event "orthodox/christmas eve"        - "Christmas Eve"                  Julian_Fixed Dec 24
-  Event "orthodox/christmas"            - "Christmas Day"                  Julian_Fixed Dec 25
-  Event "orthodox/christmas2d"          - "Christmas"                      Julian_Fixed Dec 25  2 days
-  Event "orthodox/boxing"               - "Boxing Day"                     Julian_Fixed Dec 26
-  Event "orthodox/childermas"           - "Childermas"                     Julian_Fixed Dec 28
-  Event "orthodox/circumcision"         - "Feast of the Circumcision"      Julian_Fixed Jan  1
-  Event "orthodox/new year"             - "Orthodox New Year"              Julian_Fixed Jan  1
-  Event "orthodox/epiphany"             - "Epiphany"                       Julian_Fixed Jan  6
-  Event "orthodox/triodon"              - "Triodon"                        Julian_Easter -70
-  Event "orthodox/presentation"         - "Presentation"                   Julian_Fixed Feb  2
-  Event "orthodox/candlemas"            - "Candlemas"                      Julian_Fixed Feb  2
-  Event "orthodox/meat fare"            - "Meat Fare"                      Julian_Easter -56
-  Event "orthodox/2nd sat. of souls"    - "2nd Sat. of Souls"              Julian_Easter -50
-  Event "orthodox/lent begins"          - "Lent Begins"                    Julian_Easter -48
-  Event "orthodox/saints/theodore"      - "St. Theodore"                   Julian_Easter -43
-  Event "orthodox/orthodoxy"            - "Sunday of Orthodoxy"            Julian_Easter -42
-  Event "orthodox/annunciation"         - "Annunciation"                   Julian_Fixed Mar 25
-  Event "orthodox/lazarus"              - "Saturday of Lazarus"            Julian_Easter -8
-  Event "orthodox/palm sunday"          - "Palm Sunday"                    Julian_Easter -7
-  Event "orthodox/good friday"          - "Good Friday"                    Julian_Easter -2
-  Event "orthodox/holy saturday"        - "Holy Saturday"                  Julian_Easter -1
-  Event "orthodox/easter"               - "Easter"                         Julian_Easter +0
-  Event "orthodox/easter monday"        - "Easter Monday"                  Julian_Easter +1
-  Event "orthodox/ascension"            - "Ascension"                      Julian_Easter +39
-  Event "orthodox/sat. of souls"        - "Sat. of Souls"                  Julian_Easter +48
-  Event "orthodox/sat. of souls"        - "Sat. of Souls"                  Julian_Easter +48
-  Event "orthodox/pentecost"            - "Pentecost"                      Julian_Easter +49
-  Event "orthodox/pentecost monday"     - "Pentecost Monday"               Julian_Easter +50
-  Event "orthodox/all saints"           - "All Saints"                     Julian_Easter +56
-  Event "orthodox/transfiguration"      - "Transfiguration"                Julian_Fixed Aug  6
-  Event "orthodox/assumption"           - "Assumption Day"                 Julian_Fixed Aug 15
-  Event "orthodox/nativity of mary"     - "Nativity of Mary"               Julian_Fixed Sep  8
-  Event "orthodox/immaculate conception"  - "Immaculate Conception"        Julian_Fixed Dec  8
+  Event "orthodox/christmas eve"         - "Christmas Eve"             Julian_Fixed Dec 24        
+  Event "orthodox/christmas"             - "Christmas Day"             Julian_Fixed Dec 25        
+  Event "orthodox/christmas2d"           - "Christmas"                 Julian_Fixed Dec 25  2 days
+  Event "orthodox/boxing"                - "Boxing Day"                Julian_Fixed Dec 26        
+  Event "orthodox/childermas"            - "Childermas"                Julian_Fixed Dec 28        
+  Event "orthodox/circumcision"          - "Feast of the Circumcision" Julian_Fixed Jan  1        
+  Event "orthodox/new year"              - "Orthodox New Year"         Julian_Fixed Jan  1        
+  Event "orthodox/epiphany"              - "Epiphany"                  Julian_Fixed Jan  6        
+  Event "orthodox/triodon"               - "Triodon"                   Julian_Easter -70          
+  Event "orthodox/presentation"          - "Presentation"              Julian_Fixed Feb  2        
+  Event "orthodox/candlemas"             - "Candlemas"                 Julian_Fixed Feb  2        
+  Event "orthodox/meat fare"             - "Meat Fare"                 Julian_Easter -56          
+  Event "orthodox/2nd sat. of souls"     - "2nd Sat. of Souls"         Julian_Easter -50          
+  Event "orthodox/lent begins"           - "Lent Begins"               Julian_Easter -48          
+  Event "orthodox/saints/theodore"       - "St. Theodore"              Julian_Easter -43          
+  Event "orthodox/orthodoxy"             - "Sunday of Orthodoxy"       Julian_Easter -42          
+  Event "orthodox/annunciation"          - "Annunciation"              Julian_Fixed Mar 25        
+  Event "orthodox/lazarus"               - "Saturday of Lazarus"       Julian_Easter -8           
+  Event "orthodox/palm sunday"           - "Palm Sunday"               Julian_Easter -7           
+  Event "orthodox/good friday"           - "Good Friday"               Julian_Easter -2           
+  Event "orthodox/holy saturday"         - "Holy Saturday"             Julian_Easter -1           
+  Event "orthodox/easter"                - "Easter"                    Julian_Easter +0           
+  Event "orthodox/easter monday"         - "Easter Monday"             Julian_Easter +1           
+  Event "orthodox/ascension"             - "Ascension"                 Julian_Easter +39          
+  Event "orthodox/sat. of souls"         - "Sat. of Souls"             Julian_Easter +48          
+  Event "orthodox/sat. of souls"         - "Sat. of Souls"             Julian_Easter +48          
+  Event "orthodox/pentecost"             - "Pentecost"                 Julian_Easter +49          
+  Event "orthodox/pentecost monday"      - "Pentecost Monday"          Julian_Easter +50          
+  Event "orthodox/all saints"            - "All Saints"                Julian_Easter +56          
+  Event "orthodox/transfiguration"       - "Transfiguration"           Julian_Fixed Aug  6        
+  Event "orthodox/assumption"            - "Assumption Day"            Julian_Fixed Aug 15        
+  Event "orthodox/nativity of mary"      - "Nativity of Mary"          Julian_Fixed Sep  8        
+  Event "orthodox/immaculate conception" - "Immaculate Conception"     Julian_Fixed Dec  8        
 
 # Bahai (church?)
 
 Region "bahai"
-  Event "bahai/ascension of abdul-baha"  - "Ascension of 'Abdu'l-Baha"     Fixed Nov 28
-  Event "bahai/ascension of bahaullah"  - "Ascension of Baha'u'llah"       Fixed May 29
-  Event "bahai/birth of bab"            - "Birth of Bab"                   Fixed Oct 20
-  Event "bahai/birth of bahaullah"      - "Birth of Baha'u'llah"           Fixed Nov 12
-  Event "bahai/day of the covenant"     - "Day of the Covenant"            Fixed Nov 27
-  Event "bahai/declaration of bab"      - "Declaration of B�b"             Fixed May 23
-  Event "bahai/festival of ridvan"      - "Festival of Ridv�n"             Fixed Apr 21
-  Event "bahai/martyrdom of bab"        - "Martyrdom of Bab"               Fixed Jul  9
-  Event "bahai/naw-ruz"                 - "Naw-R�z"                        Fixed Mar 21
+  Event "bahai/ascension of abdul-baha" - "Ascension of 'Abdu'l-Baha" Fixed Nov 28
+  Event "bahai/ascension of bahaullah"  - "Ascension of Baha'u'llah"  Fixed May 29
+  Event "bahai/birth of bab"            - "Birth of Bab"              Fixed Oct 20
+  Event "bahai/birth of bahaullah"      - "Birth of Baha'u'llah"      Fixed Nov 12
+  Event "bahai/day of the covenant"     - "Day of the Covenant"       Fixed Nov 27
+  Event "bahai/declaration of bab"      - "Declaration of B�b"        Fixed May 23
+  Event "bahai/festival of ridvan"      - "Festival of Ridv�n"        Fixed Apr 21
+  Event "bahai/martyrdom of bab"        - "Martyrdom of Bab"          Fixed Jul  9
+  Event "bahai/naw-ruz"                 - "Naw-R�z"                   Fixed Mar 21
 
 # anglican church (?)
 Region "anglican church"
-  Event "anglican church/name of jesus"  - "Feast of the Name of Jesus"    Fixed Aug  7
+  Event "anglican church/name of jesus" - "Feast of the Name of Jesus" Fixed Aug  7
+
+# mormonism (?)
+Region "mormonism"
+  Event "mormonism/founding of the mormon church" - "Founding of the Mormon Church" Fixed Apr  6
 
 # ====================================================================================================
 
 # afghanistan
 Region "af"
-  Event "af/afghan new year"   - "Afghan New Year"                Fixed Mar 21
-  Event "af/revolution"        - "Revolution Day"                 Fixed Apr 27
-  Event "af/workers"           - "Workers' Day"                   Fixed May  1
-  Event "af/independence"      - "Independence Day"               Fixed May 27
-  Event "af/mothers"           - "Mother's Day"                   Fixed Jun 14
-  Event "af/childrens"         - "Children's Day"                 Fixed Aug 30
-  Event "af/national assembly"  - "National Assembly Day"         WDRel Sep Wed 2nd
+  Event "af/afghan new year"      - "Afghan New Year"         Fixed Mar 21     
+  Event "af/revolution"           - "Revolution Day"          Fixed Apr 27     
+  Event "af/workers"              - "Workers' Day"            Fixed May  1     
+  Event "af/independence"         - "Independence Day"        Fixed May 27     
+  Event "af/mothers"              - "Mother's Day"            Fixed Jun 14     
+  Event "af/childrens"            - "Children's Day"          Fixed Aug 30     
+  Event "af/national assembly"    - "National Assembly Day"   WDRel Sep Wed 2nd
 
 
 # albania
 Region "al"
-  Add   "new year 2d"                   - # "New Year"                     Fixed Jan  1  2 days
-  Event "al/proclamation of the republic"  - "Proclamation of the Republic Day" Fixed Jan 11
-  Add   "womens"                        - # "Int. Women's Day"             Fixed Mar  8
-  Event "al/army"                  - "Army Day"                       Fixed Jul 10
-  Event "al/independence"          - "Independence Day"               Fixed Nov 28
-  Event "al/liberation"            - "Liberation Day"                 Fixed Nov 29
+  Add   "new year 2d"                     - # "New Year"                         Fixed Jan  1  2 days
+  Event "al/proclamation of the republic" -   "Proclamation of the Republic Day" Fixed Jan 11        
+  Add   "womens"                          - # "Int. Women's Day"                 Fixed Mar  8        
+  Event "al/army"                         -   "Army Day"                         Fixed Jul 10        
+  Event "al/independence"                 -   "Independence Day"                 Fixed Nov 28        
+  Event "al/liberation"                   -   "Liberation Day"                   Fixed Nov 29        
 
 
 # algeria
 Region "dz"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Event "dz/national"              - "National Day"                   Fixed Jun 19
-  Event "dz/independence"          - "Independence Day"               Fixed Jul  3
-  Event "dz/revolution"            - "Revolution Day"                 Fixed Nov  1
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Add   "labor"                   - # "Labor Day"             Fixed May  1
+  Event "dz/national"             -   "National Day"          Fixed Jun 19
+  Event "dz/independence"         -   "Independence Day"      Fixed Jul  3
+  Event "dz/revolution"           -   "Revolution Day"        Fixed Nov  1
 
 
 # american baptist
 Region "american baptist"
-  Event "american baptist/roger williams"  - "Roger Williams Day"          Fixed Feb  5
+  Event "american baptist/roger williams" - "Roger Williams Day" Fixed Feb  5
 
 
 # american samoa
 Region "as"
   Include "us"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "as/flag"           - "Flag Day"                       Fixed Apr 17
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Event "as/flag"                 -   "Flag Day"              Fixed Apr 17
+  Add   "labor"                   - # "Labor Day"             Fixed May  1
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25
 
 
 # andorra
 Region "ad"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "c/epiphany"                    - # "Epiphany"                     Fixed Jan  6
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Event "ad/national feast"        - "National Feast Day"             Fixed Sep  8
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
-  Add   "c/boxing"                      - # "Boxing Day"                   Fixed Dec 26
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Add   "c/epiphany"              - # "Epiphany"              Fixed Jan  6
+  Add   "c/good friday"           - # "Good Friday"           Easter -2   
+  Add   "c/easter monday"         - # "Easter Monday"         Easter +1   
+  Event "ad/national feast"       -   "National Feast Day"    Fixed Sep  8
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25
+  Add   "c/boxing"                - # "Boxing Day"            Fixed Dec 26
 
 
 
 # angola
 Region "ao"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "ao/martyrs"                - "Day of Martyrs of the Colonial Repression" Fixed Jan  4
-  Event "ao/national holiday"       - "National Holiday"               Fixed Feb  4
-  Event "ao/victory"                - "Victory Day"                    Fixed Mar 27
-  Event "ao/youth"                  - "Youth Day"                      Fixed Apr 14
-  Event "ao/workers"                - "Workers' Day"                   Fixed May  1
-  Event "ao/armed forces"           - "Armed Forces Day"               Fixed Aug  1
-  Event "ao/national heros"         - "National Hero's Day"            Fixed Sep 17
-  Event "ao/independence"           - "Independence Day"               Fixed Nov 11
-  Event "ao/pioneers"               - "Pioneers' Day"                  Fixed Dec  1
-  Event "ao/mpla foundation"        - "MPLA Foundation Day"            Fixed Dec 10
-  Add   "family"                        - # "Family Day"                   Fixed Dec 25
+  Add   "new year"                - # "New Year's Day"                            Fixed Jan  1
+  Event "ao/martyrs"              -   "Day of Martyrs of the Colonial Repression" Fixed Jan  4
+  Event "ao/national holiday"     -   "National Holiday"                          Fixed Feb  4
+  Event "ao/victory"              -   "Victory Day"                               Fixed Mar 27
+  Event "ao/youth"                -   "Youth Day"                                 Fixed Apr 14
+  Event "ao/workers"              -   "Workers' Day"                              Fixed May  1
+  Event "ao/armed forces"         -   "Armed Forces Day"                          Fixed Aug  1
+  Event "ao/national heros"       -   "National Hero's Day"                       Fixed Sep 17
+  Event "ao/independence"         -   "Independence Day"                          Fixed Nov 11
+  Event "ao/pioneers"             -   "Pioneers' Day"                             Fixed Dec  1
+  Event "ao/mpla foundation"      -   "MPLA Foundation Day"                       Fixed Dec 10
+  Add   "family"                  - # "Family Day"                                Fixed Dec 25
 
 
 # anguilla
 Region "ai"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Event "ai/anguilla"                   - "Anguilla Day"                   Fixed Jun  1
-  Add   "c/whitmonday"                  - # "Whitmonday"                   Easter +50
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Add   "c/good friday"           - # "Good Friday"           Easter -2   
+  Add   "c/easter monday"         - # "Easter Monday"         Easter +1   
+  Add   "labor"                   - # "Labor Day"             Fixed May  1
+  Event "ai/anguilla"             -   "Anguilla Day"          Fixed Jun  1
+  Add   "c/whitmonday"            - # "Whitmonday"            Easter +50  
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25
 
 
 # antigua and barbuda
 Region "ag"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Add   "c/whitmonday"                  - # "Whitmonday"                   Easter +50
-  Add   "caribbean/caricom"             - # "CARICOM Day"                  WDRel Jul Mon 1st
-  Event "ag/independence"               - "Independence Day"           Fixed Nov  1
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
-  Add   "c/boxing"                      - # "Boxing Day"                   Fixed Dec 26
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1     
+  Add   "c/good friday"           - # "Good Friday"           Easter -2        
+  Add   "c/easter monday"         - # "Easter Monday"         Easter +1        
+  Add   "labor"                   - # "Labor Day"             Fixed May  1     
+  Add   "c/whitmonday"            - # "Whitmonday"            Easter +50       
+  Add   "caribbean/caricom"       - # "CARICOM Day"           WDRel Jul Mon 1st
+  Event "ag/independence"         -   "Independence Day"      Fixed Nov  1     
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25     
+  Add   "c/boxing"                - # "Boxing Day"            Fixed Dec 26     
 
 
 # argentina
 Region "ar"
-  Event "ar/revolution"          h "Revolution Anniversary"         Fixed May 25
-  Event "ar/flag"                h "Flag's Day"                     Fixed Jun 20
-  Add   "labor"                         h # "Labor Day"                    Fixed May  1
-  Event "ar/race"                h "Race's Day"                     Fixed Oct 12
-  Add   "sunday"                        h # "Sun"                          Weekday ---
-  Event "ar/soberanys"           h "Soberany's Day"                 Fixed Jun 10
-  Event "ar/independence"        h "Independence Day"               Fixed Jul  9
-  Add   "new year"                      h # "New Year's Day"               Fixed Jan  1
-  Add   "c/easter"                      h # "Easter"                       Easter +0
-  Event "ar/malvinas"            h "Malvinas Day"                   Fixed Apr  2
-  Event "ar/gral san martin"     h "Gral San Mart�n decease"     Fixed Aug 17
-  Add   "c/immaculate conception"       h # "Immaculate Conception"        Fixed Dec  8
-  Add   "c/good friday"                 h # "Good Friday"                  Easter -2
-  Add   "c/christmas"                   h # "Christmas Day"                Fixed Dec 25
-  Add   "c/epiphany"                    - # "Epiphany"                     Fixed Jan  6
-  Add   "c/holy thursday"               - # "Holy Thursday"                Easter -3
-  Add   "c/holy saturday"               - # "Holy Saturday"                Easter -1
-  Add   "c/corpus christi"              - # "Corpus Christi"               Easter +60
-  Add   "c/assumption"                  - # "Assumption Day"               Fixed Aug 15
-  Add   "c/all saints"                  - # "All Saints Day"               Fixed Nov  1
+  Event "ar/revolution"           h   "Revolution Anniversary"  Fixed May 25
+  Event "ar/flag"                 h   "Flag's Day"              Fixed Jun 20
+  Add   "labor"                   h # "Labor Day"               Fixed May  1
+  Event "ar/race"                 h   "Race's Day"              Fixed Oct 12
+  Add   "sunday"                  h # "Sun"                     Weekday --- 
+  Event "ar/soberanys"            h   "Soberany's Day"          Fixed Jun 10
+  Event "ar/independence"         h   "Independence Day"        Fixed Jul  9
+  Add   "new year"                h # "New Year's Day"          Fixed Jan  1
+  Add   "c/easter"                h # "Easter"                  Easter +0   
+  Event "ar/malvinas"             h   "Malvinas Day"            Fixed Apr  2
+  Event "ar/gral san martin"      h   "Gral San Mart�n decease" Fixed Aug 17
+  Add   "c/immaculate conception" h # "Immaculate Conception"   Fixed Dec  8
+  Add   "c/good friday"           h # "Good Friday"             Easter -2   
+  Add   "c/christmas"             h # "Christmas Day"           Fixed Dec 25
+  Add   "c/epiphany"              - # "Epiphany"                Fixed Jan  6
+  Add   "c/holy thursday"         - # "Holy Thursday"           Easter -3   
+  Add   "c/holy saturday"         - # "Holy Saturday"           Easter -1   
+  Add   "c/corpus christi"        - # "Corpus Christi"          Easter +60  
+  Add   "c/assumption"            - # "Assumption Day"          Fixed Aug 15
+  Add   "c/all saints"            - # "All Saints Day"          Fixed Nov  1
 
 
 # armenia
 Region "am"
-  Event "am/christmas"             - "Christmas"                      Fixed Jan  6
-  Event "am/martyrs"               - "Martyrs' Day"                   Fixed Apr 24
-  Event "am/republic"              - "Republic Day"                   Fixed May 28
+  Event "am/christmas"            - "Christmas"               Fixed Jan  6
+  Event "am/martyrs"              - "Martyrs' Day"            Fixed Apr 24
+  Event "am/republic"             - "Republic Day"            Fixed May 28
 
 
 # aruba
 Region "aw"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "aw/aruba flag"              - "Aruba Flag Day"                 Fixed Mar 18
-  Add   "c/easter"                      - # "Easter"                       Easter +0
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Add   "c/ascension"                   - # "Ascension"                    Easter +39
-  Add   "british commonwealth/queens"   - # "Queen's Birthday"             Fixed Jun  4
-  Add   "c/whitmonday"                  - # "Whitmonday"                   Easter +50
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+  Add   "new year"                    - # "New Year's Day"    Fixed Jan  1
+  Event "aw/aruba flag"               -   "Aruba Flag Day"    Fixed Mar 18
+  Add   "c/easter"                    - # "Easter"            Easter +0   
+  Add   "labor"                       - # "Labor Day"         Fixed May  1
+  Add   "c/ascension"                 - # "Ascension"         Easter +39  
+  Add   "british commonwealth/queens" - # "Queen's Birthday"  Fixed Jun  4
+  Add   "c/whitmonday"                - # "Whitmonday"        Easter +50  
+  Add   "c/christmas"                 - # "Christmas Day"     Fixed Dec 25
 
 
 # australia
 Region "au"
-  Add   "c/easter monday"               h # "Easter Monday"                Easter +1
-  Add   "c/good friday"                 h # "Good Friday"                  Easter -2
-  Event "au/australia"           h "Australia Day"                  Fixed Jan 26
-  Add   "new year"                      h # "New Year's Day"               Fixed Jan  1
-  Add   "c/easter"                      h # "Easter"                       Easter +0
-  Add   "anzac"                         h # "ANZAC Day"                    Fixed Apr 25
-  Add   "uk/queens"                     h # "Queen's Birthday"             WDRel Jun Thu 2nd
-  Add   "c/christmas"                   h # "Christmas Day"                Fixed Dec 25
-  Add   "c/boxing"                      h # "Boxing Day"                   Fixed Dec 26
-  Event "au/eight hour"          - "Eight Hour Day"                 Fixed Oct 11
+  Add   "c/easter monday"         h # "Easter Monday"         Easter +1        
+  Add   "c/good friday"           h # "Good Friday"           Easter -2        
+  Event "au/australia"            h   "Australia Day"         Fixed Jan 26     
+  Add   "new year"                h # "New Year's Day"        Fixed Jan  1     
+  Add   "c/easter"                h # "Easter"                Easter +0        
+  Add   "anzac"                   h # "ANZAC Day"             Fixed Apr 25     
+  Add   "uk/queens"               h # "Queen's Birthday"      WDRel Jun Thu 2nd
+  Add   "c/christmas"             h # "Christmas Day"         Fixed Dec 25     
+  Add   "c/boxing"                h # "Boxing Day"            Fixed Dec 26     
+  Event "au/eight hour"           -   "Eight Hour Day"        Fixed Oct 11     
 
 
 # australia/new south wales
 Region "au/new south wales"
   Include "au"
-  Event "au/summer bank holiday"  h "Bank Holiday"                  WDRel Aug Mon 4th
+  Event "au/summer bank holiday"  h "Bank Holiday"            WDRel Aug Mon 4th
 
 
 # australia/northern territory
 Region "au/northern territory"
   Include "au"
-  Add   "labor"                         h # "Labor Day"                    Fixed May  1
+  Add   "labor"                   h # "Labor Day"             Fixed May  1
 
 
 # australia/queensland
 Region "au/queensland"
   Include "au"
-  Event "au/summer bank holiday"  h "Bank Holiday"                  WDRel Aug Mon 4th
+  Event "au/summer bank holiday"  h "Bank Holiday"            WDRel Aug Mon 4th
 
 
 # australia/south australia
 Region "au/south au"
   Include "au"
-  Event "au/proclamation"        h "Proclamation Day"               Fixed Dec 28
-  Add   "labor"                         h # "Labor Day"                    Fixed May  1
+  Event "au/proclamation"         h   "Proclamation Day"      Fixed Dec 28
+  Add   "labor"                   h # "Labor Day"             Fixed May  1
 
 
 # australia/tasmania
 Region "au/tasmania"
   Include "au"
-  Event "au/hobert regatta"      h "Hobert Regatta Day"             Fixed Feb  9
-  Event "au/spring bank holiday"  h "Bank Holiday"                  WDRel Mar Mon 4th
-  Event "au/recreation"          - "Recreation Day"                 Fixed Nov  1
+  Event "au/hobert regatta"       h "Hobert Regatta Day"      Fixed Feb  9     
+  Event "au/spring bank holiday"  h "Bank Holiday"            WDRel Mar Mon 4th
+  Event "au/recreation"           - "Recreation Day"          Fixed Nov  1     
 
 
 # australia/victoria
 Region "au/victoria"
   Include "au"
-  Event "au/spring bank holiday"  h "Bank Holiday"                  WDRel Mar Mon 4th
-  Event "au/show"                h "Show Day"                       WDRel Nov Tue 1st
-  Event "au/second new years"    - "Second New Year's Day"          Fixed Jan  2
+  Event "au/spring bank holiday"  h "Bank Holiday"            WDRel Mar Mon 4th
+  Event "au/show"                 h "Show Day"                WDRel Nov Tue 1st
+  Event "au/second new years"     - "Second New Year's Day"   Fixed Jan  2     
 
 
 # australia/western australia
 Region "au/western au"
   Include "au"
-  Event "au/spring bank holiday"  h "Bank Holiday"                  WDRel Mar Mon 4th
-  Event "au/foundation"          h "Foundation Day"                 Fixed Jun  7
-  Event "au/show"                h "Show Day"                       WDRel Nov Tue 1st
+  Event "au/spring bank holiday"  h "Bank Holiday"            WDRel Mar Mon 4th
+  Event "au/foundation"           h "Foundation Day"          Fixed Jun  7     
+  Event "au/show"                 h "Show Day"                WDRel Nov Tue 1st
 
 
 # austria
-Region "austria"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "c/epiphany"                    - # "Epiphany"                     Fixed Jan  6
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Event "at/second republic"       - "Second Republic Day"            Fixed Apr 27
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Event "at/national"              - "National Day"                   Fixed May 15
-  Add   "c/ascension"                   - # "Ascension"                    Easter +39
-  Add   "c/whitmonday"                  - # "Whitmonday"                   Easter +50
-  Add   "c/corpus christi"              - # "Corpus Christi"               Easter +60
-  Add   "c/assumption"                  - # "Assumption Day"               Fixed Aug 15
-  Event "at/national holiday of austria"  - "National Holiday of Austria" Fixed Oct 26
-  Event "at/national holiday"      - "National Holiday"               Fixed Oct 26
-  Add   "c/all saints"                  - # "All Saints Day"               Fixed Nov  1
-  Event "at/republic"              - "Republic Day"                   Fixed Nov 12
-  Add   "c/immaculate conception"       - # "Immaculate Conception"        Fixed Dec  8
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "at"
+  Add   "new year"                       - # "New Year's Day"              Fixed Jan  1
+  Add   "c/epiphany"                     - # "Epiphany"                    Fixed Jan  6
+  Add   "c/easter monday"                - # "Easter Monday"               Easter +1   
+  Event "at/second republic"             -   "Second Republic Day"         Fixed Apr 27
+  Add   "labor"                          - # "Labor Day"                   Fixed May  1
+  Event "at/national"                    -   "National Day"                Fixed May 15
+  Add   "c/ascension"                    - # "Ascension"                   Easter +39  
+  Add   "c/whitmonday"                   - # "Whitmonday"                  Easter +50  
+  Add   "c/corpus christi"               - # "Corpus Christi"              Easter +60  
+  Add   "c/assumption"                   - # "Assumption Day"              Fixed Aug 15
+  Event "at/national holiday of austria" -   "National Holiday of Austria" Fixed Oct 26
+  Event "at/national holiday"            -   "National Holiday"            Fixed Oct 26
+  Add   "c/all saints"                   - # "All Saints Day"              Fixed Nov  1
+  Event "at/republic"                    -   "Republic Day"                Fixed Nov 12
+  Add   "c/immaculate conception"        - # "Immaculate Conception"       Fixed Dec  8
+  Add   "c/christmas"                    - # "Christmas Day"               Fixed Dec 25
 
 
 # bahamas
 Region "bs"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Event "bs/labor"                 - "Labour Day"                     WDRel Jun Fri 1st
-  Add   "c/whitmonday"                  - # "Whitmonday"                   Easter +50
-  Event "bs/independence"          - "Independence Day"               Fixed Jul 10
-  Add   "caribbean/emancipation"        - # "Emancipation Day"             WDRel Aug Mon 1st
-  Event "bs/fox hill"              - "Fox Hill Day"                   WDRel Aug Tue 2nd
-  Add   "columbus"                      - # "Columbus Day"                 Fixed Oct 12
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1     
+  Add   "c/good friday"           - # "Good Friday"           Easter -2        
+  Add   "c/easter monday"         - # "Easter Monday"         Easter +1        
+  Add   "labor"                   - # "Labor Day"             Fixed May  1     
+  Event "bs/labor"                -   "Labour Day"            WDRel Jun Fri 1st
+  Add   "c/whitmonday"            - # "Whitmonday"            Easter +50       
+  Event "bs/independence"         -   "Independence Day"      Fixed Jul 10     
+  Add   "caribbean/emancipation"  - # "Emancipation Day"      WDRel Aug Mon 1st
+  Event "bs/fox hill"             -   "Fox Hill Day"          WDRel Aug Tue 2nd
+  Add   "columbus"                - # "Columbus Day"          Fixed Oct 12     
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25     
 
 
 # bahrain
 Region "bh"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "bh/national of bahrain"   - "National Day of Bahrain"        Fixed Dec 16
+  Add   "new year"                - # "New Year's Day"          Fixed Jan  1
+  Event "bh/national of bahrain"  -   "National Day of Bahrain" Fixed Dec 16
 
 
 # bangladesh
 Region "bd"
-  Event "bd/national mourning"  - "National Mourning Day"          Fixed Feb 21
-  Event "bd/independence"       - "Independence Day"               Fixed Mar 26
-  Event "bd/bengali new year"   - "Bengali New Year"               Fixed Apr 14
-  Add   "may day"                       - # "May Day"                      Fixed May  1
-  Event "bd/revolution"         - "Revolution Day"                 Fixed Nov  7
-  Event "bd/victory"            - "Victory Day"                    Fixed Dec 16
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+  Event "bd/national mourning"    -   "National Mourning Day" Fixed Feb 21
+  Event "bd/independence"         -   "Independence Day"      Fixed Mar 26
+  Event "bd/bengali new year"     -   "Bengali New Year"      Fixed Apr 14
+  Add   "may day"                 - # "May Day"               Fixed May  1
+  Event "bd/revolution"           -   "Revolution Day"        Fixed Nov  7
+  Event "bd/victory"              -   "Victory Day"           Fixed Dec 16
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25
 
 
 # barbados
 Region "bb"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "bb/errol barrow"         - "Errol Barrow Day"               Fixed Jan 21
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Add   "c/whitmonday"                  - # "Whitmonday"                   Easter +50
-  Event "bb/united nations"       - "United Nations Day"             Fixed Oct  7
-  Event "bb/independence"         - "Independence Day"               Fixed Nov 30
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Event "bb/errol barrow"         -   "Errol Barrow Day"      Fixed Jan 21
+  Add   "c/good friday"           - # "Good Friday"           Easter -2   
+  Add   "c/easter monday"         - # "Easter Monday"         Easter +1   
+  Add   "labor"                   - # "Labor Day"             Fixed May  1
+  Add   "c/whitmonday"            - # "Whitmonday"            Easter +50  
+  Event "bb/united nations"       -   "United Nations Day"    Fixed Oct  7
+  Event "bb/independence"         -   "Independence Day"      Fixed Nov 30
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25
 
 
 # belgium
 Region "be"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Add   "c/ascension"                   - # "Ascension"                    Easter +39
-  Add   "c/whitmonday"                  - # "Whitmonday"                   Easter +50
-  Event "be/independence"          - "Independence Day"               Fixed Jul 21  2 days
-  Add   "c/assumption"                  - # "Assumption Day"               Fixed Aug 15
-  Add   "c/all saints"                  - # "All Saints Day"               Fixed Nov  1
-  Add   "c/all souls"                   - # "All Souls Day"                Fixed Nov  2
-  Add   "armistice"                     - # "Armistice Day"                Fixed Nov 11
-  Event "be/kings"                 - "King's Birthday"                Fixed Nov 15
-  Event "be/dynasty"               - "Dynasty Day"                    Fixed Nov 15
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
-  Add   "c/boxing"                      - # "Boxing Day"                   Fixed Dec 26
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1        
+  Add   "c/easter monday"         - # "Easter Monday"         Easter +1           
+  Add   "labor"                   - # "Labor Day"             Fixed May  1        
+  Add   "c/ascension"             - # "Ascension"             Easter +39          
+  Add   "c/whitmonday"            - # "Whitmonday"            Easter +50          
+  Event "be/independence"         -   "Independence Day"      Fixed Jul 21  2 days
+  Add   "c/assumption"            - # "Assumption Day"        Fixed Aug 15        
+  Add   "c/all saints"            - # "All Saints Day"        Fixed Nov  1        
+  Add   "c/all souls"             - # "All Souls Day"         Fixed Nov  2        
+  Add   "armistice"               - # "Armistice Day"         Fixed Nov 11        
+  Event "be/kings"                -   "King's Birthday"       Fixed Nov 15        
+  Event "be/dynasty"              -   "Dynasty Day"           Fixed Nov 15        
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25        
+  Add   "c/boxing"                - # "Boxing Day"            Fixed Dec 26        
 
 
 # belize
 Region "bz"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "bz/baron bliss"            - "Baron Bliss Day"                Fixed Mar  9
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/holy saturday"               - # "Holy Saturday"                Easter -1
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Event "bz/commonwealth"           - "Commonwealth Day"               Fixed May 24
-  Event "bz/national"               - "National Day"                   Fixed Sep 10
-  Event "bz/saint georges cay"      - "St. George's Cay Day"           Fixed Sep 10
-  Event "bz/independence"           - "Independence Day"               Fixed Sep 21
-  Event "bz/pan american"           - "Pan American Day"               Fixed Oct 12
-  Event "bz/garifuna"               - "Garifuna Day"                   Fixed Nov 19
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
-  Add   "c/boxing"                      - # "Boxing Day"                   Fixed Dec 26
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Event "bz/baron bliss"          -   "Baron Bliss Day"       Fixed Mar  9
+  Add   "c/good friday"           - # "Good Friday"           Easter -2   
+  Add   "c/holy saturday"         - # "Holy Saturday"         Easter -1   
+  Add   "c/easter monday"         - # "Easter Monday"         Easter +1   
+  Add   "labor"                   - # "Labor Day"             Fixed May  1
+  Event "bz/commonwealth"         -   "Commonwealth Day"      Fixed May 24
+  Event "bz/national"             -   "National Day"          Fixed Sep 10
+  Event "bz/saint georges cay"    -   "St. George's Cay Day"  Fixed Sep 10
+  Event "bz/independence"         -   "Independence Day"      Fixed Sep 21
+  Event "bz/pan american"         -   "Pan American Day"      Fixed Oct 12
+  Event "bz/garifuna"             -   "Garifuna Day"          Fixed Nov 19
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25
+  Add   "c/boxing"                - # "Boxing Day"            Fixed Dec 26
 
 
 # benin
 Region "bj"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "bj/martyrs"                 - "Martyrs' Day"                   Fixed Jan 16
-  Event "bj/youth"                   - "Youth Day"                      Fixed Apr  1
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Event "bj/workers"                 - "Workers' Day"                   Fixed May  1
-  Add   "c/ascension"                   - # "Ascension"                    Easter +39
-  Add   "c/whitmonday"                  - # "Whitmonday"                   Easter +50
-  Add   "c/assumption"                  - # "Assumption Day"               Fixed Aug 15
-  Event "bj/armed forces"            - "Armed Forces Day"               Fixed Oct 26
-  Add   "c/all saints"                  - # "All Saints Day"               Fixed Nov  1
-  Event "bj/national"                - "National Day"                   Fixed Nov 30
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
-  Event "bj/harvest"                 - "Harvest Day"                    Fixed Dec 31
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Event "bj/martyrs"              -   "Martyrs' Day"          Fixed Jan 16
+  Event "bj/youth"                -   "Youth Day"             Fixed Apr  1
+  Add   "c/good friday"           - # "Good Friday"           Easter -2   
+  Add   "c/easter monday"         - # "Easter Monday"         Easter +1   
+  Event "bj/workers"              -   "Workers' Day"          Fixed May  1
+  Add   "c/ascension"             - # "Ascension"             Easter +39  
+  Add   "c/whitmonday"            - # "Whitmonday"            Easter +50  
+  Add   "c/assumption"            - # "Assumption Day"        Fixed Aug 15
+  Event "bj/armed forces"         -   "Armed Forces Day"      Fixed Oct 26
+  Add   "c/all saints"            - # "All Saints Day"        Fixed Nov  1
+  Event "bj/national"             -   "National Day"          Fixed Nov 30
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25
+  Event "bj/harvest"              -   "Harvest Day"           Fixed Dec 31
 
 
 # bermuda
-Region "bermuda"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Event "bermuda/peppercorn"            - "Peppercorn Day"                 Fixed Apr 23
-  Event "bermuda/bermuda"               - "Bermuda Day"                    Fixed May 24
-  Event "bermuda/somers"                - "Somers Day"                     Fixed Jul 28
-  Event "bermuda/remembrance"           - "Remembrance Day"                Fixed Nov 11
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "bm"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Add   "c/good friday"           - # "Good Friday"           Easter -2   
+  Event "bm/peppercorn"           -   "Peppercorn Day"        Fixed Apr 23
+  Event "bm/bermuda"              -   "Bermuda Day"           Fixed May 24
+  Event "bm/somers"               -   "Somers Day"            Fixed Jul 28
+  Event "bm/remembrance"          -   "Remembrance Day"       Fixed Nov 11
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25
 
 
 # bhutan
-Region "bhutan"
-  Event "bhutan/kings"                  - "King's Birthday"                Fixed Nov 11
-  Event "bhutan/national of bhutan"     - "National Day of Bhutan"         Fixed Dec 17
+Region "bt"
+  Event "bt/kings"                - "King's Birthday"         Fixed Nov 11
+  Event "bt/national of bhutan"   - "National Day of Bhutan"  Fixed Dec 17
 
 
 # bolivia
-Region "bolivia"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "bolivia/memorial"              - "Memorial Day"                   Fixed Mar 23
-  Event "bolivia/national"              - "National Day"                   Fixed Apr  9
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Add   "c/corpus christi"              - # "Corpus Christi"               Easter +60
-  Event "bolivia/martyrs"               - "Martyrs' Day"                   Fixed Jul 21
-  Event "bolivia/independence"          - "Independence Day"               Fixed Aug  6
-  Add   "c/all souls"                   - # "All Souls Day"                Fixed Nov  2
-  Event "bolivia/la paz"                - "La Paz Day"                     Fixed Jul 16
+Region "bo"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Event "bo/memorial"             -   "Memorial Day"          Fixed Mar 23
+  Event "bo/national"             -   "National Day"          Fixed Apr  9
+  Add   "c/good friday"           - # "Good Friday"           Easter -2   
+  Add   "labor"                   - # "Labor Day"             Fixed May  1
+  Add   "c/corpus christi"        - # "Corpus Christi"        Easter +60  
+  Event "bo/martyrs"              -   "Martyrs' Day"          Fixed Jul 21
+  Event "bo/independence"         -   "Independence Day"      Fixed Aug  6
+  Add   "c/all souls"             - # "All Souls Day"         Fixed Nov  2
+  Event "bo/la paz"               -   "La Paz Day"            Fixed Jul 16
 
 # bosnia and herzegovina
-Region "bosnia and herzegovina"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "bosnia and herzegovina/labors"  - "Labor Days"                    Fixed May  1  2 days
+Region "ba"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1        
+  Event "ba/labors"               -   "Labor Days"            Fixed May  1  2 days
 
 
 # botswana
-Region "botswana"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "c/easter"                      - # "Easter"                       Easter +0
-  Event "botswana/presidents"           - "President's Day"                Fixed May 24
-  Add   "c/ascension"                   - # "Ascension"                    Easter +39
-  Event "botswana/botswana"             - "Botswana Day"                   Fixed Sep 30
+Region "bw"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Add   "c/easter"                - # "Easter"                Easter +0   
+  Event "bw/presidents"           -   "President's Day"       Fixed May 24
+  Add   "c/ascension"             - # "Ascension"             Easter +39  
+  Event "bw/botswana"             -   "Botswana Day"          Fixed Sep 30
 
 
 # brazil
-Region "brazil"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "brazil/sao paulo"              - "Sao Paulo Anniversary"          Fixed Jan 25
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Event "brazil/tiradentes"             - "Tiradentes Day"                 Fixed Apr 21
-  Event "brazil/brasilia"               - "Brasilia Day"                   Fixed Apr 21
-  Event "brazil/discovery"              - "Discovery Day"                  Fixed Apr 22
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Add   "c/corpus christi"              - # "Corpus Christi"               Easter +60
-  Event "brazil/independence"           - "Independence Day"               Fixed Sep  7
-  Add   "c/all souls"                   - # "All Souls Day"                Fixed Nov  2
-  Event "brazil/proclamation of the republic"  - "Proclamation of the Republic Day" Fixed Nov 15
-  Event "brazil/republic"               - "Republic Day"                   Fixed Nov 15
+Region "br"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Event "br/sao paulo"            -   "Sao Paulo Anniversary" Fixed Jan 25
+  Add   "c/good friday"           - # "Good Friday"           Easter -2   
+  Event "br/tiradentes"           -   "Tiradentes Day"        Fixed Apr 21
+  Event "br/brasilia"             -   "Brasilia Day"          Fixed Apr 21
+  Event "br/discovery"            -   "Discovery Day"         Fixed Apr 22
+  Add   "labor"                   - # "Labor Day"             Fixed May  1
+  Add   "c/corpus christi"        - # "Corpus Christi"        Easter +60  
+  Event "br/independence"         -   "Independence Day"      Fixed Sep  7
+  Add   "c/all souls"             - # "All Souls Day"         Fixed Nov  2
+  Event "br/republic"             -   "Republic Day"          Fixed Nov 15
 
 
 # british virgin islands
-Region "british virgin islands"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Add   "c/whitmonday"                  - # "Whitmonday"                   Easter +50
-  Event "british virgin islands/territory"  - "Territory Day"              Fixed Jul  1
-  Add   "british commonwealth/prince of wales"  - # "Prince of Wales' Birthday" Fixed Nov 14
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "vg"
+  Add   "new year"                             - # "New Year's Day"            Fixed Jan  1
+  Add   "c/good friday"                        - # "Good Friday"               Easter -2   
+  Add   "c/easter monday"                      - # "Easter Monday"             Easter +1   
+  Add   "c/whitmonday"                         - # "Whitmonday"                Easter +50  
+  Event "vg/territory"                         -   "Territory Day"             Fixed Jul  1
+  Add   "british commonwealth/prince of wales" - # "Prince of Wales' Birthday" Fixed Nov 14
+  Add   "c/christmas"                          - # "Christmas Day"             Fixed Dec 25
 
 
 # brunei
 Region "brunei"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "brunei/national"               - "National Day"                   Fixed Feb 23
-  Event "brunei/royal brunei armed forces"  - "Royal Brunei Armed Forces Day" Fixed Jun  1
-  Event "brunei/sultans"                - "Sultan's Birthday"              Fixed Jul 15
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+  Add   "new year"                         - # "New Year's Day"                Fixed Jan  1
+  Event "brunei/national"                  -   "National Day"                  Fixed Feb 23
+  Event "brunei/royal brunei armed forces" -   "Royal Brunei Armed Forces Day" Fixed Jun  1
+  Event "brunei/sultans"                   -   "Sultan's Birthday"             Fixed Jul 15
+  Add   "c/christmas"                      - # "Christmas Day"                 Fixed Dec 25
 
 
 # bulgaria
-Region "bulgaria"
-  Add   "new year 2d"                   - # "New Year"                     Fixed Jan  1  2 days
-  Event "bulgaria/babin den"            - "Babin Den"                      Fixed Jan 20
-  Event "bulgaria/viticulturists"       - "Viticulturists' Day"            Fixed Feb 14
-  Event "bulgaria/liberation"           - "Liberation Day"                 Fixed Mar  3
-  Event "bulgaria/national"             - "National Day"                   Fixed Mar  3
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Event "bulgaria/botev"                - "Botev Day"                      Fixed May 20
-  Event "bulgaria/education"            - "Education Day"                  Fixed May 24
-  Event "bulgaria/national holiday"     - "National Holiday"               Fixed Sep  9  2 days
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "bg"
+  Add   "new year 2d"             - # "New Year"              Fixed Jan  1  2 days
+  Event "bg/babin den"            -   "Babin Den"             Fixed Jan 20        
+  Event "bg/viticulturists"       -   "Viticulturists' Day"   Fixed Feb 14        
+  Event "bg/liberation"           -   "Liberation Day"        Fixed Mar  3        
+  Event "bg/national"             -   "National Day"          Fixed Mar  3        
+  Add   "labor"                   - # "Labor Day"             Fixed May  1        
+  Event "bg/botev"                -   "Botev Day"             Fixed May 20        
+  Event "bg/education"            -   "Education Day"         Fixed May 24        
+  Event "bg/national holiday"     -   "National Holiday"      Fixed Sep  9  2 days
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25        
 
 
 # burkina faso
-Region "burkina faso"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "burkina faso/anniversary of 1966 coup"  - "Anniversary of 1966 Coup" Fixed Jan  3
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Event "burkina faso/labor"            - "Labour Day"                     Fixed May  1
-  Add   "c/ascension"                   - # "Ascension"                    Easter +39
-  Add   "c/whitmonday"                  - # "Whitmonday"                   Easter +50
-  Event "burkina faso/national"         - "National Day"                   Fixed Aug  4
-  Add   "c/assumption"                  - # "Assumption Day"               Fixed Aug 15
-  Add   "c/all saints"                  - # "All Saints Day"               Fixed Nov  1
-  Event "burkina faso/youth"            - "Youth Day"                      Fixed Nov 30
-  Event "burkina faso/republic"         - "Republic Day"                   Fixed Dec 11
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "bf"
+  Add   "new year"                    - # "New Year's Day"           Fixed Jan  1
+  Event "bf/anniversary of 1966 coup" -   "Anniversary of 1966 Coup" Fixed Jan  3
+  Add   "c/easter monday"             - # "Easter Monday"            Easter +1   
+  Event "bf/labor"                    -   "Labour Day"               Fixed May  1
+  Add   "c/ascension"                 - # "Ascension"                Easter +39  
+  Add   "c/whitmonday"                - # "Whitmonday"               Easter +50  
+  Event "bf/national"                 -   "National Day"             Fixed Aug  4
+  Add   "c/assumption"                - # "Assumption Day"           Fixed Aug 15
+  Add   "c/all saints"                - # "All Saints Day"           Fixed Nov  1
+  Event "bf/youth"                    -   "Youth Day"                Fixed Nov 30
+  Event "bf/republic"                 -   "Republic Day"             Fixed Dec 11
+  Add   "c/christmas"                 - # "Christmas Day"            Fixed Dec 25
 
 
 # burundi
-Region "burundi"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Add   "c/ascension"                   - # "Ascension"                    Easter +39
-  Event "burundi/independence"          - "Independence Day"               Fixed Jul  1
-  Add   "c/assumption"                  - # "Assumption Day"               Fixed Aug 15
-  Event "burundi/victory of uprona"     - "Victory of Uprona Day"          Fixed Sep 18
-  Event "burundi/murder of the hero"    - "Murder of the Hero Day"         Fixed Oct 13
-  Add   "c/all saints"                  - # "All Saints Day"               Fixed Nov  1
-  Event "burundi/anniversary of the revolution"  - "Anniversary of the Revolution" Fixed Nov 30
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "bi"
+  Add   "new year"                         - # "New Year's Day"                Fixed Jan  1
+  Add   "c/easter monday"                  - # "Easter Monday"                 Easter +1   
+  Add   "labor"                            - # "Labor Day"                     Fixed May  1
+  Add   "c/ascension"                      - # "Ascension"                     Easter +39  
+  Event "bi/independence"                  -   "Independence Day"              Fixed Jul  1
+  Add   "c/assumption"                     - # "Assumption Day"                Fixed Aug 15
+  Event "bi/victory of uprona"             -   "Victory of Uprona Day"         Fixed Sep 18
+  Event "bi/murder of the hero"            -   "Murder of the Hero Day"        Fixed Oct 13
+  Add   "c/all saints"                     - # "All Saints Day"                Fixed Nov  1
+  Event "bi/anniversary of the revolution" -   "Anniversary of the Revolution" Fixed Nov 30
+  Add   "c/christmas"                      - # "Christmas Day"                 Fixed Dec 25
 
 #--------------------------------------------------------------
 # Cambodia 
 #--------------------------------------------------------------
-Region "cambodia"
-  Add   "new year"                      h # "New Year's Day" (1-Jan 2000)
-  Event "cambodia/victory over the genocidal regime"  h "Victory Day Over the Genocidal Regime" Fixed Jan  7
+Region "kh"
+  Add   "new year"                             h # "New Year's Day"                        (1-Jan 2000)
+  Event "kh/victory over the genocidal regime" h   "Victory Day Over the Genocidal Regime" Fixed Jan  7
 # Cambodia Makha Puja 1-Feb moveable but still researching
-  Event "cambodia/women"                h "Women's Day"                            Fixed Mar  8
-  Event "cambodia/cambodian new year"   h "Cambodian New Year (3 days)"            Fixed Apr 14
-  Event "cambodia/independence"         h "Independence Day"                       Fixed Apr 17
-  Add   "labor"                         h # "Labor Day" (1-May 2000)
+  Event "kh/women"                             h   "Women's Day"                           Fixed Mar  8
+  Event "kh/cambodian new year"                h   "Cambodian New Year (3 days)"           Fixed Apr 14
+  Event "kh/independence"                      h   "Independence Day"                      Fixed Apr 17
+  Add   "labor"                                h # "Labor Day"                             (1-May 2000)
 # Ploughing Ceremony 3-May moveable but still researching
-  Event "cambodia/khmer republic constitution"  - "Khmer Republic Constitution Day" Fixed May 12
+  Event "kh/khmer republic constitution"       -   "Khmer Republic Constitution Day"       Fixed May 12
 # Visaka Buja Day (Birth of the Buddha) 18-May moveable but still researching
-  Event "cambodia/day of hatred"        - "Day of Hatred"                  Fixed May 20
-  Event "cambodia/international children"  h "International Children's Day"        Fixed Jun  1
+  Event "kh/day of hatred"                     -   "Day of Hatred"                         Fixed May 20
+  Event "kh/international children"            h   "International Children's Day"          Fixed Jun  1
 # Ashala Puja 16-Jun moveable but still researching
-  Event "cambodia/memorial"             - "Memorial Day"                   Fixed Jun 28
-  Event "cambodia/ancestors"            - "Feast of the Ancestors"         Fixed Sep 22
-  Event "cambodia/constitutional declaration"  h "Constitutional Declaration Day"  Fixed Sep 24
-  Event "cambodia/cambodia peace treaty"  h "Cambodia Peace Treaty Day"            Fixed Oct 23
+  Event "kh/memorial"                          -   "Memorial Day"                          Fixed Jun 28
+  Event "kh/ancestors"                         -   "Feast of the Ancestors"                Fixed Sep 22
+  Event "kh/constitutional declaration"        h   "Constitutional Declaration Day"        Fixed Sep 24
+  Event "kh/cambodia peace treaty"             h   "Cambodia Peace Treaty Day"             Fixed Oct 23
 # Phansa 23-Oct moveable but still researching
-  Event "cambodia/kings birthday"       h "King's Birthday (3 days)"               Fixed Oct 30
+  Event "kh/kings birthday"                    h   "King's Birthday (3 days)"              Fixed Oct 30
 # Phchum Ben Day (Feast of the Ancestors) 8-Oct moveable but still researching
-  Event "cambodia/national independence"  h "National Independence Day"            Fixed Nov  9
+  Event "kh/national independence"             h   "National Independence Day"             Fixed Nov  9
 # Fete des Eaux (3 days) 21-Nov moveable but still researching
-  Event "cambodia/human right"          h "Human Rights Day"                       Fixed Dec 10
+  Event "kh/human right"                       h   "Human Rights Day"                      Fixed Dec 10
 
 
 #--------------------------------------------------------------
 # Cameroon 
 #--------------------------------------------------------------
-Region "cameroon"
-  Event "cameroon/independence"         h "Independence Day"                       Fixed Jan  1
-  Add   "new year"                      h # "New Year's Day" (1-Jan 2000)
-  Event "cameroon/djoulde soumae"       h "Djoulde Soumae (End of Ramadan)"        Islamic_Fixed Schaww�l 1
-  Event "cameroon/youth"                h "Youth Day"                              Fixed Feb 11
-  Event "cameroon/feast of the sacrifice"  h "Feast of the Sacrifice (Festival of the Sheep)" Islamic_Fixed Dhu'l-Hiddja 9
-  Add   "c/good friday"                 h # "Good Friday" (21-Apr 2000)
-  Add   "c/easter monday"               h # "Easter Monday" (24-Apr 2000)
-  Add   "labor"                         h # "Labor Day" (1-May 2000)
-  Event "cameroon/commemoration of national institutions"  - "Commemoration of National Institutions Day" Fixed May 10
-  Event "cameroon/national"             h "National Day"                           Fixed May 20
-  Event "cameroon/sheep festival"       h "Sheep Festival"                         Fixed May 21
-  Add   "c/ascension"                   h # "Ascension Thursday" (1-Jun 2000)
-  Add   "c/pentecost monday"            - # "Pentecost Monday"             Easter +50
-  Event "cameroon/mouloud"              h "Mouloud (Birth of the Prophet)"         Islamic_Fixed Reb�u'l-awwal 12
-  Add   "c/assumption"                  h # "Assumption" (15-Aug 2000)
-  Event "cameroon/unification"          h "Unification Day"                        Fixed Oct  1
-  Add   "c/all saints"                  - # "All Saints Day"               Fixed Nov  1
-  Event "cameroon/human rights"         - "Human Rights Day"               Fixed Dec 10
-  Add   "c/christmas"                   h # "Christmas" (25-Dec 2000)
+Region "cm"
+  Event "cm/independence"           h   "Independence Day"                               Fixed Jan  1                  
+  Add   "new year"                  h # "New Year's Day"                                 (1-Jan 2000)                  
+  Event "cm/djoulde soumae"         h   "Djoulde Soumae (End of Ramadan)"                Islamic_Fixed Schaww�l 1      
+  Event "cm/youth"                  h   "Youth Day"                                      Fixed Feb 11                  
+  Event "cm/feast of the sacrifice" h   "Feast of the Sacrifice (Festival of the Sheep)" Islamic_Fixed Dhu'l-Hiddja 9  
+  Add   "c/good friday"             h # "Good Friday"                                    (21-Apr 2000)                 
+  Add   "c/easter monday"           h # "Easter Monday"                                  (24-Apr 2000)                 
+  Add   "labor"                     h # "Labor Day"                                      (1-May 2000)                  
+  Event "cm/commemoration"          -   "Commemoration of National Institutions Day"     Fixed May 10                  
+  Event "cm/national"               h   "National Day"                                   Fixed May 20                  
+  Event "cm/sheep festival"         h   "Sheep Festival"                                 Fixed May 21                  
+  Add   "c/ascension"               h # "Ascension Thursday"                             (1-Jun 2000)                  
+  Add   "c/pentecost monday"        - # "Pentecost Monday"                               Easter +50                    
+  Event "cm/mouloud"                h   "Mouloud (Birth of the Prophet)"                 Islamic_Fixed Reb�u'l-awwal 12
+  Add   "c/assumption"              h # "Assumption"                                     (15-Aug 2000)                 
+  Event "cm/unification"            h   "Unification Day"                                Fixed Oct  1                  
+  Add   "c/all saints"              - # "All Saints Day"                                 Fixed Nov  1                  
+  Event "cm/human rights"           -   "Human Rights Day"                               Fixed Dec 10                  
+  Add   "c/christmas"               h # "Christmas"                                      (25-Dec 2000)                 
 
 
 #--------------------------------------------------------------
 # Canada 
 #--------------------------------------------------------------
-Region "canada"
-  Add   "new year"                      h # "New Year's Day" (1-Jan 2000)
-  Event "canada/groundhog"              h "Groundhog Day"                          Fixed Feb  2
-  Add   "saints/valentine"              h # "St. Valentine's Day" (14-Feb 2000)
-  Event "canada/national flag of canada"  h "National Flag of Canada Day"          Fixed Feb 15
-  Event "canada/family"                 h "Family Day"                             WDRel Feb Mon 3rd
+Region "ca"
+  Add   "new year"                         h # "New Year's Day"                          (1-Jan 2000)            
+  Event "ca/groundhog"                     h   "Groundhog Day"                           Fixed Feb  2            
+  Add   "saints/valentine"                 h # "St. Valentine's Day"                     (14-Feb 2000)           
+  Event "ca/national flag of canada"       h   "National Flag of Canada Day"             Fixed Feb 15            
+  Event "ca/family"                        h   "Family Day"                              WDRel Feb Mon 3rd       
 # Event "canada/heritage"               h "Heritage Day"                           Friday before the last Sunday in February                          
-  Event "canada/commonwealth"           h "Commonwealth Day"                       Fixed Mar  9
-  Add   "saints/patrick"                h # "St. Patrick's Day" (17-Mar 2000)
-  Event "canada/april fools"            h "April Fools' Day"                       Fixed Apr  1
-  Event "canada/daylight saving time begins"  h "Daylight Saving Time begins"      WDRel Apr Sun 1st
-  Event "canada/saint george"           h "Saint George's Day"                     Fixed Apr 20
-  Add   "c/good friday"                 h # "Good Friday" (21-Apr 2000)
-  Event "canada/earth"                  h "Earth Day"                              Fixed Apr 22
-  Event "canada/canada book"            h "Canada Book Day"                        Fixed Apr 23
-  Add   "c/easter"                      h # "Easter Sunday" (23-Apr 2000)
-  Add   "c/easter monday"               h # "Easter Monday" (24-Apr 2000)
-  Event "canada/national of mourning"   h "National Day of Mourning"               Fixed Apr 28
-  Add   "mothers"                       h # "Mother's Day" (14-May 2000)
-  Event "canada/victoria"               h "Victoria Day"                           WDRel May 24 Mon -1 incl
-  Add   "fathers"                       h # "Fathers Day" (18-Jun 2000)
-  Event "canada/discovery"              h "Discovery Day (Newfoundland & Labrador)" Fixed Jun 24
-  Event "canada/fete nationale"         h "Fete Nationale (Quebec)"                Fixed Jun 24
-  Event "canada/national public service week"  h "National Public Service Week"    WDRel Jun Sun 3rd
-  Event "canada/canada"                 h "Canada Day"                             Fixed Jul  1
-  Event "canada/orangeman"              h "Orangeman's Day"                        Fixed Jul 12
-  Event "canada/micmac festival of saints/ann"  h "MicMac Festival of St. Ann"     Fixed Jul 30
-  Event "canada/british colombia"       h "British Colombia Day"                   WDRel Aug Mon 1st
-  Event "canada/civic holiday"          h "Civic Holiday"                          WDRel Aug Mon 1st
-  Event "canada/heritage"               h "Heritage Day"                           WDRel Aug Mon 1st
-  Event "canada/natal"                  h "Natal Day"                              WDRel Aug Mon 1st
-  Event "canada/new brunswick"          h "New Brunswick Day"                      WDRel Aug Mon 1st
-  Event "canada/acadian"                h "Acadian Day"                            Fixed Aug 15
-  Event "canada/discovery"              h "Discovery Day (Yukon)"                  WDRel Aug 17 Mon 0
-  Event "canada/labour"                 h "Labour Day"                             WDRel Sep Mon 1st
-  Event "canada/thanksgiving"           h "Thanksgiving Day"                       WDRel Oct Mon 2nd
-  Event "canada/daylight saving time ends"  h "Daylight Saving Time ends"          WDRel Oct Sun last
-  Add   "halloween"                     h # "Hallowe'en" (31-Oct 2000)
-  Event "canada/remembrance"            h "Remembrance Day"                        Fixed Nov 11
-  Add   "c/christmas"                   h # "Christmas" (25-Dec 2000)
-  Add   "c/boxing"                      h # "Boxing Day" (26-Dec 2000)
-  Add   "new years eve"                 h # "New Year's Eve" (31-Dec 2000)
+  Event "ca/commonwealth"                  h   "Commonwealth Day"                        Fixed Mar  9            
+  Add   "saints/patrick"                   h # "St. Patrick's Day"                       (17-Mar 2000)           
+  Event "ca/april fools"                   h   "April Fools' Day"                        Fixed Apr  1            
+  Event "ca/daylight saving time begins"   h   "Daylight Saving Time begins"             WDRel Apr Sun 1st       
+  Event "ca/saint george"                  h   "Saint George's Day"                      Fixed Apr 20            
+  Add   "c/good friday"                    h # "Good Friday"                             (21-Apr 2000)           
+  Event "ca/earth"                         h   "Earth Day"                               Fixed Apr 22            
+  Event "ca/canada book"                   h   "Canada Book Day"                         Fixed Apr 23            
+  Add   "c/easter"                         h # "Easter Sunday"                           (23-Apr 2000)           
+  Add   "c/easter monday"                  h # "Easter Monday"                           (24-Apr 2000)           
+  Event "ca/national of mourning"          h   "National Day of Mourning"                Fixed Apr 28            
+  Add   "mothers"                          h # "Mother's Day"                            (14-May 2000)           
+  Event "ca/victoria"                      h   "Victoria Day"                            WDRel May 24 Mon -1 incl
+  Add   "fathers"                          h # "Fathers Day"                             (18-Jun 2000)           
+  Event "ca/discovery"                     h   "Discovery Day (Newfoundland & Labrador)" Fixed Jun 24            
+  Event "ca/fete nationale"                h   "Fete Nationale (Quebec)"                 Fixed Jun 24            
+  Event "ca/national public service week"  h   "National Public Service Week"            WDRel Jun Sun 3rd       
+  Event "ca/canada"                        h   "Canada Day"                              Fixed Jul  1            
+  Event "ca/orangeman"                     h   "Orangeman's Day"                         Fixed Jul 12            
+  Event "ca/micmac festival of saints/ann" h   "MicMac Festival of St. Ann"              Fixed Jul 30            
+  Event "ca/british colombia"              h   "British Colombia Day"                    WDRel Aug Mon 1st       
+  Event "ca/civic holiday"                 h   "Civic Holiday"                           WDRel Aug Mon 1st       
+  Event "ca/heritage"                      h   "Heritage Day"                            WDRel Aug Mon 1st       
+  Event "ca/natal"                         h   "Natal Day"                               WDRel Aug Mon 1st       
+  Event "ca/new brunswick"                 h   "New Brunswick Day"                       WDRel Aug Mon 1st       
+  Event "ca/acadian"                       h   "Acadian Day"                             Fixed Aug 15            
+  Event "ca/discovery"                     h   "Discovery Day (Yukon)"                   WDRel Aug 17 Mon 0      
+  Event "ca/labour"                        h   "Labour Day"                              WDRel Sep Mon 1st       
+  Event "ca/thanksgiving"                  h   "Thanksgiving Day"                        WDRel Oct Mon 2nd       
+  Event "ca/daylight saving time ends"     h   "Daylight Saving Time ends"               WDRel Oct Sun last      
+  Add   "halloween"                        h # "Hallowe'en"                              (31-Oct 2000)           
+  Event "ca/remembrance"                   h   "Remembrance Day"                         Fixed Nov 11            
+  Add   "c/christmas"                      h # "Christmas"                               (25-Dec 2000)           
+  Add   "c/boxing"                         h # "Boxing Day"                              (26-Dec 2000)           
+  Add   "new years eve"                    h # "New Year's Eve"                          (31-Dec 2000)           
 
 #--------------------------------------------------------------
 # Cape Verde 
 #--------------------------------------------------------------
-Region "cape verde"
-  Add   "new year"                      h # "New Year's Day" (1-Jan 2000)
-  Event "cape verde/national heroe"     h "National Heroes Day"                    Fixed Jan 20
-  Event "cape verde/carnival"           h "Carnival"                               Easter -47
-  Add   "c/good friday"                 h # "Good Friday" (21-Apr 2000)
-  Add   "c/easter monday"               h # "Easter Monday" (24-Apr 2000)
-  Add   "labor"                         h # "Labor Day" (1-May 2000)
-  Event "cape verde/independence"       h "Independence Day"                       Fixed Jul  5
-  Add   "c/assumption"                  h # "Assumption Day" (15-Aug 2000)
-  Event "cape verde/national"           h "National Day"                           Fixed Sep 12
-  Event "cape verde/all saint"          h "All Saint's Day"                        Fixed Nov  1
-  Add   "c/christmas"                   h # "Christmas" (25-Dec 2000)
+Region "cv"
+  Add   "new year"                h # "New Year's Day"        (1-Jan 2000) 
+  Event "cv/national heroe"       h   "National Heroes Day"   Fixed Jan 20 
+  Event "cv/carnival"             h   "Carnival"              Easter -47   
+  Add   "c/good friday"           h # "Good Friday"           (21-Apr 2000)
+  Add   "c/easter monday"         h # "Easter Monday"         (24-Apr 2000)
+  Add   "labor"                   h # "Labor Day"             (1-May 2000) 
+  Event "cv/independence"         h   "Independence Day"      Fixed Jul  5 
+  Add   "c/assumption"            h # "Assumption Day"        (15-Aug 2000)
+  Event "cv/national"             h   "National Day"          Fixed Sep 12 
+  Event "cv/all saint"            h   "All Saint's Day"       Fixed Nov  1 
+  Add   "c/christmas"             h # "Christmas"             (25-Dec 2000)
 
 
 #--------------------------------------------------------------
 # Cayman Islands 
 #--------------------------------------------------------------
-Region "cayman islands"
-  Add   "new year"                      h # "New Year's Day" (1-Jan 2000)
-  Add   "c/ash wednesday"               h # "Ash Wednesday" (8-Mar 2000)
-  Add   "c/good friday"                 h # "Good Friday" (21-Apr 2000)
-  Add   "c/easter monday"               h # "Easter Monday" (24-Apr 2000)
-  Event "cayman islands/discovery"      h "Discovery Day"                          WDRel May Mon 3rd
-  Event "cayman islands/queens birthday"  h "Queen's Birthday"                     WDRel Jun 3 Mon +2 incl 
-  Event "cayman islands/constitution"   h "Constitution Day"                       WDRel Jul Mon 1st
+Region "ky"
+  Add   "new year"                h # "New Year's Day"        (1-Jan 2000)            
+  Add   "c/ash wednesday"         h # "Ash Wednesday"         (8-Mar 2000)            
+  Add   "c/good friday"           h # "Good Friday"           (21-Apr 2000)           
+  Add   "c/easter monday"         h # "Easter Monday"         (24-Apr 2000)           
+  Event "ky/discovery"            h   "Discovery Day"         WDRel May Mon 3rd       
+  Event "ky/queens birthday"      h   "Queen's Birthday"      WDRel Jun 3 Mon +2 incl 
+  Event "ky/constitution"         h   "Constitution Day"      WDRel Jul Mon 1st       
 # Event "cayman islands/pirates week"   h "Pirates Week"                           # 23-Oct 22-Oct 21-Oct 20-Oct 25-Oct last week in October
-  Event "cayman islands/remembrance"    h "Remembrance Day"                        Fixed Nov 11
-  Add   "c/christmas"                   h # "Christmas" (25-Dec 2000)
-  Add   "c/boxing"                      h # "Boxing Day" (26-Dec 2000)
-  Event "cayman islands/public holiday"  h "Public Holiday"                        Fixed Dec 27
+  Event "ky/remembrance"          h   "Remembrance Day"       Fixed Nov 11            
+  Add   "c/christmas"             h # "Christmas"             (25-Dec 2000)           
+  Add   "c/boxing"                h # "Boxing Day"            (26-Dec 2000)           
+  Event "ky/public holiday"       h   "Public Holiday"        Fixed Dec 27            
 
 #--------------------------------------------------------------
 # Central African Republic 
 #--------------------------------------------------------------
-Region "central african republic"
-  Add   "new year"                      h # "New Year's Day" (1-Jan 2000)
-  Event "central african republic/boganda"  h "Boganda Day"                        Fixed Mar 29
-  Add   "c/easter monday"               h # "Easter Monday" (24-Apr 2000)
-  Add   "labor"                         h # "Labor Day" (1-May 2000)
-  Event "central african republic/first government"  - "anniversary of first government" Fixed May 15
-  Add   "c/ascension"                   h # "Ascension Thursday" (1-Jun 2000)
-  Add   "c/pentecost"                   - # "Pentecost"                    Easter +49
-  Event "central african republic/national of prayer"  h "National Day of Prayer"  Fixed Jun 30
-  Event "central african republic/independence"  h "Independence Day"              Fixed Aug 13
-  Add   "c/assumption"                  h # "Assumption Day" (15-Aug 2000)
-  Add   "c/all saints"                  - # "All Saints Day"                       Fixed Nov  1
-  Event "central african republic/national holiday"  - "national holiday"          Fixed Nov 11
-  Event "central african republic/republic"  - "Anniversary of the Proclamation of the Republic" Fixed Dec  1
-  Event "central african republic/day after republic"  - "Day after Republic Day"  Fixed Dec  2
-  Add   "c/christmas"                   h # "Christmas" (25-Dec 2000)
+Region "cf"
+  Add   "new year"                h # "New Year's Day"                                  (1-Jan 2000) 
+  Event "cf/boganda"              h   "Boganda Day"                                     Fixed Mar 29 
+  Add   "c/easter monday"         h # "Easter Monday"                                   (24-Apr 2000)
+  Add   "labor"                   h # "Labor Day"                                       (1-May 2000) 
+  Event "cf/first government"     -   "anniversary of first government"                 Fixed May 15 
+  Add   "c/ascension"             h # "Ascension Thursday"                              (1-Jun 2000) 
+  Add   "c/pentecost"             - # "Pentecost"                                       Easter +49   
+  Event "cf/national of prayer"   h   "National Day of Prayer"                          Fixed Jun 30 
+  Event "cf/independence"         h   "Independence Day"                                Fixed Aug 13 
+  Add   "c/assumption"            h # "Assumption Day"                                  (15-Aug 2000)
+  Add   "c/all saints"            - # "All Saints Day"                                  Fixed Nov  1 
+  Event "cf/national holiday"     -   "national holiday"                                Fixed Nov 11 
+  Event "cf/republic"             -   "Anniversary of the Proclamation of the Republic" Fixed Dec  1 
+  Event "cf/day after republic"   -   "Day after Republic Day"                          Fixed Dec  2 
+  Add   "c/christmas"             h # "Christmas"                                       (25-Dec 2000)
 
 
 #--------------------------------------------------------------
 # Chad 
 #--------------------------------------------------------------
-Region "chad"
-  Add   "new year"                      h # "New Year's Day" (1-Jan 2000)
-  Add   "islamic/al fitr"               h # "Id al Fitr (End of Ramadan)" (8-Jan 2000)
-  Add   "islamic/al fitr"               h # "Id al Fitr (End of Ramadan)" (28-Dec 2000)
-  Add   "islamic/al adha"               h # "Id al-Adha" (16-Mar 2000)
-  Event "chad/creation of the union of central african states"  - "Creation of the Union of Central African States Day" Fixed Apr  2
-  Event "chad/national"                 h "National Day"                           Fixed Apr 13
-  Add   "c/easter monday"               h # "Easter Monday" (24-Apr 2000)
-  Add   "labor"                         h # "Labor Day" (1-May 2000)
-  Add   "africa"                        h # "Africa Day" (25-May 2000)
-  Add   "c/ascension"                   - # "Ascension"                    Easter +39
-  Add   "c/pentecost"                   - # "Pentecost"                    Easter +49
-  Event "chad/revolution"               h "Revolution Day"                         Fixed Jun  7
-  Event "chad/mouloud"                  h "Mouloud (Prophet's Birthday)"           Islamic_Fixed Reb�u'l-awwal 12
-  Event "chad/independence"             h "Independence Day"                       Fixed Aug 11
-  Add   "c/assumption"                  h # "Assumption Day" (15-Aug 2000)
-  Add   "c/all saints"                  - # "All Saints Day"               Fixed Nov  1
-  Event "chad/republic"                 h "Republic Day"                           Fixed Nov 28
-  Event "chad/festival of freedom and democracy"  h "Festival of Freedom and Democracy" Fixed Dec  1
-  Add   "c/christmas"                   h # "Christmas" (25-Dec 2000)
+Region "td"
+  Add   "new year"                                           h # "New Year's Day"                                      (1-Jan 2000)                  
+  Add   "islamic/al fitr"                                    h # "Id al Fitr (End of Ramadan)"                         (8-Jan 2000)                  
+  Add   "islamic/al fitr"                                    h # "Id al Fitr (End of Ramadan)"                         (28-Dec 2000)                 
+  Add   "islamic/al adha"                                    h # "Id al-Adha"                                          (16-Mar 2000)                 
+  Event "td/creation of the union of central african states" -   "Creation of the Union of Central African States Day" Fixed Apr  2                  
+  Event "td/national"                                        h   "National Day"                                        Fixed Apr 13                  
+  Add   "c/easter monday"                                    h # "Easter Monday"                                       (24-Apr 2000)                 
+  Add   "labor"                                              h # "Labor Day"                                           (1-May 2000)                  
+  Add   "africa"                                             h # "Africa Day"                                          (25-May 2000)                 
+  Add   "c/ascension"                                        - # "Ascension"                                           Easter +39                    
+  Add   "c/pentecost"                                        - # "Pentecost"                                           Easter +49                    
+  Event "td/revolution"                                      h   "Revolution Day"                                      Fixed Jun  7                  
+  Event "td/mouloud"                                         h   "Mouloud (Prophet's Birthday)"                        Islamic_Fixed Reb�u'l-awwal 12
+  Event "td/independence"                                    h   "Independence Day"                                    Fixed Aug 11                  
+  Add   "c/assumption"                                       h # "Assumption Day"                                      (15-Aug 2000)                 
+  Add   "c/all saints"                                       - # "All Saints Day"                                      Fixed Nov  1                  
+  Event "td/republic"                                        h   "Republic Day"                                        Fixed Nov 28                  
+  Event "td/festival of freedom and democracy"               h   "Festival of Freedom and Democracy"                   Fixed Dec  1                  
+  Add   "c/christmas"                                        h # "Christmas"                                           (25-Dec 2000)                 
 
 
 #--------------------------------------------------------------
 # Chile 
 #--------------------------------------------------------------
-Region "chile"
-  Add   "new year"                      h # "New Year's Day" (1-Jan 2000)
-  Add   "c/good friday"                 h # "Good Friday" (21-Apr 2000)
-  Add   "c/easter monday"               h # "Easter Monday" (24-Apr 2000)
-  Add   "labor"                         h # "Labor Day" (1-May 2000)
-  Event "chile/naval glorie"            h "Naval Glories Day (Battle of Iquique)"  Fixed May 21
-  Add   "c/ascension"                   - # "Ascension"                    Easter +39
-  Add   "c/corpus christi"              h # "Corpus Christi" (22-Jun 2000)
-  Add   "saints/peter"                  - # "St. Peter"                    Fixed Jun 29
-  Add   "saints/paul"                   - # "St. Paul"                     Fixed Jun 29
-  Add   "c/assumption"                  h # "Assumption Day" (15-Aug 2000)
-  Event "chile/reconciliation"          h "Reconciliation Day"                     WDRel Sep Mon 1st
-  Event "chile/dia de la unidad nacional"  h "Dia de la Unidad Nacional (National Union Day)" Fixed Sep  6
-  Event "chile/independence"            h "Independence Day"                       Fixed Sep 18 2 days
-  Event "chile/armed force"             h "Armed Forces Day"                       Fixed Sep 19
-  Event "chile/day of the race"         h "Day of the Race"                        Fixed Oct 12
-  Event "chile/all saint"               h "All Saint's Day"                        Fixed Nov  1
-  Add   "c/immaculate conception"       h # "Immaculate Conception" (8-Dec 2000)
-  Add   "c/christmas"                   h # "Christmas" (25-Dec 2000)
+Region "cl"
+  Add   "new year"                     h # "New Year's Day"                                 (1-Jan 2000)       
+  Add   "c/good friday"                h # "Good Friday"                                    (21-Apr 2000)      
+  Add   "c/easter monday"              h # "Easter Monday"                                  (24-Apr 2000)      
+  Add   "labor"                        h # "Labor Day"                                      (1-May 2000)       
+  Event "cl/naval glorie"              h   "Naval Glories Day (Battle of Iquique)"          Fixed May 21       
+  Add   "c/ascension"                  - # "Ascension"                                      Easter +39         
+  Add   "c/corpus christi"             h # "Corpus Christi"                                 (22-Jun 2000)      
+  Add   "saints/peter"                 - # "St. Peter"                                      Fixed Jun 29       
+  Add   "saints/paul"                  - # "St. Paul"                                       Fixed Jun 29       
+  Add   "c/assumption"                 h # "Assumption Day"                                 (15-Aug 2000)      
+  Event "cl/reconciliation"            h   "Reconciliation Day"                             WDRel Sep Mon 1st  
+  Event "cl/dia de la unidad nacional" h   "Dia de la Unidad Nacional (National Union Day)" Fixed Sep  6       
+  Event "cl/independence"              h   "Independence Day"                               Fixed Sep 18 2 days
+  Event "cl/armed force"               h   "Armed Forces Day"                               Fixed Sep 19       
+  Event "cl/day of the race"           h   "Day of the Race"                                Fixed Oct 12       
+  Event "cl/all saint"                 h   "All Saint's Day"                                Fixed Nov  1       
+  Add   "c/immaculate conception"      h # "Immaculate Conception"                          (8-Dec 2000)       
+  Add   "c/christmas"                  h # "Christmas"                                      (25-Dec 2000)      
 
 #--------------------------------------------------------------
 # China 
 #--------------------------------------------------------------
-Region "china"
-  Add   "new year"                      h # "New Year's Day" (1-Jan 2000)
+Region "cn"
+  Add   "new year"                      h # "New Year's Day"               (1-Jan 2000)
 # Event "china/lunar new year"          h "Lunar New Year's Day"                   China Lunar New Year's Day 5-Feb 24-Jan 12-Feb 1-Feb 22-Jan moveable
 # Event "china/spring festival"         h "Spring Festival"                        China Spring Festival 5-Feb 24-Jan 12-Feb 1-Feb 22-Jan moveable
-  Add   "chinese/new year"              h # "Chinese New Year" (8-Mar 2000)
-  Event "china/women"                   h "Women's Day"                            Fixed Mar  8
+  Add   "chinese/new year"              h # "Chinese New Year"             (8-Mar 2000)
+  Event "cn/women"                      h   "Women's Day"                  Fixed Mar  8
 # Event "china/4apr"                    h "4-Apr"                                  China 4-Apr 5-Apr 5-Apr 5-Apr 4-Apr moveable
-  Add   "labor"                         h # "Labor Day" (1-May 2000)
-  Event "china/national youth"          h "National Youth Day"                     Fixed May  4
-  Event "china/international children"  h "International Children's Day"           Fixed Jun  1
+  Add   "labor"                         h # "Labor Day"                    (1-May 2000)
+  Event "cn/national youth"             h   "National Youth Day"           Fixed May  4
+  Event "cn/international children"     h   "International Children's Day" Fixed Jun  1
 # Event "china/dragon boat festival"    h "Dragon Boat Festival Day"               China Dragon Boat Festival Day 6-Jun 25-Jun 15-Jun 4-Jun 22-Jun static
-  Event "china/communist party foundation"  h "Communist Party Foundation"         Fixed Jul  1
+  Event "cn/communist party foundation" h   "Communist Party Foundation"   Fixed Jul  1
 # China Chih Nu 7-Jul moveable but still researching
 # China Chung Yuan 15-Jul moveable but still researching
 # China Kwan Kung 29-Jul moveable but still researching
-  Event "china/peoples liberation army"  h "People's Liberation Army Day"          Fixed Aug  1
+  Event "cn/peoples liberation army"    h   "People's Liberation Army Day" Fixed Aug  1
 # Event "china/mid autumn festival"     h "Mid Autumn Festival"                    China Mid Autumn Festival 12-Sep 1-Oct 21-Sep 11-Sep 28-Sep moveable
-  Event "china/pr chinas birthday"      h "P.R. China's Birthday"                  Fixed Oct  1
-  Event "china/national"                h "National Day"                           Fixed Oct  2
+  Event "cn/pr chinas birthday"         h   "P.R. China's Birthday"        Fixed Oct  1
+  Event "cn/national"                   h   "National Day"                 Fixed Oct  2
 
 #--------------------------------------------------------------
 # Colombia 
 #--------------------------------------------------------------
-Region "colombia"
-  Add   "new year"                      h # "New Year's Day" (1-Jan 2000)
-  Add   "c/epiphany"                    - # "Epiphany"                             Fixed Jan  6
-  Event "colombia/st joseph"            h "St. Joseph's Day"                       WDRel Mar 19 Mon +1 incl
-  Add   "c/holy thursday"               h # "Holy Thursday" (20-Apr 2000)
-  Add   "c/good friday"                 h # "Good Friday" (21-Apr 2000)
-  Add   "labor"                         h # "Labor Day" (1-May 2000)
-  Add   "c/ascension"                   h # "Ascension Thursday" (1-Jun 2000)
-  Event "columbia/thanksgiving"         - "Thanksgiving Day"                   	   Fixed Jun  5
-  Add   "c/corpus christi"              - # "Corpus Christi"                   	   Easter +60
-  Add   "saints/peter"                  - # "St. Peter"                        	   Fixed Jun 29
-  Add   "saints/paul"                   - # "St. Paul"                         	   Fixed Jun 29
-  Event "colombia/independence"         h "Independence Day"                       Fixed Jul 20
-  Event "colombia/battle of boyaca"     h "Battle of Boyaca"                       Fixed Aug  7
-  Add   "c/assumption"                  h # "Assumption Day" (15-Aug 2000)
-  Add   "columbus"                      - # "Columbus Day"                         Fixed Oct 12
-  Add   "c/all saints"                  - # "All Saints Day"                       Fixed Nov  1
-  Event "colombia/independence of cartagena"  h "Independence of Cartagena"        Fixed Nov 11
-  Add   "c/immaculate conception"       h # "Immaculate Conception" (8-Dec 2000)
-  Add   "c/christmas"                   h # "Christmas" (25-Dec 2000)
-  Event "colombia/sagrado corazon"      h "Sagrado Corazon"                        Easter +68
+Region "co"
+  Add   "new year"                     h # "New Year's Day"            (1-Jan 2000)            
+  Add   "c/epiphany"                   - # "Epiphany"                  Fixed Jan  6            
+  Event "co/st joseph"                 h   "St. Joseph's Day"          WDRel Mar 19 Mon +1 incl
+  Add   "c/holy thursday"              h # "Holy Thursday"             (20-Apr 2000)           
+  Add   "c/good friday"                h # "Good Friday"               (21-Apr 2000)           
+  Add   "labor"                        h # "Labor Day"                 (1-May 2000)            
+  Add   "c/ascension"                  h # "Ascension Thursday"        (1-Jun 2000)            
+  Event "columbia/thanksgiving"        -   "Thanksgiving Day"          Fixed Jun  5            
+  Add   "c/corpus christi"             - # "Corpus Christi"            Easter +60              
+  Add   "saints/peter"                 - # "St. Peter"                 Fixed Jun 29            
+  Add   "saints/paul"                  - # "St. Paul"                  Fixed Jun 29            
+  Event "co/independence"              h   "Independence Day"          Fixed Jul 20            
+  Event "co/battle of boyaca"          h   "Battle of Boyaca"          Fixed Aug  7            
+  Add   "c/assumption"                 h # "Assumption Day"            (15-Aug 2000)           
+  Add   "columbus"                     - # "Columbus Day"              Fixed Oct 12            
+  Add   "c/all saints"                 - # "All Saints Day"            Fixed Nov  1            
+  Event "co/independence of cartagena" h   "Independence of Cartagena" Fixed Nov 11            
+  Add   "c/immaculate conception"      h # "Immaculate Conception"     (8-Dec 2000)            
+  Add   "c/christmas"                  h # "Christmas"                 (25-Dec 2000)           
+  Event "co/sagrado corazon"           h   "Sagrado Corazon"           Easter +68              
 
 # comoros
-Region "comoros"
-  Event "comoros/independence"          - "Independence Day"               Fixed Jul  6
-  Event "comoros/anniversary of president abdallahs assassination"  - "Anniversary of President Abdallah's Assassination" Fixed Nov 27
+Region "km"
+  Event "km/independence"         - "Independence Day"                                  Fixed Jul  6
+  Event "km/assassination"        - "Anniversary of President Abdallah's Assassination" Fixed Nov 27
 
 
 #--------------------------------------------------------------
 # Congo (Republic of) 
 #--------------------------------------------------------------
-Region "congo"
-  Add   "new year"                      h # "New Year's Day" (1-Jan 2000)
-  Event "congo/martyr of independence"  - "Martyr of Independence Day"     Fixed Jan  4
-  Event "congo/president"               h "President's Day"                        Fixed Feb  5
-  Event "congo/youth"                   h "Youth Day"                              Fixed Feb  8
-  Event "congo/congolese women"         h "Congolese Women's Day"                  Fixed Mar  8
-  Event "congo/marien ngouabi"          h "Marien Ngouabi Day"                     Fixed Mar 18
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Add   "labor"                         h # "Labor Day" (1-May 2000)
-  Event "congo/day of national reconciliation"  h "Day of National Reconciliation" Fixed Jun 10
-  Event "congo/foundation of the nations army"  h "Foundation of the Nation's Army" Fixed Jun 22
-  Add   "c/ascension"                   - # "Ascension"                    Easter +39
-  Add   "c/pentecost"                   - # "Pentecost"                    Easter +49
-  Event "congo/day before independence"  - "day before Independence Day"           Fixed Jun 29
-  Event "congo/upswing of the revolution"  h "Upswing of the Revolution"           Fixed Jul 31
-  Event "congo/revolution anniversary"  h "Revolution Anniversary"                 Fixed Aug 13
-  Add   "c/assumption"                  - # "Assumption Day"               Fixed Aug 15
-  Event "congo/independence"            h "Independence Day"                       Fixed Aug 15
-  Add   "c/all saints"                  - # "All Saints Day"                  	   Fixed Nov  1
-  Event "congo/day before army"         - "day before Army Day"                	   Fixed Nov 16
-  Event "congo/army"                    - "Army Day (?)"                       	   Fixed Nov 17
-  Event "congo/day before national"     - "day before national day"           	   Fixed Nov 23
-  Event "congo/national"                - "national day (?)"                   	   Fixed Nov 24
-  Event "congo/children"                h "Children's Day"                         Fixed Dec 25
-  Event "congo/foundation of the congolese labour party"  h "Foundation of the Congolese Labour Party" Fixed Dec 31
-  Event "congo/republic"                h "Republic Day"                           Fixed Dec 31
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "cg"
+  Add   "new year"                                    h # "New Year's Day"                           (1-Jan 2000)    
+  Event "cg/martyr of independence"                   -   "Martyr of Independence Day"               Fixed Jan  4    
+  Event "cg/president"                                h   "President's Day"                          Fixed Feb  5    
+  Event "cg/youth"                                    h   "Youth Day"                                Fixed Feb  8    
+  Event "cg/congolese women"                          h   "Congolese Women's Day"                    Fixed Mar  8    
+  Event "cg/marien ngouabi"                           h   "Marien Ngouabi Day"                       Fixed Mar 18    
+  Add   "c/easter monday"                             - # "Easter Monday"                            Easter +1       
+  Add   "labor"                                       h # "Labor Day"                                (1-May 2000)    
+  Event "cg/day of national reconciliation"           h   "Day of National Reconciliation"           Fixed Jun 10    
+  Event "cg/foundation of the nations army"           h   "Foundation of the Nation's Army"          Fixed Jun 22    
+  Add   "c/ascension"                                 - # "Ascension"                                Easter +39      
+  Add   "c/pentecost"                                 - # "Pentecost"                                Easter +49      
+  Event "cg/day before independence"                  -   "day before Independence Day"              Fixed Jun 29    
+  Event "cg/upswing of the revolution"                h   "Upswing of the Revolution"                Fixed Jul 31    
+  Event "cg/revolution anniversary"                   h   "Revolution Anniversary"                   Fixed Aug 13    
+  Add   "c/assumption"                                - # "Assumption Day"                           Fixed Aug 15    
+  Event "cg/independence"                             h   "Independence Day"                         Fixed Aug 15    
+  Add   "c/all saints"                                - # "All Saints Day"                           Fixed Nov  1    
+  Event "cg/day before army"                          -   "day before Army Day"                      Fixed Nov 16    
+  Event "cg/army"                                     -   "Army Day (?)"                             Fixed Nov 17    
+  Event "cg/day before national"                      -   "day before national day"                  Fixed Nov 23    
+  Event "cg/national"                                 -   "national day (?)"                         Fixed Nov 24    
+  Event "cg/children"                                 h   "Children's Day"                           Fixed Dec 25    
+  Event "cg/foundation of the congolese labour party" h   "Foundation of the Congolese Labour Party" Fixed Dec 31    
+  Event "cg/republic"                                 h   "Republic Day"                             Fixed Dec 31    
+  Add   "c/christmas"                                 - # "Christmas Day"                            Fixed Dec 25    
 
 #--------------------------------------------------------------
 # Cook Islands 
 #--------------------------------------------------------------
-Region "cook islands"
-  Add   "new year"                      h # "New Year's Day" (1-Jan 2000)
-  Add   "anzac"                         h # "Anzac Day" (25-Apr 2000)
-  Add   "c/good friday"                 h # "Good Friday" (21-Apr 2000)
-  Add   "c/easter"                      h # "Easter" (23-Apr 2000)
-  Add   "c/easter monday"               h # "Easter Monday" (24-Apr 2000)
-  Event "cook islands/queens birthday"  h "Queen's Birthday"                       WDRel Jun Mon 2nd
-  Event "cook islands/gospel"           h "Gospel Day (Rarotonga only)"            Fixed Jul 25
-  Event "cook islands/constitution"     h "Constitution Day"                       Fixed Aug  4
-  Event "cook islands/gospel"           h "Gospel Day"                             Fixed Oct 25
-  Add   "c/christmas"                   h # "Christmas" (25-Dec 2000)
-  Add   "c/boxing"                      h # "Boxing Day" (26-Dec 2000)
-  Add   "new years eve"                 h # "New Year's Eve" (31-Dec 2000)
+Region "ck"
+  Add   "new year"                h # "New Year's Day"              (1-Jan 2000)     
+  Add   "anzac"                   h # "Anzac Day"                   (25-Apr 2000)    
+  Add   "c/good friday"           h # "Good Friday"                 (21-Apr 2000)    
+  Add   "c/easter"                h # "Easter"                      (23-Apr 2000)    
+  Add   "c/easter monday"         h # "Easter Monday"               (24-Apr 2000)    
+  Event "ck/queens birthday"      h   "Queen's Birthday"            WDRel Jun Mon 2nd
+  Event "ck/gospel"               h   "Gospel Day (Rarotonga only)" Fixed Jul 25     
+  Event "ck/constitution"         h   "Constitution Day"            Fixed Aug  4     
+  Event "ck/gospel"               h   "Gospel Day"                  Fixed Oct 25     
+  Add   "c/christmas"             h # "Christmas"                   (25-Dec 2000)    
+  Add   "c/boxing"                h # "Boxing Day"                  (26-Dec 2000)    
+  Add   "new years eve"           h # "New Year's Eve"              (31-Dec 2000)    
 
 # corsica
 Region "corsica"
-  Event "corsica/napoleons"             - "Napoleon's Day"                 Fixed Aug 15
+  Event "corsica/napoleons"       - "Napoleon's Day"          Fixed Aug 15
 
 #--------------------------------------------------------------
 # Costa Rica 
 #--------------------------------------------------------------
-Region "costa rica"
-  Add   "new year"                      h # "New Year's Day" (1-Jan 2000)
-  Event "costa rica/saint joseph"       h "Saint Joseph's Day"                     Fixed Mar 19
-  Event "costa rica/battle of rivas"    h "Battle of Rivas"                        Fixed Apr 11
-  Event "costa rica/national heroe"     h "National Heroes Day"                    Fixed Apr 11
-  Add   "c/holy thursday"               h # "Holy Thursday" (20-Apr 2000)
-  Add   "c/good friday"                 h # "Good Friday" (21-Apr 2000)
-  Add   "labor"                         h # "Labor Day" (1-May 2000)
-  Add   "c/corpus christi"              h # "Corpus Christi" (22-Jun 2000)
-  Event "costa rica/guanacaste"         h "Guanacaste Day"                         Fixed Jul 25
-  Event "costa rica/saints/peter & paul"  h "St. Peter & Paul Day"                 Fixed Jun 29
-  Event "costa rica/virgin of the angel"  h "Virgin of the Angels Day"             Fixed Aug  2
-  Add   "c/assumption"                  h # "Assumption Day" (15-Aug 2000)
-  Event "costa rica/mother"             h "Mother's Day"                           Fixed Aug 15
-  Event "costa rica/independence"       h "Independence Day"                       Fixed Sep 15
-  Event "costa rica/dia de la raza"     h "Dia de la Raza"                         Fixed Oct 12
-  Add   "c/christmas"                   h # "Christmas" (25-Dec 2000)
-  Add   "new years eve"                 h # "New Year's Eve" (31-Dec 2000)
+Region "cr"
+  Add   "new year"                h # "New Year's Day"           (1-Jan 2000) 
+  Event "cr/saint joseph"         h   "Saint Joseph's Day"       Fixed Mar 19 
+  Event "cr/battle of rivas"      h   "Battle of Rivas"          Fixed Apr 11 
+  Event "cr/national heroe"       h   "National Heroes Day"      Fixed Apr 11 
+  Add   "c/holy thursday"         h # "Holy Thursday"            (20-Apr 2000)
+  Add   "c/good friday"           h # "Good Friday"              (21-Apr 2000)
+  Add   "labor"                   h # "Labor Day"                (1-May 2000) 
+  Add   "c/corpus christi"        h # "Corpus Christi"           (22-Jun 2000)
+  Event "cr/guanacaste"           h   "Guanacaste Day"           Fixed Jul 25 
+  Event "cr/saints/peter & paul"  h   "St. Peter & Paul Day"     Fixed Jun 29 
+  Event "cr/virgin of the angel"  h   "Virgin of the Angels Day" Fixed Aug  2 
+  Add   "c/assumption"            h # "Assumption Day"           (15-Aug 2000)
+  Event "cr/mother"               h   "Mother's Day"             Fixed Aug 15 
+  Event "cr/independence"         h   "Independence Day"         Fixed Sep 15 
+  Event "cr/dia de la raza"       h   "Dia de la Raza"           Fixed Oct 12 
+  Add   "c/christmas"             h # "Christmas"                (25-Dec 2000)
+  Add   "new years eve"           h # "New Year's Eve"           (31-Dec 2000)
 
 
 #--------------------------------------------------------------
 # Croatia 
 #--------------------------------------------------------------
-Region "croatia"
-  Add   "new year"                      h # "New Year's Day" (1-Jan 2000)
-  Add   "c/epiphany"                    h # "Epiphany (Julian Calendar)" (6-Jan 2000)
-  Add   "c/easter monday"               h # "Easter Monday (Gregorian Calendar)" (24-Apr 2000)
-  Add   "labor"                         h # "Labor Day" (1-May 2000)
-  Event "croatia/republic"              h "Republic Day"                           Fixed May 30
-  Event "croatia/antifascist struggle commemoration"  h "Antifascist Struggle Commemoration Day" Fixed Jun 22
-  Event "croatia/homeland thanksgiving"  h "Homeland Thanksgiving Day"             Fixed Aug  5
-  Add   "c/assumption"                  h # "Assumption Day" (15-Aug 2000)
-  Event "croatia/all saint"             h "All Saint's Day"                        Fixed Nov  1
-  Add   "c/christmas"                   h # "Christmas" (25-Dec 2000)
-  Event "croatia/second of christmas"   h "Second day of Christmas"                Fixed Dec 26
+Region "hr"
+  Add   "new year"                              h # "New Year's Day"                         (1-Jan 2000) 
+  Add   "c/epiphany"                            h # "Epiphany (Julian Calendar)"             (6-Jan 2000) 
+  Add   "c/easter monday"                       h # "Easter Monday (Gregorian Calendar)"     (24-Apr 2000)
+  Add   "labor"                                 h # "Labor Day"                              (1-May 2000) 
+  Event "hr/republic"                           h   "Republic Day"                           Fixed May 30 
+  Event "hr/antifascist struggle commemoration" h   "Antifascist Struggle Commemoration Day" Fixed Jun 22 
+  Event "hr/homeland thanksgiving"              h   "Homeland Thanksgiving Day"              Fixed Aug  5 
+  Add   "c/assumption"                          h # "Assumption Day"                         (15-Aug 2000)
+  Event "hr/all saint"                          h   "All Saint's Day"                        Fixed Nov  1 
+  Add   "c/christmas"                           h # "Christmas"                              (25-Dec 2000)
+  Event "hr/second of christmas"                h   "Second day of Christmas"                Fixed Dec 26 
 
 #--------------------------------------------------------------
 # Cuba 
 #--------------------------------------------------------------
-Region "cuba"
-  Event "cuba/liberation"               h "Liberation Day"                         Fixed Jan  1
-  Add   "new year"                      h # "New Year's Day" (1-Jan 2000)
-  Event "cuba/victory of the armed forces"  h "Victory of the Armed Forces"        Fixed Jan  2
-  Event "cuba/baire proclamation"       h "Baire Proclamation"                     Fixed Feb 24
-  Event "cuba/revolutionary attack on the presidential palace"  h "Revolutionary Attack on the Presidential Palace" Fixed Mar 13
-  Event "cuba/women"                    h "Women's Day"                            Fixed Mar 28
-  Event "cuba/militia"                  h "Militia Day"                            Fixed Apr 16
-  Event "cuba/victory at girn"          h "Victory at Gir-n"                       Fixed Apr 19
-  Add   "labor"                         h # "Labor Day" (1-May 2000)
-  Event "cuba/independence"             - "Independence Day"               Fixed May 20
-  Event "cuba/moncada anniversary"      h "Moncada Anniversary"                    Fixed Jul 25
-  Event "cuba/anniversary of the moncada barracks attack"  h "Anniversary of the Moncada Barracks Attack Day" Fixed Jul 26
-  Event "cuba/revolution"               h "Revolution Day"                         Fixed Jul 27
-  Event "cuba/independence war"         h "Independence War (Beginning of)"        Fixed Oct 10
-  Add   "c/christmas"                   h # "Christmas" (25-Dec 2000)
-  Event "cuba/second of christmas"      h "Second day of Christmas"                Fixed Dec 26
+Region "cu"
+  Event "cu/liberation"                                      h   "Liberation Day"                                  Fixed Jan  1 
+  Add   "new year"                                           h # "New Year's Day"                                  (1-Jan 2000) 
+  Event "cu/victory of the armed forces"                     h   "Victory of the Armed Forces"                     Fixed Jan  2 
+  Event "cu/baire proclamation"                              h   "Baire Proclamation"                              Fixed Feb 24 
+  Event "cu/revolutionary attack on the presidential palace" h   "Revolutionary Attack on the Presidential Palace" Fixed Mar 13 
+  Event "cu/women"                                           h   "Women's Day"                                     Fixed Mar 28 
+  Event "cu/militia"                                         h   "Militia Day"                                     Fixed Apr 16 
+  Event "cu/victory at girn"                                 h   "Victory at Gir-n"                                Fixed Apr 19 
+  Add   "labor"                                              h # "Labor Day"                                       (1-May 2000) 
+  Event "cu/independence"                                    -   "Independence Day"                                Fixed May 20 
+  Event "cu/moncada anniversary"                             h   "Moncada Anniversary"                             Fixed Jul 25 
+  Event "cu/anniversary of the moncada barracks attack"      h   "Anniversary of the Moncada Barracks Attack Day"  Fixed Jul 26 
+  Event "cu/revolution"                                      h   "Revolution Day"                                  Fixed Jul 27 
+  Event "cu/independence war"                                h   "Independence War (Beginning of)"                 Fixed Oct 10 
+  Add   "c/christmas"                                        h # "Christmas"                                       (25-Dec 2000)
+  Event "cu/second of christmas"                             h   "Second day of Christmas"                         Fixed Dec 26 
 
 #--------------------------------------------------------------
 # Curacao 
 #--------------------------------------------------------------
 Region "curacao"
-  Add   "new year"                      h # "New Year's Day" (1-Jan 2000)
-  Event "curacao/carnival"              h "Carnival"                               Easter -48
-  Add   "c/good friday"                 h # "Good Friday" (21-Apr 2000)
-  Add   "c/easter"                      h # "Easter" (23-Apr 2000)
-  Add   "c/easter monday"               h # "Easter Monday" (24-Apr 2000)
-  Event "curacao/queen beatrixs birthday"  h "Queen Beatrix's Birthday"            Fixed Apr 30
-  Add   "labor"                         h # "Labor Day" (1-May 2000)
-  Add   "c/ascension"                   h # "Ascension" (1-Jun 2000)
-  Event "curacao/flag"                  h "Flag Day"                               Fixed Jul  2
-  Event "curacao/antillean"             h "Antillean Day"                          Fixed Oct 21
-  Event "curacao/christma"              h "Christmas Day"                          Fixed Dec 25
-  Add   "c/boxing"                      h # "Boxing Day" (26-Dec 2000)
+  Add   "new year"                        h # "New Year's Day"           (1-Jan 2000) 
+  Event "curacao/carnival"                h   "Carnival"                 Easter -48   
+  Add   "c/good friday"                   h # "Good Friday"              (21-Apr 2000)
+  Add   "c/easter"                        h # "Easter"                   (23-Apr 2000)
+  Add   "c/easter monday"                 h # "Easter Monday"            (24-Apr 2000)
+  Event "curacao/queen beatrixs birthday" h   "Queen Beatrix's Birthday" Fixed Apr 30 
+  Add   "labor"                           h # "Labor Day"                (1-May 2000) 
+  Add   "c/ascension"                     h # "Ascension"                (1-Jun 2000) 
+  Event "curacao/flag"                    h   "Flag Day"                 Fixed Jul  2 
+  Event "curacao/antillean"               h   "Antillean Day"            Fixed Oct 21 
+  Event "curacao/christma"                h   "Christmas Day"            Fixed Dec 25 
+  Add   "c/boxing"                        h # "Boxing Day"               (26-Dec 2000)
 
 #--------------------------------------------------------------
 # Turkish Cyprus ("south")
@@ -1096,19 +1104,19 @@ Region "curacao"
 
 # cyprus/greece
 Region "cyprus/greece"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "c/epiphany"                    - # "Epiphany"                     Fixed Jan  6
-  Event "cyprus/submersion of the holy cross"  - "Feast of the Submersion of the Holy Cross" Fixed Jan  6
-  Event "cyprus/name day"               - "Name Day"                       Fixed Jan 19
-  Event "cyprus/green monday"           - "Green Monday"                   Easter -41
-  Add   "greece/independence"           - # "Independence Day"             Fixed Mar 25
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/holy saturday"               - # "Holy Saturday"                Easter -1
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Event "cyprus/kataklysmos"            - "Kataklysmos"                    Fixed Jun  7
-  Event "cyprus/greek national"         - "Greek National Day"             Fixed Oct 28
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
-  Add   "c/boxing"                      - # "Boxing Day"                   Fixed Dec 26
+  Add   "new year"                        - # "New Year's Day"                            Fixed Jan  1
+  Add   "c/epiphany"                      - # "Epiphany"                                  Fixed Jan  6
+  Event "cy/submersion of the holy cross" -   "Feast of the Submersion of the Holy Cross" Fixed Jan  6
+  Event "cy/name day"                     -   "Name Day"                                  Fixed Jan 19
+  Event "cy/green monday"                 -   "Green Monday"                              Easter -41  
+  Add   "gr/independence"                 - # "Independence Day"                          Fixed Mar 25
+  Add   "c/good friday"                   - # "Good Friday"                               Easter -2   
+  Add   "c/holy saturday"                 - # "Holy Saturday"                             Easter -1   
+  Add   "c/easter monday"                 - # "Easter Monday"                             Easter +1   
+  Event "cy/kataklysmos"                  -   "Kataklysmos"                               Fixed Jun  7
+  Event "cy/greek national"               -   "Greek National Day"                        Fixed Oct 28
+  Add   "c/christmas"                     - # "Christmas Day"                             Fixed Dec 25
+  Add   "c/boxing"                        - # "Boxing Day"                                Fixed Dec 26
 
 #--------------------------------------------------------------
 # Turkish Cyprus ("northern")
@@ -1116,2952 +1124,3054 @@ Region "cyprus/greece"
 
 # cyprus/turkey
 Region "cyprus/turkey"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "cyprus/submersion of the holy cross"  - "Feast of the Submersion of the Holy Cross" Fixed Jan  6
-  Add   "turkey/childrens"              - # "Children's day"               Fixed Apr 23
-  Add   "turkey/national sovereignty"   - # "National Sovereignty"         Fixed Apr 23
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Add   "turkey/youth and sports"       - # "Youth and Sports Day"         Fixed May 19
-  Event "cyprus/kataklysmos"            - "Kataklysmos"                    Fixed Jun  7
-  Event "cyprus/peace and freedom"      - "Peace and Freedom Day"          Fixed Jul 20
-  Event "cyprus/communal resistance"    - "Communal Resistance Day"        Fixed Aug  1
-  Add   "turkey/victory"                - # "Victory Day"                  Fixed Aug 30
-  Add   "turkey/independence"           - # "Independence Day"             Fixed Oct 29
-  Add   "islamic/al fitr"               h # "Id al Fitr (End of Ramadan)" (8-Jan 2000)
-  Add   "islamic/al adha"               h # "Eid al-Adha (Feast of the Sacrifice)" (16-Mar 2000)
-  Event "cyprus/proclamation of t r northern cyprus"  h "Proclamation of \"T. R. Northern Cyprus\"" Fixed Nov 15
+  Add   "new year"                               - # "New Year's Day"                            Fixed Jan  1                         
+  Event "cy/submersion of the holy cross"        -   "Feast of the Submersion of the Holy Cross" Fixed Jan  6                         
+  Add   "tr/childrens"                           - # "Children's day"                            Fixed Apr 23                         
+  Add   "tr/national sovereignty"                - # "National Sovereignty"                      Fixed Apr 23                         
+  Add   "labor"                                  - # "Labor Day"                                 Fixed May  1                         
+  Add   "tr/youth and sports"                    - # "Youth and Sports Day"                      Fixed May 19                         
+  Event "cy/kataklysmos"                         -   "Kataklysmos"                               Fixed Jun  7                         
+  Event "cy/peace and freedom"                   -   "Peace and Freedom Day"                     Fixed Jul 20                         
+  Event "cy/communal resistance"                 -   "Communal Resistance Day"                   Fixed Aug  1                         
+  Add   "tr/victory"                             - # "Victory Day"                               Fixed Aug 30                         
+  Add   "tr/independence"                        - # "Independence Day"                          Fixed Oct 29                         
+  Add   "islamic/al fitr"                        h # "Id al Fitr (End of Ramadan)"               (8-Jan 2000)                         
+  Add   "islamic/al adha"                        h # "Eid al-Adha (Feast of the Sacrifice)"      (16-Mar 2000)                        
+  Event "cy/proclamation of t r northern cyprus" h   "Proclamation of \"                         T. R. Northern Cyprus\"" Fixed Nov 15
 
 
 # czech republic
-Region "czech republic"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Event "czech republic/introduction of christianity"  - "Introduction of Christianity" Fixed Jul  5
-  Event "czech republic/death of jan hus"  - "Death of Jan Hus"            Fixed Jul  6
-  Add   "c/christmas eve"               - # "Christmas Eve"                Fixed Dec 24
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
-  Add   "saints/stephen"                - # "St. Stephen"                  Fixed Dec 26
+Region "cz"
+  Add   "new year"                        - # "New Year's Day"               Fixed Jan  1
+  Add   "c/easter monday"                 - # "Easter Monday"                Easter +1   
+  Add   "labor"                           - # "Labor Day"                    Fixed May  1
+  Event "cz/introduction of christianity" -   "Introduction of Christianity" Fixed Jul  5
+  Event "cz/death of jan hus"             -   "Death of Jan Hus"             Fixed Jul  6
+  Add   "c/christmas eve"                 - # "Christmas Eve"                Fixed Dec 24
+  Add   "c/christmas"                     - # "Christmas Day"                Fixed Dec 25
+  Add   "saints/stephen"                  - # "St. Stephen"                  Fixed Dec 26
 
 
 #--------------------------------------------------------------
 # Denmark 
 #--------------------------------------------------------------
-Region "denmark"
-  Add   "new year"                      h # "New Year's Day" (1-Jan 2000)
-  Event "denmark/3 king"                h "3 King's Day"                           Fixed Jan  6
-  Event "denmark/fjortende februar"     - "Fjortende Februar"              Fixed Feb 14
-  Event "denmark/"                      h "(similar to Hallowe'en)"                Fixed Mar  5
-  Add   "c/palm sunday"                 h # "Palm Sunday" (14-Apr 2000)
-  Event "denmark/birthday of queen"     - "Birthday of Queen Margrethe II" Fixed Apr 16
-  Add   "c/holy thursday"               h # "Holy Thursday" (20-Apr 2000)
-  Add   "c/good friday"                 h # "Good Friday " (21-Apr 2000)
-  Add   "c/easter"                      h # "Easter Sunday" (23-Apr 2000)
-  Add   "c/easter monday"               h # "Easter Monday" (24-Apr 2000)
-  Add   "mothers"                       h # "Mother's Day" (14-May 2000)
-  Event "denmark/great prayer"          h "Great Prayer Day"                       Easter +26
-  Event "denmark/liberation"            - "Liberation Day"                 Fixed May  5
-  Event "denmark/prince fredriks birthday"  h "Prince Fredrik's Birthday"          Fixed May 26
-  Add   "c/ascension"                   h # "Ascension Thursday" (11-Jun 2000)
-  Event "denmark/constitution"          h "Constitution Day"                       Fixed Jun  5
+Region "dk"
+  Add   "new year"                    h # "New Year's Day"                 (1-Jan 2000) 
+  Event "dk/3 king"                   h   "3 King's Day"                   Fixed Jan  6 
+  Event "dk/fjortende februar"        -   "Fjortende Februar"              Fixed Feb 14 
+  Event "dk/"                         h   "(similar to Hallowe'en)"        Fixed Mar  5 
+  Add   "c/palm sunday"               h # "Palm Sunday"                    (14-Apr 2000)
+  Event "dk/birthday of queen"        -   "Birthday of Queen Margrethe II" Fixed Apr 16 
+  Add   "c/holy thursday"             h # "Holy Thursday"                  (20-Apr 2000)
+  Add   "c/good friday"               h # "Good Friday "                   (21-Apr 2000)
+  Add   "c/easter"                    h # "Easter Sunday"                  (23-Apr 2000)
+  Add   "c/easter monday"             h # "Easter Monday"                  (24-Apr 2000)
+  Add   "mothers"                     h # "Mother's Day"                   (14-May 2000)
+  Event "dk/great prayer"             h   "Great Prayer Day"               Easter +26   
+  Event "dk/liberation"               -   "Liberation Day"                 Fixed May  5 
+  Event "dk/prince fredriks birthday" h   "Prince Fredrik's Birthday"      Fixed May 26 
+  Add   "c/ascension"                 h # "Ascension Thursday"             (11-Jun 2000)
+  Event "dk/constitution"             h   "Constitution Day"               Fixed Jun  5 
 # Denmark Father's Day Fars Dag 5-Jun
-  Add   "c/pentecost"                   h # "Pentecost" (11-Jun 2000)
-  Add   "c/pentecost monday"            h # "Pentecost Monday" (12-Jun 2000)
-  Event "denmark/valdemar"              h "Valdemars Day"                          Fixed Jun 15
-  Add   "c/trinity"                     h # "Trinity" (18-Jun 2000)
-  Event "denmark/midsummer party"       h "Midsummer Party"                        Fixed Jun 23
-  Event "denmark/morten"                h "Mortens Day"                            Fixed Nov 11
-  Add   "c/christmas eve"               h # "Christmas Eve" (24-Dec 2000)
-  Add   "c/christmas"                   h # "Christmas" (25-Dec 2000)
-  Event "denmark/2nd of christmas"      h "2nd day of Christmas"                   Fixed Dec 26
-  Add   "new years eve"                 h # "New Year's Eve" (31-Dec 2000)
+  Add   "c/pentecost"                 h # "Pentecost"                      (11-Jun 2000)
+  Add   "c/pentecost monday"          h # "Pentecost Monday"               (12-Jun 2000)
+  Event "dk/valdemar"                 h   "Valdemars Day"                  Fixed Jun 15 
+  Add   "c/trinity"                   h # "Trinity"                        (18-Jun 2000)
+  Event "dk/midsummer party"          h   "Midsummer Party"                Fixed Jun 23 
+  Event "dk/morten"                   h   "Mortens Day"                    Fixed Nov 11 
+  Add   "c/christmas eve"             h # "Christmas Eve"                  (24-Dec 2000)
+  Add   "c/christmas"                 h # "Christmas"                      (25-Dec 2000)
+  Event "dk/2nd of christmas"         h   "2nd day of Christmas"           Fixed Dec 26 
+  Add   "new years eve"               h # "New Year's Eve"                 (31-Dec 2000)
 
 
 #--------------------------------------------------------------
 # Djibouti 
 #--------------------------------------------------------------
-Region "djibouti"
-  Add   "new year"                      h # "New Year's Day" (1-Jan 2000)
-  Add   "islamic/al fitr"               h # "Id al Fitr (End of Ramadan)" (8-Jan 2000)
-  Add   "islamic/al adha"               h # "Id al-Adha" (16-Mar 2000)
-  Add   "islamic/new year"              h # "Islamic New Year" (6-Apr 2000)
-  Event "djibouti/fete du travail"      h "Fete du Travail"                Fixed May  1
-  Event "djibouti/mouloud"              h "Mouloud (Birth of the Prophet)" Islamic_Fixed Reb�u'l-awwal 12
-  Event "djibouti/independence feast"   - "Independence Feast Day"         Fixed Jun 27
-  Event "djibouti/independence"         h "Independence Day"               Fixed Jul 27
-  Add   "c/christmas"                   h # "Christmas" (25-Dec 2000)
-
-
-# dominica
-Region "dominica"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "c/epiphany"                    - # "Epiphany"                     Fixed Jan  6
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Add   "c/whitmonday"                  - # "Whitmonday"                   Easter +50
-  Event "dominica/emancipation"         - "Emancipation Day"               WDRel Aug Mon 1st
-  Event "dominica/independence"         - "Independence Day"               Fixed Nov  3
-  Event "dominica/community service"    - "Community Service Day"          Fixed Nov  4
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "dj"
+  Add   "new year"                h # "New Year's Day"                 (1-Jan 2000)                  
+  Add   "islamic/al fitr"         h # "Id al Fitr (End of Ramadan)"    (8-Jan 2000)                  
+  Add   "islamic/al adha"         h # "Id al-Adha"                     (16-Mar 2000)                 
+  Add   "islamic/new year"        h # "Islamic New Year"               (6-Apr 2000)                  
+  Event "dj/fete du travail"      h   "Fete du Travail"                Fixed May  1                  
+  Event "dj/mouloud"              h   "Mouloud (Birth of the Prophet)" Islamic_Fixed Reb�u'l-awwal 12
+  Event "dj/independence feast"   -   "Independence Feast Day"         Fixed Jun 27                  
+  Event "dj/independence"         h   "Independence Day"               Fixed Jul 27                  
+  Add   "c/christmas"             h # "Christmas"                      (25-Dec 2000)                 
+
+
+#--------------------------------------------------------------
+# Dominica 
+#--------------------------------------------------------------
+Region "dm"
+  Add   "new year"                    h # "New Year's Day"                   (1-Jan 2000)     
+  Add   "c/epiphany"                  - # "Epiphany"                         Fixed Jan  6     
+  Event "dm/carnival"                 h   "Carnival"                         Easter -47       
+  Add   "c/good friday"               h # "Good Friday"                      (21-Apr 2000)    
+  Add   "c/easter monday"             h # "Easter Monday"                    (24-Apr 2000)    
+  Add   "labor"                       h # "Labor Day"                        (1-May 2000)     
+  Add   "c/whitmonday"                h # "Whitmonday"                       (12-Jun 2000)    
+  Event "dm/august monday"            h   "August Monday"                    WDRel Aug Mon 1st
+  Event "dm/creole"                   h   "Creole Day"                       Fixed Oct 29     
+  Event "dm/independence & discovery" h   "Independence Day & Discovery Day" Fixed Nov  3     
+  Event "dm/community service"        h   "Community Service Day"            Fixed Nov  4     
+  Add   "c/christmas"                 h # "Christmas"                        (25-Dec 2000)    
+  Add   "c/boxing"                    h # "Boxing Day"                       (26-Dec 2000)    
 
+#--------------------------------------------------------------
+# Dominican Republic 
+#--------------------------------------------------------------
+Region "do"
+  Add   "new year"                           h # "New Year's Day"                  (1-Jan 2000) 
+  Add   "c/epiphany"                         h # "Epiphany"                        (6-Jan 2000) 
+  Event "do/feast of the three kings"        h   "Feast of the Three Kings"        Fixed Jan  6 
+  Event "do/feast of our lady of altagracia" h   "Feast of our Lady of Altagracia" Fixed Jan 21 
+  Event "do/duarte"                          h   "Duarte Day"                      Fixed Jan 26 
+  Event "do/independence"                    h   "Independence Day"                Fixed Feb 27 
+  Event "do/battle of march"                 h   "Battle of March"                 Fixed Mar 19 
+  Add   "c/good friday"                      h # "Good Friday"                     (21-Apr 2000)
+  Add   "labor"                              h # "Labor Day"                       (1-May 2000) 
+  Add   "c/corpus christi"                   h # "Corpus Christi"                  (22-Jun 2000)
+  Event "do/father"                          h   "Father's Day"                    Fixed Jul 29 
+  Event "do/santo domingo foundation"        h   "Santo Domingo Foundation Day"    Fixed Aug  5 
+  Event "do/restoration"                     h   "Restoration Day"                 Fixed Aug 16 
+  Event "do/our lady of mercy"               h   "Our Lady of Mercy Day"           Fixed Sep 24 
+  Event "do/columbu"                         h   "Columbus Day"                    Fixed Oct  9 
+  Event "do/constitution"                    h   "Constitution Day"                Fixed Nov  6 
+  Event "do/discovery of hispaniola"         h   "Discovery of Hispaniola"         Fixed Dec  5 
+  Add   "c/christmas"                        h # "Christmas"                       (25-Dec 2000)
 
 # ecuador
-Region "ecuador"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "c/epiphany"                    - # "Epiphany"                     Fixed Jan  6
-  Add   "c/holy thursday"               - # "Holy Thursday"                Easter -3
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Event "ecuador/battle of pichincha "  - "Battle of Pichincha  Day"       Fixed May 24
-  Event "ecuador/simon bolivars"        - "Simon Bolivar's Birthday"       Fixed Jul 24
-  Event "ecuador/guayaquils independence"  - "Guayaquil's Independence Day" Fixed Oct  9
-  Add   "columbus"                      - # "Columbus Day"                 Fixed Oct 12
-  Add   "c/all saints"                  - # "All Saints Day"               Fixed Nov  1
-  Add   "c/all souls"                   - # "All Souls Day"                Fixed Nov  2
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
-
-
-# egypt
-Region "egypt"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "unity"                         - # "Unity Day"                    Fixed Feb 22
-  Event "egypt/sham al-naseem"          - "Sham al-Naseem"                 Fixed Mar 21
-  Event "egypt/sinai liberation"        - "Sinai Liberation Day"           Fixed Apr 25
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Event "egypt/leylet en-nuktah"        - "Leylet en-Nuktah"               Fixed Jun 17
-  Event "egypt/evacuation"              - "Evacuation Day"                 Fixed Jun 18
-  Event "egypt/revolution"              - "Revolution Day"                 Fixed Jul 23
-  Event "egypt/armed forces"            - "Armed Forces Day"               Fixed Oct  6
-  Event "egypt/suez"                    - "Suez Day"                       Fixed Oct 24
-  Event "egypt/victory"                 - "Victory Day"                    Fixed Dec 23
-
-
-# el salvador
-Region "el salvador"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "c/easter"                      - # "Easter"                       Easter +0
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Add   "c/corpus christi"              - # "Corpus Christi"               Easter +60
-  Event "el salvador/schoolteachers"    - "Schoolteachers Day"             Fixed Jun 22
-  Event "el salvador/san salvador festival"  - "San Salvador Festival"     Fixed Aug  4  3 days
-  Event "el salvador/independence"      - "Independence Day"               Fixed Sep 15
-  Add   "c/all souls"                   - # "All Souls Day"                Fixed Nov  2
-  Event "el salvador/first call for independence"  - "First Call for Independence Day" Fixed Nov  5
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
-
-
-# equatorial guinea
-Region "equatorial guinea"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/easter"                      - # "Easter"                       Easter +0
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Event "equatorial guinea/oau"         - "OAU DAy"                        Fixed May 25
-  Event "equatorial guinea/presidents"  - "President's Birthday"           Fixed Jun  5
-  Event "equatorial guinea/armed forces"  - "Armed Forces Day"             Fixed Aug  3
-  Event "equatorial guinea/constitution"  - "Constitution Day"             Fixed Aug 15
-  Event "equatorial guinea/independence"  - "Independence Day"             Fixed Oct 12
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
-
-
-# estonia
-Region "estonia"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Event "estonia/victory"               - "Victory Day"                    Fixed Jun 23
-  Event "estonia/midsummer"             - "Midsummer Day"                  Fixed Jun 24
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
-
-
-# ethiopia
-Region "ethiopia"
-  Event "ethiopia/genna"                - "Genna"                          Fixed Jan  7
-  Event "ethiopia/epiphany"             - "Epiphany"                       Fixed Jan 19
-  Event "ethiopia/martyrs"              - "Martyrs' Day"                   Fixed Feb 19
-  Event "ethiopia/victory of adowa"     - "Victory of Adowa"               Fixed Mar  2
-  Event "ethiopia/battle of aduwa"      - "Battle of Aduwa Day"            Fixed Mar  2
-  Event "ethiopia/patriots victory"     - "Patriots' Victory Day"          Fixed Apr  6
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Event "ethiopia/liberation"           - "Liberation Day"                 Fixed May  5
-  Event "ethiopia/buhe"                 - "Buhe"                           Fixed Aug 19
-  Event "ethiopia/ethiopian new year"   - "Ethiopian New Year"             Fixed Sep 11
-  Event "ethiopia/popular revolution commemoration"  - "Popular Revolution Commemoration Day" Fixed Sep 12
-  Event "ethiopia/revolution"           - "Revolution Day"                 Fixed Sep 12
-  Event "ethiopia/meskel"               - "Meskel"                         Fixed Sep 28
-
-
-# falkland islands
-Region "falkland islands"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "british commonwealth/queens"   - # "Queen's Birthday"             Fixed Jun  4
-  Event "falkland islands/liberation"   - "Liberation Day"                 Fixed Jun 14
-  Event "falkland islands/anniversary of the battle of the falkland islands"  - "Anniversary of the Battle of the Falkland Islands" Fixed Dec  8
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
-
-
-# fiji
-Region "fiji"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/easter eve"                  - # "Easter Eve"                   Easter -1
-  Add   "c/easter"                      - # "Easter"                       Easter +0
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Event "fiji/queens"                   - "Queen's Birthday"               WDRel Jun Mon 2nd
-  Event "fiji/bank holiday"             - "Bank Holiday"                   WDRel Aug Mon 1st
-  Event "fiji/fiji"                     - "Fiji Day"                       WDRel Aug Mon 2nd
-  Event "fiji/prince charles"           - "Prince Charles Day"             WDRel Nov Mon 3rd
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
-  Add   "c/boxing"                      - # "Boxing Day"                   Fixed Dec 26
+Region "ec"
+  Add   "new year"                   - # "New Year's Day"               Fixed Jan  1
+  Add   "c/epiphany"                 - # "Epiphany"                     Fixed Jan  6
+  Add   "c/holy thursday"            - # "Holy Thursday"                Easter -3   
+  Add   "c/good friday"              - # "Good Friday"                  Easter -2   
+  Add   "labor"                      - # "Labor Day"                    Fixed May  1
+  Event "ec/battle of pichincha "    -   "Battle of Pichincha  Day"     Fixed May 24
+  Event "ec/simon bolivars"          -   "Simon Bolivar's Birthday"     Fixed Jul 24
+  Event "ec/guayaquils independence" -   "Guayaquil's Independence Day" Fixed Oct  9
+  Add   "columbus"                   - # "Columbus Day"                 Fixed Oct 12
+  Add   "c/all saints"               - # "All Saints Day"               Fixed Nov  1
+  Add   "c/all souls"                - # "All Souls Day"                Fixed Nov  2
+  Add   "c/christmas"                - # "Christmas Day"                Fixed Dec 25
 
 
+#--------------------------------------------------------------
+# Egypt 
+#--------------------------------------------------------------
+Region "eg"
+  Add   "new year"                - # "New Year's Day"                   Fixed Jan  1                  
+  Event "eg/bairam feast"         h   "Bairam Feast (End of Ramadan)"    Islamic_Fixed Schaww�l 1      
+  Add   "unity"                   - # "Unity Day"                        Fixed Feb 22                  
+# Egypt Grand Feast 15-Mar
+  Add   "islamic/new year"        h # "Islamic New Year"                 (6-Apr 2000)                  
+  Event "eg/sinai liberation"     h   "Sinai Liberation Day"             Fixed Apr 25                  
+  Event "eg/sham el nessim"       h   "Sham el Nessim (Egyptian Easter)" Julian_Easter +1              
+  Add   "labor"                   h # "Labor Day"                        (1-May 2000)                  
+  Event "eg/mouloud"              h   "Mouloud (Birth of the Prophet)"   Islamic_Fixed Reb�u'l-awwal 12
+  Event "eg/leylet en-nuktah"     -   "Leylet en-Nuktah"                 Fixed Jun 17                  
+  Event "eg/liberation"           h   "Liberation Day"                   Fixed Jun 18                  
+# Egypt Night of the Droplet 18-Jun
+  Event "eg/revolution"           h   "Revolution Day"                   Fixed Jul 23                  
+# Egypt Nile Festival Day ?
+  Add   "new year"                h # "New Year (1715 Coptic)"           (12-Sep 2000)                 
+  Event "eg/armed force"          h   "Armed Forces Day"                 Fixed Oct  6                  
+  Event "eg/suez"                 -   "Suez Victory Day"                 Fixed Oct 24                  
+  Event "eg/victory"              -   "Victory Day"                      Fixed Dec 23                  
+
+#--------------------------------------------------------------
+# El Salvador 
+#--------------------------------------------------------------
+Region "sv"
+  Add   "new year"                 h # "New Years Day"                 (1-Jan 2000)        
+  Add   "c/holy wednesday"         h # #                                                   
+  Add   "c/holy thursday"          h # "Holy Thursday"                 (20-Apr 2000)       
+  Add   "c/good friday"            h # "Good Friday"                   (21-Apr 2000)       
+  Add   "c/holy saturday"          h # "Holy Saturday"                 (22-Apr 2000)       
+  Add   "c/easter"                 h # "Easter Sunday"                 (23-Apr 2000)       
+  Add   "labor"                    h # "Labor Day"                     (1-May 2000)        
+  Event "sv/schoolteacher"         h   "Schoolteacher's Day"           Fixed Jun 22        
+  Event "sv/bank holiday"          h   "Bank Holiday (Balance Day)"    Fixed Jun 30        
+  Add   "c/corpus christi"         - # "Corpus Christi"                Easter +60          
+  Event "sv/independence"          h   "Independence Day"              Fixed Sep 15        
+  Event "sv/all soul or memorial"  h   "All Souls Day or Memorial Day" Fixed Nov  2        
+  Event "sv/cry of independence"   h   "Cry of Independence Day"       Fixed Nov  5        
+  Event "sv/virgen de guadalupe"   h   "Virgen de Guadalupe"           Fixed Dec 12        
+  Event "sv/bank holiday"          h   "Bank Holiday"                  Fixed Dec 31        
+  Event "sv/san salvador festival" -   "San Salvador Festival"         Fixed Aug  4  3 days
+  Add   "c/christmas"              - # "Christmas Day"                 Fixed Dec 25        
+
+#--------------------------------------------------------------
+# Equatorial Guinea 
+#--------------------------------------------------------------
+Region "gq"
+  Add   "new year"                h # "New Year's Day"        (1-Jan 2000) 
+  Event "gq/women"                h   "Women's Day"           Fixed Mar  8 
+  Add   "c/good friday"           h # "Good Friday"           (21-Apr 2000)
+  Add   "c/easter monday"         h # "Easter Monday"         (24-Apr 2000)
+  Add   "labor"                   h # "Labor Day"             (1-May 2000) 
+  Event "gq/oau"                  h   "OAU Day"               Fixed May 25 
+  Event "gq/presidents birthday"  h   "President's Birthday"  Fixed Jun  5 
+  Event "gq/batas fiesta"         h   "Bata's Fiesta"         Fixed Jul 23 
+  Event "gq/armed force"          h   "Armed Forces Day"      Fixed Aug  3 
+  Event "gq/constitution"         h   "Constitution Day"      Fixed Aug 15 
+  Event "gq/our lady of bissila"  h   "Our Lady of Bissila"   Fixed Aug 15 
+  Event "gq/independence"         h   "Independence Day"      Fixed Oct 12 
+  Event "gq/malabo fiesta"        h   "Malabo Fiesta"         Fixed Nov 17 
+  Add   "c/immaculate conception" h # "Immaculate Conception" (8-Dec 2000) 
+  Event "gq/human right"          h   "Human Rights Day"      Fixed Dec 10 
+  Add   "c/christmas"             h # "Christmas"             (25-Dec 2000)
+
+#--------------------------------------------------------------
+# Eritrea 
+#--------------------------------------------------------------
+Region "er"
+  Add   "new year"                       h # "New Years Day"               (1-Jan 2000)
+  Event "er/women"                       h   "Women's Day"                 Fixed Mar  8
+  Event "er/liberation"                  h   "Liberation Day"              Fixed May 24
+  Event "er/martyrs"                     h   "Martyrs' Day"                Fixed Jun 20
+  Event "er/start of the armed struggle" h   "Start of the Armed Struggle" Fixed Sep  1
+
+#--------------------------------------------------------------
+# Estonia 
+#--------------------------------------------------------------
+Region "ee"
+  Add   "new year"                       h # "New Year's Day"                  (1-Jan 2000) 
+  Event "ee/independence"                h   "Independence Day (1918)"         Fixed Feb 24 
+  Add   "c/good friday"                  h # "Good Friday"                     (21-Apr 2000)
+  Add   "labor"                          - # "Labor Day"                       Fixed May  1 
+  Event "ee/spring"                      h   "Labor Day / Spring Day"          Fixed May  1 
+  Event "ee/victory"                     h   "Victory Day"                     Fixed Jun 23 
+  Event "ee/midsummer"                   h   "Midsummer's Day"                 Fixed Jun 24 
+  Event "ee/restoration of independence" h   "Restoration of Independence Day" Fixed Aug 20 
+  Add   "c/christmas2d"                  h # "Christmas"                       (25-Dec 2000)
+
+
+#--------------------------------------------------------------
+# Ethiopia 
+#--------------------------------------------------------------
+Region "et"
+  Event "et/ethiopian christmas"            h   "Ethiopian Christmas (Genna)"     Fixed Jan  7                  
+  Add   "islamic/al fitr"                   h # "Id al Fitr (End of Ramadan)"     (8-Jan 2000)                  
+  Event "et/ethiopian epiphany"             h   "Ethiopian Epiphany (Timket)"     Fixed Jan 19                  
+  Event "et/battle of adowa"                h   "Battle of Adowa"                 Fixed Mar  2                  
+  Event "et/patriots victory"               -   "Patriots' Victory Day"           Fixed Apr  6                  
+  Add   "islamic/al adha"                   h # "Id al Adha"                                                    
+  Add   "orthodox/good friday"              h # "Orthodox Good friday"                                          
+  Add   "orthodox/easter"                   h # "Orthodox Easter"                                               
+  Add   "labor"                             h # "Labor Day"                       (1-May 2000)                  
+  Event "et/overthrow of the dergue regime" h   "Overthrow of the Dergue Regime"  Fixed May 28                  
+  Event "et/mouloud"                        h   �Mouloud (Birth of the Prophet)"  Islamic_Fixed Reb�u'l-awwal 12
+  Event "et/ethiopian new year"             h   "Ethiopian New Year (Enqutatash)" Coptic_Fixed Tout 1           
+  Event "et/true cros"                      h   "True Cross Day (Meskal)"         Coptic_Fixed Tout 18          
+  Event "et/genna"                          -   "Genna"                           Fixed Jan  7                  
+  Event "et/martyrs"                        -   "Martyrs' Day"                    Fixed Feb 19                  
+  Event "et/liberation"                     -   "Liberation Day"                  Fixed May  5                  
+  Event "et/buhe"                           -   "Buhe"                            Fixed Aug 19                  
+
+
+#--------------------------------------------------------------
+# Falkland Islands 
+#--------------------------------------------------------------
+Region "fk"
+  Add   "new year"                    h # "New Year's Day"              (1-Jan 2000) 
+  Add   "c/good friday"               h # "Good Friday"                 (21-Apr 2000)
+  Add   "british commonwealth/queens" - # "Queen's Birthday"            Fixed Jun  4 
+  Event "fk/liberation"               h   "Liberation Day"              Fixed Jun 14 
+  Event "fk/battle of the falkland"   h   "Battle of the Falklands Day" Fixed Dec  8 
+  Add   "c/christmas"                 h # "Christmas"                   (25-Dec 2000)
+  Event "fk/annual sport"             h   "Annual Sports Day"           Fixed Dec 26 
+  Add   "c/christmas"                 - # "Christmas Day"               Fixed Dec 25 
+  Add   "c/boxing"                    h # "Boxing Day"                  (26-Dec 2000)
+  Event "fk/stanley sport"            h   "Stanley Sports Day"          Fixed Dec 27 
+
+#--------------------------------------------------------------
+# Faroe Islands 
+#--------------------------------------------------------------
+Region "fo"
+  Add   "new year"                h # "New Year's Day"              (1-Jan 2000)     
+  Add   "c/maundy thursday"       h # "Maundy Thursday"             (20-Apr 2000)    
+  Add   "c/good friday"           h # "Good Friday"                 (21-Apr 2000)    
+  Add   "c/easter"                h # "Easter"                      (23-Apr 2000)    
+  Add   "c/easter monday"         h # "Easter Monday"               (24-Apr 2000)    
+  Event "fo/flag"                 h   "Flag Day"                    Fixed Apr 25     
+  Event "fo/common prayer"        h   "Common Prayer Day"           Easter +26       
+  Event "fo/nordoyastevna"        h   "Nor�oyastevna"               WDRel May wee 4th
+  Add   "c/ascension"             h # "Ascension"                   (1-Jun 2000)     
+  Event "fo/constitution"         h   "Constitution Day"            Fixed Jun  5     
+  Event "fo/eystanstevna"         h   "Eystanstevna"                WDRel Jun wee 2nd
+  Event "fo/whit sunday"          h   "Whit Sunday (Pentecost)"     Easter +49       
+  Event "fo/whit monday"          h   "Whit Monday"                 Easter +50       
+  Event "fo/joansoka"             h   "J�ans�ka"                    WDRel Jun wee 4th
+  Event "fo/varmakeldustevna"     h   "Varmakeldustevna"            WDRel Jul wee 1st
+  Event "fo/olavsoka eve"         h   "Olavsoka Eve"                Fixed Jul 28     
+  Event "fo/vestanstevna"         h   "Vestanstevna"                WDRel Jul wee 4th
+  Event "fo/olavsoka"             h   "Olavsoka Day (National Day)" Fixed Jul 29     
+  Add   "c/christmas eve"         h # "Christmas Eve"               (24-Dec 2000)    
+  Event "fo/christma"             h   "Christmas Day"               Fixed Dec 25     
+  Add   "c/boxing"                h # "Boxing Day"                  (26-Dec 2000)    
+  Add   "new years eve"           h # "New Year's Eve"              (31-Dec 2000)    
+
+#--------------------------------------------------------------
+# Fiji 
+#--------------------------------------------------------------
+Region "fj"
+  Add   "new year"                h # "New Year's Day"                 (1-Jan 2000)                               
+# Event "fiji/national youth"           h "National Youth Day"         Fiji National Youth Day 7-Mar ? ? ? ? moveable but still researching
+  Add   "c/good friday"           h # "Good Friday"                    (21-Apr 2000)                              
+  Add   "c/easter eve"            - # "Easter Eve"                     Easter -1                                  
+  Add   "c/easter"                - # "Easter"                         Easter +0                                  
+  Add   "c/easter monday"         h # "Easter Monday"                  (24-Apr 2000)                              
+# Event "fi/ratu sir lala sukuna" h "Ratu Sir Lala Sukuna Day"          Fiji Ratu Sir Lala Sukuna Day 29-May ? ? ? ? moveable but still researching
+  Event "fj/queens birthday"      h   "Queen's Birthday"               WDRel Jun Sat 2nd                          
+  Event "fj/mouloud"              h   "Mouloud (Birth of the Prophet)" Islamic_Fixed Reb�u'l-awwal 12             
+# Event "fi/constitution"         h "Constitution Day"                 Fiji Constitution Day 28-Jul ? ? ? ? moveable but still researching
+  Event "fj/bank holiday"         -   "Bank Holiday"                   WDRel Aug Mon 1st                          
+  Event "fj/fiji"                 -   "Fiji Day"                       WDRel Aug Mon 2nd                          
+  Event "fj/cession"              h   "Cession Day"                    Fixed Oct 13                               
+# Event "fi/diwali"               h "Diwali"                           Fiji Diwali 26 ? ? ? ? moveable but still researching
+  Event "fj/prince charles"       -   "Prince Charles Day"             WDRel Nov Mon 3rd                          
+  Add   "c/christmas"             h # "Christmas"                      (25-Dec 2000)                              
+  Add   "c/boxing"                h # "Boxing Day"                     (26-Dec 2000)                 
+
 # finland
-Region "finland"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "c/epiphany"                    - # "Epiphany"                     Fixed Jan  6
-  Event "finland/runebergs"             - "Runeberg's Day"                 Fixed Feb  5
-  Event "finland/kalevala"              - "Kalevala Day"                   Fixed Feb 28
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Add   "may day"                       - # "May Day"                      Fixed May  1
-  Event "finland/snellman"              - "Snellman Day"                   Fixed May 12
-  Event "finland/flag of the army"      - "Flag Day of the Army"           Fixed May 19
-  Add   "c/pentecost eve"               - # "Pentecost Eve"                Easter +48
-  Event "finland/flag"                  - "Flag Day"                       Fixed Jun  4
-  Event "finland/midsummers eve"        - "Midsummer's Eve"                WDRel Jun 24 Fri +0
-  Event "finland/midsummer"             - "Midsummer's Day"                WDRel Jun 25 Sat +0
-  Event "finland/alexis kivi"           - "Alexis Kivi Day"                Fixed Oct 10
-  Event "finland/all saints"            - "All Saints Day"                 WDRel Nov Sat 1st
-  Event "finland/independence"          - "Independence Day"               Fixed Dec  6
-  Add   "c/christmas eve"               - # "Christmas Eve"                Fixed Dec 24
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
-  Add   "c/boxing"                      - # "Boxing Day"                   Fixed Dec 26
+Region "fi"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1       
+  Add   "c/epiphany"              - # "Epiphany"              Fixed Jan  6       
+  Event "fi/runebergs"            -   "Runeberg's Day"        Fixed Feb  5       
+  Event "fi/kalevala"             -   "Kalevala Day"          Fixed Feb 28       
+  Add   "c/good friday"           - # "Good Friday"           Easter -2          
+  Add   "c/easter monday"         - # "Easter Monday"         Easter +1          
+  Add   "may day"                 - # "May Day"               Fixed May  1       
+  Event "fi/snellman"             -   "Snellman Day"          Fixed May 12       
+  Event "fi/flag of the army"     -   "Flag Day of the Army"  Fixed May 19       
+  Add   "c/pentecost eve"         - # "Pentecost Eve"         Easter +48         
+  Event "fi/flag"                 -   "Flag Day"              Fixed Jun  4       
+  Event "fi/midsummers eve"       -   "Midsummer's Eve"       WDRel Jun 24 Fri +0
+  Event "fi/midsummer"            -   "Midsummer's Day"       WDRel Jun 25 Sat +0
+  Event "fi/alexis kivi"          -   "Alexis Kivi Day"       Fixed Oct 10       
+  Event "fi/all saints"           -   "All Saints Day"        WDRel Nov Sat 1st  
+  Event "fi/independence"         -   "Independence Day"      Fixed Dec  6       
+  Add   "c/christmas eve"         - # "Christmas Eve"         Fixed Dec 24       
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25       
+  Add   "c/boxing"                - # "Boxing Day"            Fixed Dec 26       
 
 
 # france
-Region "france"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "c/ash wednesday"               - # "Ash wednesday"                Easter -46
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Event "france/liberation"             - "Liberation Day"                 Fixed May  8
-  Event "france/ascension"              - "Ascension Day"                  Fixed May 12
-  Event "france/fete des saintes-maries" - "F�te des Saintes-Maries"       Fixed May 24
-  Add   "c/pentecost"                   - # "Pentecost"                    Easter +49
-  Event "france/d-day observance"       - "D-Day Observance"               Fixed Jun  6
-  Event "france/fathers"                - "Father's Day"                   WDRel Jun Sun 2nd
-  Event "france/night watch"            - "Night Watch"                    Fixed Jul 13
-  Event "france/bastille"               - "Bastille Day"                   Fixed Jul 14
-  Event "france/marseillaise"           - "Marseillaise Day"               Fixed Jul 30
-  Add   "c/assumption"                  - # "Assumption Day"               Fixed Aug 15
-  Event "france/fete nationale"         - "F�te Nationale"                 Fixed Sep 22
-  Add   "c/all saints"                  - # "All Saints Day"               Fixed Nov  1
-  Add   "c/all souls"                   - # "All Souls Day"                Fixed Nov  2
-  Add   "armistice"                     - # "Armistice Day"                Fixed Nov 11
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "fr"
+  Add   "new year"                   - # "New Year's Day"          Fixed Jan  1     
+  Add   "c/ash wednesday"            - # "Ash wednesday"           Easter -46       
+  Add   "c/good friday"              - # "Good Friday"             Easter -2        
+  Add   "c/easter monday"            - # "Easter Monday"           Easter +1        
+  Event "fr/liberation"              -   "Liberation Day"          Fixed May  8     
+  Event "fr/ascension"               -   "Ascension Day"           Fixed May 12     
+  Event "fr/fete des saintes-maries" -   "F�te des Saintes-Maries" Fixed May 24     
+  Add   "c/pentecost"                - # "Pentecost"               Easter +49       
+  Event "fr/d-day observance"        -   "D-Day Observance"        Fixed Jun  6     
+  Event "fr/fathers"                 -   "Father's Day"            WDRel Jun Sun 2nd
+  Event "fr/night watch"             -   "Night Watch"             Fixed Jul 13     
+  Event "fr/bastille"                -   "Bastille Day"            Fixed Jul 14     
+  Event "fr/marseillaise"            -   "Marseillaise Day"        Fixed Jul 30     
+  Add   "c/assumption"               - # "Assumption Day"          Fixed Aug 15     
+  Event "fr/fete nationale"          -   "F�te Nationale"          Fixed Sep 22     
+  Add   "c/all saints"               - # "All Saints Day"          Fixed Nov  1     
+  Add   "c/all souls"                - # "All Souls Day"           Fixed Nov  2     
+  Add   "armistice"                  - # "Armistice Day"           Fixed Nov 11     
+  Add   "c/christmas"                - # "Christmas Day"           Fixed Dec 25     
 
 
 # french guiana
-Region "french guiana"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "c/ash wednesday"               - # "Ash wednesday"                Easter -46
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Add   "c/ascension"                   - # "Ascension"                    Easter +39
-  Add   "c/pentecost"                   - # "Pentecost"                    Easter +49
-  Add   "c/assumption"                  - # "Assumption Day"               Fixed Aug 15
-  Add   "c/all saints"                  - # "All Saints Day"               Fixed Nov  1
-  Add   "c/all souls"                   - # "All Souls Day"                Fixed Nov  2
-  Add   "armistice"                     - # "Armistice Day"                Fixed Nov 11
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "gf"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Add   "c/ash wednesday"         - # "Ash wednesday"         Easter -46  
+  Add   "c/good friday"           - # "Good Friday"           Easter -2   
+  Add   "c/easter monday"         - # "Easter Monday"         Easter +1   
+  Add   "c/ascension"             - # "Ascension"             Easter +39  
+  Add   "c/pentecost"             - # "Pentecost"             Easter +49  
+  Add   "c/assumption"            - # "Assumption Day"        Fixed Aug 15
+  Add   "c/all saints"            - # "All Saints Day"        Fixed Nov  1
+  Add   "c/all souls"             - # "All Souls Day"         Fixed Nov  2
+  Add   "armistice"               - # "Armistice Day"         Fixed Nov 11
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25
 
 
 # french polynesia
-Region "french polynesia"
-  Event "french polynesia/chinese new year"  - "Chinese New Year"          Fixed Feb  6
-  Event "french polynesia/missionaries arrival commemoration"  - "Missionaries Arrival Commemoration" Fixed Mar  5
-  Add   "may day"                       - # "May Day"                      Fixed May  1
-  Event "french polynesia/armistice"    - "Armistice Day"                  Fixed May  8
+Region "pf"
+  Event "pf/chinese new year"                   -   "Chinese New Year"                   Fixed Feb  6
+  Event "pf/missionaries arrival commemoration" -   "Missionaries Arrival Commemoration" Fixed Mar  5
+  Add   "may day"                               - # "May Day"                            Fixed May  1
+  Event "pf/armistice"                          -   "Armistice Day"                      Fixed May  8
 
 
 # gabon
-Region "gabon"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "gabon/constitution"            - "Constitution Day"               Fixed Feb 19
-  Event "gabon/renovation"              - "Renovation Day"                 Fixed Mar 12
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Add   "c/whitmonday"                  - # "Whitmonday"                   Easter +50
-  Event "gabon/independence"            - "Independence Day"               Fixed Aug 17
-  Add   "c/all saints"                  - # "All Saints Day"               Fixed Nov  1
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "ga"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Event "ga/constitution"         -   "Constitution Day"      Fixed Feb 19
+  Event "ga/renovation"           -   "Renovation Day"        Fixed Mar 12
+  Add   "c/easter monday"         - # "Easter Monday"         Easter +1   
+  Add   "labor"                   - # "Labor Day"             Fixed May  1
+  Add   "c/whitmonday"            - # "Whitmonday"            Easter +50  
+  Event "ga/independence"         -   "Independence Day"      Fixed Aug 17
+  Add   "c/all saints"            - # "All Saints Day"        Fixed Nov  1
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25
 
 
 # gambia
-Region "gambia"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "gambia/independence"           - "Independence Day"               Fixed Feb 18
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Add   "c/assumption"                  - # "Assumption Day"               Fixed Aug 15
-  Event "gambia/moslem new year"        - "Moslem New Year"                Fixed Oct  7
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "gm"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Event "gm/independence"         -   "Independence Day"      Fixed Feb 18
+  Add   "labor"                   - # "Labor Day"             Fixed May  1
+  Add   "c/assumption"            - # "Assumption Day"        Fixed Aug 15
+  Event "gm/moslem new year"      -   "Moslem New Year"       Fixed Oct  7
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25
 
 
 # germany
-Region "germany"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "c/epiphany"                    - # "Epiphany"                     Fixed Jan  6
-  Add   "unity"                         - # "Unity Day"                    Fixed Feb 22
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Event "germany/day of the workers"    - "Day of the Workers"             Fixed May  1
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Event "germany/national"              - "National Day"                   Fixed May 23
-  Add   "c/ascension"                   - # "Ascension"                    Easter +39
-  Add   "c/whitmonday"                  - # "Whitmonday"                   Easter +50
-  Event "germany/waldchestag"           - "Waldchestag"                    Easter +53
-  Add   "c/corpus christi"              - # "Corpus Christi"               Easter +60
-  Add   "c/assumption"                  - # "Assumption Day"               Fixed Aug 15
-  Event "germany/unity"                 - "Unity Day"                      Fixed Oct  3
-  Event "germany/foundation"            - "Foundation Day"                 Fixed Oct  7
-  Add   "c/all saints"                  - # "All Saints Day"               Fixed Nov  1
-  Event "germany/day of repentance"     - "Day of Repentance"              Fixed Nov 18
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "de"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Add   "c/epiphany"              - # "Epiphany"              Fixed Jan  6
+  Add   "unity"                   - # "Unity Day"             Fixed Feb 22
+  Add   "c/good friday"           - # "Good Friday"           Easter -2   
+  Add   "c/easter monday"         - # "Easter Monday"         Easter +1   
+  Event "de/day of the workers"   -   "Day of the Workers"    Fixed May  1
+  Add   "labor"                   - # "Labor Day"             Fixed May  1
+  Event "de/national"             -   "National Day"          Fixed May 23
+  Add   "c/ascension"             - # "Ascension"             Easter +39  
+  Add   "c/whitmonday"            - # "Whitmonday"            Easter +50  
+  Event "de/waldchestag"          -   "Waldchestag"           Easter +53  
+  Add   "c/corpus christi"        - # "Corpus Christi"        Easter +60  
+  Add   "c/assumption"            - # "Assumption Day"        Fixed Aug 15
+  Event "de/unity"                -   "Unity Day"             Fixed Oct  3
+  Event "de/foundation"           -   "Foundation Day"        Fixed Oct  7
+  Add   "c/all saints"            - # "All Saints Day"        Fixed Nov  1
+  Event "de/day of repentance"    -   "Day of Repentance"     Fixed Nov 18
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25
 
 
 # ghana
-Region "ghana"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "ghana/liberation"              - "Liberation Day"                 Fixed Feb 24
-  Event "ghana/independence"            - "Independence Day"               Fixed Mar  6
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/easter eve"                  - # "Easter Eve"                   Easter -1
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Event "ghana/uprising"                - "Uprising Day"                   Fixed Jun  4
-  Event "ghana/republic"                - "Republic Day"                   Fixed Jul  1
-  Event "ghana/homowo"                  - "Homowo"                         Fixed Aug  1
-  Event "ghana/third republic"          - "Third Republic Day"             Fixed Sep 24
-  Add   "c/boxing"                      - # "Boxing Day"                   Fixed Dec 26
-  Event "ghana/revolution"              - "Revolution Day"                 Fixed Dec 31
+Region "gh"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Event "gh/liberation"           -   "Liberation Day"        Fixed Feb 24
+  Event "gh/independence"         -   "Independence Day"      Fixed Mar  6
+  Add   "c/good friday"           - # "Good Friday"           Easter -2   
+  Add   "c/easter eve"            - # "Easter Eve"            Easter -1   
+  Add   "c/easter monday"         - # "Easter Monday"         Easter +1   
+  Add   "labor"                   - # "Labor Day"             Fixed May  1
+  Event "gh/uprising"             -   "Uprising Day"          Fixed Jun  4
+  Event "gh/republic"             -   "Republic Day"          Fixed Jul  1
+  Event "gh/homowo"               -   "Homowo"                Fixed Aug  1
+  Event "gh/third republic"       -   "Third Republic Day"    Fixed Sep 24
+  Add   "c/boxing"                - # "Boxing Day"            Fixed Dec 26
+  Event "gh/revolution"           -   "Revolution Day"        Fixed Dec 31
 
 
 # gibraltar
-Region "gibraltar"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "gibraltar/commonwealth"        - "Commonwealth Day"               Fixed Mar 13
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Add   "may day"                       - # "May Day"                      Fixed May  1
-  Event "gibraltar/spring bank holiday"  - "Spring Bank Holiday"           Fixed Jun 25
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
-  Add   "c/boxing"                      - # "Boxing Day"                   Fixed Dec 26
+Region "gi"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Event "gi/commonwealth"         -   "Commonwealth Day"      Fixed Mar 13
+  Add   "c/good friday"           - # "Good Friday"           Easter -2   
+  Add   "c/easter monday"         - # "Easter Monday"         Easter +1   
+  Add   "may day"                 - # "May Day"               Fixed May  1
+  Event "gi/spring bank holiday"  -   "Spring Bank Holiday"   Fixed Jun 25
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25
+  Add   "c/boxing"                - # "Boxing Day"            Fixed Dec 26
 
 
 # greece
-Region "greece"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "saints/basil"                  - # "St. Basil"                    Fixed Jan  1
-  Add   "orthodox/christmas"            - # "Christmas Day"                Julian_Fixed Dec 25
-  Event "greece/midwifes"               - "Midwife's Day"                  Fixed Jan  8
-  Add   "orthodox/epiphany"             - # "Epiphany"                     Julian_Fixed Jan  6
-  Event "greece/clean monday"           - "Clean Monday"                   Easter -41
-  Event "greece/dodecanese accession"   - "Dodecanese Accession Day"       Fixed Mar  7
-  Event "greece/independence"           - "Independence Day"               Fixed Mar 25
-  Add   "orthodox/good friday"          - # "Good Friday"                  Julian_Easter -2
-  Add   "orthodox/holy saturday"        - # "Holy Saturday"                Julian_Easter -1
-  Add   "orthodox/easter"               - # "Easter"                       Julian_Easter +0
-  Add   "orthodox/easter monday"        - # "Easter Monday"                Julian_Easter +1
-  Event "greece/flower festival"        - "Flower Festival"                Fixed May  1
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Add   "orthodox/assumption"           - # "Assumption Day"               Julian_Fixed Aug 15
-  Event "greece/liberation of xanthi"   - "Liberation of Xanthi"           Fixed Oct  4
-  Add   "saints/demetrios"              - # "St. Demetrios"                Fixed Oct 26
-  Event "greece/ochi"                   - "Ochi Day"                       Fixed Oct 28
-
-
-# gregorian calendar 
-Region "gregorian calendar "
-  Event "gregorian calendar /gregorian calendar"  - "Gregorian Calendar Day" Fixed Feb 24
+Region "gr"
+  Add   "new year"                - # "New Year's Day"           Fixed Jan  1       
+  Add   "saints/basil"            - # "St. Basil"                Fixed Jan  1       
+  Add   "orthodox/christmas"      - # "Christmas Day"            Julian_Fixed Dec 25
+  Event "gr/midwifes"             -   "Midwife's Day"            Fixed Jan  8       
+  Add   "orthodox/epiphany"       - # "Epiphany"                 Julian_Fixed Jan  6
+  Event "gr/clean monday"         -   "Clean Monday"             Easter -41         
+  Event "gr/dodecanese accession" -   "Dodecanese Accession Day" Fixed Mar  7       
+  Event "gr/independence"         -   "Independence Day"         Fixed Mar 25       
+  Add   "orthodox/good friday"    - # "Good Friday"              Julian_Easter -2   
+  Add   "orthodox/holy saturday"  - # "Holy Saturday"            Julian_Easter -1   
+  Add   "orthodox/easter"         - # "Easter"                   Julian_Easter +0   
+  Add   "orthodox/easter monday"  - # "Easter Monday"            Julian_Easter +1   
+  Event "gr/flower festival"      -   "Flower Festival"          Fixed May  1       
+  Add   "labor"                   - # "Labor Day"                Fixed May  1       
+  Add   "orthodox/assumption"     - # "Assumption Day"           Julian_Fixed Aug 15
+  Event "gr/liberation of xanthi" -   "Liberation of Xanthi"     Fixed Oct  4       
+  Add   "saints/demetrios"        - # "St. Demetrios"            Fixed Oct 26       
+  Event "gr/ochi"                 -   "Ochi Day"                 Fixed Oct 28       
 
 
 # grenada
-Region "grenada"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "grenada/independence"          - "Independence Day"               Fixed Feb  7
-  Event "grenada/national holiday"      - "National Holiday"               Fixed Mar 13
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Add   "c/whitmonday"                  - # "Whitmonday"                   Easter +50
-  Add   "c/corpus christi"              - # "Corpus Christi"               Easter +60
-  Add   "caribbean/emancipation"        - # "Emancipation Day"             WDRel Aug Mon 1st
-  Event "grenada/thanksgiving"          - "Thanksgiving Day"               Fixed Oct 25
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
-  Add   "c/boxing"                      - # "Boxing Day"                   Fixed Dec 26
+Region "gd"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1     
+  Event "gd/independence"         -   "Independence Day"      Fixed Feb  7     
+  Event "gd/national holiday"     -   "National Holiday"      Fixed Mar 13     
+  Add   "c/good friday"           - # "Good Friday"           Easter -2        
+  Add   "c/easter monday"         - # "Easter Monday"         Easter +1        
+  Add   "labor"                   - # "Labor Day"             Fixed May  1     
+  Add   "c/whitmonday"            - # "Whitmonday"            Easter +50       
+  Add   "c/corpus christi"        - # "Corpus Christi"        Easter +60       
+  Add   "caribbean/emancipation"  - # "Emancipation Day"      WDRel Aug Mon 1st
+  Event "gd/thanksgiving"         -   "Thanksgiving Day"      Fixed Oct 25     
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25     
+  Add   "c/boxing"                - # "Boxing Day"            Fixed Dec 26     
 
 
 # guadeloupe
-Region "guadeloupe"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "c/ash wednesday"               - # "Ash wednesday"                Easter -46
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Event "guadeloupe/ascension"          - "Ascension Day"                  Fixed May 12
-  Add   "c/pentecost"                   - # "Pentecost"                    Easter +49
-  Add   "caribbean/schoelcher"          - # "Schoelcher Day"               Fixed Jul 21
-  Add   "c/assumption"                  - # "Assumption Day"               Fixed Aug 15
-  Add   "c/all saints"                  - # "All Saints Day"               Fixed Nov  1
-  Add   "c/all souls"                   - # "All Souls Day"                Fixed Nov  2
-  Add   "armistice"                     - # "Armistice Day"                Fixed Nov 11
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "gp"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Add   "c/ash wednesday"         - # "Ash wednesday"         Easter -46  
+  Add   "c/good friday"           - # "Good Friday"           Easter -2   
+  Add   "c/easter monday"         - # "Easter Monday"         Easter +1   
+  Event "gp/ascension"            -   "Ascension Day"         Fixed May 12
+  Add   "c/pentecost"             - # "Pentecost"             Easter +49  
+  Add   "caribbean/schoelcher"    - # "Schoelcher Day"        Fixed Jul 21
+  Add   "c/assumption"            - # "Assumption Day"        Fixed Aug 15
+  Add   "c/all saints"            - # "All Saints Day"        Fixed Nov  1
+  Add   "c/all souls"             - # "All Souls Day"         Fixed Nov  2
+  Add   "armistice"               - # "Armistice Day"         Fixed Nov 11
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25
 
 
 # guam
-Region "guam"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "guam/guam discovery"           - "Guam Discovery Day"             WDRel Mar Mon 1st
-  Event "guam/discovery"                - "Discovery Day"                  Fixed Mar  6
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Event "guam/liberation"               - "Liberation Day"                 Fixed Jul 21
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "gu"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1     
+  Event "gu/guam discovery"       -   "Guam Discovery Day"    WDRel Mar Mon 1st
+  Event "gu/discovery"            -   "Discovery Day"         Fixed Mar  6     
+  Add   "labor"                   - # "Labor Day"             Fixed May  1     
+  Event "gu/liberation"           -   "Liberation Day"        Fixed Jul 21     
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25     
 
 
 # guatemala
-Region "guatemala"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "c/holy thursday"               - # "Holy Thursday"                Easter -3
-  Add   "c/holy friday"                 - # "Holy Friday"                  Easter -2
-  Add   "c/holy saturday"               - # "Holy Saturday"                Easter -1
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Event "guatemala/army"                - "Army Day"                       Fixed Jun 30
-  Event "guatemala/revolution"          - "Revolution Day"                 Fixed Jun 30
-  Event "guatemala/bank employees"      - "Bank Employees' Day"            Fixed Jul  1
-  Add   "c/assumption"                  - # "Assumption Day"               Fixed Aug 15
-  Event "guatemala/independence"        - "Independence Day"               Fixed Sep 15
-  Add   "c/all saints"                  - # "All Saints Day"               Fixed Nov  1
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "gt"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Add   "c/holy thursday"         - # "Holy Thursday"         Easter -3   
+  Add   "c/holy friday"           - # "Holy Friday"           Easter -2   
+  Add   "c/holy saturday"         - # "Holy Saturday"         Easter -1   
+  Add   "labor"                   - # "Labor Day"             Fixed May  1
+  Event "gt/army"                 -   "Army Day"              Fixed Jun 30
+  Event "gt/revolution"           -   "Revolution Day"        Fixed Jun 30
+  Event "gt/bank employees"       -   "Bank Employees' Day"   Fixed Jul  1
+  Add   "c/assumption"            - # "Assumption Day"        Fixed Aug 15
+  Event "gt/independence"         -   "Independence Day"      Fixed Sep 15
+  Add   "c/all saints"            - # "All Saints Day"        Fixed Nov  1
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25
 
 
 # guinea
-Region "guinea"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "guinea/anniversary of cmrn"    - "Anniversary of CMRN"            Fixed Apr  3
-  Add   "c/easter"                      - # "Easter"                       Easter +0
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Event "guinea/anniversary of womens revolt"  - "Anniversary of Women's Revolt" Fixed Aug 27
-  Event "guinea/referendum"             - "Referendum Day"                 Fixed Sep 28
-  Event "guinea/independence"           - "Independence Day"               Fixed Oct  2
-  Add   "c/all saints"                  - # "All Saints Day"               Fixed Nov  1
-  Event "guinea/day of 1970 invasion"   - "Day of 1970 Invasion"           Fixed Nov 22
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "gn"
+  Add   "new year"                        - # "New Year's Day"                Fixed Jan  1
+  Event "gn/anniversary of cmrn"          -   "Anniversary of CMRN"           Fixed Apr  3
+  Add   "c/easter"                        - # "Easter"                        Easter +0   
+  Add   "labor"                           - # "Labor Day"                     Fixed May  1
+  Event "gn/anniversary of womens revolt" -   "Anniversary of Women's Revolt" Fixed Aug 27
+  Event "gn/referendum"                   -   "Referendum Day"                Fixed Sep 28
+  Event "gn/independence"                 -   "Independence Day"              Fixed Oct  2
+  Add   "c/all saints"                    - # "All Saints Day"                Fixed Nov  1
+  Event "gn/day of 1970 invasion"         -   "Day of 1970 Invasion"          Fixed Nov 22
+  Add   "c/christmas"                     - # "Christmas Day"                 Fixed Dec 25
 
 
 # guinea-bissau
-Region "guinea-bissau"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "guinea-bissau/national heroes"  - "National Heroes Day"           Fixed Jan 20
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Event "guinea-bissau/colonization martyrs"  - "Colonization Martyr's Day" Fixed Aug  3
-  Event "guinea-bissau/national"        - "National Day"                   Fixed Sep 12
-  Event "guinea-bissau/independence"    - "Independence Day"               Fixed Sep 24
-  Event "guinea-bissau/readjustment movement"  - "Readjustment Movement Day" Fixed Nov 14
-  Event "guinea-bissau/mocidade"        - "Mocidade Day"                   Fixed Dec  1
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "gw"
+  Add   "new year"                 - # "New Year's Day"            Fixed Jan  1
+  Event "gw/national heroes"       -   "National Heroes Day"       Fixed Jan 20
+  Add   "labor"                    - # "Labor Day"                 Fixed May  1
+  Event "gw/colonization martyrs"  -   "Colonization Martyr's Day" Fixed Aug  3
+  Event "gw/national"              -   "National Day"              Fixed Sep 12
+  Event "gw/independence"          -   "Independence Day"          Fixed Sep 24
+  Event "gw/readjustment movement" -   "Readjustment Movement Day" Fixed Nov 14
+  Event "gw/mocidade"              -   "Mocidade Day"              Fixed Dec  1
+  Add   "c/christmas"              - # "Christmas Day"             Fixed Dec 25
 
 
 # guyana
-Region "guyana"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "guyana/republic"               - "Republic Day"                   Fixed Feb 23
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Event "guyana/independence"           - "Independence Day"               Fixed May 26
-  Event "guyana/freedom"                - "Freedom Day"                    Fixed Aug  1
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
-  Add   "c/boxing"                      - # "Boxing Day"                   Fixed Dec 26
+Region "gy"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Event "gy/republic"             -   "Republic Day"          Fixed Feb 23
+  Add   "c/good friday"           - # "Good Friday"           Easter -2   
+  Add   "c/easter monday"         - # "Easter Monday"         Easter +1   
+  Add   "labor"                   - # "Labor Day"             Fixed May  1
+  Event "gy/independence"         -   "Independence Day"      Fixed May 26
+  Event "gy/freedom"              -   "Freedom Day"           Fixed Aug  1
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25
+  Add   "c/boxing"                - # "Boxing Day"            Fixed Dec 26
 
 
 # haiti
-Region "haiti"
-  Event "haiti/independence"            - "Independence Day"               Fixed Jan  1
-  Event "haiti/ancestry"                - "Ancestry Day"                   Fixed Jan  2
-  Add   "mardi gras"                    - # "Mardi Gras"                   Easter -47
-  Add   "mardi gras 2"                  - # "Mardi Gras"                   Easter -46
-  Event "haiti/toussaint"               - "Toussain L'Ouverture Day"       Fixed Apr  7
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Event "haiti/pan american"            - "Pan-American Day"               Fixed Apr 14
-  Event "haiti/labor"                   - "Agriculture and Labor Day"      Fixed May  1
-  Event "haiti/flag"                    - "Flag & University Day"          Fixed May 18
-  Event "haiti/sovereignty"             - "National Sovereignty"           Fixed May 22
-  Add   "c/corpus christi"              - # "Corpus Christi"               Easter +60
-  Event "haiti/agwe"                    - "Day of Agwe"                    Fixed Jul  4
-  Event "haiti/papa ogou"               - "Day of Papa Ogou"               Fixed Jul 25
-  Add   "c/assumption"                  - # "Assumption Day"               Fixed Aug 15
-  Event "haiti/dessalines"              - "Dessalines Day"                 Fixed Oct 17
-  Add   "un"                            - # "UN Day"                       Fixed Oct 24
-  Add   "c/all saints"                  - # "All Saints Day"               Fixed Nov  1
-  Add   "c/all souls"                   - # "All Souls Day"                Fixed Nov  2
-  Event "haiti/vertieres"               - "Verti�res Day"               Fixed Nov 18
-  Event "haiti/discovery"               - "Discovery Day"                  Fixed Dec  5
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "ht"
+  Event "ht/independence"         -   "Independence Day"          Fixed Jan  1
+  Event "ht/ancestry"             -   "Ancestry Day"              Fixed Jan  2
+  Add   "mardi gras"              - # "Mardi Gras"                Easter -47  
+  Add   "mardi gras 2"            - # "Mardi Gras"                Easter -46  
+  Event "ht/toussaint"            -   "Toussain L'Ouverture Day"  Fixed Apr  7
+  Add   "c/good friday"           - # "Good Friday"               Easter -2   
+  Event "ht/pan american"         -   "Pan-American Day"          Fixed Apr 14
+  Event "ht/labor"                -   "Agriculture and Labor Day" Fixed May  1
+  Event "ht/flag"                 -   "Flag & University Day"     Fixed May 18
+  Event "ht/sovereignty"          -   "National Sovereignty"      Fixed May 22
+  Add   "c/corpus christi"        - # "Corpus Christi"            Easter +60  
+  Event "ht/agwe"                 -   "Day of Agwe"               Fixed Jul  4
+  Event "ht/papa ogou"            -   "Day of Papa Ogou"          Fixed Jul 25
+  Add   "c/assumption"            - # "Assumption Day"            Fixed Aug 15
+  Event "ht/dessalines"           -   "Dessalines Day"            Fixed Oct 17
+  Add   "un"                      - # "UN Day"                    Fixed Oct 24
+  Add   "c/all saints"            - # "All Saints Day"            Fixed Nov  1
+  Add   "c/all souls"             - # "All Souls Day"             Fixed Nov  2
+  Event "ht/vertieres"            -   "Verti�res Day"             Fixed Nov 18
+  Event "ht/discovery"            -   "Discovery Day"             Fixed Dec  5
+  Add   "c/christmas"             - # "Christmas Day"             Fixed Dec 25
 
 
 # honduras
-Region "honduras"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "honduras/thanksgiving"         - "Thanksgiving Day"               Fixed Mar 15
-  Add   "c/holy thursday"               - # "Holy Thursday"                Easter -3
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Event "honduras/pan american"         - "Pan American Day"               Fixed Apr 14
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Event "honduras/independence"         - "Independence Day"               Fixed Sep 15
-  Event "honduras/morazan"              - "Moraz�n Day"                 Fixed Oct  3
-  Add   "columbus"                      - # "Columbus Day"                 Fixed Oct 12
-  Event "honduras/armed forces"         - "Armed Forces Day"               Fixed Oct 21
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "hn"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Event "hn/thanksgiving"         -   "Thanksgiving Day"      Fixed Mar 15
+  Add   "c/holy thursday"         - # "Holy Thursday"         Easter -3   
+  Add   "c/good friday"           - # "Good Friday"           Easter -2   
+  Event "hn/pan american"         -   "Pan American Day"      Fixed Apr 14
+  Add   "labor"                   - # "Labor Day"             Fixed May  1
+  Event "hn/independence"         -   "Independence Day"      Fixed Sep 15
+  Event "hn/morazan"              -   "Moraz�n Day"           Fixed Oct  3
+  Add   "columbus"                - # "Columbus Day"          Fixed Oct 12
+  Event "hn/armed forces"         -   "Armed Forces Day"      Fixed Oct 21
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25
 
 
 # hong kong
-Region "hong kong"
-  Event "hong kong/birthday of pak tai"  - "Birthday of Pak Tai"           Fixed Apr  3
-  Event "hong kong/half-year"           - "Half-Year Day"                  Fixed Jul  1
-  Event "hong kong/liberation"          - "Liberation Day"                 WDRel Aug Mon last
-  Event "hong kong/birthday of confucious"  - "Birthday of Confucious"     Fixed Sep 22
+Region "hk"
+  Event "hk/birthday of pak tai"    - "Birthday of Pak Tai"    Fixed Apr  3      
+  Event "hk/half-year"              - "Half-Year Day"          Fixed Jul  1      
+  Event "hk/liberation"             - "Liberation Day"         WDRel Aug Mon last
+  Event "hk/birthday of confucious" - "Birthday of Confucious" Fixed Sep 22      
 
 
 # hungary
-Region "hungary"
+Region "hu"
 # Event   Add   "namedays/hungary"              - # "Sweden"                       Unknown  0 days
-  Event "hungary/constitution"          h "Constitution Day"               Fixed Aug 20
-  Event "hungary/revolution1848"        h "1848 Revolution Day"            Fixed Mar 15
-  Add   "c/easter"                      h # "Easter"                       Easter +0
-  Event "hungary/revolution56"          h "'56 Revolution Day"             Fixed Oct 23
-  Event "hungary/labor"                 h "Holiday of Labor"               Fixed May  1
-  Add   "new year"                      h # "New Year's Day"               Fixed Jan  1
-  Add   "c/pentecost monday"            h # "Pentecost Monday"             Easter +50
-  Add   "c/easter monday"               h # "Easter Monday"                Easter +1
-  Add   "c/pentecost"                   h # "Pentecost"                    Easter +49
-  Add   "sunday"                        h # "Sun"                          Weekday ---
-  Add   "c/christmas2d"                 h # "Christmas"                    Fixed Dec 25  2 days
+  Event "hu/constitution"         h   "Constitution Day"      Fixed Aug 20        
+  Event "hu/revolution1848"       h   "1848 Revolution Day"   Fixed Mar 15        
+  Add   "c/easter"                h # "Easter"                Easter +0           
+  Event "hu/revolution56"         h   "'56 Revolution Day"    Fixed Oct 23        
+  Event "hu/labor"                h   "Holiday of Labor"      Fixed May  1        
+  Add   "new year"                h # "New Year's Day"        Fixed Jan  1        
+  Add   "c/pentecost monday"      h # "Pentecost Monday"      Easter +50          
+  Add   "c/easter monday"         h # "Easter Monday"         Easter +1           
+  Add   "c/pentecost"             h # "Pentecost"             Easter +49          
+  Add   "sunday"                  h # "Sun"                   Weekday ---         
+  Add   "c/christmas2d"           h # "Christmas"             Fixed Dec 25  2 days
 
 
 # iceland
-Region "iceland"
-  Event "iceland/independence"          - "Independence Day"               Fixed Jun 17
+Region "is"
+  Event "is/independence"         - "Independence Day"        Fixed Jun 17
 
 
 # india
-Region "india"
-  Event "india/republic"                - "Republic Day"                   Fixed Jan 26
-  Event "india/mahatma gandhi martyrdom"  - "Mahatma Gandhi Martyrdom Day" Fixed Jan 30
-  Event "india/indian independence"     - "Indian Independence Day"        Fixed Aug 15
-  Event "india/mahatma gandhi jayanti"  - "Mahatma Gandhi Jayanti"         Fixed Oct  2
+Region "in"
+  Event "in/republic"                 - "Republic Day"                 Fixed Jan 26
+  Event "in/mahatma gandhi martyrdom" - "Mahatma Gandhi Martyrdom Day" Fixed Jan 30
+  Event "in/indian independence"      - "Indian Independence Day"      Fixed Aug 15
+  Event "in/mahatma gandhi jayanti"   - "Mahatma Gandhi Jayanti"       Fixed Oct  2
 
 
 # indonesia
-Region "indonesia"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Event "indonesia/kartini"             - "Kartini Day"                    Fixed Apr 21
-  Add   "c/ascension"                   - # "Ascension"                    Easter +39
-  Event "indonesia/independence"        - "Independence Day"               Fixed Aug 17
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "id"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Add   "c/good friday"           - # "Good Friday"           Easter -2   
+  Event "id/kartini"              -   "Kartini Day"           Fixed Apr 21
+  Add   "c/ascension"             - # "Ascension"             Easter +39  
+  Event "id/independence"         -   "Independence Day"      Fixed Aug 17
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25
 
 
 # iran
-Region "iran"
-  Event "iran/revolution"               - "Revolution Day"                 Fixed Feb 11
-  Event "iran/oil nationalization"      - "Oil Nationalization Day"        Fixed Mar 20
-  Event "iran/no ruz"                   - "No Ruz"                         Fixed Mar 21
-  Event "iran/islamic republic"         - "Islamic Republic Day"           Fixed Apr  1
-  Event "iran/revolution2"              - "Revolution Day"                 Fixed Apr  2
-  Event "iran/martyrdom of imam ali"    - "Martyrdom of Imam Ali"          Fixed Jul 14
-  Event "iran/constitution"             - "Constitution Day"               Fixed Aug  5
+Region "ir"
+  Event "ir/revolution"            - "Revolution Day"          Fixed Feb 11
+  Event "ir/oil nationalization"   - "Oil Nationalization Day" Fixed Mar 20
+  Event "ir/no ruz"                - "No Ruz"                  Fixed Mar 21
+  Event "ir/islamic republic"      - "Islamic Republic Day"    Fixed Apr  1
+  Event "ir/revolution2"           - "Revolution Day"          Fixed Apr  2
+  Event "ir/martyrdom of imam ali" - "Martyrdom of Imam Ali"   Fixed Jul 14
+  Event "ir/constitution"          - "Constitution Day"        Fixed Aug  5
 
 
 # iraq
-Region "iraq"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "iraq/army"                     - "Army Day"                       Fixed Jan  6
-  Event "iraq/14 ramadan revolution"    - "14 Ramadan Revolution Day"      Fixed Feb  8
-  Event "iraq/republic"                 - "Republic Day"                   Fixed Jul 14
-  Event "iraq/july revolution"          - "July Revolution Day"            Fixed Jul 17
+Region "iq"
+  Add   "new year"                 - # "New Year's Day"            Fixed Jan  1
+  Event "iq/army"                  -   "Army Day"                  Fixed Jan  6
+  Event "iq/14 ramadan revolution" -   "14 Ramadan Revolution Day" Fixed Feb  8
+  Event "iq/republic"              -   "Republic Day"              Fixed Jul 14
+  Event "iq/july revolution"       -   "July Revolution Day"       Fixed Jul 17
 
 
 # ireland
-Region "ireland"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "ireland/sheelahs"              - "Sheelah's Day"                  Fixed Mar 18
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
-  Add   "saints/stephen"                - # "St. Stephen"                  Fixed Dec 26
+Region "ie"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Event "ie/sheelahs"             -   "Sheelah's Day"         Fixed Mar 18
+  Add   "c/good friday"           - # "Good Friday"           Easter -2   
+  Add   "c/easter monday"         - # "Easter Monday"         Easter +1   
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25
+  Add   "saints/stephen"          - # "St. Stephen"           Fixed Dec 26
 
 
 # israel
-Region "israel"
-  Event "israel/jerusalem reunification"  - "Jerusalem Reunification Day"  Fixed May 12
-  Event "israel/balfour declaration"    - "Balfour Declaration Day"        Fixed Nov  2
+Region "il"
+  Event "il/jerusalem reunification" - "Jerusalem Reunification Day" Fixed May 12
+  Event "il/balfour declaration"     - "Balfour Declaration Day"     Fixed Nov  2
 
 
 # italy
-Region "italy"
-  Add   "c/epiphany"                    - # "Epiphany"                     Fixed Jan  6
-  Event "italy/befana"                  - "Befana Day"                     Fixed Jan  6
-  Event "italy/day of conciliation"     - "Day of Conciliation"            Fixed Feb 11
-  Event "italy/natale di roma"          - "Natale di Roma"                 Fixed Apr 21
-  Event "italy/liberation"              - "Liberation Day"                 Fixed Apr 25
-  Event "italy/anniversary of the republic"  - "Anniversary of the Republic" Fixed Jun  2
-  Event "italy/festa del redentore"     - "Festa del Redentore"            WDRel Jul Sun 3rd
-  Event "italy/joust of the quintana"   - "Joust of the Quintana"          WDRel Aug Sun 1st
-  Event "italy/palio del golfo"         - "Palio Del Golfo"                WDRel Aug Sun 2nd
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
-  Event "italy/santo stefano"           - "Santo Stefano"                  Fixed Dec 26
+Region "it"
+  Add   "c/epiphany"                     - # "Epiphany"                    Fixed Jan  6     
+  Event "it/befana"                      -   "Befana Day"                  Fixed Jan  6     
+  Event "it/day of conciliation"         -   "Day of Conciliation"         Fixed Feb 11     
+  Event "it/natale di roma"              -   "Natale di Roma"              Fixed Apr 21     
+  Event "it/liberation"                  -   "Liberation Day"              Fixed Apr 25     
+  Event "it/anniversary of the republic" -   "Anniversary of the Republic" Fixed Jun  2     
+  Event "it/festa del redentore"         -   "Festa del Redentore"         WDRel Jul Sun 3rd
+  Event "it/joust of the quintana"       -   "Joust of the Quintana"       WDRel Aug Sun 1st
+  Event "it/palio del golfo"             -   "Palio Del Golfo"             WDRel Aug Sun 2nd
+  Add   "c/christmas"                    - # "Christmas Day"               Fixed Dec 25     
+  Event "it/santo stefano"               -   "Santo Stefano"               Fixed Dec 26     
 
 
 # ivory coast
-Region "ivory coast"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Add   "c/ascension"                   - # "Ascension"                    Easter +39
-  Add   "c/whitmonday"                  - # "Whitmonday"                   Easter +50
-  Add   "c/assumption"                  - # "Assumption Day"               Fixed Aug 15
-  Add   "c/all saints"                  - # "All Saints Day"               Fixed Nov  1
-  Event "ivory coast/independence"      - "Independence Day"               Fixed Dec  7
-  Event "ivory coast/national holiday of the ivory coast"  - "National Holiday of the Ivory Coast" Fixed Dec  7
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "ci"
+  Add   "new year"                               - # "New Year's Day"                      Fixed Jan  1
+  Add   "c/good friday"                          - # "Good Friday"                         Easter -2   
+  Add   "c/easter monday"                        - # "Easter Monday"                       Easter +1   
+  Add   "labor"                                  - # "Labor Day"                           Fixed May  1
+  Add   "c/ascension"                            - # "Ascension"                           Easter +39  
+  Add   "c/whitmonday"                           - # "Whitmonday"                          Easter +50  
+  Add   "c/assumption"                           - # "Assumption Day"                      Fixed Aug 15
+  Add   "c/all saints"                           - # "All Saints Day"                      Fixed Nov  1
+  Event "ci/independence"                        -   "Independence Day"                    Fixed Dec  7
+  Event "ci/national holiday of the ivory coast" -   "National Holiday of the Ivory Coast" Fixed Dec  7
+  Add   "c/christmas"                            - # "Christmas Day"                       Fixed Dec 25
 
 
 # jamaica
-Region "jamaica"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "c/ash wednesday"               - # "Ash wednesday"                Easter -46
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Event "jamaica/labor"                 - "Labour Day"                     Fixed May 23
-  Event "jamaica/independence"          - "Independence Day"               WDRel Aug Mon 1st
-  Event "jamaica/heroes"                - "Heroes' Day"                    WDRel Oct Mon 3rd
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "jm"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1     
+  Add   "c/ash wednesday"         - # "Ash wednesday"         Easter -46       
+  Add   "c/good friday"           - # "Good Friday"           Easter -2        
+  Add   "c/easter monday"         - # "Easter Monday"         Easter +1        
+  Add   "labor"                   - # "Labor Day"             Fixed May  1     
+  Event "jm/labor"                -   "Labour Day"            Fixed May 23     
+  Event "jm/independence"         -   "Independence Day"      WDRel Aug Mon 1st
+  Event "jm/heroes"               -   "Heroes' Day"           WDRel Oct Mon 3rd
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25     
 
 
 # japan
-Region "japan"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "japan/kakizome"                - "Kakizome"                       Fixed Jan  2
-  Event "japan/shigoto hajime"          - "Shigoto Hajime"                 Fixed Jan  2
-  Event "japan/adults"                  - "Adults Day"                     Fixed Jan 15
-  Event "japan/bean-throwing festival"  - "Bean-Throwing Festival"         Fixed Feb  4
-  Event "japan/martyr"                  - "Martyr Day"                     Fixed Feb  5
-  Event "japan/national foundation"     - "National Foundation Day"        Fixed Feb 11
-  Event "japan/empire"                  - "Empire Day"                     Fixed Feb 11
-  Event "japan/gion matsuri"            - "Gion Matsuri"                   Fixed Feb 16  9 days
-  Event "japan/hina matsuri"            - "Hina Matsuri"                   Fixed Mar  3
-  Event "japan/kambutsue"               - "Kambutsue"                      Fixed Apr  8
-  Event "japan/childrens protection"    - "Children's Protection Day"      Fixed Apr 17
-  Event "japan/greenery"                - "Greenery Day"                   Fixed Apr 29
-  Event "japan/constitution"            - "Constitution Day"               Fixed May  3
-  Event "japan/kite battles of hamamatsu"  - "Kite Battles of Hamamatsu"   Fixed May  3  3 days
-  Event "japan/childrens"               - "Children's Day"                 Fixed May  5
-  Event "japan/tango-no-sekku"          - "Tango-no-sekku"                 Fixed May  5
-  Event "japan/hollyhock festival"      - "Hollyhock Festival"             Fixed May 15
-  Event "japan/memorial to broken dolls"  - "Memorial to Broken Dolls Day" Fixed Jun  3
-  Event "japan/sanno matsuri"           - "Sanno Matsuri"                  Fixed Jun 15
-  Event "japan/tanabata"                - "Tanabata"                       Fixed Jul  7
-  Event "japan/hiroshima peace festival"  - "Hiroshima Peace Festival"     Fixed Aug  6
-  Event "japan/respect for the aged"    - "Respect for the Aged Day"       Fixed Sep 15
-  Event "japan/jidai matsuri"           - "Jidai Matsuri"                  Fixed Oct 22
-  Event "japan/culture"                 - "Culture Day"                    Fixed Nov  3
-  Event "japan/labor thanksgiving"      - "Labor Thanksgiving Day"         Fixed Nov 23
-  Event "japan/emperors"                - "Emperor's Birthday"             Fixed Dec 23
+Region "jp"
+  Add   "new year"                           -      # "New Year's Day"                            Fixed Jan  1        
+  Event "jp/kakizome"                        -        "Kakizome"                                  Fixed Jan  2        
+  Event "jp/shigoto hajime"                  -        "Shigoto Hajime"                            Fixed Jan  2        
+  Event "jp/adults"                          -        "Adults Day"                                Fixed Jan 15        
+  Event "jp/bean-throwing festival"          -        "Bean-Throwing Festival"                    Fixed Feb  4        
+  Event "jp/martyr"                          -        "Martyr Day"                                Fixed Feb  5        
+  Event "jp/national foundation"             -        "National Foundation Day"                   Fixed Feb 11        
+  Event "jp/empire�                    -   " Empire   Day"                   Fixed Feb 11                             
+  Event "jp/gion matsuri"                    -        "Gion Matsuri"                              Fixed Feb 16  9 days
+  Event "jp/hina matsuri"                    -        "Hina Matsuri"                              Fixed Mar  3        
+  Event "jp/kambutsue"                       -        "Kambutsue"                                 Fixed Apr  8        
+  Event "jp/childrens protection"            -        "Children's Protection Day"                 Fixed Apr 17        
+  Event "jp/greenery"                        -        "Greenery Day"                              Fixed Apr 29        
+  Event "jp/constitution"                    -        "Constitution Day"                          Fixed May  3        
+  Event "jp/kite battles of hamamatsu"       -        "Kite Battles of Hamamatsu"                 Fixed May  3  3 days
+  Event "jp/childrens"                       -        "Children's Day"                            Fixed May  5        
+  Event "jp/tango-no-sekku"                  -        "Tango-no-sekku"                            Fixed May  5        
+  Event "jp/hollyhock festival"              -        "Hollyhock Festival"                        Fixed May 15        
+  Event "jp/memorial to broken dolls"        -        "Memorial to Broken Dolls Day"              Fixed Jun  3        
+  Event "jp/sanno matsuri"                   -        "Sanno Matsuri"                             Fixed Jun 15        
+  Event "jp/tanabata"                        -        "Tanabata"                                  Fixed Jul  7        
+  Event "jp/hiroshima peace festival"        -        "Hiroshima Peace Festival"                  Fixed Aug  6        
+  Event "jp/respect for the aged"            -        "Respect for the Aged Day"                  Fixed Sep 15        
+  Event "jp/jidai matsuri"                   -        "Jidai Matsuri"                             Fixed Oct 22        
+  Event "jp/culture"                         -        "Culture Day"                               Fixed Nov  3        
+  Event "jp/labor thanksgiving"              -        "Labor Thanksgiving Day"                    Fixed Nov 23        
+  Event "jp/emperors"                        -        "Emperor's Birthday"                        Fixed Dec 23        
 
 
 # jordan
-Region "jordan"
-  Event "jordan/arbor"                  - "Arbor Day"                      Fixed Jan 15
-  Add   "arab league"                   - # "Arab League Day"              Fixed Mar 22
-  Event "jordan/independence"           - "Independence Day"               Fixed May 25
-  Event "jordan/coronation"             - "Coronation Day"                 Fixed Aug 11
-  Event "jordan/king hussein"           - "King Hussein Day"               Fixed Nov 14
+Region "jo"
+  Event "jo/arbor"                -   "Arbor Day"             Fixed Jan 15
+  Add   "arab league"             - # "Arab League Day"       Fixed Mar 22
+  Event "jo/independence"         -   "Independence Day"      Fixed May 25
+  Event "jo/coronation"           -   "Coronation Day"        Fixed Aug 11
+  Event "jo/king hussein"         -   "King Hussein Day"      Fixed Nov 14
 
 
 # kazakhstan
-Region "kazakhstan"
-  Add   "new year 2d"                   - # "New Year"                     Fixed Jan  1  2 days
-  Add   "womens"                        - # "Int. Women's Day"             Fixed Mar  8
-  Event "kazakhstan/nauryz meyrami"     - "Nauryz Meyrami"                 Fixed Mar 22
-  Event "kazakhstan/peoples unity"      - "People's Unity Day"             Fixed May  1
-  Event "kazakhstan/victory"            - "Victory Day"                    Fixed May  9
-  Event "kazakhstan/national flag"      - "National Flag"                  Fixed Aug 24
-  Event "kazakhstan/constitution"       - "Constitution Day"               Fixed Aug 30
-  Event "kazakhstan/republic"           - "Republic Day"                   Fixed Oct 25
-  Event "kazakhstan/independence"       - "Independence Day"               Fixed Dec 16
+Region "kz"
+  Add   "new year 2d"             - # "New Year"              Fixed Jan  1  2 days
+  Add   "womens"                  - # "Int. Women's Day"      Fixed Mar  8        
+  Event "kz/nauryz meyrami"       -   "Nauryz Meyrami"        Fixed Mar 22        
+  Event "kz/peoples unity"        -   "People's Unity Day"    Fixed May  1        
+  Event "kz/victory"              -   "Victory Day"           Fixed May  9        
+  Event "kz/national flag"        -   "National Flag"         Fixed Aug 24        
+  Event "kz/constitution"         -   "Constitution Day"      Fixed Aug 30        
+  Event "kz/republic"             -   "Republic Day"          Fixed Oct 25        
+  Event "kz/independence"         -   "Independence Day"      Fixed Dec 16        
 
 
 # kenya
-Region "kenya"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Event "kenya/madaraka"                - "Madaraka Day"                   Fixed Jun  1
-  Event "kenya/kenyatta"                - "Kenyatta Day"                   Fixed Oct 20
-  Event "kenya/independence"            - "Independence Day"               Fixed Dec 12
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
-  Add   "c/boxing"                      - # "Boxing Day"                   Fixed Dec 26
+Region "ke"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Add   "c/good friday"           - # "Good Friday"           Easter -2   
+  Add   "c/easter monday"         - # "Easter Monday"         Easter +1   
+  Add   "labor"                   - # "Labor Day"             Fixed May  1
+  Event "ke/madaraka"             -   "Madaraka Day"          Fixed Jun  1
+  Event "ke/kenyatta"             -   "Kenyatta Day"          Fixed Oct 20
+  Event "ke/independence"         -   "Independence Day"      Fixed Dec 12
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25
+  Add   "c/boxing"                - # "Boxing Day"            Fixed Dec 26
 
 
 # kiribati
-Region "kiribati"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "c/easter"                      - # "Easter"                       Easter +0
-  Event "kiribati/independence"         - "Independence Day"               Fixed Jul 12
-  Event "kiribati/youth"                - "Youth Day"                      Fixed Aug  4
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "ki"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Add   "c/easter"                - # "Easter"                Easter +0   
+  Event "ki/independence"         -   "Independence Day"      Fixed Jul 12
+  Event "ki/youth"                -   "Youth Day"             Fixed Aug  4
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25
 
 
 # kuwait
-Region "kuwait"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "kuwait/national"               - "National Day"                   Fixed Feb 25
-  Event "kuwait/independence"           - "Independence Day"               Fixed Jun 19
+Region "kw"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Event "kw/national"             -   "National Day"          Fixed Feb 25
+  Event "kw/independence"         -   "Independence Day"      Fixed Jun 19
 
 
 # laos
-Region "laos"
-  Event "laos/pathet lao"               - "Pathet Lao Day"                 Fixed Jan  6
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Event "laos/constitution"             - "Constitution Day"               Fixed May 11
-  Event "laos/independence"             - "Independence Day"               Fixed Jul 19
-  Event "laos/memorial"                 - "Memorial Day"                   Fixed Aug 15
-  Event "laos/republic"                 - "Republic Day"                   Fixed Dec  2
+Region "la"
+  Event "la/pathet lao"           -   "Pathet Lao Day"        Fixed Jan  6
+  Add   "labor"                   - # "Labor Day"             Fixed May  1
+  Event "la/constitution"         -   "Constitution Day"      Fixed May 11
+  Event "la/independence"         -   "Independence Day"      Fixed Jul 19
+  Event "la/memorial"             -   "Memorial Day"          Fixed Aug 15
+  Event "la/republic"             -   "Republic Day"          Fixed Dec  2
 
 
 # latvia
-Region "latvia"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Event "latvia/midsummer festival"     - "Midsummer Festival"             Fixed Jun 23  2 days
-  Event "latvia/independence"           - "Independence Day"               Fixed Nov 18
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
-  Add   "new years eve"                 - # "New Year's Eve"               Fixed Dec 31
+Region "lv"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1        
+  Add   "c/good friday"           - # "Good Friday"           Easter -2           
+  Event "lv/midsummer festival"   -   "Midsummer Festival"    Fixed Jun 23  2 days
+  Event "lv/independence"         -   "Independence Day"      Fixed Nov 18        
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25        
+  Add   "new years eve"           - # "New Year's Eve"        Fixed Dec 31        
 
 
 # lebanon
-Region "lebanon"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "lebanon/saint maron"           - "Saint Maron Day"                Fixed Feb  9
-  Add   "arab league"                   - # "Arab League Day"              Fixed Mar 22
-  Add   "c/easter"                      - # "Easter"                       Easter +0
-  Event "lebanon/martyrs"               - "Martyrs' Day"                   Fixed May  6
-  Add   "c/ascension"                   - # "Ascension"                    Easter +39
-  Add   "c/assumption"                  - # "Assumption Day"               Fixed Aug 15
-  Add   "c/all saints"                  - # "All Saints Day"               Fixed Nov  1
-  Event "lebanon/independence"          - "Independence Day"               Fixed Nov 22
-  Event "lebanon/evacuation"            - "Evacuation Day"                 Fixed Dec 31
+Region "lb"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Event "lb/saint maron"          -   "Saint Maron Day"       Fixed Feb  9
+  Add   "arab league"             - # "Arab League Day"       Fixed Mar 22
+  Add   "c/easter"                - # "Easter"                Easter +0   
+  Event "lb/martyrs"              -   "Martyrs' Day"          Fixed May  6
+  Add   "c/ascension"             - # "Ascension"             Easter +39  
+  Add   "c/assumption"            - # "Assumption Day"        Fixed Aug 15
+  Add   "c/all saints"            - # "All Saints Day"        Fixed Nov  1
+  Event "lb/independence"         -   "Independence Day"      Fixed Nov 22
+  Event "lb/evacuation"           -   "Evacuation Day"        Fixed Dec 31
 
 
 # lesotho
-Region "lesotho"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "lesotho/national holiday"      - "National Holiday"               Fixed Jan 28
-  Event "lesotho/moshoeshoes"           - "Moshoeshoe's Day"               Fixed Mar 12
-  Event "lesotho/national tree planting"  - "National Tree Planting Day"   Fixed Mar 21
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Event "lesotho/kings"                 - "King's Birthday"                Fixed May  2
-  Add   "c/ascension"                   - # "Ascension"                    Easter +39
-  Event "lesotho/family"                - "Family Day"                     WDRel Jul Mon 1st
-  Event "lesotho/independence"          - "Independence Day"               Fixed Oct  4
-  Event "lesotho/national sports"       - "National Sports Day"            Fixed Oct  6
-  Add   "family"                        - # "Family Day"                   Fixed Dec 25
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
-  Add   "c/boxing"                      - # "Boxing Day"                   Fixed Dec 26
+Region "ls"
+  Add   "new year"                  - # "New Year's Day"             Fixed Jan  1     
+  Event "ls/national holiday"       -   "National Holiday"           Fixed Jan 28     
+  Event "ls/moshoeshoes"            -   "Moshoeshoe's Day"           Fixed Mar 12     
+  Event "ls/national tree planting" -   "National Tree Planting Day" Fixed Mar 21     
+  Add   "c/good friday"             - # "Good Friday"                Easter -2        
+  Add   "c/easter monday"           - # "Easter Monday"              Easter +1        
+  Event "ls/kings"                  -   "King's Birthday"            Fixed May  2     
+  Add   "c/ascension"               - # "Ascension"                  Easter +39       
+  Event "ls/family"                 -   "Family Day"                 WDRel Jul Mon 1st
+  Event "ls/independence"           -   "Independence Day"           Fixed Oct  4     
+  Event "ls/national sports"        -   "National Sports Day"        Fixed Oct  6     
+  Add   "family"                    - # "Family Day"                 Fixed Dec 25     
+  Add   "c/christmas"               - # "Christmas Day"              Fixed Dec 25     
+  Add   "c/boxing"                  - # "Boxing Day"                 Fixed Dec 26     
 
 
 # liberia
-Region "liberia"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "liberia/pioneers"              - "Pioneers' Day"                  Fixed Jan  7
-  Event "liberia/armed forces"          - "Armed Forces Day"               Fixed Feb 11
-  Event "liberia/literacy"              - "Literacy Day"                   Fixed Feb 14
-  Event "liberia/decoration"            - "Decoration Day"                 Fixed Mar 13
-  Event "liberia/j j roberts"           - "J. J. Robert's Birthday"        Fixed Mar 15
-  Event "liberia/fast and prayer"       - "Fast and Prayer Day"            Fixed Apr 11
-  Event "liberia/national redemption"   - "National Redemption Day"        Fixed Apr 12
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Event "liberia/unification and integration"  - "Unification and Integration Day" Fixed May 14
-  Event "liberia/independence"          - "Independence Day"               Fixed Jul 26
-  Event "liberia/flag"                  - "Flag Day"                       Fixed Aug 24
-  Event "liberia/thanksgiving"          - "Thanksgiving Day"               WDRel Nov Thu 1st
-  Event "liberia/memorial"              - "Memorial Day"                   Fixed Nov 12
-  Event "liberia/president tubmans"     - "President Tubman's Birthday"    Fixed Nov 29
-  Event "liberia/matilda newport"       - "Matilda Newport Day"            Fixed Dec  1
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "lr"
+  Add   "new year"                       - # "New Year's Day"                  Fixed Jan  1     
+  Event "lr/pioneers"                    -   "Pioneers' Day"                   Fixed Jan  7     
+  Event "lr/armed forces"                -   "Armed Forces Day"                Fixed Feb 11     
+  Event "lr/literacy"                    -   "Literacy Day"                    Fixed Feb 14     
+  Event "lr/decoration"                  -   "Decoration Day"                  Fixed Mar 13     
+  Event "lr/j j roberts"                 -   "J. J. Robert's Birthday"         Fixed Mar 15     
+  Event "lr/fast and prayer"             -   "Fast and Prayer Day"             Fixed Apr 11     
+  Event "lr/national redemption"         -   "National Redemption Day"         Fixed Apr 12     
+  Add   "c/good friday"                  - # "Good Friday"                     Easter -2        
+  Event "lr/unification and integration" -   "Unification and Integration Day" Fixed May 14     
+  Event "lr/independence"                -   "Independence Day"                Fixed Jul 26     
+  Event "lr/flag"                        -   "Flag Day"                        Fixed Aug 24     
+  Event "lr/thanksgiving"                -   "Thanksgiving Day"                WDRel Nov Thu 1st
+  Event "lr/memorial"                    -   "Memorial Day"                    Fixed Nov 12     
+  Event "lr/president tubmans"           -   "President Tubman's Birthday"     Fixed Nov 29     
+  Event "lr/matilda newport"             -   "Matilda Newport Day"             Fixed Dec  1     
+  Add   "c/christmas"                    - # "Christmas Day"                   Fixed Dec 25     
 
 
 # libya
-Region "libya"
-  Event "libya/kings"                   - "King's Birthday"                Fixed Mar 12
-  Event "libya/evacuation"              - "Evacuation Day"                 Fixed Mar 28
-  Event "libya/sanusi army"             - "Sanusi Army Day"                Fixed Aug  9
-  Event "libya/revolution"              - "Revolution Day"                 Fixed Sep  1
-  Event "libya/national"                - "National Day"                   Fixed Sep  1
-  Event "libya/expulsion of the fascist settlers"  - "Expulsion of the Fascist Settlers Day" Fixed Oct  7
+Region "ly"
+  Event "ly/kings"                - "King's Birthday"                       Fixed Mar 12
+  Event "ly/evacuation"           - "Evacuation Day"                        Fixed Mar 28
+  Event "ly/sanusi army"          - "Sanusi Army Day"                       Fixed Aug  9
+  Event "ly/revolution"           - "Revolution Day"                        Fixed Sep  1
+  Event "ly/national"             - "National Day"                          Fixed Sep  1
+  Event "ly/expulsion"            - "Expulsion of the Fascist Settlers Day" Fixed Oct  7
 
 
 # liechtenstein
-Region "liechtenstein"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "liechtenstein/bank holiday"    - "Bank Holiday"                   Fixed Jan  2
-  Add   "c/epiphany"                    - # "Epiphany"                     Fixed Jan  6
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/easter"                      - # "Easter"                       Easter +0
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Add   "c/ascension"                   - # "Ascension"                    Easter +39
-  Add   "c/whitmonday"                  - # "Whitmonday"                   Easter +50
-  Add   "c/corpus christi"              - # "Corpus Christi"               Easter +60
-  Add   "c/assumption"                  - # "Assumption Day"               Fixed Aug 15
-  Event "liechtenstein/national"        - "National Day"                   Fixed Aug 15
-  Event "liechtenstein/birthday of prince franz-josef ii"  - "Birthday of Prince Franz-Josef II" Fixed Aug 16
-  Add   "c/nativity of mary"            - # "Nativity of Mary"             Fixed Sep  8
-  Add   "c/all saints"                  - # "All Saints Day"               Fixed Nov  1
-  Add   "c/immaculate conception"       - # "Immaculate Conception"        Fixed Dec  8
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
-  Add   "saints/stephen"                - # "St. Stephen"                  Fixed Dec 26
+Region "li"
+  Add   "new year"                    - # "New Year's Day"                    Fixed Jan  1
+  Event "li/bank holiday"             -   "Bank Holiday"                      Fixed Jan  2
+  Add   "c/epiphany"                  - # "Epiphany"                          Fixed Jan  6
+  Add   "c/good friday"               - # "Good Friday"                       Easter -2   
+  Add   "c/easter"                    - # "Easter"                            Easter +0   
+  Add   "labor"                       - # "Labor Day"                         Fixed May  1
+  Add   "c/ascension"                 - # "Ascension"                         Easter +39  
+  Add   "c/whitmonday"                - # "Whitmonday"                        Easter +50  
+  Add   "c/corpus christi"            - # "Corpus Christi"                    Easter +60  
+  Add   "c/assumption"                - # "Assumption Day"                    Fixed Aug 15
+  Event "li/national"                 -   "National Day"                      Fixed Aug 15
+  Event "li/of prince franz-josef ii" -   "Birthday of Prince Franz-Josef II" Fixed Aug 16
+  Add   "c/nativity of mary"          - # "Nativity of Mary"                  Fixed Sep  8
+  Add   "c/all saints"                - # "All Saints Day"                    Fixed Nov  1
+  Add   "c/immaculate conception"     - # "Immaculate Conception"             Fixed Dec  8
+  Add   "c/christmas"                 - # "Christmas Day"                     Fixed Dec 25
+  Add   "saints/stephen"              - # "St. Stephen"                       Fixed Dec 26
 
 
 # lithuania
-Region "lithuania"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "lithuania/independence"        - "Independence Day"               Fixed Feb 16
-  Event "lithuania/coronation"          - "Coronation Day"                 Fixed Jul  6
-  Event "lithuania/mourning"            - "Mourning"                       Fixed Nov  1
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "lt"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Event "lt/independence"         -   "Independence Day"      Fixed Feb 16
+  Event "lt/coronation"           -   "Coronation Day"        Fixed Jul  6
+  Event "lt/mourning"             -   "Mourning"              Fixed Nov  1
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25
 
 
 # luxembourg
-Region "luxembourg"
-  Add   "new year 2d"                   - # "New Year"                     Fixed Jan  1  2 days
-  Event "luxembourg/grand duchess"      - "Grand Duchess' Birthday"        Fixed Jan 23
-  Event "luxembourg/burgsonndeg"        - "Burgsonndeg"                    Fixed Feb 28
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Event "luxembourg/national"           - "National Day"                   Fixed Jun 23
-  Event "luxembourg/liberation"         - "Liberation Day"                 Fixed Sep  9
-  Add   "c/all saints"                  - # "All Saints Day"               Fixed Nov  1
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
-  Add   "c/boxing"                      - # "Boxing Day"                   Fixed Dec 26
+Region "lu"
+  Add   "new year 2d"             - # "New Year"                Fixed Jan  1  2 days
+  Event "lu/grand duchess"        -   "Grand Duchess' Birthday" Fixed Jan 23        
+  Event "lu/burgsonndeg"          -   "Burgsonndeg"             Fixed Feb 28        
+  Add   "c/easter monday"         - # "Easter Monday"           Easter +1           
+  Event "lu/national"             -   "National Day"            Fixed Jun 23        
+  Event "lu/liberation"           -   "Liberation Day"          Fixed Sep  9        
+  Add   "c/all saints"            - # "All Saints Day"          Fixed Nov  1        
+  Add   "c/christmas"             - # "Christmas Day"           Fixed Dec 25        
+  Add   "c/boxing"                - # "Boxing Day"              Fixed Dec 26        
 
 
 # macao
-Region "macao"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Event "macao/anniversary of the portugese revolution"  - "Anniversary of the Portugese Revolution" Fixed Apr 25
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Event "macao/procession of our lady of fatima"  - "Procession of Our Lady of Fatima" Fixed May 13
-  Event "macao/battle of july 13"       - "Feast of the Battle of July 13" Fixed Jul 13
-  Event "macao/republic"                - "Republic Day"                   Fixed Oct  5
-  Add   "c/all souls"                   - # "All Souls Day"                Fixed Nov  2
-  Add   "c/immaculate conception"       - # "Immaculate Conception"        Fixed Dec  8
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "mo"
+  Add   "new year"                 - # "New Year's Day"                          Fixed Jan  1
+  Add   "c/good friday"            - # "Good Friday"                             Easter -2   
+  Event "mo/aportugese revolution" -   "Anniversary of the Portugese Revolution" Fixed Apr 25
+  Add   "labor"                    - # "Labor Day"                               Fixed May  1
+  Event "mo/lady of fatima"        -   "Procession of Our Lady of Fatima"        Fixed May 13
+  Event "mo/battle of july 13"     -   "Feast of the Battle of July 13"          Fixed Jul 13
+  Event "mo/republic"              -   "Republic Day"                            Fixed Oct  5
+  Add   "c/all souls"              - # "All Souls Day"                           Fixed Nov  2
+  Add   "c/immaculate conception"  - # "Immaculate Conception"                   Fixed Dec  8
+  Add   "c/christmas"              - # "Christmas Day"                           Fixed Dec 25
 
 
 # madagascar
-Region "madagascar"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "madagascar/commemoration"      - "Commemoration Day"              Fixed Mar 29
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Add   "c/ascension"                   - # "Ascension"                    Easter +39
-  Add   "c/whitsunday"                  - # "Whitsunday"                   Easter +49
-  Event "madagascar/independence"       - "Independence Day"               Fixed Jun 26
-  Add   "c/all saints"                  - # "All Saints Day"               Fixed Nov  1
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
-  Event "madagascar/republic"           - "Republic Day"                   Fixed Dec 30
+Region "mg"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Event "mg/commemoration"        -   "Commemoration Day"     Fixed Mar 29
+  Add   "c/good friday"           - # "Good Friday"           Easter -2   
+  Add   "c/easter monday"         - # "Easter Monday"         Easter +1   
+  Add   "labor"                   - # "Labor Day"             Fixed May  1
+  Add   "c/ascension"             - # "Ascension"             Easter +39  
+  Add   "c/whitsunday"            - # "Whitsunday"            Easter +49  
+  Event "mg/independence"         -   "Independence Day"      Fixed Jun 26
+  Add   "c/all saints"            - # "All Saints Day"        Fixed Nov  1
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25
+  Event "mg/republic"             -   "Republic Day"          Fixed Dec 30
 
 
 # malawi
-Region "malawi"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "malawi/martyrs"                - "Martyrs' Day"                   Fixed Mar  3
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Add   "mothers"                       - # "Mother's Day"                 WDRel May Sun 2nd
-  Event "malawi/kamuzu"                 - "Kamuzu Day"                     Fixed May 14
-  Event "malawi/republic"               - "Republic Day"                   Fixed Jul  6
-  Event "malawi/august holiday"         - "August Holiday"                 Fixed Aug  6
-  Event "malawi/mothers"                - "Mother's Day"                   Fixed Oct 17
-  Event "malawi/national tree-planting"  - "National Tree-Planting Day"    Fixed Dec 21
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
-  Add   "c/boxing"                      - # "Boxing Day"                   Fixed Dec 26
+Region "mw"
+  Add   "new year"                  - # "New Year's Day"             Fixed Jan  1     
+  Event "mw/martyrs"                -   "Martyrs' Day"               Fixed Mar  3     
+  Add   "c/good friday"             - # "Good Friday"                Easter -2        
+  Add   "c/easter monday"           - # "Easter Monday"              Easter +1        
+  Add   "mothers"                   - # "Mother's Day"               WDRel May Sun 2nd
+  Event "mw/kamuzu"                 -   "Kamuzu Day"                 Fixed May 14     
+  Event "mw/republic"               -   "Republic Day"               Fixed Jul  6     
+  Event "mw/august holiday"         -   "August Holiday"             Fixed Aug  6     
+  Event "mw/mothers"                -   "Mother's Day"               Fixed Oct 17     
+  Event "mw/national tree-planting" -   "National Tree-Planting Day" Fixed Dec 21     
+  Add   "c/christmas"               - # "Christmas Day"              Fixed Dec 25     
+  Add   "c/boxing"                  - # "Boxing Day"                 Fixed Dec 26     
 
 
 # malaysia
-Region "malaysia"
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Event "malaysia/kings"                - "King's Birthday"                Fixed Jun  3
-  Event "malaysia/malaysia"             - "Malaysia Day"                   Fixed Aug 31
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "my"
+  Add   "labor"                   - # "Labor Day"             Fixed May  1
+  Event "my/kings"                -   "King's Birthday"       Fixed Jun  3
+  Event "my/malaysia"             -   "Malaysia Day"          Fixed Aug 31
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25
 
 
 # maldives
-Region "maldives"
-  Event "maldives/national"             - "National Day"                   Fixed Jan  7
-  Event "maldives/independence"         - "Independence Day"               Fixed Jul 26
-  Event "maldives/victory"              - "Victory Day"                    Fixed Nov  3
-  Event "maldives/republic"             - "Republic Day"                   Fixed Nov 11
-  Event "maldives/fisheries"            - "Fisheries Day"                  Fixed Dec 10
+Region "mv"
+  Event "mv/national"             - "National Day"            Fixed Jan  7
+  Event "mv/independence"         - "Independence Day"        Fixed Jul 26
+  Event "mv/victory"              - "Victory Day"             Fixed Nov  3
+  Event "mv/republic"             - "Republic Day"            Fixed Nov 11
+  Event "mv/fisheries"            - "Fisheries Day"           Fixed Dec 10
 
 
 # mali
-Region "mali"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "mali/army"                     - "Army Day"                       Fixed Jan 20
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Add   "africa"                        - # "Africa Day"                   Fixed May 25
-  Event "mali/independence"             - "Independence Day"               Fixed Sep 22
-  Event "mali/liberation"               - "Liberation Day"                 Fixed Nov 19
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "ml"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Event "ml/army"                 -   "Army Day"              Fixed Jan 20
+  Add   "c/easter monday"         - # "Easter Monday"         Easter +1   
+  Add   "labor"                   - # "Labor Day"             Fixed May  1
+  Add   "africa"                  - # "Africa Day"            Fixed May 25
+  Event "ml/independence"         -   "Independence Day"      Fixed Sep 22
+  Event "ml/liberation"           -   "Liberation Day"        Fixed Nov 19
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25
 
 
 # malta
-Region "malta"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "malta/freedom"                 - "Freedom Day"                    Fixed Mar 31
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Event "malta/memorial of 1919 riot"   - "Memorial of 1919 riot"          Fixed Jun  7
-  Add   "saints/paul"                   - # "St. Paul"                     Fixed Jun 29
-  Add   "saints/peter"                  - # "St. Peter"                    Fixed Jun 29
-  Add   "c/assumption"                  - # "Assumption Day"               Fixed Aug 15
-  Event "malta/independence"            - "Independence Day"               Fixed Sep 21
-  Add   "c/immaculate conception"       - # "Immaculate Conception"        Fixed Dec  8
-  Event "malta/republic"                - "Republic Day"                   Fixed Dec 13
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "mt"
+  Add   "new year"                 - # "New Year's Day"        Fixed Jan  1
+  Event "mt/freedom"               -   "Freedom Day"           Fixed Mar 31
+  Add   "c/good friday"            - # "Good Friday"           Easter -2   
+  Add   "labor"                    - # "Labor Day"             Fixed May  1
+  Event "mt/memorial of 1919 riot" -   "Memorial of 1919 riot" Fixed Jun  7
+  Add   "saints/paul"              - # "St. Paul"              Fixed Jun 29
+  Add   "saints/peter"             - # "St. Peter"             Fixed Jun 29
+  Add   "c/assumption"             - # "Assumption Day"        Fixed Aug 15
+  Event "mt/independence"          -   "Independence Day"      Fixed Sep 21
+  Add   "c/immaculate conception"  - # "Immaculate Conception" Fixed Dec  8
+  Event "mt/republic"              -   "Republic Day"          Fixed Dec 13
+  Add   "c/christmas"              - # "Christmas Day"         Fixed Dec 25
 
 
 # marshall islands
-Region "marshall islands"
-  Event "marshall islands/proclamation of the republic of marshall islands"  - "Proclamation of the Republic of Marshall Islands" Fixed May  1
+Region "mh"
+  Event "mh/proclamation"         - "Proclamation of the Republic of Marshall Islands" Fixed May  1
 
 
 # martinique
-Region "martinique"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "c/ash wednesday"               - # "Ash wednesday"                Easter -46
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Event "martinique/ascension"          - "Ascension Day"                  Fixed May 12
-  Add   "c/pentecost"                   - # "Pentecost"                    Easter +49
-  Add   "c/assumption"                  - # "Assumption Day"               Fixed Aug 15
-  Add   "c/all saints"                  - # "All Saints Day"               Fixed Nov  1
-  Add   "c/all souls"                   - # "All Souls Day"                Fixed Nov  2
-  Add   "armistice"                     - # "Armistice Day"                Fixed Nov 11
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "mq"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Add   "c/ash wednesday"         - # "Ash wednesday"         Easter -46  
+  Add   "c/good friday"           - # "Good Friday"           Easter -2   
+  Add   "c/easter monday"         - # "Easter Monday"         Easter +1   
+  Event "mq/ascension"            -   "Ascension Day"         Fixed May 12
+  Add   "c/pentecost"             - # "Pentecost"             Easter +49  
+  Add   "c/assumption"            - # "Assumption Day"        Fixed Aug 15
+  Add   "c/all saints"            - # "All Saints Day"        Fixed Nov  1
+  Add   "c/all souls"             - # "All Souls Day"         Fixed Nov  2
+  Add   "armistice"               - # "Armistice Day"         Fixed Nov 11
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25
 
 
 # mauritania
-Region "mauritania"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Add   "africa"                        - # "Africa Day"                   Fixed May 25
-  Event "mauritania/independence"       - "Independence Day"               Fixed Nov 28
+Region "mr"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Add   "labor"                   - # "Labor Day"             Fixed May  1
+  Add   "africa"                  - # "Africa Day"            Fixed May 25
+  Event "mr/independence"         -   "Independence Day"      Fixed Nov 28
 
 
 # mauritius
-Region "mauritius"
-  Add   "new year 2d"                   - # "New Year"                     Fixed Jan  1  2 days
-  Event "mauritius/independence"        - "Independence Day"               Fixed Mar 12
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Add   "c/all saints"                  - # "All Saints Day"               Fixed Nov  1
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "mu"
+  Add   "new year 2d"             - # "New Year"              Fixed Jan  1  2 days
+  Event "mu/independence"         -   "Independence Day"      Fixed Mar 12        
+  Add   "c/good friday"           - # "Good Friday"           Easter -2           
+  Add   "labor"                   - # "Labor Day"             Fixed May  1        
+  Add   "c/all saints"            - # "All Saints Day"        Fixed Nov  1        
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25        
 
 
 # mexico
-Region "mexico"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "mexico/constitution"           - "Constitution Day"               Fixed Feb  5
-  Event "mexico/birthday of benito juarez"  - "Birthday of Benito Ju�rez" Fixed Mar 21
-  Event "mexico/san marc�s"          - "San Marc�s Day"              Fixed Apr 25
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Event "mexico/holy cross"             - "Holy Cross Day"                 Fixed May  3
-  Event "mexico/cinco de mayo"          - "Cinco de Mayo"                  Fixed May  5
-  Event "mexico/day of mourning"        - "Day of Mourning"                Fixed Jul 17
-  Event "mexico/presidential message"   - "Presidential Message Day"       Fixed Sep  1
-  Event "mexico/independence"           - "Independence Day"               Fixed Sep 16
-  Event "mexico/dia de la raza"         - "Dia de la Raza"                 Fixed Oct 12
-  Event "mexico/revolution"             - "Revolution Day"                 Fixed Nov 20
-  Event "mexico/our lady of guadalupe"  - "Feast of Our Lady of Guadalupe" Fixed Dec 12
-  Event "mexico/posadass"               - "Posadas Days"                   Fixed Dec 16  9 days
-  Event "mexico/night of the radishes"  - "Night of the Radishes"          Fixed Dec 23
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "mx"
+  Add   "new year"                     - # "New Year's Day"                 Fixed Jan  1        
+  Event "mx/constitution"              -   "Constitution Day"               Fixed Feb  5        
+  Event "mx/birthday of benito juarez" -   "Birthday of Benito Ju�rez"      Fixed Mar 21        
+  Event "mx/san marc�s"                -   "San Marc�s Day"                 Fixed Apr 25        
+  Add   "labor"                        - # "Labor Day"                      Fixed May  1        
+  Event "mx/holy cross"                -   "Holy Cross Day"                 Fixed May  3        
+  Event "mx/cinco de mayo"             -   "Cinco de Mayo"                  Fixed May  5        
+  Event "mx/day of mourning"           -   "Day of Mourning"                Fixed Jul 17        
+  Event "mx/presidential message"      -   "Presidential Message Day"       Fixed Sep  1        
+  Event "mx/independence"              -   "Independence Day"               Fixed Sep 16        
+  Event "mx/dia de la raza"            -   "Dia de la Raza"                 Fixed Oct 12        
+  Event "mx/revolution"                -   "Revolution Day"                 Fixed Nov 20        
+  Event "mx/our lady of guadalupe"     -   "Feast of Our Lady of Guadalupe" Fixed Dec 12        
+  Event "mx/posadass"                  -   "Posadas Days"                   Fixed Dec 16  9 days
+  Event "mx/night of the radishes"     -   "Night of the Radishes"          Fixed Dec 23        
+  Add   "c/christmas"                  - # "Christmas Day"                  Fixed Dec 25        
 
 
 # micronesia
-Region "micronesia"
+Region "fm"
 
 
 # monaco
-Region "monaco"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "saints/devote"                 - # "St. Devote"                   Fixed Jan 27
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Add   "c/ascension"                   - # "Ascension"                    Easter +39
-  Add   "c/whitmonday"                  - # "Whitmonday"                   Easter +50
-  Add   "c/assumption"                  - # "Assumption Day"               Fixed Aug 15
-  Add   "c/all saints"                  - # "All Saints Day"               Fixed Nov  1
-  Event "monaco/monaco national festival"  - "Monaco National Festival"    Fixed Nov 19
-  Add   "c/immaculate conception"       - # "Immaculate Conception"        Fixed Dec  8
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "mc"
+  Add   "new year"                    - # "New Year's Day"           Fixed Jan  1
+  Add   "saints/devote"               - # "St. Devote"               Fixed Jan 27
+  Add   "c/easter monday"             - # "Easter Monday"            Easter +1   
+  Add   "c/ascension"                 - # "Ascension"                Easter +39  
+  Add   "c/whitmonday"                - # "Whitmonday"               Easter +50  
+  Add   "c/assumption"                - # "Assumption Day"           Fixed Aug 15
+  Add   "c/all saints"                - # "All Saints Day"           Fixed Nov  1
+  Event "mc/monaco national festival" -   "Monaco National Festival" Fixed Nov 19
+  Add   "c/immaculate conception"     - # "Immaculate Conception"    Fixed Dec  8
+  Add   "c/christmas"                 - # "Christmas Day"            Fixed Dec 25
 
 
 # mongolia
-Region "mongolia"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "womens"                        - # "Int. Women's Day"             Fixed Mar  8
-  Event "mongolia/national"             - "National Day"                   Fixed Jul 11
-  Event "mongolia/republic"             - "Republic Day"                   Fixed Nov 26
+Region "mn"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Add   "womens"                  - # "Int. Women's Day"      Fixed Mar  8
+  Event "mn/national"             -   "National Day"          Fixed Jul 11
+  Event "mn/republic"             -   "Republic Day"          Fixed Nov 26
 
 
 # montserrat
-Region "montserrat"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Add   "c/whitmonday"                  - # "Whitmonday"                   Easter +50
-  Event "montserrat/liberation"         - "Liberation Day"                 Fixed Nov 23
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
-  Add   "c/boxing"                      - # "Boxing Day"                   Fixed Dec 26
-  Event "montserrat/festival"           - "Festival Day"                   Fixed Dec 31
-
-
-# mormonism
-Region "mormonism"
-  Event "mormonism/founding of the mormon church"  - "Founding of the Mormon Church" Fixed Apr  6
+Region "ms"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Add   "c/good friday"           - # "Good Friday"           Easter -2   
+  Add   "c/easter monday"         - # "Easter Monday"         Easter +1   
+  Add   "labor"                   - # "Labor Day"             Fixed May  1
+  Add   "c/whitmonday"            - # "Whitmonday"            Easter +50  
+  Event "ms/liberation"           -   "Liberation Day"        Fixed Nov 23
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25
+  Add   "c/boxing"                - # "Boxing Day"            Fixed Dec 26
+  Event "ms/festival"             -   "Festival Day"          Fixed Dec 31
 
 
 # morocco
-Region "morocco"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "morocco/independence"          - "Independence Day"               Fixed Mar  2
-  Event "morocco/throne"                - "Throne Day"                     Fixed Mar  3
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Event "morocco/oued ed-dahab"         - "Oued ed-Dahab Day"              Fixed Aug 14
-  Event "morocco/green march"           - "Green March"                    Fixed Nov  6
+Region "ma"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Event "ma/independence"         -   "Independence Day"      Fixed Mar  2
+  Event "ma/throne"               -   "Throne Day"            Fixed Mar  3
+  Add   "labor"                   - # "Labor Day"             Fixed May  1
+  Event "ma/oued ed-dahab"        -   "Oued ed-Dahab Day"     Fixed Aug 14
+  Event "ma/green march"          -   "Green March"           Fixed Nov  6
 
 
 # mozambique
-Region "mozambique"
-  Event "mozambique/universal fraternity"  - "Universal Fraternity Day"    Fixed Jan  1
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "mozambique/heroes"             - "Heroes' Day"                    Fixed Feb  3
-  Event "mozambique/womens"             - "Women's Day"                    Fixed Apr  7
-  Event "mozambique/workers"            - "Workers' Day"                   Fixed May  1
-  Event "mozambique/independence"       - "Independence Day"               Fixed Jun 25
-  Event "mozambique/lusaka agreement"   - "Lusaka Agreement Day"           Fixed Sep  7
-  Event "mozambique/armed forces"       - "Armed Forces Day"               Fixed Sep 25
-  Add   "family"                        - # "Family Day"                   Fixed Dec 25
+Region "mz"
+  Event "mz/universal fraternity" -   "Universal Fraternity Day" Fixed Jan  1
+  Add   "new year"                - # "New Year's Day"           Fixed Jan  1
+  Event "mz/heroes"               -   "Heroes' Day"              Fixed Feb  3
+  Event "mz/womens"               -   "Women's Day"              Fixed Apr  7
+  Event "mz/workers"              -   "Workers' Day"             Fixed May  1
+  Event "mz/independence"         -   "Independence Day"         Fixed Jun 25
+  Event "mz/lusaka agreement"     -   "Lusaka Agreement Day"     Fixed Sep  7
+  Event "mz/armed forces"         -   "Armed Forces Day"         Fixed Sep 25
+  Add   "family"                  - # "Family Day"               Fixed Dec 25
 
 
 # myanmar
-Region "myanmar"
-  Event "myanmar/independence"          - "Independence Day"               Fixed Jan  4
-  Event "myanmar/union"                 - "Union Day"                      Fixed Feb 12
-  Event "myanmar/peasants"              - "Peasants' Day"                  Fixed Mar  2
-  Event "myanmar/resistance"            - "Resistance Day"                 Fixed Mar 27
-  Event "myanmar/armed forces"          - "Armed Forces Day"               Fixed Mar 27
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Event "myanmar/martyrs"               - "Martyrs' Day"                   Fixed Jul 19
-  Event "myanmar/national"              - "National Day"                   Fixed Dec 10
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "mm"
+  Event "mm/independence"         -   "Independence Day"      Fixed Jan  4
+  Event "mm/union"                -   "Union Day"             Fixed Feb 12
+  Event "mm/peasants"             -   "Peasants' Day"         Fixed Mar  2
+  Event "mm/resistance"           -   "Resistance Day"        Fixed Mar 27
+  Event "mm/armed forces"         -   "Armed Forces Day"      Fixed Mar 27
+  Add   "labor"                   - # "Labor Day"             Fixed May  1
+  Event "mm/martyrs"              -   "Martyrs' Day"          Fixed Jul 19
+  Event "mm/national"             -   "National Day"          Fixed Dec 10
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25
 
 
 # namibia
-Region "namibia"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "namibia/independence"          - "Independence Day"               Fixed Mar 21
-  Add   "c/easter"                      - # "Easter"                       Easter +0
-  Event "namibia/workers"               - "Workers' Day"                   Fixed May  1
-  Event "namibia/casinga"               - "Casinga Day"                    Fixed May  4
-  Add   "c/ascension"                   - # "Ascension"                    Easter +39
-  Add   "africa"                        - # "Africa Day"                   Fixed May 25
-  Event "namibia/heroes"                - "Heroes' Day"                    Fixed Aug 26
-  Event "namibia/day of goodwill"       - "Day of Goodwill"                Fixed Oct  7
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
-  Add   "family"                        - # "Family Day"                   Fixed Dec 25
-  Event "namibia/family"                - "Family Day"                     Fixed Dec 26
+Region "na"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Event "na/independence"         -   "Independence Day"      Fixed Mar 21
+  Add   "c/easter"                - # "Easter"                Easter +0   
+  Event "na/workers"              -   "Workers' Day"          Fixed May  1
+  Event "na/casinga"              -   "Casinga Day"           Fixed May  4
+  Add   "c/ascension"             - # "Ascension"             Easter +39  
+  Add   "africa"                  - # "Africa Day"            Fixed May 25
+  Event "na/heroes"               -   "Heroes' Day"           Fixed Aug 26
+  Event "na/day of goodwill"      -   "Day of Goodwill"       Fixed Oct  7
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25
+  Add   "family"                  - # "Family Day"            Fixed Dec 25
+  Event "na/family"               -   "Family Day"            Fixed Dec 26
 
 
 # nauru
-Region "nauru"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "nauru/independence"            - "Independence Day"               Fixed Jan 31
-  Add   "c/easter"                      - # "Easter"                       Easter +0
-  Event "nauru/angam"                   - "Angam Day"                      Fixed Oct 27
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "nr"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Event "nr/independence"         -   "Independence Day"      Fixed Jan 31
+  Add   "c/easter"                - # "Easter"                Easter +0   
+  Event "nr/angam"                -   "Angam Day"             Fixed Oct 27
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25
 
 
 # nepal
-Region "nepal"
-  Event "nepal/national unity"          - "National Unity Day"             Fixed Jan 11
-  Event "nepal/democracy"               - "Democracy Day"                  Fixed Feb 18
-  Add   "womens"                        - # "Int. Women's Day"             Fixed Mar  8
-  Event "nepal/tij"                     - "Tij Day"                        Fixed Aug  8
-  Event "nepal/queens"                  - "Queen's Birthday"               Fixed Nov  8
-  Event "nepal/constitution"            - "Constitution Day"               Fixed Dec 16
-  Event "nepal/independence"            - "Independence Day"               Fixed Dec 21
-  Event "nepal/birthday of king birendra"  - "Birthday of King Birendra"   Fixed Dec 28
-  Event "nepal/kings"                   - "King's Birthday"                Fixed Dec 28
+Region "np"
+  Event "np/national unity"            -   "National Unity Day"        Fixed Jan 11
+  Event "np/democracy"                 -   "Democracy Day"             Fixed Feb 18
+  Add   "womens"                       - # "Int. Women's Day"          Fixed Mar  8
+  Event "np/tij"                       -   "Tij Day"                   Fixed Aug  8
+  Event "np/queens"                    -   "Queen's Birthday"          Fixed Nov  8
+  Event "np/constitution"              -   "Constitution Day"          Fixed Dec 16
+  Event "np/independence"              -   "Independence Day"          Fixed Dec 21
+  Event "np/birthday of king birendra" -   "Birthday of King Birendra" Fixed Dec 28
+  Event "np/kings"                     -   "King's Birthday"           Fixed Dec 28
 
 
 # netherlands
-Region "netherlands"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Event "netherlands/queens"            - "Queen's Day"                    Fixed Apr 30
-  Event "netherlands/liberation"        - "Liberation Day"                 Fixed May  5
-  Add   "c/ascension"                   - # "Ascension"                    Easter +39
-  Add   "c/whitmonday"                  - # "Whitmonday"                   Easter +50
-  Event "netherlands/independence"      - "Independence Day"               Fixed Jul 25
-  Event "netherlands/beggars"           - "Beggar's Day"                   Fixed Nov 11
-  Event "netherlands/sinterklaas"       - "Sinterklaas"                    Fixed Dec  6
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "nl"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Add   "c/good friday"           - # "Good Friday"           Easter -2   
+  Add   "c/easter monday"         - # "Easter Monday"         Easter +1   
+  Event "nl/queens"               -   "Queen's Day"           Fixed Apr 30
+  Event "nl/liberation"           -   "Liberation Day"        Fixed May  5
+  Add   "c/ascension"             - # "Ascension"             Easter +39  
+  Add   "c/whitmonday"            - # "Whitmonday"            Easter +50  
+  Event "nl/independence"         -   "Independence Day"      Fixed Jul 25
+  Event "nl/beggars"              -   "Beggar's Day"          Fixed Nov 11
+  Event "nl/sinterklaas"          -   "Sinterklaas"           Fixed Dec  6
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25
 
 
 # netherlands antilles
-Region "netherlands antilles"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Event "netherlands antilles/queens"   - "Queen's Birthday"               Fixed Apr 30
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Add   "c/ascension"                   - # "Ascension"                    Easter +39
-  Event "netherlands antilles/cura�ao"  - "Cura�ao Day"              Fixed Jul  2
-  Event "netherlands antilles/bonaire"  - "Bonaire Day"                    Fixed Sep  6
-  Event "netherlands antilles/saint maarten"  - "St Maarten Day"           Fixed Nov 11
-  Event "netherlands antilles/saint eustatius"  - "St Eustatius Day"       Fixed Nov 16
-  Event "netherlands antilles/saba"     - "Saba Day"                       Fixed Dec  6
+Region "an"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Add   "c/good friday"           - # "Good Friday"           Easter -2   
+  Add   "c/easter monday"         - # "Easter Monday"         Easter +1   
+  Event "an/queens"               -   "Queen's Birthday"      Fixed Apr 30
+  Add   "labor"                   - # "Labor Day"             Fixed May  1
+  Add   "c/ascension"             - # "Ascension"             Easter +39  
+  Event "an/cura�ao"              -   "Cura�ao Day"           Fixed Jul  2
+  Event "an/bonaire"              -   "Bonaire Day"           Fixed Sep  6
+  Event "an/saint maarten"        -   "St Maarten Day"        Fixed Nov 11
+  Event "an/saint eustatius"      -   "St Eustatius Day"      Fixed Nov 16
+  Event "an/saba"                 -   "Saba Day"              Fixed Dec  6
 
 
 # new caledonia
-Region "new caledonia"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "new caledonia/bridge"          - "Bridge Day"                     Fixed Jan  2
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Add   "c/ascension"                   - # "Ascension"                    Easter +39
-  Add   "c/whitmonday"                  - # "Whitmonday"                   Easter +50
-  Add   "armistice"                     - # "Armistice Day"                Fixed Nov 11
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "nc"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Event "nc/bridge"               -   "Bridge Day"            Fixed Jan  2
+  Add   "c/easter monday"         - # "Easter Monday"         Easter +1   
+  Add   "labor"                   - # "Labor Day"             Fixed May  1
+  Add   "c/ascension"             - # "Ascension"             Easter +39  
+  Add   "c/whitmonday"            - # "Whitmonday"            Easter +50  
+  Add   "armistice"               - # "Armistice Day"         Fixed Nov 11
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25
 
 
 # new zealand
 Region "new zealand"
-  Add   "new year 2d"                   - # "New Year"                     Fixed Jan  1  2 days
-  Event "new zealand/waitangi"          - "Waitangi Day"                   Fixed Feb  6
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Add   "anzac"                         - # "ANZAC Day"                    Fixed Apr 25
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Event "new zealand/queens"            - "Queen's Birthday"               Fixed Jun  4
-  Event "new zealand/labor"             - "Labor Day"                      WDRel Oct Mon last
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
-  Add   "c/boxing"                      - # "Boxing Day"                   Fixed Dec 26
+  Add   "new year 2d"             - # "New Year"              Fixed Jan  1  2 days
+  Event "new zealand/waitangi"    -   "Waitangi Day"          Fixed Feb  6        
+  Add   "c/good friday"           - # "Good Friday"           Easter -2           
+  Add   "c/easter monday"         - # "Easter Monday"         Easter +1           
+  Add   "anzac"                   - # "ANZAC Day"             Fixed Apr 25        
+  Add   "labor"                   - # "Labor Day"             Fixed May  1        
+  Event "new zealand/queens"      -   "Queen's Birthday"      Fixed Jun  4        
+  Event "new zealand/labor"       -   "Labor Day"             WDRel Oct Mon last  
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25        
+  Add   "c/boxing"                - # "Boxing Day"            Fixed Dec 26        
 
 
 # nicaragua
-Region "nicaragua"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "nicaragua/air force"           - "Air Force Day"                  Fixed Feb  1
-  Add   "c/holy thursday"               - # "Holy Thursday"                Easter -3
-  Add   "c/holy friday"                 - # "Holy Friday"                  Easter -2
-  Add   "c/easter"                      - # "Easter"                       Easter +0
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Event "nicaragua/army"                - "Army Day"                       Fixed May 27
-  Event "nicaragua/revolution"          - "Revolution Day"                 Fixed Jul 19
-  Event "nicaragua/fiesta"              - "Fiesta Day"                     Fixed Aug  1
-  Event "nicaragua/san jacinto"         - "San Jacinto Day"                Fixed Sep 14
-  Event "nicaragua/independence"        - "Independence Day"               Fixed Sep 15
-  Add   "c/all souls"                   - # "All Souls Day"                Fixed Nov  2
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "ni"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Event "ni/air force"            -   "Air Force Day"         Fixed Feb  1
+  Add   "c/holy thursday"         - # "Holy Thursday"         Easter -3   
+  Add   "c/holy friday"           - # "Holy Friday"           Easter -2   
+  Add   "c/easter"                - # "Easter"                Easter +0   
+  Add   "labor"                   - # "Labor Day"             Fixed May  1
+  Event "ni/army"                 -   "Army Day"              Fixed May 27
+  Event "ni/revolution"           -   "Revolution Day"        Fixed Jul 19
+  Event "ni/fiesta"               -   "Fiesta Day"            Fixed Aug  1
+  Event "ni/san jacinto"          -   "San Jacinto Day"       Fixed Sep 14
+  Event "ni/independence"         -   "Independence Day"      Fixed Sep 15
+  Add   "c/all souls"             - # "All Souls Day"         Fixed Nov  2
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25
 
 
 # niger
-Region "niger"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "niger/national"                - "National Day"                   Fixed Apr 15
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Event "niger/independence"            - "Independence Day"               Fixed Aug  3
-  Event "niger/republic"                - "Republic Day"                   Fixed Dec 18
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "ne"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Event "ne/national"             -   "National Day"          Fixed Apr 15
+  Add   "c/easter monday"         - # "Easter Monday"         Easter +1   
+  Add   "labor"                   - # "Labor Day"             Fixed May  1
+  Event "ne/independence"         -   "Independence Day"      Fixed Aug  3
+  Event "ne/republic"             -   "Republic Day"          Fixed Dec 18
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25
 
 
 # nigeria
-Region "nigeria"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Event "nigeria/childrens"             - "Children's Day"                 Fixed May 27
-  Event "nigeria/national"              - "National Day"                   Fixed Oct  1
-  Event "nigeria/harvest festival"      - "Harvest Festival"               Fixed Oct 12
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
-  Add   "c/boxing"                      - # "Boxing Day"                   Fixed Dec 26
+Region "ng"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Add   "c/good friday"           - # "Good Friday"           Easter -2   
+  Add   "c/easter monday"         - # "Easter Monday"         Easter +1   
+  Event "ng/childrens"            -   "Children's Day"        Fixed May 27
+  Event "ng/national"             -   "National Day"          Fixed Oct  1
+  Event "ng/harvest festival"     -   "Harvest Festival"      Fixed Oct 12
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25
+  Add   "c/boxing"                - # "Boxing Day"            Fixed Dec 26
 
 
 # north korea
-Region "north korea"
-  Add   "new year 2d"                   - # "New Year"                     Fixed Jan  1  2 days
-  Event "north korea/kim jong-il"       - "Kim Jong-il's Birthday"         Fixed Feb 16
-  Add   "womens"                        - # "Int. Women's Day"             Fixed Mar  8
-  Event "north korea/kim il-sun"        - "Kim Il-Sun's Birthday"          Fixed Apr 15
-  Event "north korea/armed forces"      - "Armed Forces Day"               Fixed Apr 25
-  Add   "may day"                       - # "May Day"                      Fixed May  1
-  Event "north korea/chilsok"           - "Ch'ilsok"                       Fixed Jul 28
-  Event "north korea/liberation"        - "Anniversary of Liberation"      Fixed Aug 15
-  Event "north korea/independence"      - "Independence Day"               Fixed Sep  9
-  Event "north korea/party foundation"  - "Party Foundation Day"           Fixed Oct 10
-  Event "north korea/constutution"      - "Anniversary of the Constitution" Fixed Dec 27
+Region "kp"
+  Add   "new year 2d"             - # "New Year"                        Fixed Jan  1  2 days
+  Event "kp/kim jong-il"          -   "Kim Jong-il's Birthday"          Fixed Feb 16        
+  Add   "womens"                  - # "Int. Women's Day"                Fixed Mar  8        
+  Event "kp/kim il-sun"           -   "Kim Il-Sun's Birthday"           Fixed Apr 15        
+  Event "kp/armed forces"         -   "Armed Forces Day"                Fixed Apr 25        
+  Add   "may day"                 - # "May Day"                         Fixed May  1        
+  Event "kp/chilsok"              -   "Ch'ilsok"                        Fixed Jul 28        
+  Event "kp/liberation"           -   "Anniversary of Liberation"       Fixed Aug 15        
+  Event "kp/independence"         -   "Independence Day"                Fixed Sep  9        
+  Event "kp/party foundation"     -   "Party Foundation Day"            Fixed Oct 10        
+  Event "kp/constutution"         -   "Anniversary of the Constitution" Fixed Dec 27        
 
 
 # northern mariana islands
-Region "northern mariana islands"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "northern mariana islands/commonwealth"  - "Commonwealth Day"      Fixed Jan  3
-  Event "northern mariana islands/presidents"  - "Presidents Day"          Fixed Feb 13
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "mp"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Event "mp/commonwealth"         -   "Commonwealth Day"      Fixed Jan  3
+  Event "mp/presidents"           -   "Presidents Day"        Fixed Feb 13
+  Add   "labor"                   - # "Labor Day"             Fixed May  1
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25
 
 
 # norway
-Region "norway"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "norway/tyvendedagen"           - "Tyvendedagen"                   Fixed Jan 13
-  Add   "c/holy thursday"               - # "Holy Thursday"                Easter -3
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Add   "may day"                       - # "May Day"                      Fixed May  1
-  Event "norway/constitution"           - "Constitution Day"               Fixed May 17
-  Add   "c/ascension"                   - # "Ascension"                    Easter +39
-  Add   "c/whitmonday"                  - # "Whitmonday"                   Easter +50
-  Event "norway/olsok eve festival"     - "Olsok Eve Festival"             Fixed Jul 29
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "no"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Event "no/tyvendedagen"         -   "Tyvendedagen"          Fixed Jan 13
+  Add   "c/holy thursday"         - # "Holy Thursday"         Easter -3   
+  Add   "c/good friday"           - # "Good Friday"           Easter -2   
+  Add   "c/easter monday"         - # "Easter Monday"         Easter +1   
+  Add   "may day"                 - # "May Day"               Fixed May  1
+  Event "no/constitution"         -   "Constitution Day"      Fixed May 17
+  Add   "c/ascension"             - # "Ascension"             Easter +39  
+  Add   "c/whitmonday"            - # "Whitmonday"            Easter +50  
+  Event "no/olsok eve festival"   -   "Olsok Eve Festival"    Fixed Jul 29
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25
 
 
 # oman
-Region "oman"
-  Event "oman/national"                 - "National Day"                   Fixed Jul 23
-  Event "oman/national2"                - "National Day"                   Fixed Nov 18
-  Event "oman/national of oman"         - "National Day of Oman"           Fixed Nov 18
-  Event "oman/sultans"                  - "Sultan's Birthday"              Fixed Nov 19
+Region "om"
+  Event "om/national"             - "National Day"            Fixed Jul 23
+  Event "om/national2"            - "National Day"            Fixed Nov 18
+  Event "om/national of oman"     - "National Day of Oman"    Fixed Nov 18
+  Event "om/sultans"              - "Sultan's Birthday"       Fixed Nov 19
 
 
 
 # pakistan
-Region "pakistan"
-  Event "pakistan/pakistan"             - "Pakistan Day"                   Fixed Mar 23
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Event "pakistan/independence"         - "Independence Day"               Fixed Aug 14
-  Event "pakistan/defense"              - "Defense Day"                    Fixed Sep  6
-  Event "pakistan/jinnah"               - "Jinnah Day"                     Fixed Sep 11
-  Event "pakistan/iqbal"                - "Iqbal Day"                      Fixed Nov  9
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
-  Event "pakistan/birthday of quaid-i-azam"  - "Birthday of Quaid-i-Azam"  Fixed Dec 25
-  Add   "c/boxing"                      - # "Boxing Day"                   Fixed Dec 26
+Region "pk"
+  Event "pk/pakistan"                 -   "Pakistan Day"             Fixed Mar 23
+  Add   "c/good friday"               - # "Good Friday"              Easter -2   
+  Add   "c/easter monday"             - # "Easter Monday"            Easter +1   
+  Add   "labor"                       - # "Labor Day"                Fixed May  1
+  Event "pk/independence"             -   "Independence Day"         Fixed Aug 14
+  Event "pk/defense"                  -   "Defense Day"              Fixed Sep  6
+  Event "pk/jinnah"                   -   "Jinnah Day"               Fixed Sep 11
+  Event "pk/iqbal"                    -   "Iqbal Day"                Fixed Nov  9
+  Add   "c/christmas"                 - # "Christmas Day"            Fixed Dec 25
+  Event "pk/birthday of quaid-i-azam" -   "Birthday of Quaid-i-Azam" Fixed Dec 25
+  Add   "c/boxing"                    - # "Boxing Day"               Fixed Dec 26
 
 
 # panama
-Region "panama"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "panama/day of mourning"        - "Day of Mourning"                Fixed Jan  9
-  Event "panama/constitution"           - "Constitution Day"               Fixed Mar  1
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Add   "mothers"                       - # "Mother's Day"                 WDRel May Sun 2nd
-  Event "panama/foundation of panama city"  - "Foundation of Panama City"  Fixed Aug 15
-  Event "panama/revolution"             - "Revolution Anniversary Day"     Fixed Oct 11
-  Event "panama/festival of the black christ"  - "Festival of the Black Christ" Fixed Oct 21
-  Event "panama/national anthem"        - "National Anthem Day"            Fixed Nov  1
-  Add   "c/all souls"                   - # "All Souls Day"                Fixed Nov  2
-  Event "panama/independence"           - "Independence Day"               Fixed Nov  3
-  Event "panama/flag"                   - "Flag Day"                       Fixed Nov  4
-  Event "panama/uprising of los santos"  - "Uprising of Los Santos"        Fixed Nov 10
-  Event "panama/independence from spain"  - "Independence from Spain"      Fixed Nov 28
-  Event "panama/mothers"                - "Mothers' Day"                   Fixed Dec  8
+Region "pa"
+  Add   "new year"                        - # "New Year's Day"               Fixed Jan  1     
+  Event "pa/day of mourning"              -   "Day of Mourning"              Fixed Jan  9     
+  Event "pa/constitution"                 -   "Constitution Day"             Fixed Mar  1     
+  Add   "c/good friday"                   - # "Good Friday"                  Easter -2        
+  Add   "labor"                           - # "Labor Day"                    Fixed May  1     
+  Add   "mothers"                         - # "Mother's Day"                 WDRel May Sun 2nd
+  Event "pa/foundation of panama city"    -   "Foundation of Panama City"    Fixed Aug 15     
+  Event "pa/revolution"                   -   "Revolution Anniversary Day"   Fixed Oct 11     
+  Event "pa/festival of the black christ" -   "Festival of the Black Christ" Fixed Oct 21     
+  Event "pa/national anthem"              -   "National Anthem Day"          Fixed Nov  1     
+  Add   "c/all souls"                     - # "All Souls Day"                Fixed Nov  2     
+  Event "pa/independence"                 -   "Independence Day"             Fixed Nov  3     
+  Event "pa/flag"                         -   "Flag Day"                     Fixed Nov  4     
+  Event "pa/uprising of los santos"       -   "Uprising of Los Santos"       Fixed Nov 10     
+  Event "pa/independence from spain"      -   "Independence from Spain"      Fixed Nov 28     
+  Event "pa/mothers"                      -   "Mothers' Day"                 Fixed Dec  8     
 
 
 # papua new guinea
-Region "papua new guinea"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Add   "british commonwealth/queens"   - # "Queen's Birthday"             Fixed Jun  4
-  Event "papua new guinea/remembrance"  - "Remembrance Day"                Fixed Jul 23
-  Event "papua new guinea/independence"  - "Independence Day"              Fixed Sep 16
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
-  Add   "c/boxing"                      - # "Boxing Day"                   Fixed Dec 26
+Region "pg"
+  Add   "new year"                    - # "New Year's Day"    Fixed Jan  1
+  Add   "c/good friday"               - # "Good Friday"       Easter -2   
+  Add   "c/easter monday"             - # "Easter Monday"     Easter +1   
+  Add   "british commonwealth/queens" - # "Queen's Birthday"  Fixed Jun  4
+  Event "pg/remembrance"              -   "Remembrance Day"   Fixed Jul 23
+  Event "pg/independence"             -   "Independence Day"  Fixed Sep 16
+  Add   "c/christmas"                 - # "Christmas Day"     Fixed Dec 25
+  Add   "c/boxing"                    - # "Boxing Day"        Fixed Dec 26
 
 
 # paraguay
-Region "paraguay"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "saints/blaise"                 - # "St. Blaise"                   Fixed Feb  3
-  Event "paraguay/heroes"               - "Heroes' Day"                    Fixed Mar  1
-  Add   "c/holy thursday"               - # "Holy Thursday"                Easter -3
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Event "paraguay/independence"         - "Independence Day"               Fixed May 14  2 days
-  Add   "c/ascension"                   - # "Ascension"                    Easter +39
-  Event "paraguay/peace of chaco"       - "Peace of Chaco Day"             Fixed Jun 12
-  Add   "c/corpus christi"              - # "Corpus Christi"               Easter +60
-  Event "paraguay/founding of the city of asunci�n"  - "Founding of the City of Asunci�n" Fixed Aug 15
-  Event "paraguay/constitution"         - "Constitution Day"               Fixed Aug 25
-  Event "paraguay/battle of boquer�n"  - "Battle of Boquer�n Day"    Fixed Sep 29
-  Event "paraguay/day of the race"      - "Day of the Race"                Fixed Oct 12
-  Add   "c/all saints"                  - # "All Saints Day"               Fixed Nov  1
-  Event "paraguay/virgin of caacupe"    - "Virgin of Caacupe"              Fixed Dec  8
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "py"
+  Add   "new year"                - # "New Year's Day"                   Fixed Jan  1        
+  Add   "saints/blaise"           - # "St. Blaise"                       Fixed Feb  3        
+  Event "py/heroes"               -   "Heroes' Day"                      Fixed Mar  1        
+  Add   "c/holy thursday"         - # "Holy Thursday"                    Easter -3           
+  Add   "c/good friday"           - # "Good Friday"                      Easter -2           
+  Add   "labor"                   - # "Labor Day"                        Fixed May  1        
+  Event "py/independence"         -   "Independence Day"                 Fixed May 14  2 days
+  Add   "c/ascension"             - # "Ascension"                        Easter +39          
+  Event "py/peace of chaco"       -   "Peace of Chaco Day"               Fixed Jun 12        
+  Add   "c/corpus christi"        - # "Corpus Christi"                   Easter +60          
+  Event "py/asunci�n"             -   "Founding of the City of Asunci�n" Fixed Aug 15        
+  Event "py/constitution"         -   "Constitution Day"                 Fixed Aug 25        
+  Event "py/battle of boquer�n"   -   "Battle of Boquer�n Day"           Fixed Sep 29        
+  Event "py/day of the race"      -   "Day of the Race"                  Fixed Oct 12        
+  Add   "c/all saints"            - # "All Saints Day"                   Fixed Nov  1        
+  Event "py/virgin of caacupe"    -   "Virgin of Caacupe"                Fixed Dec  8        
+  Add   "c/christmas"             - # "Christmas Day"                    Fixed Dec 25        
 
 
 # peru
-Region "peru"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "c/holy thursday"               - # "Holy Thursday"                Easter -3
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Event "peru/inti raymi fiesta"        - "Inti Raymi Fiesta"              Fixed Jun 24
-  Add   "saints/paul"                   - # "St. Paul"                     Fixed Jun 29
-  Add   "saints/peter"                  - # "St. Peter"                    Fixed Jun 29
-  Event "peru/independence"             - "Independence Day"               Fixed Jul 28  2 days
-  Event "peru/santa rosa de lima"       - "Santa Rosa de Lima"             Fixed Aug 30
-  Event "peru/combat of angamos"        - "Combat of Angamos"              Fixed Oct  8
-  Add   "c/all saints"                  - # "All Saints Day"               Fixed Nov  1
-  Add   "c/immaculate conception"       - # "Immaculate Conception"        Fixed Dec  8
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "pe"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1        
+  Add   "c/holy thursday"         - # "Holy Thursday"         Easter -3           
+  Add   "c/good friday"           - # "Good Friday"           Easter -2           
+  Add   "labor"                   - # "Labor Day"             Fixed May  1        
+  Event "pe/inti raymi fiesta"    -   "Inti Raymi Fiesta"     Fixed Jun 24        
+  Add   "saints/paul"             - # "St. Paul"              Fixed Jun 29        
+  Add   "saints/peter"            - # "St. Peter"             Fixed Jun 29        
+  Event "pe/independence"         -   "Independence Day"      Fixed Jul 28  2 days
+  Event "pe/santa rosa de lima"   -   "Santa Rosa de Lima"    Fixed Aug 30        
+  Event "pe/combat of angamos"    -   "Combat of Angamos"     Fixed Oct  8        
+  Add   "c/all saints"            - # "All Saints Day"        Fixed Nov  1        
+  Add   "c/immaculate conception" - # "Immaculate Conception" Fixed Dec  8        
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25        
 
 
 # philippines
-Region "philippines"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "philippines/constitution"      - "Constitution Day"               Fixed Jan 17
-  Event "philippines/freedom"           - "Freedom Day"                    Fixed Feb 25
-  Event "philippines/bataan"            - "Bataan Day"                     Fixed Apr  9
-  Add   "c/maundy thursday"             - # "Maundy Thursday"              Easter -3
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Event "philippines/araw ng kagitingan"  - "Araw ng Kagitingan"           Fixed May  6
-  Event "philippines/independence"      - "Independence Day"               Fixed Jun 12
-  Event "philippines/philippine-american friendship"  - "Philippine-American Friendship Day" Fixed Jul  4
-  Event "philippines/national heroes"   - "National Heroes' Day"           Fixed Aug 27
-  Event "philippines/barangay"          - "Barangay Day"                   Fixed Sep 11
-  Event "philippines/thanksgiving"      - "Thanksgiving Day"               Fixed Sep 21
-  Event "philippines/christ the king"   - "Feast of Christ the King"       Fixed Oct 24
-  Add   "c/all saints"                  - # "All Saints Day"               Fixed Nov  1
-  Event "philippines/bonifacio"         - "Bonifacio Day"                  Fixed Nov 30
-  Event "philippines/misa de gallo"     - "Misa de Gallo"                  Fixed Dec 16  9 days
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
-  Event "philippines/rizal"             - "Rizal Day"                      Fixed Dec 30
-  Add   "new years eve"                 - # "New Year's Eve"               Fixed Dec 31
+Region "ph"
+  Add   "new year"                - # "New Year's Day"                     Fixed Jan  1        
+  Event "ph/constitution"         -   "Constitution Day"                   Fixed Jan 17        
+  Event "ph/freedom"              -   "Freedom Day"                        Fixed Feb 25        
+  Event "ph/bataan"               -   "Bataan Day"                         Fixed Apr  9        
+  Add   "c/maundy thursday"       - # "Maundy Thursday"                    Easter -3           
+  Add   "c/good friday"           - # "Good Friday"                        Easter -2           
+  Add   "labor"                   - # "Labor Day"                          Fixed May  1        
+  Event "ph/araw ng kagitingan"   -   "Araw ng Kagitingan"                 Fixed May  6        
+  Event "ph/independence"         -   "Independence Day"                   Fixed Jun 12        
+  Event "ph/friendship"           -   "Philippine-American Friendship Day" Fixed Jul  4        
+  Event "ph/national heroes"      -   "National Heroes' Day"               Fixed Aug 27        
+  Event "ph/barangay"             -   "Barangay Day"                       Fixed Sep 11        
+  Event "ph/thanksgiving"         -   "Thanksgiving Day"                   Fixed Sep 21        
+  Event "ph/christ the king"      -   "Feast of Christ the King"           Fixed Oct 24        
+  Add   "c/all saints"            - # "All Saints Day"                     Fixed Nov  1        
+  Event "ph/bonifacio"            -   "Bonifacio Day"                      Fixed Nov 30        
+  Event "ph/misa de gallo"        -   "Misa de Gallo"                      Fixed Dec 16  9 days
+  Add   "c/christmas"             - # "Christmas Day"                      Fixed Dec 25        
+  Event "ph/rizal"                -   "Rizal Day"                          Fixed Dec 30        
+  Add   "new years eve"           - # "New Year's Eve"                     Fixed Dec 31        
 
 
 # portugal
-Region "portugal"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Event "portugal/liberty"              - "Liberty Day"                    Fixed Apr 25
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Event "portugal/cam�es memorial"   - "Cam�es Memorial Day"         Fixed Jun 10
-  Event "portugal/portugal"             - "Portugal Day"                   Fixed Jun 10
-  Event "portugal/christmas lisbon also observes the st anthony"  - "Christmas. Lisbon also observes the feast of St Anthony" Fixed Jun 13
-  Add   "c/corpus christi"              - # "Corpus Christi"               Easter +60
-  Add   "c/assumption"                  - # "Assumption Day"               Fixed Aug 15
-  Event "portugal/republic"             - "Republic Day"                   Fixed Oct  5
-  Add   "c/all saints"                  - # "All Saints Day"               Fixed Nov  1
-  Event "portugal/day of the dead"      - "Day of the Dead"                Fixed Nov  2
-  Event "portugal/restoration of the independence"  - "Restoration of the Independence" Fixed Dec  1
-  Add   "c/immaculate conception"       - # "Immaculate Conception"        Fixed Dec  8
+Region "pt"
+  Add   "new year"                           - # "New Year's Day"                  Fixed Jan  1
+  Add   "c/good friday"                      - # "Good Friday"                     Easter -2   
+  Event "pt/liberty"                         -   "Liberty Day"                     Fixed Apr 25
+  Add   "labor"                              - # "Labor Day"                       Fixed May  1
+  Event "pt/cam�es memorial"                 -   "Cam�es Memorial Day"             Fixed Jun 10
+  Event "pt/portugal"                        -   "Portugal Day"                    Fixed Jun 10
+  Add   "c/corpus christi"                   - # "Corpus Christi"                  Easter +60  
+  Add   "c/assumption"                       - # "Assumption Day"                  Fixed Aug 15
+  Event "pt/republic"                        -   "Republic Day"                    Fixed Oct  5
+  Add   "c/all saints"                       - # "All Saints Day"                  Fixed Nov  1
+  Event "pt/day of the dead"                 -   "Day of the Dead"                 Fixed Nov  2
+  Event "pt/restoration of the independence" -   "Restoration of the Independence" Fixed Dec  1
+  Add   "c/immaculate conception"            - # "Immaculate Conception"           Fixed Dec  8
 
 
 # puerto rico
-Region "puerto rico"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "c/epiphany"                    - # "Epiphany"                     Fixed Jan  6
-  Event "puerto rico/birthday of eugenio maria de hostos"  - "Birthday of Eugenio Maria de Hostos" Fixed Jan 11
-  Event "puerto rico/emancipation"      - "Emancipation Day"               Fixed Mar 22
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Event "puerto rico/de diego"          - "De Diego Day"                   Fixed Apr 16
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Event "puerto rico/memorial"          - "Memorial Day"                   Fixed May 28
-  Event "puerto rico/saint johns"       - "St John's Day"                  Fixed Jun 24
-  Event "puerto rico/san juan"          - "San Juan Day"                   Fixed Jun 24
-  Event "puerto rico/mu�oz rivera"   - "Mu�oz Rivera Day"            Fixed Jul 17
-  Event "puerto rico/constitution"      - "Constitution Day"               Fixed Jul 25
-  Event "puerto rico/barbosa"           - "Barbosa Day"                    Fixed Jul 27
-  Event "puerto rico/ponce de leon"     - "Ponce de Leon Day"              Fixed Aug 12
-  Add   "columbus"                      - # "Columbus Day"                 Fixed Oct 12
-  Event "puerto rico/discovery"         - "Discovery Day"                  Fixed Nov 19
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "pr"
+  Add   "new year"                   - # "New Year's Day"                      Fixed Jan  1
+  Add   "c/epiphany"                 - # "Epiphany"                            Fixed Jan  6
+  Event "pr/eugenio maria de hostos" -   "Birthday of Eugenio Maria de Hostos" Fixed Jan 11
+  Event "pr/emancipation"            -   "Emancipation Day"                    Fixed Mar 22
+  Add   "c/good friday"              - # "Good Friday"                         Easter -2   
+  Event "pr/de diego"                -   "De Diego Day"                        Fixed Apr 16
+  Add   "labor"                      - # "Labor Day"                           Fixed May  1
+  Event "pr/memorial"                -   "Memorial Day"                        Fixed May 28
+  Event "pr/saint johns"             -   "St John's Day"                       Fixed Jun 24
+  Event "pr/san juan"                -   "San Juan Day"                        Fixed Jun 24
+  Event "pr/mu�oz rivera"            -   "Mu�oz Rivera Day"                    Fixed Jul 17
+  Event "pr/constitution"            -   "Constitution Day"                    Fixed Jul 25
+  Event "pr/barbosa"                 -   "Barbosa Day"                         Fixed Jul 27
+  Event "pr/ponce de leon"           -   "Ponce de Leon Day"                   Fixed Aug 12
+  Add   "columbus"                   - # "Columbus Day"                        Fixed Oct 12
+  Event "pr/discovery"               -   "Discovery Day"                       Fixed Nov 19
+  Add   "c/christmas"                - # "Christmas Day"                       Fixed Dec 25
 
 
 # qatar
-Region "qatar"
-  Event "qatar/anniversary of the amirs accession"  - "Anniversary of the Amir's Accession" Fixed Feb 22
-  Event "qatar/independence"            - "Independence Day"               Fixed Sep  3
+Region "qa"
+  Event "qa/amirs accession"      - "Anniversary of the Amir's Accession" Fixed Feb 22
+  Event "qa/independence"         - "Independence Day"                    Fixed Sep  3
 
 
 # romania
-Region "romania"
-  Add   "new year 2d"                   - # "New Year"                     Fixed Jan  1  2 days
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Event "romania/liberation"            - "Liberation Day"                 Fixed Aug 23
-  Event "romania/public holiday"        - "Public Holiday"                 Fixed Aug 23  2 days
-  Event "romania/national"              - "National Day"                   Fixed Dec  1
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "ro"
+  Add   "new year 2d"             - # "New Year"              Fixed Jan  1  2 days
+  Add   "c/good friday"           - # "Good Friday"           Easter -2           
+  Add   "c/easter monday"         - # "Easter Monday"         Easter +1           
+  Add   "labor"                   - # "Labor Day"             Fixed May  1        
+  Event "ro/liberation"           -   "Liberation Day"        Fixed Aug 23        
+  Event "ro/public holiday"       -   "Public Holiday"        Fixed Aug 23  2 days
+  Event "ro/national"             -   "National Day"          Fixed Dec  1        
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25        
 
 
 # russia
 Region "russia"
-  Event "russia/victory"                h "Victory Day"                    Fixed May  9
-  Add   "orthodox/easter"               h # "Easter"                       Julian_Easter +0
-  Add   "labor"                         h # "Labor Day"                    Fixed May  1
-  Add   "new year"                      h # "New Year's Day"               Fixed Jan  1
-  Add   "orthodox/christmas"            h # "Christmas Day"                Julian_Fixed Dec 25
-  Event "russia/state sovereignity"     h "State Sovereignity Day"         Fixed Jun 12
-  Event "russia/teachers"               h "Teachers Day"                   Fixed Oct  1
-  Event "russia/valpurgis"              h "Valpurgis Night"                Fixed May  1
-  Event "russia/warriors"               h "Warriors Day"                   Fixed Feb 23
-  Add   "womens"                        h # "Int. Women's Day"             Fixed Mar  8
+  Event "russia/victory"            h   "Victory Day"            Fixed May  9       
+  Add   "orthodox/easter"           h # "Easter"                 Julian_Easter +0   
+  Add   "labor"                     h # "Labor Day"              Fixed May  1       
+  Add   "new year"                  h # "New Year's Day"         Fixed Jan  1       
+  Add   "orthodox/christmas"        h # "Christmas Day"          Julian_Fixed Dec 25
+  Event "russia/state sovereignity" h   "State Sovereignity Day" Fixed Jun 12       
+  Event "russia/teachers"           h   "Teachers Day"           Fixed Oct  1       
+  Event "russia/valpurgis"          h   "Valpurgis Night"        Fixed May  1       
+  Event "russia/warriors"           h   "Warriors Day"           Fixed Feb 23       
+  Add   "womens"                    h # "Int. Women's Day"       Fixed Mar  8       
 
 
 # rwanda
-Region "rwanda"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "rwanda/democracy"              - "Democracy Day"                  Fixed Jan 28
-  Add   "unity"                         - # "Unity Day"                    Fixed Feb 22
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Add   "c/ascension"                   - # "Ascension"                    Easter +39
-  Add   "c/whitmonday"                  - # "Whitmonday"                   Easter +50
-  Event "rwanda/independence"           - "Independence Day"               Fixed Jul  1
-  Event "rwanda/peace and unity"        - "Peace and Unity Day"            Fixed Jul  5
-  Add   "c/assumption"                  - # "Assumption Day"               Fixed Aug 15
-  Event "rwanda/kamarampaka"            - "Kamarampaka Day"                Fixed Sep 25
-  Event "rwanda/armed forces"           - "Armed Forces Day"               Fixed Oct 26
-  Add   "c/all saints"                  - # "All Saints Day"               Fixed Nov  1
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "rw"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Event "rw/democracy"            -   "Democracy Day"         Fixed Jan 28
+  Add   "unity"                   - # "Unity Day"             Fixed Feb 22
+  Add   "c/easter monday"         - # "Easter Monday"         Easter +1   
+  Add   "labor"                   - # "Labor Day"             Fixed May  1
+  Add   "c/ascension"             - # "Ascension"             Easter +39  
+  Add   "c/whitmonday"            - # "Whitmonday"            Easter +50  
+  Event "rw/independence"         -   "Independence Day"      Fixed Jul  1
+  Event "rw/peace and unity"      -   "Peace and Unity Day"   Fixed Jul  5
+  Add   "c/assumption"            - # "Assumption Day"        Fixed Aug 15
+  Event "rw/kamarampaka"          -   "Kamarampaka Day"       Fixed Sep 25
+  Event "rw/armed forces"         -   "Armed Forces Day"      Fixed Oct 26
+  Add   "c/all saints"            - # "All Saints Day"        Fixed Nov  1
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25
 
 
 # saint kitts and nevis
-Region "saint kitts and nevis"
-  Event "saint kitts and nevis/carnival"  - "Carnival"                     Fixed Dec 31  3 days
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Add   "british commonwealth/queens"   - # "Queen's Birthday"             Fixed Jun  4
-  Add   "c/whitmonday"                  - # "Whitmonday"                   Easter +50
-  Event "saint kitts and nevis/independence"  - "Independence Day"         Fixed Sep 19
-  Event "saint kitts and nevis/prince of wales"  - "Prince of Wales' Birthday" Fixed Nov 14
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "kn"
+  Event "kn/carnival"                 -   "Carnival"                  Fixed Dec 31  3 days
+  Add   "c/good friday"               - # "Good Friday"               Easter -2           
+  Add   "c/easter monday"             - # "Easter Monday"             Easter +1           
+  Add   "labor"                       - # "Labor Day"                 Fixed May  1        
+  Add   "british commonwealth/queens" - # "Queen's Birthday"          Fixed Jun  4        
+  Add   "c/whitmonday"                - # "Whitmonday"                Easter +50          
+  Event "kn/independence"             -   "Independence Day"          Fixed Sep 19        
+  Event "kn/prince of wales"          -   "Prince of Wales' Birthday" Fixed Nov 14        
+  Add   "c/christmas"                 - # "Christmas Day"             Fixed Dec 25        
 
 
 # saint lucia
-Region "saint lucia"
-  Add   "new year 2d"                   - # "New Year"                     Fixed Jan  1  2 days
-  Event "saint lucia/independence"      - "Independence Day"               Fixed Feb 22
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Add   "c/whitmonday"                  - # "Whitmonday"                   Easter +50
-  Add   "british commonwealth/queens"   - # "Queen's Birthday"             Fixed Jun  4
-  Add   "c/corpus christi"              - # "Corpus Christi"               Easter +60
-  Add   "british commonwealth/august bank holiday"  - # "August Bank Holiday" WDRel Aug Mon 1st
-  Event "saint lucia/thanksgiving"      - "Thanksgiving Day"               WDRel Oct Mon 1st
-  Event "saint lucia/discovery"         - "Discovery Day"                  Fixed Dec 13
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
-  Add   "c/boxing"                      - # "Boxing Day"                   Fixed Dec 26
+Region "lc"
+  Add   "new year 2d"                              - # "New Year"            Fixed Jan  1  2 days
+  Event "lc/independence"                          -   "Independence Day"    Fixed Feb 22        
+  Add   "c/good friday"                            - # "Good Friday"         Easter -2           
+  Add   "c/easter monday"                          - # "Easter Monday"       Easter +1           
+  Add   "labor"                                    - # "Labor Day"           Fixed May  1        
+  Add   "c/whitmonday"                             - # "Whitmonday"          Easter +50          
+  Add   "british commonwealth/queens"              - # "Queen's Birthday"    Fixed Jun  4        
+  Add   "c/corpus christi"                         - # "Corpus Christi"      Easter +60          
+  Add   "british commonwealth/august bank holiday" - # "August Bank Holiday" WDRel Aug Mon 1st   
+  Event "lc/thanksgiving"                          -   "Thanksgiving Day"    WDRel Oct Mon 1st   
+  Event "lc/discovery"                             -   "Discovery Day"       Fixed Dec 13        
+  Add   "c/christmas"                              - # "Christmas Day"       Fixed Dec 25        
+  Add   "c/boxing"                                 - # "Boxing Day"          Fixed Dec 26        
 
 
 # saint pierre and miquelon
 Region "saint pierre and miquelon"
-  Add   "new year 2d"                   - # "New Year"                     Fixed Jan  1  2 days
-  Add   "mardi gras"                    - # "Mardi Gras"                   Easter -47
+  Add   "new year 2d"             - # "New Year"              Fixed Jan  1  2 days
+  Add   "mardi gras"              - # "Mardi Gras"            Easter -47          
 
 
 # saint vincent and the grenadines
-Region "saint vincent and the grenadines"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "saint vincent and the grenadines/saint vincent and the grenadines"  - "Saint Vincent and the Grenadines Day" Fixed Jan 22
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Add   "c/whitmonday"                  - # "Whitmonday"                   Easter +50
-  Add   "caribbean/caricom"             - # "CARICOM Day"                  WDRel Jul Mon 1st
-  Add   "caribbean/emancipation"        - # "Emancipation Day"             WDRel Aug Mon 1st
-  Event "saint vincent and the grenadines/independence"  - "Independence Day" Fixed Oct 27
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
-  Add   "c/boxing"                      - # "Boxing Day"                   Fixed Dec 26
+Region "vc"
+  Add   "new year"                            - # "New Year's Day"                       Fixed Jan  1     
+  Event "vc/saint vincent and the grenadines" -   "Saint Vincent and the Grenadines Day" Fixed Jan 22     
+  Add   "c/good friday"                       - # "Good Friday"                          Easter -2        
+  Add   "c/easter monday"                     - # "Easter Monday"                        Easter +1        
+  Add   "labor"                               - # "Labor Day"                            Fixed May  1     
+  Add   "c/whitmonday"                        - # "Whitmonday"                           Easter +50       
+  Add   "caribbean/caricom"                   - # "CARICOM Day"                          WDRel Jul Mon 1st
+  Add   "caribbean/emancipation"              - # "Emancipation Day"                     WDRel Aug Mon 1st
+  Event "vc/independence"                     -   "Independence Day"                     Fixed Oct 27     
+  Add   "c/christmas"                         - # "Christmas Day"                        Fixed Dec 25     
+  Add   "c/boxing"                            - # "Boxing Day"                           Fixed Dec 26     
 
 
 # san marino
-Region "san marino"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "c/epiphany"                    - # "Epiphany"                     Fixed Jan  6
-  Event "san marino/liberation"         - "Liberation Day"                 Fixed Feb  5
-  Event "san marino/anniversary of the arengo"  - "Anniversary of the Arengo" Fixed Mar 25
-  Event "san marino/national"           - "National Day"                   Fixed Apr  1
-  Event "san marino/investiture of the new captains regent"  - "Investiture of the New Captains Regent" Fixed Apr  1
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Add   "c/corpus christi"              - # "Corpus Christi"               Easter +60
-  Event "san marino/fall of fascism"    - "Fall of Fascism Day"            Fixed Jul 28
-  Add   "c/assumption"                  - # "Assumption Day"               Fixed Aug 15
-  Event "san marino/san marino"         - "San Marino Day"                 Fixed Sep  3
-  Event "san marino/investiture of the new captains-regent"  - "Investiture of the New Captains-Regent" Fixed Oct  1
-  Add   "c/all saints"                  - # "All Saints Day"               Fixed Nov  1
-  Add   "c/all souls"                   - # "All Souls Day"                Fixed Nov  2
-  Add   "c/immaculate conception"       - # "Immaculate Conception"        Fixed Dec  8
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
-  Add   "saints/stephen"                - # "St. Stephen"                  Fixed Dec 26
+Region "sm"
+  Add   "new year"                - # "New Year's Day"                         Fixed Jan  1
+  Add   "c/epiphany"              - # "Epiphany"                               Fixed Jan  6
+  Event "sm/liberation"           -   "Liberation Day"                         Fixed Feb  5
+  Event "sm/arengo"               -   "Anniversary of the Arengo"              Fixed Mar 25
+  Event "sm/national"             -   "National Day"                           Fixed Apr  1
+  Event "sm/investiture1"         -   "Investiture of the New Captains Regent" Fixed Apr  1
+  Add   "c/easter monday"         - # "Easter Monday"                          Easter +1   
+  Add   "labor"                   - # "Labor Day"                              Fixed May  1
+  Add   "c/corpus christi"        - # "Corpus Christi"                         Easter +60  
+  Event "sm/fall of fascism"      -   "Fall of Fascism Day"                    Fixed Jul 28
+  Add   "c/assumption"            - # "Assumption Day"                         Fixed Aug 15
+  Event "sm/san marino"           -   "San Marino Day"                         Fixed Sep  3
+  Event "sm/investiture2"         -   "Investiture of the New Captains-Regent" Fixed Oct  1
+  Add   "c/all saints"            - # "All Saints Day"                         Fixed Nov  1
+  Add   "c/all souls"             - # "All Souls Day"                          Fixed Nov  2
+  Add   "c/immaculate conception" - # "Immaculate Conception"                  Fixed Dec  8
+  Add   "c/christmas"             - # "Christmas Day"                          Fixed Dec 25
+  Add   "saints/stephen"          - # "St. Stephen"                            Fixed Dec 26
 
 
 # sao tome and principe
-Region "sao tome and principe"
-  Event "sao tome and principe/martyrs"  - "Martyrs' Day"                  Fixed Feb  4
-  Event "sao tome and principe/independence"  - "Independence Day"         Fixed Jul 12
-  Event "sao tome and principe/farmers"  - "Farmers' Day"                  Fixed Sep 30
-  Event "sao tome and principe/transitional government"  - "Transitional Government Day" Fixed Dec 21
-  Add   "family"                        - # "Family Day"                   Fixed Dec 25
+Region "st"
+  Event "st/martyrs"                 -   "Martyrs' Day"                Fixed Feb  4
+  Event "st/independence"            -   "Independence Day"            Fixed Jul 12
+  Event "st/farmers"                 -   "Farmers' Day"                Fixed Sep 30
+  Event "st/transitional government" -   "Transitional Government Day" Fixed Dec 21
+  Add   "family"                     - # "Family Day"                  Fixed Dec 25
 
 
 # saudi arabia
-Region "saudi arabia"
-  Event "saudi arabia/national"         - "National Day"                   Fixed Sep 12
-  Event "saudi arabia/national of saudi arabia"  - "National Day of Saudi Arabia" Fixed Sep 23
+Region "sa"
+  Event "sa/national"                 - "National Day"                 Fixed Sep 12
+  Event "sa/national of saudi arabia" - "National Day of Saudi Arabia" Fixed Sep 23
 
 
 # senegal
-Region "senegal"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "senegal/independence"          - "Independence Day"               Fixed Apr  4
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Add   "c/ascension"                   - # "Ascension"                    Easter +39
-  Add   "c/whitmonday"                  - # "Whitmonday"                   Easter +50
-  Event "senegal/african community"     - "African Community Day"          Fixed Jul 14
-  Add   "c/assumption"                  - # "Assumption Day"               Fixed Aug 15
-  Add   "c/all saints"                  - # "All Saints Day"               Fixed Nov  1
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "sn"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Event "sn/independence"         -   "Independence Day"      Fixed Apr  4
+  Add   "c/good friday"           - # "Good Friday"           Easter -2   
+  Add   "c/easter monday"         - # "Easter Monday"         Easter +1   
+  Add   "labor"                   - # "Labor Day"             Fixed May  1
+  Add   "c/ascension"             - # "Ascension"             Easter +39  
+  Add   "c/whitmonday"            - # "Whitmonday"            Easter +50  
+  Event "sn/african community"    -   "African Community Day" Fixed Jul 14
+  Add   "c/assumption"            - # "Assumption Day"        Fixed Aug 15
+  Add   "c/all saints"            - # "All Saints Day"        Fixed Nov  1
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25
 
 
 # seychelles
-Region "seychelles"
-  Add   "new year 2d"                   - # "New Year"                     Fixed Jan  1  2 days
-  Add   "c/easter"                      - # "Easter"                       Easter +0
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Event "seychelles/liberation"         - "Liberation Day"                 Fixed Jun  5
-  Add   "c/corpus christi"              - # "Corpus Christi"               Easter +60
-  Event "seychelles/independence"       - "Independence Day"               Fixed Jun 29
-  Add   "c/assumption"                  - # "Assumption Day"               Fixed Aug 15
-  Add   "c/all saints"                  - # "All Saints Day"               Fixed Nov  1
-  Add   "c/immaculate conception"       - # "Immaculate Conception"        Fixed Dec  8
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "sc"
+  Add   "new year 2d"             - # "New Year"              Fixed Jan  1  2 days
+  Add   "c/easter"                - # "Easter"                Easter +0           
+  Add   "labor"                   - # "Labor Day"             Fixed May  1        
+  Event "sc/liberation"           -   "Liberation Day"        Fixed Jun  5        
+  Add   "c/corpus christi"        - # "Corpus Christi"        Easter +60          
+  Event "sc/independence"         -   "Independence Day"      Fixed Jun 29        
+  Add   "c/assumption"            - # "Assumption Day"        Fixed Aug 15        
+  Add   "c/all saints"            - # "All Saints Day"        Fixed Nov  1        
+  Add   "c/immaculate conception" - # "Immaculate Conception" Fixed Dec  8        
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25        
 
 
 # sierra leone
-Region "sierra leone"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Event "sierra leone/republic"         - "Republic Day"                   Fixed Apr 19
-  Event "sierra leone/independence"     - "Independence Day"               Fixed Apr 27
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
-  Add   "c/boxing"                      - # "Boxing Day"                   Fixed Dec 26
+Region "sl"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Add   "c/good friday"           - # "Good Friday"           Easter -2   
+  Add   "c/easter monday"         - # "Easter Monday"         Easter +1   
+  Event "sl/republic"             -   "Republic Day"          Fixed Apr 19
+  Event "sl/independence"         -   "Independence Day"      Fixed Apr 27
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25
+  Add   "c/boxing"                - # "Boxing Day"            Fixed Dec 26
 
 
 # singapore
-Region "singapore"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Event "singapore/labor"               - "Labour Day"                     Fixed May  1
-  Event "singapore/national holiday"    - "National Holiday"               Fixed Aug  9
-  Event "singapore/independence"        - "Independence Day"               Fixed Sep 16
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "sg"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Add   "c/good friday"           - # "Good Friday"           Easter -2   
+  Event "sg/labor"                -   "Labour Day"            Fixed May  1
+  Event "sg/national holiday"     -   "National Holiday"      Fixed Aug  9
+  Event "sg/independence"         -   "Independence Day"      Fixed Sep 16
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25
 
 
 # slovakia
 Region "slovakia"
-  Event "slovakia/independence"         - "Independence Day"               Fixed Jan  1
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "c/epiphany"                    - # "Epiphany"                     Fixed Jan  6
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Add   "may day"                       - # "May Day"                      Fixed May  1
-  Event "slovakia/liberation"           - "Liberation Day"                 Fixed May  8
-  Event "slovakia/day of the slav apostles"  - "Day of the Slav Apostles"  Fixed Jul  5
-  Add   "saints/cyril & methodius"      - # "St Cyril & Methodius"         Fixed Jul  5
-  Event "slovakia/slovak national uprising"  - "Slovak National Uprising Day" Fixed Aug 29
-  Event "slovakia/constitution"         - "Constitution Day"               Fixed Sep  1
-  Add   "c/all saints"                  - # "All Saints Day"               Fixed Nov  1
-  Event "slovakia/reconciliation"       - "Reconciliation Day"             Fixed Nov  1
-  Add   "c/christmas eve"               - # "Christmas Eve"                Fixed Dec 24
-  Add   "c/christmas2d"                 - # "Christmas"                    Fixed Dec 25  2 days
+  Event "slovakia/independence"             -   "Independence Day"             Fixed Jan  1        
+  Add   "new year"                          - # "New Year's Day"               Fixed Jan  1        
+  Add   "c/epiphany"                        - # "Epiphany"                     Fixed Jan  6        
+  Add   "c/good friday"                     - # "Good Friday"                  Easter -2           
+  Add   "c/easter monday"                   - # "Easter Monday"                Easter +1           
+  Add   "may day"                           - # "May Day"                      Fixed May  1        
+  Event "slovakia/liberation"               -   "Liberation Day"               Fixed May  8        
+  Event "slovakia/day of the slav apostles" -   "Day of the Slav Apostles"     Fixed Jul  5        
+  Add   "saints/cyril & methodius"          - # "St Cyril & Methodius"         Fixed Jul  5        
+  Event "slovakia/slovak national uprising" -   "Slovak National Uprising Day" Fixed Aug 29        
+  Event "slovakia/constitution"             -   "Constitution Day"             Fixed Sep  1        
+  Add   "c/all saints"                      - # "All Saints Day"               Fixed Nov  1        
+  Event "slovakia/reconciliation"           -   "Reconciliation Day"           Fixed Nov  1        
+  Add   "c/christmas eve"                   - # "Christmas Eve"                Fixed Dec 24        
+  Add   "c/christmas2d"                     - # "Christmas"                    Fixed Dec 25  2 days
 
 
 # slovenia
-Region "slovenia"
-  Add   "new year 2d"                   - # "New Year"                     Fixed Jan  1  2 days
-  Event "slovenia/culture"              - "Culture Day"                    Fixed Feb  8
-  Add   "c/easter"                      - # "Easter"                       Easter +0
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Event "slovenia/national resistance"  - "National Resistance Day"        Fixed Apr 27
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Add   "labor 2"                       - # "2nd day of Labor"             Fixed May  2
-  Add   "c/pentecost"                   - # "Pentecost"                    Easter +49
-  Event "slovenia/national"             - "National Day"                   Fixed Jun 25
-  Event "slovenia/peoples uprising"     - "People's Uprising"              Fixed Jul 25
-  Add   "c/assumption"                  - # "Assumption Day"               Fixed Aug 15
-  Event "slovenia/reformation"          - "Reformation Day"                Fixed Oct 31
-  Add   "c/all saints"                  - # "All Saints Day"               Fixed Nov  1
-  Event "slovenia/remembrance"          - "Remembrance Day"                Fixed Nov  1
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
-  Event "slovenia/independence"         - "Independence Day"               Fixed Dec 26
+Region "si"
+  Add   "new year 2d"             - # "New Year"                Fixed Jan  1  2 days
+  Event "si/culture"              -   "Culture Day"             Fixed Feb  8        
+  Add   "c/easter"                - # "Easter"                  Easter +0           
+  Add   "c/easter monday"         - # "Easter Monday"           Easter +1           
+  Event "si/national resistance"  -   "National Resistance Day" Fixed Apr 27        
+  Add   "labor"                   - # "Labor Day"               Fixed May  1        
+  Add   "labor 2"                 - # "2nd day of Labor"        Fixed May  2        
+  Add   "c/pentecost"             - # "Pentecost"               Easter +49          
+  Event "si/national"             -   "National Day"            Fixed Jun 25        
+  Event "si/peoples uprising"     -   "People's Uprising"       Fixed Jul 25        
+  Add   "c/assumption"            - # "Assumption Day"          Fixed Aug 15        
+  Event "si/reformation"          -   "Reformation Day"         Fixed Oct 31        
+  Add   "c/all saints"            - # "All Saints Day"          Fixed Nov  1        
+  Event "si/remembrance"          -   "Remembrance Day"         Fixed Nov  1        
+  Add   "c/christmas"             - # "Christmas Day"           Fixed Dec 25        
+  Event "si/independence"         -   "Independence Day"        Fixed Dec 26        
 
 
 # solomon islands
-Region "solomon islands"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/holy saturday"               - # "Holy Saturday"                Easter -1
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Add   "british commonwealth/queens"   - # "Queen's Birthday"             Fixed Jun  4
-  Add   "c/whitmonday"                  - # "Whitmonday"                   Easter +50
-  Event "solomon islands/independence"  - "Independence Day"               Fixed Jul  7
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
-  Add   "c/boxing"                      - # "Boxing Day"                   Fixed Dec 26
+Region "sb"
+  Add   "new year"                    - # "New Year's Day"    Fixed Jan  1
+  Add   "c/good friday"               - # "Good Friday"       Easter -2   
+  Add   "c/holy saturday"             - # "Holy Saturday"     Easter -1   
+  Add   "c/easter monday"             - # "Easter Monday"     Easter +1   
+  Add   "british commonwealth/queens" - # "Queen's Birthday"  Fixed Jun  4
+  Add   "c/whitmonday"                - # "Whitmonday"        Easter +50  
+  Event "sb/independence"             -   "Independence Day"  Fixed Jul  7
+  Add   "c/christmas"                 - # "Christmas Day"     Fixed Dec 25
+  Add   "c/boxing"                    - # "Boxing Day"        Fixed Dec 26
 
 
 # somalia
-Region "somalia"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Event "somalia/independence"          - "Independence Day"               Fixed Jun 26
-  Event "somalia/foundation of the republic"  - "Foundation of the Republic Day" Fixed Jul  1
-  Event "somalia/revolution"            - "Revolution Anniversary"         Fixed Oct 21  2 days
+Region "so"
+  Add   "new year"                      - # "New Year's Day"                 Fixed Jan  1        
+  Add   "labor"                         - # "Labor Day"                      Fixed May  1        
+  Event "so/independence"               -   "Independence Day"               Fixed Jun 26        
+  Event "so/foundation of the republic" -   "Foundation of the Republic Day" Fixed Jul  1        
+  Event "so/revolution"                 -   "Revolution Anniversary"         Fixed Oct 21  2 days
 
 
 # south africa
-Region "south africa"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "south africa/van riebeeck"     - "Van Riebeeck Day"               Fixed Apr  6
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Event "south africa/workers"          - "Workers' Day"                   Fixed May  1
-  Add   "c/ascension"                   - # "Ascension"                    Easter +39
-  Event "south africa/republic"         - "Republic Day"                   Fixed May 31
-  Event "south africa/family"           - "Family Day"                     WDRel Jul Mon 2nd
-  Event "south africa/settlers"         - "Settlers' Day"                  WDRel Sep Mon 1st
-  Event "south africa/kruger"           - "Kruger Day"                     Fixed Oct 10
-  Event "south africa/day of the vow"   - "Day of the Vow"                 Fixed Dec 16
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
-  Add   "c/boxing"                      - # "Boxing Day"                   Fixed Dec 26
+Region "za"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1     
+  Event "za/van riebeeck"         -   "Van Riebeeck Day"      Fixed Apr  6     
+  Add   "c/good friday"           - # "Good Friday"           Easter -2        
+  Add   "c/easter monday"         - # "Easter Monday"         Easter +1        
+  Event "za/workers"              -   "Workers' Day"          Fixed May  1     
+  Add   "c/ascension"             - # "Ascension"             Easter +39       
+  Event "za/republic"             -   "Republic Day"          Fixed May 31     
+  Event "za/family"               -   "Family Day"            WDRel Jul Mon 2nd
+  Event "za/settlers"             -   "Settlers' Day"         WDRel Sep Mon 1st
+  Event "za/kruger"               -   "Kruger Day"            Fixed Oct 10     
+  Event "za/day of the vow"       -   "Day of the Vow"        Fixed Dec 16     
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25     
+  Add   "c/boxing"                - # "Boxing Day"            Fixed Dec 26     
 
 
 # south korea
-Region "south korea"
-  Add   "new year 2d"                   - # "New Year"                     Fixed Jan  1  2 days
-  Event "south korea/folklore"          - "Folklore Day"                   Fixed Feb  3
-  Event "south korea/taeborum"          - "Taeborum"                       Fixed Feb 20  3 days
-  Event "south korea/independence"      - "Independence Movement Day"      Fixed Mar  1
-  Event "south korea/labor"             - "Labor Day"                      Fixed Mar 10
-  Event "south korea/arbor"             - "Arbor Day"                      Fixed Apr  5
-  Event "south korea/childrens"         - "Children's Day"                 Fixed May  5
-  Event "south korea/buddha"            - "Buddha's Birthday"              Fixed May 22
-  Event "south korea/memorial"          - "Memorial Day"                   Fixed Jun  6
-  Event "south korea/constitution"      - "Constitution Day"               Fixed Jul 17
-  Event "south korea/republic"          - "Republic Day"                   Fixed Aug 15
-  Event "south korea/liberation"        - "Liberation Day"                 Fixed Aug 15
-  Event "south korea/thanksgiving"      - "Thanksgiving"                   Fixed Sep 20  3 days
-  Event "south korea/armed forces"      - "Armed Forces Day"               Fixed Oct  1
-  Event "south korea/foundation"        - "Foundation Day"                 Fixed Oct  3
-  Event "south korea/alphabet"          - "Alphabet Day"                   Fixed Oct  9
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
-  Add   "chinese/new year"              - # 0                              Null
-
-
-# soviet union
-Region "soviet union"
-  Event "soviet union/victory"          - "Victory Day"                    Fixed May  9
-  Event "soviet union/anniversary of the october socialist revolution"  - "Anniversary of the October Socialist Revolution" Fixed Nov  7  2 days
-
+Region "kr"
+  Add   "new year 2d"             - # "New Year"                                         Fixed Jan  1  2 days
+  Event "kr/folklore"             -   "Folklore Day"                                     Fixed Feb  3        
+  Event "kr/taeborum"             -   "Taeborum"                                         Fixed Feb 20  3 days
+  Event "kr/independence"         -   "Independence Movement Day"                        Fixed Mar  1        
+  Event "kr/labor"                -   "Labor Day"                                        Fixed Mar 10        
+  Event "kr/arbor"                -   "Arbor Day"                                        Fixed Apr  5        
+  Event "kr/childrens"            -   "Children's Day"                                   Fixed May  5        
+  Event "kr/buddha"               -   "Buddha's Birthday"                                Fixed May 22        
+  Event "kr/memorial"             -   "Memorial Day"                                     Fixed Jun  6        
+  Event "kr/constitution"         -   "Constitution Day"                                 Fixed Jul 17        
+  Event "kr/republic"             -   "Republic Day"                                     Fixed Aug 15        
+  Event "kr/liberation"           -   "Liberation Day"                                   Fixed Aug 15        
+  Event "kr/thanksgiving"         -   "Thanksgiving"                                     Fixed Sep 20  3 days
+  Event "kr/armed forces"         -   "Armed Forces Day"                                 Fixed Oct  1        
+  Event "kr/foundation"           -   "Foundation Day"                                   Fixed Oct  3        
+  Event "kr/alphabet"             -   "Alphabet Day"                                     Fixed Oct  9        
+  Add   "c/christmas"             - # "Christmas Day"                                    Fixed Dec 25        
+  Add   "chinese/new year"        - # #                                                                      
+
+
+# soviet union (historic)
+Region "su"
+  Event "su/victory"              - "Victory Day"                                     Fixed May  9        
+  Event "su/revolution"           - "Anniversary of the October Socialist Revolution" Fixed Nov  7  2 days
 
 # spain
-Region "spain"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "spain/grenada"                 - "Grenada Day"                    Fixed Jan  2
-  Event "spain/dia de la toma"          - "Dia de la Toma"                 Fixed Jan  5
-  Add   "c/epiphany"                    - # "Epiphany"                     Fixed Jan  6
-  Event "spain/fiesta del arbol"        - "Fiesta del Arbol"               Fixed Mar 26
-  Add   "c/maundy thursday"             - # "Maundy Thursday"              Easter -3
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Event "spain/queen isabella"          - "Queen Isabella Day"             Fixed Apr 22
-  Event "spain/saint joseph the workman"  - "St Joseph the Workman"        Fixed May  1
-  Add   "c/corpus christi"              - # "Corpus Christi"               Easter +60
-  Event "spain/king juan carlos saints"  - "King Juan Carlos' Saint's Day" Fixed Jun 24
-  Event "spain/fiesta de san fermin"    - "Fiesta de San Fermin"           Fixed Jul  7
-  Event "spain/labor"                   - "Labor Day"                      Fixed Jul 18
-  Event "spain/saint james"             - "St James Day"                   Fixed Jul 25
-  Add   "c/assumption"                  - # "Assumption Day"               Fixed Aug 15
-  Event "spain/national"                - "National Day"                   Fixed Oct 12
-  Event "spain/hispanidad"              - "Hispanidad Day"                 Fixed Oct 12
-  Event "spain/national holiday of spain"  - "National Holiday of Spain"   Fixed Oct 12
-  Add   "c/all saints"                  - # "All Saints Day"               Fixed Nov  1
-  Event "spain/constitution"            - "Constitution Day"               Fixed Dec  6
-  Add   "c/immaculate conception"       - # "Immaculate Conception"        Fixed Dec  8
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
-  Add   "c/boxing"                      - # "Boxing Day"                   Fixed Dec 26
+Region "es"
+  Add   "new year"                     - # "New Year's Day"                Fixed Jan  1
+  Event "es/grenada"                   -   "Grenada Day"                   Fixed Jan  2
+  Event "es/dia de la toma"            -   "Dia de la Toma"                Fixed Jan  5
+  Add   "c/epiphany"                   - # "Epiphany"                      Fixed Jan  6
+  Event "es/fiesta del arbol"          -   "Fiesta del Arbol"              Fixed Mar 26
+  Add   "c/maundy thursday"            - # "Maundy Thursday"               Easter -3   
+  Add   "c/good friday"                - # "Good Friday"                   Easter -2   
+  Add   "c/easter monday"              - # "Easter Monday"                 Easter +1   
+  Event "es/queen isabella"            -   "Queen Isabella Day"            Fixed Apr 22
+  Event "es/saint joseph the workman"  -   "St Joseph the Workman"         Fixed May  1
+  Add   "c/corpus christi"             - # "Corpus Christi"                Easter +60  
+  Event "es/king juan carlos saints"   -   "King Juan Carlos' Saint's Day" Fixed Jun 24
+  Event "es/fiesta de san fermin"      -   "Fiesta de San Fermin"          Fixed Jul  7
+  Event "es/labor"                     -   "Labor Day"                     Fixed Jul 18
+  Event "es/saint james"               -   "St James Day"                  Fixed Jul 25
+  Add   "c/assumption"                 - # "Assumption Day"                Fixed Aug 15
+  Event "es/national"                  -   "National Day"                  Fixed Oct 12
+  Event "es/hispanidad"                -   "Hispanidad Day"                Fixed Oct 12
+  Event "es/national holiday of spain" -   "National Holiday of Spain"     Fixed Oct 12
+  Add   "c/all saints"                 - # "All Saints Day"                Fixed Nov  1
+  Event "es/constitution"              -   "Constitution Day"              Fixed Dec  6
+  Add   "c/immaculate conception"      - # "Immaculate Conception"         Fixed Dec  8
+  Add   "c/christmas"                  - # "Christmas Day"                 Fixed Dec 25
+  Add   "c/boxing"                     - # "Boxing Day"                    Fixed Dec 26
 
 
 # sri lanka
-Region "sri lanka"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "sri lanka/independence"        - "Independence Day"               Fixed Feb  4
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Event "sri lanka/sinhala and tamil new year"  - "Sinhala and Tamil New Year" Fixed Apr 14
-  Add   "may day"                       - # "May Day"                      Fixed May  1
-  Event "sri lanka/national heroes"     - "National Heroes Day"            Fixed May 22
-  Event "sri lanka/republic"            - "Republic Day"                   Fixed May 22
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "lk"
+  Add   "new year"                      - # "New Year's Day"             Fixed Jan  1
+  Event "lk/independence"               -   "Independence Day"           Fixed Feb  4
+  Add   "c/good friday"                 - # "Good Friday"                Easter -2   
+  Event "lk/sinhala and tamil new year" -   "Sinhala and Tamil New Year" Fixed Apr 14
+  Add   "may day"                       - # "May Day"                    Fixed May  1
+  Event "lk/national heroes"            -   "National Heroes Day"        Fixed May 22
+  Event "lk/republic"                   -   "Republic Day"               Fixed May 22
+  Add   "c/christmas"                   - # "Christmas Day"              Fixed Dec 25
 
 
 # sudan
-Region "sudan"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "sudan/independence"            - "Independence Day"               Fixed Jan  1
-  Event "sudan/unity"                   - "Unity Day"                      Fixed Mar  3
-  Event "sudan/uprising"                - "Uprising Day"                   Fixed Apr  6
-  Event "sudan/national"                - "National Day"                   Fixed May 25
-  Event "sudan/decentralization"        - "Decentralization Day"           Fixed Jul  1
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "sd"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Event "sd/independence"         -   "Independence Day"      Fixed Jan  1
+  Event "sd/unity"                -   "Unity Day"             Fixed Mar  3
+  Event "sd/uprising"             -   "Uprising Day"          Fixed Apr  6
+  Event "sd/national"             -   "National Day"          Fixed May 25
+  Event "sd/decentralization"     -   "Decentralization Day"  Fixed Jul  1
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25
 
 
 # suriname
-Region "suriname"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "suriname/revolution"           - "Revolution Day"                 Fixed Feb 25
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Event "suriname/national union"       - "National Union Day"             Fixed Jul  1
-  Event "suriname/independence"         - "Independence Day"               Fixed Nov 25
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
-  Add   "c/boxing"                      - # "Boxing Day"                   Fixed Dec 26
+Region "sr"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Event "sr/revolution"           -   "Revolution Day"        Fixed Feb 25
+  Add   "c/good friday"           - # "Good Friday"           Easter -2   
+  Add   "c/easter monday"         - # "Easter Monday"         Easter +1   
+  Add   "labor"                   - # "Labor Day"             Fixed May  1
+  Event "sr/national union"       -   "National Union Day"    Fixed Jul  1
+  Event "sr/independence"         -   "Independence Day"      Fixed Nov 25
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25
+  Add   "c/boxing"                - # "Boxing Day"            Fixed Dec 26
 
 
 # swaziland
-Region "swaziland"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "swaziland/commonwealth"        - "Commonwealth Day"               WDRel Mar Mon 2nd
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Event "swaziland/flag"                - "Flag Day"                       Fixed Apr 25
-  Add   "c/ascension"                   - # "Ascension"                    Easter +39
-  Event "swaziland/reed dance"          - "Reed Dance Day"                 WDRel Jul Mon 2nd
-  Event "swaziland/kings"               - "King's Birthday"                Fixed Jul 22
-  Event "swaziland/somhlolo"            - "Somhlolo Day"                   Fixed Sep  6
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
-  Add   "c/boxing"                      - # "Boxing Day"                   Fixed Dec 26
+Region "sz"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1     
+  Event "sz/commonwealth"         -   "Commonwealth Day"      WDRel Mar Mon 2nd
+  Add   "c/good friday"           - # "Good Friday"           Easter -2        
+  Add   "c/easter monday"         - # "Easter Monday"         Easter +1        
+  Event "sz/flag"                 -   "Flag Day"              Fixed Apr 25     
+  Add   "c/ascension"             - # "Ascension"             Easter +39       
+  Event "sz/reed dance"           -   "Reed Dance Day"        WDRel Jul Mon 2nd
+  Event "sz/kings"                -   "King's Birthday"       Fixed Jul 22     
+  Event "sz/somhlolo"             -   "Somhlolo Day"          Fixed Sep  6     
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25     
+  Add   "c/boxing"                - # "Boxing Day"            Fixed Dec 26     
 
 
 # sweden
-Region "sweden"
-  Add   "un"                            f # "UN Day"                       Fixed Oct 24
-  Add   "labor"                        hf # "Labor Day"                    Fixed May  1
-  Add   "new year"                     hf # "New Year's Day"               Fixed Jan  1
-  Add   "c/advent 2"                    h # "Advent 2"                     WDRel Dec 24 Sun -3 excl
-  Add   "saints/stephen"                h # "St. Stephen"                  Fixed Dec 26
-  Add   "c/ascension"                   h # "Ascension"                    Easter +39
-  Add   "c/christmas"                  hf # "Christmas Day"                Fixed Dec 25
-  Add   "c/epiphany"                    h # "Epiphany"                     Fixed Jan  6
-  Event "sweden/queens birthday"        f "Queen's Birthday"               Fixed Dec 23
-  Event "sweden/queens nameday"         f "Queen's Nameday"                Fixed Aug  8
-  Add   "c/easter monday"               h # "Easter Monday"                Easter +1
-  Add   "c/easter"                     hf # "Easter"                       Easter +0
-  Event "sweden/midsummer"             hf "Midsummer's Day"                WDRel Jun 21 Sat +1
-  Add   "c/pentecost"                  hf # "Pentecost"                    Easter +49
-  Add   "c/pentecost monday"            h # "Pentecost Monday"             Easter +50
-  Add   "c/good friday"                 h # "Good Friday"                  Easter -2
-  Add   "c/palm sunday"                 h # "Palm Sunday"                  Easter -7
-  Event "sweden/flag"                   f "Sweden's Flag Day"              Fixed Jun  6
-  Event "sweden/kings nameday"          f "King's Nameday"                 Fixed Nov  6
-  Add   "c/advent 1"                    h # "Advent 1"                     WDRel Dec 24 Sun -4 excl
-  Event "sweden/kings nameday 2"        f "King's Nameday"                 Fixed Jan 28
-  Add   "c/advent 4"                    h # "Advent 4"                     WDRel Dec 24 Sun -1 excl
-  Add   "c/advent 3"                    h # "Advent 3"                     WDRel Dec 24 Sun -2 excl
-  Event "sweden/kings birthday"         f "King's Birthday"                Fixed Apr 30
-  Event "sweden/crown princess birthtday"  f "Crown Princess' Birthday"    Fixed Jul 14
-  Event "sweden/crown princess nameday"  f "Crown Princess' Nameday"       Fixed Mar 12
-  Event "sweden/nobel"                  f "Nobel Day"                      Fixed Dec 10
-  Event "sweden/all saints"             h "Alla helgons dag"               WDRel Nov Sat 1st
-  Add   "c/candlemas"                   - # "Candlemas"                    Fixed Feb  2
-  Add   "saints/valentine"              - # "St. Valentine"                Fixed Feb 14
-  Add   "c/fat tuesday"                 - # "Fat Tuesday"                  Easter -47
-  Add   "womens"                        - # "Int. Women's Day"             Fixed Mar  8
-  Event "sweden/waffle"                 - "Waffle Day"                     Fixed Mar 25
-  Add   "c/annunciation"                - # "Annunciation"                 Fixed Mar 25
-  Add   "c/easter eve"                  - # "Easter Eve"                   Easter -1
-  Event "sweden/valborg eve"            - "Valborgsm�ssoafton"             Fixed Apr 30
-  Event "sweden/mothers"                - "Mother's Day"                   WDRel May Sun last
-  Add   "c/pentecost eve"               - # "Pentecost Eve"                Easter +48
-  Event "sweden/midsummers eve"         - "Midsummer's Eve"                WDRel Jun 20 Fri +1
-  Add   "saints/john the baptist"       - # "St. John the Baptist"         Fixed Jun 24
-  Add   "halloween"                     - # "Halloween"                    Fixed Oct 31
-  Add   "c/all saints"                  - # "All Saints Day"               Fixed Nov  1
-  Event "sweden/fathers"                - "Father's Day"                   WDRel Nov Sun 2nd
-  Add   "saints/lucy"                   - # "St. Lucy"                     Fixed Dec 13
-  Add   "c/christmas eve"               - # "Christmas Eve"                Fixed Dec 24
-  Add   "new years eve"                 - # "New Year's Eve"               Fixed Dec 31
-
-  Add   "namedays/sweden"
-  Add   "sunday"                        h # "Sun"                          Weekday ---
+Region "se"
+  Add   "un"                          f  # "UN Day"                                                                         Fixed Oct 24            
+  Add   "labor"                       hf # "Labor Day"                                                                      Fixed May  1            
+  Add   "new year"                    hf # "New Year's Day"                                                                 Fixed Jan  1            
+  Add   "c/advent 2"                  h  # "Advent 2"                                                                       WDRel Dec 24 Sun -3 excl
+  Add   "saints/stephen"              h  # "St. Stephen"                                                                    Fixed Dec 26            
+  Add   "c/ascension"                 h  # "Ascension"                                                                      Easter +39              
+  Add   "c/christmas"                 hf # "Christmas Day"                                                                  Fixed Dec 25            
+  Add   "c/epiphany"                  h  # "Epiphany"                                                                       Fixed Jan  6            
+  Event "se/queens birthday"          f    "Queen's Birthday"                                                               Fixed Dec 23            
+  Event "se/queens nameday"           f    "Queen's Nameday"                                                                Fixed Aug  8            
+  Add   "c/easter monday"             h  # "Easter Monday"                                                                  Easter +1               
+  Add   "c/easter"                    hf # "Easter"                                                                         Easter +0               
+  Event "se/midsummer"                hf   "Midsummer's Day"                                                                WDRel Jun 21 Sat +1     
+  Add   "c/pentecost"                 hf # "Pentecost"                                                                      Easter +49              
+  Add   "c/pentecost monday"          h  # "Pentecost Monday"                                                               Easter +50              
+  Add   "c/good friday"               h  # "Good Friday"                                                                    Easter -2               
+  Add   "c/palm sunday"               h  # "Palm Sunday"                                                                    Easter -7               
+  Event "se/flag"                     f    "Sweden's Flag Day"                                                              Fixed Jun  6            
+  Event "se/kings nameday"            f    "King's Nameday"                                                                 Fixed Nov  6            
+  Add   "c/advent 1"                  h  # "Advent 1"                                                                       WDRel Dec 24 Sun -4 excl
+  Event "se/kings nameday 2"          f    "King's Nameday"                                                                 Fixed Jan 28            
+  Add   "c/advent 4"                  h  # "Advent 4"                                                                       WDRel Dec 24 Sun -1 excl
+  Add   "c/advent 3"                  h  # "Advent 3"                                                                       WDRel Dec 24 Sun -2 excl
+  Event "se/kings birthday"           f    "King's Birthday"                                                                Fixed Apr 30            
+  Event "se/crown princess birthtday" f    "Crown Princess' Birthday"                                                       Fixed Jul 14            
+  Event "se/crown princess nameday"   f    "Crown Princess' Nameday"                                                        Fixed Mar 12            
+  Event "se/nobel"                    f    "Nobel Day"                                                                      Fixed Dec 10            
+  Event "se/all saints"               h    "Alla helgons dag"                                                               WDRel Nov Sat 1st       
+  Add   "c/candlemas"                 -  # "Candlemas"                                                                      Fixed Feb  2            
+  Add   "saints/valentine"            -  # "St. Valentine"                                                                  Fixed Feb 14            
+  Add   "c/fat tuesday"               -  # "Fat Tuesday"                                                                    Easter -47              
+  Add   "womens"                      -  # "Int. Women's Day"                                                               Fixed Mar  8            
+  Event "se/waffle"                   -    "Waffle Day"                                                                     Fixed Mar 25            
+  Add   "c/annunciation"              -  # "Annunciation"                                                                   Fixed Mar 25            
+  Add   "c/easter eve"                -  # "Easter Eve"                                                                     Easter -1               
+  Event "se/valborg eve"              -    "Valborgsm�ssoafton"                                                             Fixed Apr 30            
+  Event "se/mothers"                  -    "Mother's Day"                                                                   WDRel May Sun last      
+  Add   "c/pentecost eve"             -  # "Pentecost Eve"                                                                  Easter +48              
+  Event "se/midsummers eve"           -    "Midsummer's Eve"                                                                WDRel Jun 20 Fri +1     
+  Add   "saints/john the baptist"     -  # "St. John the Baptist"                                                           Fixed Jun 24            
+  Add   "halloween"                   -  # "Halloween"                                                                      Fixed Oct 31            
+  Add   "c/all saints"                -  # "All Saints Day"                                                                 Fixed Nov  1            
+  Event "se/fathers"                  -    "Father's Day"                                                                   WDRel Nov Sun 2nd       
+  Add   "saints/lucy"                 -  # "St. Lucy"                                                                       Fixed Dec 13            
+  Add   "c/christmas eve"             -  # "Christmas Eve"                                                                  Fixed Dec 24            
+  Add   "new years eve"               -  # "New Year's Eve"                                                                 Fixed Dec 31            
+
+  Add   "namedays/sweden"             #  # # #                                                                                                      
+  Add   "sunday"                      h  # "Sun"                                                                            Weekday ---             
 
 
 # switzerland
-Region "switzerland"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "switzerland/berchtolds"        - "Berchtold's Day"                Fixed Jan  2
-  Add   "c/epiphany"                    - # "Epiphany"                     Fixed Jan  6
-  Event "switzerland/homstrom"          - "Homstrom"                       WDRel Feb Sun 1st
-  Event "switzerland/glarus festival"   - "Glarus Festival"                WDRel Apr Thu 1st
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Event "switzerland/may eve"           - "May Day Eve"                    Fixed Apr 30
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Add   "c/ascension"                   - # "Ascension"                    Easter +39
-  Add   "c/whitmonday"                  - # "Whitmonday"                   Easter +50
-  Event "switzerland/independence"      - "Independence Day"               Fixed Aug  1
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
-  Add   "c/boxing"                      - # "Boxing Day"                   Fixed Dec 26
+Region "ch"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1     
+  Event "ch/berchtolds"           -   "Berchtold's Day"       Fixed Jan  2     
+  Add   "c/epiphany"              - # "Epiphany"              Fixed Jan  6     
+  Event "ch/homstrom"             -   "Homstrom"              WDRel Feb Sun 1st
+  Event "ch/glarus festival"      -   "Glarus Festival"       WDRel Apr Thu 1st
+  Add   "c/good friday"           - # "Good Friday"           Easter -2        
+  Add   "c/easter monday"         - # "Easter Monday"         Easter +1        
+  Event "ch/may eve"              -   "May Day Eve"           Fixed Apr 30     
+  Add   "labor"                   - # "Labor Day"             Fixed May  1     
+  Add   "c/ascension"             - # "Ascension"             Easter +39       
+  Add   "c/whitmonday"            - # "Whitmonday"            Easter +50       
+  Event "ch/independence"         -   "Independence Day"      Fixed Aug  1     
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25     
+  Add   "c/boxing"                - # "Boxing Day"            Fixed Dec 26     
 
 
 # syria
-Region "syria"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "unity"                         - # "Unity Day"                    Fixed Feb 22
-  Event "syria/revolution"              - "Revolution Day"                 Fixed Mar  8
-  Event "syria/evacuation"              - "Evacuation Day"                 Fixed Apr 17
-  Event "syria/union"                   - "Union Day"                      Fixed Sep  1
-  Event "syria/beginning of october war"  - "Beginning of October War"     Fixed Oct  6
-  Event "syria/national"                - "National Day"                   Fixed Nov 16
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "sy"
+  Add   "new year"                    - # "New Year's Day"           Fixed Jan  1
+  Add   "unity"                       - # "Unity Day"                Fixed Feb 22
+  Event "sy/revolution"               -   "Revolution Day"           Fixed Mar  8
+  Event "sy/evacuation"               -   "Evacuation Day"           Fixed Apr 17
+  Event "sy/union"                    -   "Union Day"                Fixed Sep  1
+  Event "sy/beginning of october war" -   "Beginning of October War" Fixed Oct  6
+  Event "sy/national"                 -   "National Day"             Fixed Nov 16
+  Add   "c/christmas"                 - # "Christmas Day"            Fixed Dec 25
 
 
 # taiwan
-Region "taiwan"
-  Event "taiwan/founding of the republic of china"  - "Founding of the Republic of China" Fixed Jan  1  2 days
-  Event "taiwan/youth"                  - "Youth Day"                      Fixed Mar 29
-  Event "taiwan/martyrs"                - "Martyrs' Day"                   Fixed Mar 29
-  Event "taiwan/childrens"              - "Children's Day"                 Fixed Apr  4
-  Event "taiwan/buddha bathing festival"  - "Buddha Bathing Festival"      Fixed Apr  8
-  Event "taiwan/dragon boat festival"   - "Dragon Boat Festival"           Fixed Jun  8
-  Event "taiwan/birthday of confucious"  - "Birthday of Confucious"        Fixed Sep 28
-  Event "taiwan/national"               - "National Day"                   Fixed Oct 10
-  Event "taiwan/restoration"            - "Restoration Day"                Fixed Oct 25
-  Event "taiwan/chiang kai-shek"        - "Chiang Kai-shek Day"            Fixed Nov  1
-  Event "taiwan/sun yat-sen"            - "Sun Yat-sen Day"                Fixed Nov 12
-  Event "taiwan/constitution"           - "Constitution Day"               Fixed Dec 25
+Region "tw"
+  Event "tw/china"                   - "Founding of the Republic of China" Fixed Jan  1  2 days
+  Event "tw/youth"                   - "Youth Day"                         Fixed Mar 29        
+  Event "tw/martyrs"                 - "Martyrs' Day"                      Fixed Mar 29        
+  Event "tw/childrens"               - "Children's Day"                    Fixed Apr  4        
+  Event "tw/buddha bathing festival" - "Buddha Bathing Festival"           Fixed Apr  8        
+  Event "tw/dragon boat festival"    - "Dragon Boat Festival"              Fixed Jun  8        
+  Event "tw/birthday of confucious"  - "Birthday of Confucious"            Fixed Sep 28        
+  Event "tw/national"                - "National Day"                      Fixed Oct 10        
+  Event "tw/restoration"             - "Restoration Day"                   Fixed Oct 25        
+  Event "tw/chiang kai-shek"         - "Chiang Kai-shek Day"               Fixed Nov  1        
+  Event "tw/sun yat-sen"             - "Sun Yat-sen Day"                   Fixed Nov 12        
+  Event "tw/constitution"            - "Constitution Day"                  Fixed Dec 25        
 
 
 # tanzania
-Region "tanzania"
-  Event "tanzania/zanzibar revolution"  - "Zanzibar Revolution Day"        Fixed Jan 12
-  Event "tanzania/chama cha mapinduzi"  - "Chama Cha Mapinduzi Day"        Fixed Feb  5
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Event "tanzania/union"                - "Union Day"                      Fixed Apr 26
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Event "tanzania/saba saba"            - "Saba Saba Day"                  Fixed Jul  7
-  Event "tanzania/sultans"              - "Sultan's Birthday"              Fixed Aug 26
-  Event "tanzania/heroes"               - "Heroes' Day"                    Fixed Sep  1
-  Event "tanzania/naming"               - "Naming Day"                     Fixed Oct 29
-  Event "tanzania/independence"         - "Independence Day"               Fixed Dec  9
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "tz"
+  Event "tz/zanzibar revolution"  -   "Zanzibar Revolution Day" Fixed Jan 12
+  Event "tz/chama cha mapinduzi"  -   "Chama Cha Mapinduzi Day" Fixed Feb  5
+  Add   "c/good friday"           - # "Good Friday"             Easter -2   
+  Add   "c/easter monday"         - # "Easter Monday"           Easter +1   
+  Event "tz/union"                -   "Union Day"               Fixed Apr 26
+  Add   "labor"                   - # "Labor Day"               Fixed May  1
+  Event "tz/saba saba"            -   "Saba Saba Day"           Fixed Jul  7
+  Event "tz/sultans"              -   "Sultan's Birthday"       Fixed Aug 26
+  Event "tz/heroes"               -   "Heroes' Day"             Fixed Sep  1
+  Event "tz/naming"               -   "Naming Day"              Fixed Oct 29
+  Event "tz/independence"         -   "Independence Day"        Fixed Dec  9
+  Add   "c/christmas"             - # "Christmas Day"           Fixed Dec 25
 
 
 # thailand
-Region "thailand"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "thailand/chakri"               - "Chakri Day"                     Fixed Apr  6
-  Event "thailand/songkran"             - "Songkran"                       Fixed Apr 13  3 days
-  Event "thailand/coronation"           - "Coronation Day"                 Fixed May  5
-  Event "thailand/harvest festival"     - "Harvest Festival Day"           Fixed May 11
-  Event "thailand/asalapha bupha"       - "Asalapha Bupha Day"             Fixed Jul 28
-  Event "thailand/queens"               - "Queen's Birthday"               Fixed Aug 12
-  Event "thailand/chulalongkorn"        - "Chulalongkorn Day"              Fixed Oct 23
-  Event "thailand/kings"                - "King's Birthday"                Fixed Dec  5
-  Event "thailand/constitution"         - "Constitution Day"               Fixed Dec 10
-  Add   "new years eve"                 - # "New Year's Eve"               Fixed Dec 31
+Region "th"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1        
+  Event "th/chakri"               -   "Chakri Day"            Fixed Apr  6        
+  Event "th/songkran"             -   "Songkran"              Fixed Apr 13  3 days
+  Event "th/coronation"           -   "Coronation Day"        Fixed May  5        
+  Event "th/harvest festival"     -   "Harvest Festival Day"  Fixed May 11        
+  Event "th/asalapha bupha"       -   "Asalapha Bupha Day"    Fixed Jul 28        
+  Event "th/queens"               -   "Queen's Birthday"      Fixed Aug 12        
+  Event "th/chulalongkorn"        -   "Chulalongkorn Day"     Fixed Oct 23        
+  Event "th/kings"                -   "King's Birthday"       Fixed Dec  5        
+  Event "th/constitution"         -   "Constitution Day"      Fixed Dec 10        
+  Add   "new years eve"           - # "New Year's Eve"        Fixed Dec 31        
 
 
 # togo
-Region "togo"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "togo/liberation"               - "Liberation Day"                 Fixed Jan 13
-  Event "togo/economic liberation"      - "Economic Liberation Day"        Fixed Jan 24
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Event "togo/victory"                  - "Victory Day"                    Fixed Apr 24
-  Event "togo/independence"             - "Independence Day"               Fixed Apr 27
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Add   "c/ascension"                   - # "Ascension"                    Easter +39
-  Add   "c/whitmonday"                  - # "Whitmonday"                   Easter +50
-  Event "togo/martyrs of pya"           - "Martyrs of Pya"                 Fixed Jun 21
-  Add   "c/assumption"                  - # "Assumption Day"               Fixed Aug 15
-  Event "togo/anniversary of the failed attack on lome"  - "Anniversary of the failed attack on Lom�" Fixed Sep 24
-  Add   "c/all saints"                  - # "All Saints Day"               Fixed Nov  1
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "tg"
+  Add   "new year"                - # "New Year's Day"                           Fixed Jan  1
+  Event "tg/liberation"           -   "Liberation Day"                           Fixed Jan 13
+  Event "tg/economic liberation"  -   "Economic Liberation Day"                  Fixed Jan 24
+  Add   "c/easter monday"         - # "Easter Monday"                            Easter +1   
+  Event "tg/victory"              -   "Victory Day"                              Fixed Apr 24
+  Event "tg/independence"         -   "Independence Day"                         Fixed Apr 27
+  Add   "labor"                   - # "Labor Day"                                Fixed May  1
+  Add   "c/ascension"             - # "Ascension"                                Easter +39  
+  Add   "c/whitmonday"            - # "Whitmonday"                               Easter +50  
+  Event "tg/martyrs of pya"       -   "Martyrs of Pya"                           Fixed Jun 21
+  Add   "c/assumption"            - # "Assumption Day"                           Fixed Aug 15
+  Event "tg/lome"                 -   "Anniversary of the failed attack on Lom�" Fixed Sep 24
+  Add   "c/all saints"            - # "All Saints Day"                           Fixed Nov  1
+  Add   "c/christmas"             - # "Christmas Day"                            Fixed Dec 25
 
 
 # tonga
-Region "tonga"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Add   "anzac"                         - # "ANZAC Day"                    Fixed Apr 25
-  Event "tonga/princes"                 - "Prince's Birthday"              Fixed May  4
-  Event "tonga/emancipation"            - "Emancipation Day"               Fixed Jun  4
-  Event "tonga/kings"                   - "King's Birthday"                Fixed Jul  4
-  Event "tonga/constitution"            - "Constitution Day"               Fixed Nov  4
-  Event "tonga/king tupou"              - "King Tupou Day"                 Fixed Dec  4
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
-  Add   "c/boxing"                      - # "Boxing Day"                   Fixed Dec 26
+Region "to"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Add   "c/good friday"           - # "Good Friday"           Easter -2   
+  Add   "c/easter monday"         - # "Easter Monday"         Easter +1   
+  Add   "anzac"                   - # "ANZAC Day"             Fixed Apr 25
+  Event "to/princes"              -   "Prince's Birthday"     Fixed May  4
+  Event "to/emancipation"         -   "Emancipation Day"      Fixed Jun  4
+  Event "to/kings"                -   "King's Birthday"       Fixed Jul  4
+  Event "to/constitution"         -   "Constitution Day"      Fixed Nov  4
+  Event "to/king tupou"           -   "King Tupou Day"        Fixed Dec  4
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25
+  Add   "c/boxing"                - # "Boxing Day"            Fixed Dec 26
 
 
 # trinidad and tobago
-Region "trinidad and tobago"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "c/easter"                      - # "Easter"                       Easter +0
-  Add   "c/whitmonday"                  - # "Whitmonday"                   Easter +50
-  Add   "c/corpus christi"              - # "Corpus Christi"               Easter +60
-  Event "trinidad and tobago/labor"     - "Labor Day"                      Fixed Jun 19
-  Event "trinidad and tobago/emancipation"  - "Emancipation Day"           Fixed Aug  1
-  Event "trinidad and tobago/discovery"  - "Discovery Day"                 Fixed Aug  1
-  Event "trinidad and tobago/independence"  - "Independence Day"           Fixed Aug 31
-  Event "trinidad and tobago/republic"  - "Republic Day"                   Fixed Sep 24
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "tt"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Add   "c/easter"                - # "Easter"                Easter +0   
+  Add   "c/whitmonday"            - # "Whitmonday"            Easter +50  
+  Add   "c/corpus christi"        - # "Corpus Christi"        Easter +60  
+  Event "tt/labor"                -   "Labor Day"             Fixed Jun 19
+  Event "tt/emancipation"         -   "Emancipation Day"      Fixed Aug  1
+  Event "tt/discovery"            -   "Discovery Day"         Fixed Aug  1
+  Event "tt/independence"         -   "Independence Day"      Fixed Aug 31
+  Event "tt/republic"             -   "Republic Day"          Fixed Sep 24
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25
 
 
 # tunisia
-Region "tunisia"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "tunisia/national revolution"   - "National Revolution Day"        Fixed Jan 18
-  Add   "womens"                        - # "Int. Women's Day"             Fixed Mar  8
-  Event "tunisia/independence"          - "Independence Day"               Fixed Mar 20
-  Event "tunisia/youth"                 - "Youth Day"                      Fixed Mar 21
-  Event "tunisia/martyrs"               - "Martyrs' Day"                   Fixed Apr  9
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Event "tunisia/national holiday of tunisia"  - "National Holiday of Tunisia" Fixed Jun  1
-  Event "tunisia/independence recognition"  - "Independence Recognition Day" Fixed Jul 20
-  Event "tunisia/republic"              - "Republic Day"                   Fixed Jul 25
-  Event "tunisia/bourguibas"            - "Bourguiba's Day"                Fixed Aug  3
-  Event "tunisia/womens"                - "Women's Day"                    Fixed Aug 13
-  Event "tunisia/memorial"              - "Memorial Day"                   Fixed Sep  3
-  Event "tunisia/evacuation"            - "Evacuation Day"                 Fixed Oct 15
-  Event "tunisia/accession"             - "Accession Day"                  Fixed Nov  7
-  Event "tunisia/tree festival"         - "Tree Festival Day"              Fixed Nov  9
+Region "tn"
+  Add   "new year"                       - # "New Year's Day"               Fixed Jan  1
+  Event "tn/national revolution"         -   "National Revolution Day"      Fixed Jan 18
+  Add   "womens"                         - # "Int. Women's Day"             Fixed Mar  8
+  Event "tn/independence"                -   "Independence Day"             Fixed Mar 20
+  Event "tn/youth"                       -   "Youth Day"                    Fixed Mar 21
+  Event "tn/martyrs"                     -   "Martyrs' Day"                 Fixed Apr  9
+  Add   "labor"                          - # "Labor Day"                    Fixed May  1
+  Event "tn/national holiday of tunisia" -   "National Holiday of Tunisia"  Fixed Jun  1
+  Event "tn/independence recognition"    -   "Independence Recognition Day" Fixed Jul 20
+  Event "tn/republic"                    -   "Republic Day"                 Fixed Jul 25
+  Event "tn/bourguibas"                  -   "Bourguiba's Day"              Fixed Aug  3
+  Event "tn/womens"                      -   "Women's Day"                  Fixed Aug 13
+  Event "tn/memorial"                    -   "Memorial Day"                 Fixed Sep  3
+  Event "tn/evacuation"                  -   "Evacuation Day"               Fixed Oct 15
+  Event "tn/accession"                   -   "Accession Day"                Fixed Nov  7
+  Event "tn/tree festival"               -   "Tree Festival Day"            Fixed Nov  9
 
 
 # turkey
-Region "turkey"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "turkey/childrens"              - "Children's day"                 Fixed Apr 23
-  Event "turkey/national sovereignty"   - "National Sovereignty"           Fixed Apr 23
-  Event "turkey/spring"                 - "Spring Day"                     Fixed May  1
-  Event "turkey/hidrellez"              - "Hidrellez"                      Fixed May  6
-  Event "turkey/youth and sports"       - "Youth and Sports Day"           Fixed May 19
-  Event "turkey/ataturk commemoration"  - "Atat�rk Commemoration"       Fixed May 19
-  Event "turkey/freedom and constitution"  - "Freedom and Constitution Day" Fixed May 27
-  Event "turkey/navy and merchant marine"  - "Navy and Merchant Marine Day" Fixed Jul  1
-  Event "turkey/victory"                - "Victory Day"                    Fixed Aug 30
-  Event "turkey/independence"           - "Independence Day"               Fixed Oct 29
-  Event "turkey/rumis"                  - "Rumi's Birthday"                Fixed Dec 17
+Region "tr"
+  Add   "new year"                    - # "New Year's Day"               Fixed Jan  1
+  Event "tr/childrens"                -   "Children's day"               Fixed Apr 23
+  Event "tr/national sovereignty"     -   "National Sovereignty"         Fixed Apr 23
+  Event "tr/spring"                   -   "Spring Day"                   Fixed May  1
+  Event "tr/hidrellez"                -   "Hidrellez"                    Fixed May  6
+  Event "tr/youth and sports"         -   "Youth and Sports Day"         Fixed May 19
+  Event "tr/ataturk commemoration"    -   "Atat�rk Commemoration"        Fixed May 19
+  Event "tr/freedom and constitution" -   "Freedom and Constitution Day" Fixed May 27
+  Event "tr/navy and merchant marine" -   "Navy and Merchant Marine Day" Fixed Jul  1
+  Event "tr/victory"                  -   "Victory Day"                  Fixed Aug 30
+  Event "tr/independence"             -   "Independence Day"             Fixed Oct 29
+  Event "tr/rumis"                    -   "Rumi's Birthday"              Fixed Dec 17
 
 
 # turks and caicos islands
-Region "turks and caicos islands"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/easter monday"               - # "Easter Monday"                Easter +1
-  Event "turks and caicos islands/jags mccartney memorial"  - "J.A.G.S. McCartney Memorial Day" Fixed Jun  6
-  Event "turks and caicos islands/emancipation"  - "Emancipation Day"      Fixed Aug  1
-  Event "turks and caicos islands/columbus"  - "Columbus Day"              Fixed Oct 10
-  Event "turks and caicos islands/human rights"  - "International Human Rights Day" Fixed Oct 24
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "tc"
+  Add   "new year"                   - # "New Year's Day"                  Fixed Jan  1
+  Add   "c/good friday"              - # "Good Friday"                     Easter -2   
+  Add   "c/easter monday"            - # "Easter Monday"                   Easter +1   
+  Event "tc/jags mccartney memorial" -   "J.A.G.S. McCartney Memorial Day" Fixed Jun  6
+  Event "tc/emancipation"            -   "Emancipation Day"                Fixed Aug  1
+  Event "tc/columbus"                -   "Columbus Day"                    Fixed Oct 10
+  Event "tc/human rights"            -   "International Human Rights Day"  Fixed Oct 24
+  Add   "c/christmas"                - # "Christmas Day"                   Fixed Dec 25
 
 
 # tuvalu
-Region "tuvalu"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "c/easter"                      - # "Easter"                       Easter +0
-  Add   "british commonwealth/queens"   - # "Queen's Birthday"             Fixed Jun  4
-  Event "tuvalu/tuvalu"                 - "Tuvalu Day"                     Fixed Oct  1  2 days
-  Add   "british commonwealth/prince of wales"  - # "Prince of Wales' Birthday" Fixed Nov 14
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
-  Add   "c/boxing"                      - # "Boxing Day"                   Fixed Dec 26
+Region "tv"
+  Add   "new year"                             - # "New Year's Day"            Fixed Jan  1        
+  Add   "c/easter"                             - # "Easter"                    Easter +0           
+  Add   "british commonwealth/queens"          - # "Queen's Birthday"          Fixed Jun  4        
+  Event "tv/tuvalu"                            -   "Tuvalu Day"                Fixed Oct  1  2 days
+  Add   "british commonwealth/prince of wales" - # "Prince of Wales' Birthday" Fixed Nov 14        
+  Add   "c/christmas"                          - # "Christmas Day"             Fixed Dec 25        
+  Add   "c/boxing"                             - # "Boxing Day"                Fixed Dec 26        
 
 
 # uganda
-Region "uganda"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "uganda/nrm/nra victorys"       - "NRM/NRA Victory Celebrations"   Fixed Jan 26
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/easter"                      - # "Easter"                       Easter +0
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Event "uganda/martyrs"                - "Martyr's Day"                   Fixed Jun  3
-  Event "uganda/heroes"                 - "Heroes Day"                     Fixed Jun  9
-  Event "uganda/republic"               - "Republic Day"                   Fixed Sep  8
-  Event "uganda/independence"           - "Independence Day"               Fixed Oct  9
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "ug"
+  Add   "new year"                - # "New Year's Day"               Fixed Jan  1
+  Event "ug/nrm/nra victorys"     -   "NRM/NRA Victory Celebrations" Fixed Jan 26
+  Add   "c/good friday"           - # "Good Friday"                  Easter -2   
+  Add   "c/easter"                - # "Easter"                       Easter +0   
+  Add   "labor"                   - # "Labor Day"                    Fixed May  1
+  Event "ug/martyrs"              -   "Martyr's Day"                 Fixed Jun  3
+  Event "ug/heroes"               -   "Heroes Day"                   Fixed Jun  9
+  Event "ug/republic"             -   "Republic Day"                 Fixed Sep  8
+  Event "ug/independence"         -   "Independence Day"             Fixed Oct  9
+  Add   "c/christmas"             - # "Christmas Day"                Fixed Dec 25
 
 
 # ukraine
-Region "ukraine"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "orthodox/christmas"            - # "Christmas Day"                Julian_Fixed Dec 25
-  Event "ukraine/ukrainian"             - "Ukrainian Day"                  Fixed Jan 22
-  Add   "womens"                        - # "Int. Women's Day"             Fixed Mar  8
-  Event "ukraine/taras shevchenko"      - "Taras Shevchenko Day"           Fixed Mar  9
-  Event "ukraine/victory"               - "Victory Day"                    Fixed Mar  9
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Event "ukraine/ukrainian independence"  - "Ukrainian Independence Day"   Fixed Aug 24
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "ua"
+  Add   "new year"                  - # "New Year's Day"             Fixed Jan  1       
+  Add   "orthodox/christmas"        - # "Christmas Day"              Julian_Fixed Dec 25
+  Event "ua/ukrainian"              -   "Ukrainian Day"              Fixed Jan 22       
+  Add   "womens"                    - # "Int. Women's Day"           Fixed Mar  8       
+  Event "ua/taras shevchenko"       -   "Taras Shevchenko Day"       Fixed Mar  9       
+  Event "ua/victory"                -   "Victory Day"                Fixed Mar  9       
+  Add   "labor"                     - # "Labor Day"                  Fixed May  1       
+  Event "ua/ukrainian independence" -   "Ukrainian Independence Day" Fixed Aug 24       
+  Add   "c/christmas"               - # "Christmas Day"              Fixed Dec 25       
 
 
 # united arab emirates
-Region "united arab emirates"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "united arab emirates/accession of the ruler of abu dhabi"  - "Accession of the Ruler of Abu Dhabi" Fixed Aug  6
-  Event "united arab emirates/national"  - "National Day"                  Fixed Dec  2
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "ae"
+  Add   "new year"                - # "New Year's Day"                      Fixed Jan  1
+  Event "ae/accession"            -   "Accession of the Ruler of Abu Dhabi" Fixed Aug  6
+  Event "ae/national"             -   "National Day"                        Fixed Dec  2
+  Add   "c/christmas"             - # "Christmas Day"                       Fixed Dec 25
 
 
 # united kingdom
 Region "uk"
-  Event "uk/spring bank holiday"        h "Spring Bank Holiday"            WDRel May Mon 4th
-  Add   "c/christmas"                   h # "Christmas Day"                Fixed Dec 25
-  Add   "c/good friday"                 h # "Good Friday"                  Easter -2
-  Add   "new year"                      h # "New Year's Day"               Fixed Jan  1
-  Add   "c/easter monday"               h # "Easter Monday"                Easter +1
-  Add   "c/boxing"                      h # "Boxing Day"                   Fixed Dec 26
-  Event "uk/late summer bank holiday"   h "Late Summer Bank Holiday"       WDRel Aug Mon 4th
-  Add   "may day"                       h # "May Day"                      Fixed May  1
-  Event "uk/burns"                      - "Burns Day"                      Fixed Jan 25
-  Event "uk/queens"                     - "Queen's Birthday"               WDRel Jun Thu 2nd
-  Event "uk/lammas"                     - "Lammas Day"                     Fixed Aug  1
+  Event "uk/spring bank holiday"      h   "Spring Bank Holiday"      WDRel May Mon 4th
+  Add   "c/christmas"                 h # "Christmas Day"            Fixed Dec 25     
+  Add   "c/good friday"               h # "Good Friday"              Easter -2        
+  Add   "new year"                    h # "New Year's Day"           Fixed Jan  1     
+  Add   "c/easter monday"             h # "Easter Monday"            Easter +1        
+  Add   "c/boxing"                    h # "Boxing Day"               Fixed Dec 26     
+  Event "uk/late summer bank holiday" h   "Late Summer Bank Holiday" WDRel Aug Mon 4th
+  Add   "may day"                     h # "May Day"                  Fixed May  1     
+  Event "uk/burns"                    -   "Burns Day"                Fixed Jan 25     
+  Event "uk/queens"                   -   "Queen's Birthday"         WDRel Jun Thu 2nd
+  Event "uk/lammas"                   -   "Lammas Day"               Fixed Aug  1     
 
 Region "uk-extra"
-  Event "british commonwealth/august bank holiday"  - "August Bank Holiday" WDRel Aug Mon 1st
-  Event "british commonwealth/empire"   - "Empire Day"                     Fixed May 24
-  Event "british commonwealth/prince of wales"  - "Prince of Wales' Birthday" Fixed Nov 14
-  Event "british commonwealth/queens"   - "Queen's Birthday"               Fixed Jun  4
+  Event "british commonwealth/august bank holiday" - "August Bank Holiday"       WDRel Aug Mon 1st   
+  Event "british commonwealth/empire"              - "Empire Day"                Fixed May 24        
+  Event "british commonwealth/prince of wales"     - "Prince of Wales' Birthday" Fixed Nov 14        
+  Event "british commonwealth/queens"              - "Queen's Birthday"          Fixed Jun  4        
 
-  Event "uk/new year"                   - "New Year's Day"                 Fixed Jan  1  2 days
-  Event "uk/orangemans"                 - "Orangeman's Day"                Fixed Jul 12
+  Event "uk/new year"                              - "New Year's Day"            Fixed Jan  1  2 days
+  Event "uk/orangemans"                            - "Orangeman's Day"           Fixed Jul 12        
 
 # united kingdom/england
 Region "uk/england"
   Include "uk"
-  Event "uk/woman peerage"              - "Woman Peerage Day"              Fixed Jan 30
-  Event "uk/pancake tuesday"            - "Fat Tuesday"                    Easter -47
-  Event "uk/mothering sunday"           - "Mothering Sunday"               Easter -21
-  Event "uk/oak apple"                  - "Oak Apple Day"                  Fixed May 29
-  Event "uk/battle of britain"          - "Battle of Britain Day"          Fixed Sep 15
-  Event "uk/guy fawkes"                 - "Guy Fawkes Day"                 Fixed Nov  5
-  Event "uk/lord mayors"                - "Lord Mayor's Day"               Fixed Nov  9
+  Event "uk/woman peerage"        - "Woman Peerage Day"       Fixed Jan 30
+  Event "uk/pancake tuesday"      - "Fat Tuesday"             Easter -47  
+  Event "uk/mothering sunday"     - "Mothering Sunday"        Easter -21  
+  Event "uk/oak apple"            - "Oak Apple Day"           Fixed May 29
+  Event "uk/battle of britain"    - "Battle of Britain Day"   Fixed Sep 15
+  Event "uk/guy fawkes"           - "Guy Fawkes Day"          Fixed Nov  5
+  Event "uk/lord mayors"          - "Lord Mayor's Day"        Fixed Nov  9
 
 
 # united kingdom/northern ireland
 Region "uk/northern ireland"
   Include "uk"
-  Event "uk/orangeman"                  h "Orangeman's Day"                Fixed Jul 12
-  Add   "saints/patrick"                - # "St. Patrick"                  Fixed Mar 17
+  Event "uk/orangeman"            h   "Orangeman's Day"       Fixed Jul 12
+  Add   "saints/patrick"          - # "St. Patrick"           Fixed Mar 17
 
 
 # united kingdom/scotland
 Region "uk/scotland"
   Include "uk"
-  Event "uk/handsel monday"             - "Handsel Monday"                 WDRel Jan Mon 1st
-  Event "uk/autumn holiday"             h "Autumn Holiday"                 WDRel Sep Mon 3rd
-  Event "uk/scottish new year"          h "Scottish New Year"              Fixed Jan  2
-  Event "uk/victoria"                   h "Victoria Day"                   WDRel May Mon 3rd
-  Event "uk/day after"                  - "The Day After"                  Fixed Jan  2
-  Event "uk/bannockburn"                - "Bannockburn Day"                Fixed Jun 24
-  Event "uk/highland games"             - "Highland Games"                 WDRel Sep Sat last
+  Event "uk/handsel monday"       - "Handsel Monday"          WDRel Jan Mon 1st 
+  Event "uk/autumn holiday"       h "Autumn Holiday"          WDRel Sep Mon 3rd 
+  Event "uk/scottish new year"    h "Scottish New Year"       Fixed Jan  2      
+  Event "uk/victoria"             h "Victoria Day"            WDRel May Mon 3rd 
+  Event "uk/day after"            - "The Day After"           Fixed Jan  2      
+  Event "uk/bannockburn"          - "Bannockburn Day"         Fixed Jun 24      
+  Event "uk/highland games"       - "Highland Games"          WDRel Sep Sat last
 
 
 # united kingdom/wales
 Region "uk/wales"
   Include "uk"
-  Add   "saints/david"                  h # "St. David"                    Fixed Mar  1
+  Add   "saints/david"            h # "St. David"             Fixed Mar  1
 
 
 # uruguay
-Region "uruguay"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "uruguay/childrens"             - "Chilren's Day"                  Fixed Jan  5
-  Add   "c/epiphany"                    - # "Epiphany"                     Fixed Jan  6
-  Event "uruguay/landing of the 33 patriots"  - "Landing of the 33 Patriots Day" Fixed Apr 19
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Event "uruguay/battle of las piedras"  - "Battle of Las Piedras"         Fixed May 18
-  Event "uruguay/artigas"               - "Artigas Day"                    Fixed Jun 19
-  Event "uruguay/constitution"          - "Constitution Day"               Fixed Jul 18
-  Event "uruguay/independence"          - "Independence Day"               Fixed Aug 25
-  Add   "columbus"                      - # "Columbus Day"                 Fixed Oct 12
-  Add   "c/all souls"                   - # "All Souls Day"                Fixed Nov  2
-  Event "uruguay/blessing of the waters"  - "Blessing of the Waters"       Fixed Dec  8
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "uy"
+  Add   "new year"                      - # "New Year's Day"                 Fixed Jan  1
+  Event "uy/childrens"                  -   "Chilren's Day"                  Fixed Jan  5
+  Add   "c/epiphany"                    - # "Epiphany"                       Fixed Jan  6
+  Event "uy/landing of the 33 patriots" -   "Landing of the 33 Patriots Day" Fixed Apr 19
+  Add   "labor"                         - # "Labor Day"                      Fixed May  1
+  Event "uy/battle of las piedras"      -   "Battle of Las Piedras"          Fixed May 18
+  Event "uy/artigas"                    -   "Artigas Day"                    Fixed Jun 19
+  Event "uy/constitution"               -   "Constitution Day"               Fixed Jul 18
+  Event "uy/independence"               -   "Independence Day"               Fixed Aug 25
+  Add   "columbus"                      - # "Columbus Day"                   Fixed Oct 12
+  Add   "c/all souls"                   - # "All Souls Day"                  Fixed Nov  2
+  Event "uy/blessing of the waters"     -   "Blessing of the Waters"         Fixed Dec  8
+  Add   "c/christmas"                   - # "Christmas Day"                  Fixed Dec 25
 
 
 # us
 Region "us"
-  Event "us/columbus"                   h "Columbus Day"                   WDRel Oct Mon 2nd
-  Event "us/veterans"                   h "Veteran's Day"                  Fixed Nov 11
-  Event "us/washingtons"                h "Washington's Birthday"          WDRel Feb Mon 3rd
-  Add   "new year"                      h # "New Year's Day"               Fixed Jan  1
-  Event "us/independence"               h "Independence Day"               Fixed Jul  4
-  Event "us/flag"                       f "Flag Day"                       Fixed Jun 14
-  Event "us/labor"                      h "Labor Day"                      WDRel Sep Mon 1st
-  Event "us/trivia"                     - "Trivia Day"                     Fixed Jan  4
-  Event "us/twelfth night"              - "Twelfth Night"                  Fixed Jan  5
-  Event "us/martin luther king"         - "Martin Luther King Day"         Fixed Jan 15
-  Event "us/robert e lee"               - "Robert E. Lee Day"              Fixed Jan 19
-  Event "us/inauguration"               - "Inauguration Day"               Fixed Jan 20
-  Event "us/vietnam"                    - "Vietnam Day"                    Fixed Jan 27
-  Event "us/carnation"                  - "Carnation Day"                  Fixed Jan 29
-  Event "us/national freedom"           - "National Freedom Day"           Fixed Feb  1
-  Event "us/kosciuszko"                 - "Kosciuszko Day"                 Fixed Feb  4
-  Event "us/lincolns"                   - "Lincoln's Birthday"             Fixed Feb 12
-  Event "us/iwo jima"                   - "Iwo Jima Day"                   Fixed Feb 23
-  Add   "mardi gras"                    - # "Mardi Gras"                   Easter -47
-  Event "us/appomattox"                 - "Appomattox Day"                 Fixed Apr  9
-  Event "us/thomas jeffersons"          - "Thomas Jefferson's Birthday"    Fixed Apr 13
-  Event "us/patriots"                   - "Patriot's Day"                  WDRel Apr Mon 3rd
-  Event "us/armed forces"               - "Armed Forces Day"               WDRel May Sat 3rd
-  Event "us/memorial"                   - "Memorial Day"                   WDRel May 30 Mon -1
-  Event "us/jefferson davis"            - "Jefferson Davis Day"            Fixed Jun  3
-  Event "us/womens equality"            - "Women's Equality Day"           Fixed Aug 26
-  Event "us/citizenship"                - "Citizenship Day"                Fixed Sep 17
-  Event "us/navy"                       - "Navy Day"                       Fixed Oct 27
-  Event "us/election"                   - "Election Day"                   WDRel Nov Mon 1st
-  Event "us/thanksgiving"               - "Thanksgiving Day"               WDRel Nov Thu 4th
-  Event "us/bill of rights"             - "Bill of Rights Day"             Fixed Dec 15
-  Event "us/forefathers"                - "Forefathers' Day"               Fixed Dec 21
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+  Event "us/columbus"             h   "Columbus Day"                WDRel Oct Mon 2nd  
+  Event "us/veterans"             h   "Veteran's Day"               Fixed Nov 11       
+  Event "us/washingtons"          h   "Washington's Birthday"       WDRel Feb Mon 3rd  
+  Add   "new year"                h # "New Year's Day"              Fixed Jan  1       
+  Event "us/independence"         h   "Independence Day"            Fixed Jul  4       
+  Event "us/flag"                 f   "Flag Day"                    Fixed Jun 14       
+  Event "us/labor"                h   "Labor Day"                   WDRel Sep Mon 1st  
+  Event "us/trivia"               -   "Trivia Day"                  Fixed Jan  4       
+  Event "us/twelfth night"        -   "Twelfth Night"               Fixed Jan  5       
+  Event "us/martin luther king"   -   "Martin Luther King Day"      Fixed Jan 15       
+  Event "us/robert e lee"         -   "Robert E. Lee Day"           Fixed Jan 19       
+  Event "us/inauguration"         -   "Inauguration Day"            Fixed Jan 20       
+  Event "us/vietnam"              -   "Vietnam Day"                 Fixed Jan 27       
+  Event "us/carnation"            -   "Carnation Day"               Fixed Jan 29       
+  Event "us/national freedom"     -   "National Freedom Day"        Fixed Feb  1       
+  Event "us/kosciuszko"           -   "Kosciuszko Day"              Fixed Feb  4       
+  Event "us/lincolns"             -   "Lincoln's Birthday"          Fixed Feb 12       
+  Event "us/iwo jima"             -   "Iwo Jima Day"                Fixed Feb 23       
+  Add   "mardi gras"              - # "Mardi Gras"                  Easter -47         
+  Event "us/appomattox"           -   "Appomattox Day"              Fixed Apr  9       
+  Event "us/thomas jeffersons"    -   "Thomas Jefferson's Birthday" Fixed Apr 13       
+  Event "us/patriots"             -   "Patriot's Day"               WDRel Apr Mon 3rd  
+  Event "us/armed forces"         -   "Armed Forces Day"            WDRel May Sat 3rd  
+  Event "us/memorial"             -   "Memorial Day"                WDRel May 30 Mon -1
+  Event "us/jefferson davis"      -   "Jefferson Davis Day"         Fixed Jun  3       
+  Event "us/womens equality"      -   "Women's Equality Day"        Fixed Aug 26       
+  Event "us/citizenship"          -   "Citizenship Day"             Fixed Sep 17       
+  Event "us/navy"                 -   "Navy Day"                    Fixed Oct 27       
+  Event "us/election"             -   "Election Day"                WDRel Nov Mon 1st  
+  Event "us/thanksgiving"         -   "Thanksgiving Day"            WDRel Nov Thu 4th  
+  Event "us/bill of rights"       -   "Bill of Rights Day"          Fixed Dec 15       
+  Event "us/forefathers"          -   "Forefathers' Day"            Fixed Dec 21       
+  Add   "c/christmas"             - # "Christmas Day"               Fixed Dec 25       
 
 # extra events used by some states
 Region "us-extra"
-  Event "us/day after thanksgiving"     - "Day after Thanksgiving Day"     WDRel Nov  2 Fri +4
-  Event "us/presidents"                 - "Presidents Day"                 WDRel Feb Mon 3rd
-  Event "us/washington"                 - "Washington Day"                 WDRel Feb Mon 3rd
-  Event "us/washington-lincoln"         - "Washington-Lincoln Day"         WDRel Feb Mon 3rd
+  Event "us/day after thanksgiving" - "Day after Thanksgiving Day" WDRel Nov  2 Fri +4
+  Event "us/presidents"             - "Presidents Day"             WDRel Feb Mon 3rd  
+  Event "us/washington"             - "Washington Day"             WDRel Feb Mon 3rd  
+  Event "us/washington-lincoln"     - "Washington-Lincoln Day"     WDRel Feb Mon 3rd  
 
 # us/alabama
 Region "us/alabama"
   Include "us"
-  Event "us/alabama/jefferson davis"    h "Jefferson Davis Day"            WDRel Jun Mon 1st
-  Add   "columbus"                      h # "Columbus Day"                 Fixed Oct 12
-  Event "us/alabama/confederate memorial"  h "Confederate Memorial Day"    WDRel Apr Mon last
-  Event "us/alabama/alabama admission"  h "Alabama Admission Day"          Fixed Dec 14
-  Add   "us/thomas jeffersons"          h # "Thomas Jefferson's Birthday"  Fixed Apr 13
-  Event "us/alabama/robert e lee"       h "Robert E. Lee Day"              WDRel Jan Mon 3rd
-  Add   "mardi gras"                    h # "Mardi Gras"                   Easter -47
+  Event "us/alabama/jefferson davis"      h   "Jefferson Davis Day"         WDRel Jun Mon 1st 
+  Add   "columbus"                        h # "Columbus Day"                Fixed Oct 12      
+  Event "us/alabama/confederate memorial" h   "Confederate Memorial Day"    WDRel Apr Mon last
+  Event "us/alabama/alabama admission"    h   "Alabama Admission Day"       Fixed Dec 14      
+  Add   "us/thomas jeffersons"            h # "Thomas Jefferson's Birthday" Fixed Apr 13      
+  Event "us/alabama/robert e lee"         h   "Robert E. Lee Day"           WDRel Jan Mon 3rd 
+  Add   "mardi gras"                      h # "Mardi Gras"                  Easter -47        
 
 
 # us/alaska
 Region "us/alaska"
   Include "us"
   Without "us/independence"
-  Event "us/alaska/alaska"              h "Alaska Day"                     WDRel Oct Mon 3rd
-  Event "us/alaska/sewards"             h "Seward's Day"                   Fixed Mar 30
-  Event "us/alaska/alaska admission"    h "Alaska Admission Day"           Fixed Jan  3
-  Add   "us/memorial"                   h # "Memorial Day"                 WDRel May 30 Mon -1
-  Event "us/alaska/flag"               fh "Flag Day"                       Fixed Jul  4
-  Add   "us/lincolns"                   h # "Lincoln's Birthday"           Fixed Feb 12
+  Event "us/alaska/alaska"           h    "Alaska Day"           WDRel Oct Mon 3rd  
+  Event "us/alaska/sewards"          h    "Seward's Day"         Fixed Mar 30       
+  Event "us/alaska/alaska admission" h    "Alaska Admission Day" Fixed Jan  3       
+  Add   "us/memorial"                h  # "Memorial Day"         WDRel May 30 Mon -1
+  Event "us/alaska/flag"             fh   "Flag Day"             Fixed Jul  4       
+  Add   "us/lincolns"                h  # "Lincoln's Birthday"   Fixed Feb 12       
 
 
 # us/arizona
 Region "us/arizona"
   Include "us"
   Without "us/washingtons"
-  Add   "us/columbus"                   h # "Columbus Day"                 WDRel Oct Mon 2nd
-  Event "us/arizona/arizona admission"  h "Arizona Admission Day"          Fixed Feb 14
-  Event "us/arizona/arbors"             h "Arbor Day (southern Arizona)"   WDRel Feb  1 Fri +1 excl
-  Event "us/arizona/arborn"             h "Arbor Day (northern Arizona)"   Fixed Jan  1
-  Event "us/arizona/american family"    h "American Family Day"            WDRel Aug Sun 1st
-  Event "us/arizona/lincoln"            h "Lincoln Day"                    WDRel Feb Mon 2nd
-  Add   "us/memorial"                   h # "Memorial Day"                 WDRel May 30 Mon -1
-  Add   "fathers"                       h # "Father's Day"                 WDRel Jun Sun 3rd
-  Add   "mothers"                       h # "Mother's Day"                 WDRel May Sun 2nd
-  Add   "us/washington"                 h # "Washington Day"               WDRel Feb Mon 3rd
+  Add   "us/columbus"                  h # "Columbus Day"                 WDRel Oct Mon 2nd       
+  Event "us/arizona/arizona admission" h   "Arizona Admission Day"        Fixed Feb 14            
+  Event "us/arizona/arbors"            h   "Arbor Day (southern Arizona)" WDRel Feb  1 Fri +1 excl
+  Event "us/arizona/arborn"            h   "Arbor Day (northern Arizona)" Fixed Jan  1            
+  Event "us/arizona/american family"   h   "American Family Day"          WDRel Aug Sun 1st       
+  Event "us/arizona/lincoln"           h   "Lincoln Day"                  WDRel Feb Mon 2nd       
+  Add   "us/memorial"                  h # "Memorial Day"                 WDRel May 30 Mon -1     
+  Add   "fathers"                      h # "Father's Day"                 WDRel Jun Sun 3rd       
+  Add   "mothers"                      h # "Mother's Day"                 WDRel May Sun 2nd       
+  Add   "us/washington"                h # "Washington Day"               WDRel Feb Mon 3rd       
 
 
 # us/arkansas
 Region "us/arkansas"
   Include "us"
-  Event "us/arkansas/world war ii memorial"  h "World War II Memorial Day" Fixed Aug 14
-  Add   "us/election"                   h # "Election Day"                 WDRel Nov Mon 1st
-  Event "us/arkansas/general douglas macarthur"  h "General Douglas MacArthur Day" Fixed Jan 26
-  Event "us/arkansas/arkansas admission"  h "Arkansas Admission Day"       Fixed Jun 15
-  Add   "us/memorial"                   h # "Memorial Day"                 WDRel May 30 Mon -1
-  Add   "us/columbus"                   h # "Columbus Day"                 WDRel Oct Mon 2nd
-  Add   "us/jefferson davis"            h # "Jefferson Davis Day"          Fixed Jun  3
-  Add   "us/robert e lee"               h # "Robert E. Lee Day"            Fixed Jan 19
+  Event "us/arkansas/world war ii memorial"     h   "World War II Memorial Day"     Fixed Aug 14       
+  Add   "us/election"                           h # "Election Day"                  WDRel Nov Mon 1st  
+  Event "us/arkansas/general douglas macarthur" h   "General Douglas MacArthur Day" Fixed Jan 26       
+  Event "us/arkansas/arkansas admission"        h   "Arkansas Admission Day"        Fixed Jun 15       
+  Add   "us/memorial"                           h # "Memorial Day"                  WDRel May 30 Mon -1
+  Add   "us/columbus"                           h # "Columbus Day"                  WDRel Oct Mon 2nd  
+  Add   "us/jefferson davis"                    h # "Jefferson Davis Day"           Fixed Jun  3       
+  Add   "us/robert e lee"                       h # "Robert E. Lee Day"             Fixed Jan 19       
 
 
 # us/california
 Region "us/california"
   Include "us"
-  Event "us/california/california admission"  h "California Admission Day" Fixed Sep  9
-  Add   "us/election"                   h # "Election Day"                 WDRel Nov Mon 1st
-  Add   "us/columbus"                   h # "Columbus Day"                 WDRel Oct Mon 2nd
-  Add   "us/memorial"                   h # "Memorial Day"                 WDRel May 30 Mon -1
-  Event "us/california/arbor"           h "Arbor Day"                      Fixed Mar  7
-  Add   "us/lincolns"                   h # "Lincoln's Birthday"           Fixed Feb 12
+  Event "us/california/california admission" h   "California Admission Day" Fixed Sep  9       
+  Add   "us/election"                        h # "Election Day"             WDRel Nov Mon 1st  
+  Add   "us/columbus"                        h # "Columbus Day"             WDRel Oct Mon 2nd  
+  Add   "us/memorial"                        h # "Memorial Day"             WDRel May 30 Mon -1
+  Event "us/california/arbor"                h   "Arbor Day"                Fixed Mar  7       
+  Add   "us/lincolns"                        h # "Lincoln's Birthday"       Fixed Feb 12       
 
 
 # us/colorado
 Region "us/colorado"
   Include "us"
-  Event "us/colorado/arbor"             h "Arbor Day"                      WDRel Apr Fri 3rd
-  Add   "us/election"                   h # "Election Day"                 WDRel Nov Mon 1st
-  Event "us/colorado/colorado"          h "Colorado Day"                   WDRel Aug Mon 1st
-  Add   "us/memorial"                   h # "Memorial Day"                 WDRel May 30 Mon -1
-  Add   "columbus"                      h # "Columbus Day"                 Fixed Oct 12
-  Add   "us/lincolns"                   h # "Lincoln's Birthday"           Fixed Feb 12
+  Event "us/colorado/arbor"       h   "Arbor Day"             WDRel Apr Fri 3rd  
+  Add   "us/election"             h # "Election Day"          WDRel Nov Mon 1st  
+  Event "us/colorado/colorado"    h   "Colorado Day"          WDRel Aug Mon 1st  
+  Add   "us/memorial"             h # "Memorial Day"          WDRel May 30 Mon -1
+  Add   "columbus"                h # "Columbus Day"          Fixed Oct 12       
+  Add   "us/lincolns"             h # "Lincoln's Birthday"    Fixed Feb 12       
 
 
 # us/connecticut
 Region "us/connecticut"
   Include "us"
-  Add   "c/good friday"                 h # "Good Friday"                  Easter -2
-  Add   "us/lincolns"                   h # "Lincoln's Birthday"           Fixed Feb 12
-  Add   "us/columbus"                   h # "Columbus Day"                 WDRel Oct Mon 2nd
-  Add   "us/memorial"                   h # "Memorial Day"                 WDRel May 30 Mon -1
-  Event "us/connecticut/connecticut ratification"  h "Connecticut Ratification Day" Fixed Jan  9
-  Add   "us/martin luther king"         h # "Martin Luther King Day"       Fixed Jan 15
+  Add   "c/good friday"                           h # "Good Friday"                  Easter -2          
+  Add   "us/lincolns"                             h # "Lincoln's Birthday"           Fixed Feb 12       
+  Add   "us/columbus"                             h # "Columbus Day"                 WDRel Oct Mon 2nd  
+  Add   "us/memorial"                             h # "Memorial Day"                 WDRel May 30 Mon -1
+  Event "us/connecticut/connecticut ratification" h   "Connecticut Ratification Day" Fixed Jan  9       
+  Add   "us/martin luther king"                   h # "Martin Luther King Day"       Fixed Jan 15       
 
 
 # us/delaware
 Region "us/delaware"
   Include "us"
-  Event "us/delaware/memorial"          h "Memorial Day"                   Fixed May 30
-  Event "us/delaware/delaware"          h "Delaware Day"                   Fixed Dec  7
-  Add   "us/columbus"                   h # "Columbus Day"                 WDRel Oct Mon 2nd
-  Event "us/delaware/arbor"             h "Arbor Day"                      Fixed Apr 22
-  Add   "c/good friday"                 h # "Good Friday"                  Easter -2
-  Event "us/delaware/swedish colonial"  h "Swedish Colonial Day"           Fixed Mar 29
-  Event "us/delaware/lincolns"          h "Lincoln's Birthday"             WDRel Feb Mon 1st
-  Event "us/delaware/separation"        h "Separation Day"                 Fixed Jun 15
-  Add   "us/election"                   h # "Election Day"                 WDRel Nov Mon 1st
+  Event "us/delaware/memorial"         h   "Memorial Day"         Fixed May 30     
+  Event "us/delaware/delaware"         h   "Delaware Day"         Fixed Dec  7     
+  Add   "us/columbus"                  h # "Columbus Day"         WDRel Oct Mon 2nd
+  Event "us/delaware/arbor"            h   "Arbor Day"            Fixed Apr 22     
+  Add   "c/good friday"                h # "Good Friday"          Easter -2        
+  Event "us/delaware/swedish colonial" h   "Swedish Colonial Day" Fixed Mar 29     
+  Event "us/delaware/lincolns"         h   "Lincoln's Birthday"   WDRel Feb Mon 1st
+  Event "us/delaware/separation"       h   "Separation Day"       Fixed Jun 15     
+  Add   "us/election"                  h # "Election Day"         WDRel Nov Mon 1st
 
 
 # us/florida
 Region "us/florida"
   Include "us"
-  Add   "us/columbus"                   h # "Columbus Day"                 WDRel Oct Mon 2nd
-  Event "us/florida/confederate memorial"  h "Confederate Memorial Day"    Fixed Apr 26
-  Add   "c/good friday"                 h # "Good Friday"                  Easter -2
-  Event "us/florida/susan b anthony"    h "Susan B. Anthony Day"           Fixed Feb 15
-  Event "us/florida/florida admission"  h "Florida Admission Day"          Fixed Mar  3
-  Event "us/florida/arbor"              h "Arbor Day"                      WDRel Jan Fri 3rd
-  Event "us/florida/farmers"            h "Farmer's Day"                   WDRel Oct Mon 2nd
-  Add   "c/christmas"                   h # "Christmas Day"                Fixed Dec 25
-  Add   "us/jefferson davis"            h # "Jefferson Davis Day"          Fixed Jun  3
-  Add   "us/martin luther king"         h # "Martin Luther King Day"       Fixed Jan 15
-  Add   "us/election"                   h # "Election Day"                 WDRel Nov Mon 1st
-  Event "us/florida/pascua florida"     h "Pascua Florida Day"             Fixed Apr  2
-  Add   "us/robert e lee"               h # "Robert E. Lee Day"            Fixed Jan 19
-  Add   "us/lincolns"                   h # "Lincoln's Birthday"           Fixed Feb 12
-  Add   "us/memorial"                   h # "Memorial Day"                 WDRel May 30 Mon -1
+  Add   "us/columbus"                     h # "Columbus Day"             WDRel Oct Mon 2nd  
+  Event "us/florida/confederate memorial" h   "Confederate Memorial Day" Fixed Apr 26       
+  Add   "c/good friday"                   h # "Good Friday"              Easter -2          
+  Event "us/florida/susan b anthony"      h   "Susan B. Anthony Day"     Fixed Feb 15       
+  Event "us/florida/florida admission"    h   "Florida Admission Day"    Fixed Mar  3       
+  Event "us/florida/arbor"                h   "Arbor Day"                WDRel Jan Fri 3rd  
+  Event "us/florida/farmers"              h   "Farmer's Day"             WDRel Oct Mon 2nd  
+  Add   "c/christmas"                     h # "Christmas Day"            Fixed Dec 25       
+  Add   "us/jefferson davis"              h # "Jefferson Davis Day"      Fixed Jun  3       
+  Add   "us/martin luther king"           h # "Martin Luther King Day"   Fixed Jan 15       
+  Add   "us/election"                     h # "Election Day"             WDRel Nov Mon 1st  
+  Event "us/florida/pascua florida"       h   "Pascua Florida Day"       Fixed Apr  2       
+  Add   "us/robert e lee"                 h # "Robert E. Lee Day"        Fixed Jan 19       
+  Add   "us/lincolns"                     h # "Lincoln's Birthday"       Fixed Feb 12       
+  Add   "us/memorial"                     h # "Memorial Day"             WDRel May 30 Mon -1
 
 
 # us/georgia
 Region "us/georgia"
   Include "us"
-  Add   "us/columbus"                   h # "Columbus Day"                 WDRel Oct Mon 2nd
-  Add   "us/jefferson davis"            h # "Jefferson Davis Day"          Fixed Jun  3
-  Event "us/georgia/confederate memorial"  h "Confederate Memorial Day"    Fixed Apr 26
-  Event "us/georgia/georgia"            h "Georgia Day"                    Fixed Feb 12
-  Add   "us/memorial"                   h # "Memorial Day"                 WDRel May 30 Mon -1
+  Add   "us/columbus"                     h # "Columbus Day"             WDRel Oct Mon 2nd  
+  Add   "us/jefferson davis"              h # "Jefferson Davis Day"      Fixed Jun  3       
+  Event "us/georgia/confederate memorial" h   "Confederate Memorial Day" Fixed Apr 26       
+  Event "us/georgia/georgia"              h   "Georgia Day"              Fixed Feb 12       
+  Add   "us/memorial"                     h # "Memorial Day"             WDRel May 30 Mon -1
 
 
 # us/hawaii
 Region "us/hawaii"
   Include "us"
-  Event "us/hawaii/lei"                 h "Lei Day"                        Fixed May  1
-  Event "us/hawaii/kamehameha"          h "Kamehameha Day"                 Fixed Jun 11
-  Event "us/hawaii/flag"               fh "Flag Day"                       Fixed Jul  4
-  Event "us/hawaii/hawaii statehood"    h "Hawaii Statehood Day"           WDRel Aug Fri 3rd
-  Add   "c/good friday"                 h # "Good Friday"                  Easter -2
-  Event "us/hawaii/kuhio"               h "Kuhio Day"                      Fixed Mar 26
-  Add   "us/memorial"                   h # "Memorial Day"                 WDRel May 30 Mon -1
-  Event "us/hawaii/wesak flower festival"  h "Wesak Flower Festival"       WDRel Apr Sun 1st
-  Add   "us/election"                   h # "Election Day"                 WDRel Nov Mon 1st
-  Add   "us/presidents"                 h # "Presidents Day"               WDRel Feb Mon 3rd
+  Event "us/hawaii/lei"                   h    "Lei Day"               Fixed May  1       
+  Event "us/hawaii/kamehameha"            h    "Kamehameha Day"        Fixed Jun 11       
+  Event "us/hawaii/flag"                  fh   "Flag Day"              Fixed Jul  4       
+  Event "us/hawaii/hawaii statehood"      h    "Hawaii Statehood Day"  WDRel Aug Fri 3rd  
+  Add   "c/good friday"                   h  # "Good Friday"           Easter -2          
+  Event "us/hawaii/kuhio"                 h    "Kuhio Day"             Fixed Mar 26       
+  Add   "us/memorial"                     h  # "Memorial Day"          WDRel May 30 Mon -1
+  Event "us/hawaii/wesak flower festival" h    "Wesak Flower Festival" WDRel Apr Sun 1st  
+  Add   "us/election"                     h  # "Election Day"          WDRel Nov Mon 1st  
+  Add   "us/presidents"                   h  # "Presidents Day"        WDRel Feb Mon 3rd  
 
 
 # us/idaho
 Region "us/idaho"
   Include "us"
-  Add   "us/columbus"                   h # "Columbus Day"                 WDRel Oct Mon 2nd
-  Add   "us/election"                   h # "Election Day"                 WDRel Nov Mon 1st
-  Event "us/idaho/idaho admission"      h "Idaho Admission Day"            Fixed Jul  3
-  Event "us/idaho/idaho pioneer"        h "Idaho Pioneer Day"              Fixed Jun 15
-  Add   "us/memorial"                   h # "Memorial Day"                 WDRel May 30 Mon -1
+  Add   "us/columbus"              h # "Columbus Day"         WDRel Oct Mon 2nd  
+  Add   "us/election"              h # "Election Day"         WDRel Nov Mon 1st  
+  Event "us/idaho/idaho admission" h   "Idaho Admission Day"  Fixed Jul  3       
+  Event "us/idaho/idaho pioneer"   h   "Idaho Pioneer Day"    Fixed Jun 15       
+  Add   "us/memorial"              h # "Memorial Day"         WDRel May 30 Mon -1
 
 
 # us/illinois
 Region "us/illinois"
   Include "us"
-  Event "us/illinois/illinois admission"  h "Illinois Admission Day"       Fixed Dec  3
-  Add   "us/election"                   h # "Election Day"                 WDRel Nov Mon 1st
-  Add   "us/day after thanksgiving"     h # "Day after Thanksgiving Day"   WDRel Nov  2 Fri +4
-  Add   "us/columbus"                   h # "Columbus Day"                 WDRel Oct Mon 2nd
-  Add   "us/martin luther king"         h # "Martin Luther King Day"       Fixed Jan 15
-  Event "us/illinois/memorial"          h "Memorial Day"                   Fixed May 30
-  Add   "us/lincolns"                   h # "Lincoln's Birthday"           Fixed Feb 12
+  Event "us/illinois/illinois admission" h   "Illinois Admission Day"     Fixed Dec  3       
+  Add   "us/election"                    h # "Election Day"               WDRel Nov Mon 1st  
+  Add   "us/day after thanksgiving"      h # "Day after Thanksgiving Day" WDRel Nov  2 Fri +4
+  Add   "us/columbus"                    h # "Columbus Day"               WDRel Oct Mon 2nd  
+  Add   "us/martin luther king"          h # "Martin Luther King Day"     Fixed Jan 15       
+  Event "us/illinois/memorial"           h   "Memorial Day"               Fixed May 30       
+  Add   "us/lincolns"                    h # "Lincoln's Birthday"         Fixed Feb 12       
 
 
 # us/indiana
 Region "us/indiana"
   Include "us"
-  Event "us/indiana/indiana admission"  h "Indiana Admission Day"          Fixed Dec 11
-  Event "us/indiana/vincennes"          h "Vincennes Day"                  Fixed Feb 24
-  Add   "us/columbus"                   h # "Columbus Day"                 WDRel Oct Mon 2nd
-  Add   "c/good friday"                 h # "Good Friday"                  Easter -2
-  Add   "us/lincolns"                   h # "Lincoln's Birthday"           Fixed Feb 12
-  Event "us/indiana/primary election"   h "Primary Election Day"           WDRel May  2 Tue +1
-  Add   "us/election"                   h # "Election Day"                 WDRel Nov Mon 1st
-  Add   "us/memorial"                   h # "Memorial Day"                 WDRel May 30 Mon -1
+  Event "us/indiana/indiana admission" h   "Indiana Admission Day" Fixed Dec 11       
+  Event "us/indiana/vincennes"         h   "Vincennes Day"         Fixed Feb 24       
+  Add   "us/columbus"                  h # "Columbus Day"          WDRel Oct Mon 2nd  
+  Add   "c/good friday"                h # "Good Friday"           Easter -2          
+  Add   "us/lincolns"                  h # "Lincoln's Birthday"    Fixed Feb 12       
+  Event "us/indiana/primary election"  h   "Primary Election Day"  WDRel May  2 Tue +1
+  Add   "us/election"                  h # "Election Day"          WDRel Nov Mon 1st  
+  Add   "us/memorial"                  h # "Memorial Day"          WDRel May 30 Mon -1
 
 
 # us/iowa
 Region "us/iowa"
   Include "us"
-  Event "us/iowa/bird"                  h "Bird Day"                       Fixed Mar 21
-  Add   "us/lincolns"                   h # "Lincoln's Birthday"           Fixed Feb 12
-  Event "us/iowa/independence sunday"   h "Independence Sunday"            WDRel Jul  4 Sun -1 excl
-  Event "us/iowa/iowa admission"        h "Iowa Admission Day"             Fixed Dec 28
-  Add   "us/memorial"                   h # "Memorial Day"                 WDRel May 30 Mon -1
+  Event "us/iowa/bird"                h   "Bird Day"            Fixed Mar 21            
+  Add   "us/lincolns"                 h # "Lincoln's Birthday"  Fixed Feb 12            
+  Event "us/iowa/independence sunday" h   "Independence Sunday" WDRel Jul  4 Sun -1 excl
+  Event "us/iowa/iowa admission"      h   "Iowa Admission Day"  Fixed Dec 28            
+  Add   "us/memorial"                 h # "Memorial Day"        WDRel May 30 Mon -1     
 
 
 # us/kansas
 Region "us/kansas"
   Include "us"
-  Add   "us/lincolns"                   h # "Lincoln's Birthday"           Fixed Feb 12
-  Add   "us/columbus"                   h # "Columbus Day"                 WDRel Oct Mon 2nd
-  Event "us/kansas/kansas"              h "Kansas Day"                     Fixed Jan 29
-  Add   "us/memorial"                   h # "Memorial Day"                 WDRel May 30 Mon -1
+  Add   "us/lincolns"             h # "Lincoln's Birthday"    Fixed Feb 12       
+  Add   "us/columbus"             h # "Columbus Day"          WDRel Oct Mon 2nd  
+  Event "us/kansas/kansas"        h   "Kansas Day"            Fixed Jan 29       
+  Add   "us/memorial"             h # "Memorial Day"          WDRel May 30 Mon -1
 
 
 # us/kentucky
 Region "us/kentucky"
   Include "us"
-  Add   "us/lincolns"                   h # "Lincoln's Birthday"           Fixed Feb 12
-  Add   "us/election"                   h # "Election Day"                 WDRel Nov Mon 1st
-  Event "us/kentucky/franklin d roosevelt"  h "Franklin D. Roosevelt Day"  Fixed Jan 30
-  Event "us/kentucky/kentucky statehood"  h "Kentucky Statehood Day"       Fixed Jun  1
-  Add   "us/columbus"                   h # "Columbus Day"                 WDRel Oct Mon 2nd
-  Add   "us/memorial"                   h # "Memorial Day"                 WDRel May 30 Mon -1
-  Add   "us/jefferson davis"            h # "Jefferson Davis Day"          Fixed Jun  3
-  Add   "us/martin luther king"         h # "Martin Luther King Day"       Fixed Jan 15
-  Add   "us/robert e lee"               h # "Robert E. Lee Day"            Fixed Jan 19
+  Add   "us/lincolns"                      h # "Lincoln's Birthday"        Fixed Feb 12       
+  Add   "us/election"                      h # "Election Day"              WDRel Nov Mon 1st  
+  Event "us/kentucky/franklin d roosevelt" h   "Franklin D. Roosevelt Day" Fixed Jan 30       
+  Event "us/kentucky/kentucky statehood"   h   "Kentucky Statehood Day"    Fixed Jun  1       
+  Add   "us/columbus"                      h # "Columbus Day"              WDRel Oct Mon 2nd  
+  Add   "us/memorial"                      h # "Memorial Day"              WDRel May 30 Mon -1
+  Add   "us/jefferson davis"               h # "Jefferson Davis Day"       Fixed Jun  3       
+  Add   "us/martin luther king"            h # "Martin Luther King Day"    Fixed Jan 15       
+  Add   "us/robert e lee"                  h # "Robert E. Lee Day"         Fixed Jan 19       
 
 
 # us/louisiana
 Region "us/louisiana"
   Include "us"
-  Add   "us/columbus"                   h # "Columbus Day"                 WDRel Oct Mon 2nd
-  Event "us/louisiana/jackson"          h "Jackson Day"                    Fixed Jan  8
-  Add   "c/good friday"                 h # "Good Friday"                  Easter -2
-  Add   "new year"                      h # "New Year's Day"               Fixed Jan  1
-  Add   "c/all saints"                  h # "All Saints Day"               Fixed Nov  1
-  Event "us/louisiana/huey p long"      h "Huey P. Long Day"               Fixed Aug 30
-  Event "us/louisiana/louisiana admission"  h "Louisiana Admission Day"    Fixed Apr 30
-  Add   "mardi gras"                    h # "Mardi Gras"                   Easter -47
-  Add   "us/martin luther king"         h # "Martin Luther King Day"       Fixed Jan 15
-  Add   "us/election"                   h # "Election Day"                 WDRel Nov Mon 1st
-  Add   "us/robert e lee"               h # "Robert E. Lee Day"            Fixed Jan 19
-  Add   "us/jefferson davis"            h # "Jefferson Davis Day"          Fixed Jun  3
-  Add   "us/memorial"                   h # "Memorial Day"                 WDRel May 30 Mon -1
+  Add   "us/columbus"                      h # "Columbus Day"            WDRel Oct Mon 2nd  
+  Event "us/louisiana/jackson"             h   "Jackson Day"             Fixed Jan  8       
+  Add   "c/good friday"                    h # "Good Friday"             Easter -2          
+  Add   "new year"                         h # "New Year's Day"          Fixed Jan  1       
+  Add   "c/all saints"                     h # "All Saints Day"          Fixed Nov  1       
+  Event "us/louisiana/huey p long"         h   "Huey P. Long Day"        Fixed Aug 30       
+  Event "us/louisiana/louisiana admission" h   "Louisiana Admission Day" Fixed Apr 30       
+  Add   "mardi gras"                       h # "Mardi Gras"              Easter -47         
+  Add   "us/martin luther king"            h # "Martin Luther King Day"  Fixed Jan 15       
+  Add   "us/election"                      h # "Election Day"            WDRel Nov Mon 1st  
+  Add   "us/robert e lee"                  h # "Robert E. Lee Day"       Fixed Jan 19       
+  Add   "us/jefferson davis"               h # "Jefferson Davis Day"     Fixed Jun  3       
+  Add   "us/memorial"                      h # "Memorial Day"            WDRel May 30 Mon -1
 
 
 # us/maine
 Region "us/maine"
   Include "us"
-  Add   "us/columbus"                   h # "Columbus Day"                 WDRel Oct Mon 2nd
-  Add   "us/memorial"                   h # "Memorial Day"                 WDRel May 30 Mon -1
-  Event "us/maine/battleship"           h "Battleship Day"                 Fixed Feb 15
-  Event "us/maine/maine admission"      h "Maine Admission Day"            Fixed Mar  3
-  Add   "us/patriots"                   h # "Patriot's Day"                WDRel Apr Mon 3rd
+  Add   "us/columbus"              h # "Columbus Day"         WDRel Oct Mon 2nd  
+  Add   "us/memorial"              h # "Memorial Day"         WDRel May 30 Mon -1
+  Event "us/maine/battleship"      h   "Battleship Day"       Fixed Feb 15       
+  Event "us/maine/maine admission" h   "Maine Admission Day"  Fixed Mar  3       
+  Add   "us/patriots"              h # "Patriot's Day"        WDRel Apr Mon 3rd  
 
 
 # us/maryland
 Region "us/maryland"
   Include "us"
-  Event "us/maryland/defenders"         h "Defenders' Day"                 Fixed Sep 12
-  Event "us/maryland/maryland"          h "Maryland Day"                   Fixed Mar 25
-  Add   "us/columbus"                   h # "Columbus Day"                 WDRel Oct Mon 2nd
-  Event "us/maryland/memorial"          h "Memorial Day"                   Fixed May 30
-  Add   "c/good friday"                 h # "Good Friday"                  Easter -2
-  Event "us/maryland/john hanson"       h "John Hanson Day"                Fixed Apr 14
-  Event "us/maryland/maryland admission"  h "Maryland Admission Day"       Fixed Apr 28
-  Event "us/maryland/maryland ratification"  h "Maryland Ratification Day" Fixed Jan 14
-  Add   "us/election"                   h # "Election Day"                 WDRel Nov Mon 1st
-  Event "us/maryland/national anthem"   h "National Anthem Day"            Fixed Sep 14
-  Add   "us/martin luther king"         h # "Martin Luther King Day"       Fixed Jan 15
-  Event "us/maryland/repudiation"       h "Repudiation Day"                Fixed Nov 23
-  Add   "us/lincolns"                   h # "Lincoln's Birthday"           Fixed Feb 12
+  Event "us/maryland/defenders"             h   "Defenders' Day"            Fixed Sep 12     
+  Event "us/maryland/maryland"              h   "Maryland Day"              Fixed Mar 25     
+  Add   "us/columbus"                       h # "Columbus Day"              WDRel Oct Mon 2nd
+  Event "us/maryland/memorial"              h   "Memorial Day"              Fixed May 30     
+  Add   "c/good friday"                     h # "Good Friday"               Easter -2        
+  Event "us/maryland/john hanson"           h   "John Hanson Day"           Fixed Apr 14     
+  Event "us/maryland/maryland admission"    h   "Maryland Admission Day"    Fixed Apr 28     
+  Event "us/maryland/maryland ratification" h   "Maryland Ratification Day" Fixed Jan 14     
+  Add   "us/election"                       h # "Election Day"              WDRel Nov Mon 1st
+  Event "us/maryland/national anthem"       h   "National Anthem Day"       Fixed Sep 14     
+  Add   "us/martin luther king"             h # "Martin Luther King Day"    Fixed Jan 15     
+  Event "us/maryland/repudiation"           h   "Repudiation Day"           Fixed Nov 23     
+  Add   "us/lincolns"                       h # "Lincoln's Birthday"        Fixed Feb 12     
 
 
 # us/massachusetts
 Region "us/massachusetts"
   Include "us"
-  Event "us/massachusetts/childrens"    h "Children's Day"                 WDRel Jun Sun 2nd
-  Event "us/massachusetts/john f kennedy"  h "John F. Kennedy Day"         WDRel Nov Sun last
-  Event "us/massachusetts/bunker hill"  h "Bunker Hill Day"                Fixed Jun 17
-  Event "us/massachusetts/spanish-american war memorial"  h "Spanish-American War Memorial Day" Fixed Feb 15
-  Event "us/massachusetts/liberty tree"  h "Liberty Tree Day"              Fixed Aug 14
-  Event "us/massachusetts/evacuation"   h "Evacuation Day"                 Fixed Mar 17
-  Event "us/massachusetts/lafayette"    h "Lafayette Day"                  Fixed May 20
-  Add   "us/columbus"                   h # "Columbus Day"                 WDRel Oct Mon 2nd
-  Event "us/massachusetts/susan b anthony"  h "Susan B. Anthony Day"       Fixed Aug 26
-  Add   "us/martin luther king"         h # "Martin Luther King Day"       Fixed Jan 15
-  Event "us/massachusetts/student government"  h "Student Government Day"  WDRel Apr Fri 1st
-  Event "us/massachusetts/massachusetts ratification"  h "Massachusetts Ratification Day" Fixed Feb  6
-  Add   "us/patriots"                   h # "Patriot's Day"                WDRel Apr Mon 3rd
-  Event "us/massachusetts/teachers"     h "Teacher's Day"                  WDRel Jun Sun 1st
-  Add   "us/memorial"                   h # "Memorial Day"                 WDRel May 30 Mon -1
+  Event "us/massachusetts/childrens"                     h   "Children's Day"                    WDRel Jun Sun 2nd  
+  Event "us/massachusetts/john f kennedy"                h   "John F. Kennedy Day"               WDRel Nov Sun last 
+  Event "us/massachusetts/bunker hill"                   h   "Bunker Hill Day"                   Fixed Jun 17       
+  Event "us/massachusetts/spanish-american war memorial" h   "Spanish-American War Memorial Day" Fixed Feb 15       
+  Event "us/massachusetts/liberty tree"                  h   "Liberty Tree Day"                  Fixed Aug 14       
+  Event "us/massachusetts/evacuation"                    h   "Evacuation Day"                    Fixed Mar 17       
+  Event "us/massachusetts/lafayette"                     h   "Lafayette Day"                     Fixed May 20       
+  Add   "us/columbus"                                    h # "Columbus Day"                      WDRel Oct Mon 2nd  
+  Event "us/massachusetts/susan b anthony"               h   "Susan B. Anthony Day"              Fixed Aug 26       
+  Add   "us/martin luther king"                          h # "Martin Luther King Day"            Fixed Jan 15       
+  Event "us/massachusetts/student government"            h   "Student Government Day"            WDRel Apr Fri 1st  
+  Event "us/massachusetts/massachusetts ratification"    h   "Massachusetts Ratification Day"    Fixed Feb  6       
+  Add   "us/patriots"                                    h # "Patriot's Day"                     WDRel Apr Mon 3rd  
+  Event "us/massachusetts/teachers"                      h   "Teacher's Day"                     WDRel Jun Sun 1st  
+  Add   "us/memorial"                                    h # "Memorial Day"                      WDRel May 30 Mon -1
 
 
 # us/michigan
 Region "us/michigan"
   Include "us"
-  Add   "us/martin luther king"         h # "Martin Luther King Day"       Fixed Jan 15
-  Event "us/michigan/memorial"          h "Memorial Day"                   WDRel May Mon 3rd
-  Event "us/michigan/michigan"          h "Michigan Day"                   Fixed Jan 26
+  Add   "us/martin luther king"   h # "Martin Luther King Day" Fixed Jan 15     
+  Event "us/michigan/memorial"    h   "Memorial Day"           WDRel May Mon 3rd
+  Event "us/michigan/michigan"    h   "Michigan Day"           Fixed Jan 26     
 
 
 # us/minnesota
 Region "us/minnesota"
   Include "us"
-  Event "us/minnesota/minnesota"        h "Minnesota Day"                  Fixed May 11
-  Add   "us/columbus"                   h # "Columbus Day"                 WDRel Oct Mon 2nd
-  Event "us/minnesota/american family"  h "American Family Day"            WDRel Aug Sun 1st
-  Add   "us/memorial"                   h # "Memorial Day"                 WDRel May 30 Mon -1
+  Event "us/minnesota/minnesota"       h   "Minnesota Day"       Fixed May 11       
+  Add   "us/columbus"                  h # "Columbus Day"        WDRel Oct Mon 2nd  
+  Event "us/minnesota/american family" h   "American Family Day" WDRel Aug Sun 1st  
+  Add   "us/memorial"                  h # "Memorial Day"        WDRel May 30 Mon -1
 
 
 # us/mississippi
 Region "us/mississippi"
   Include "us"
-  Event "us/mississippi/robert elee"    h "Robert E.Lee Day"               WDRel Jan Mon 3rd
-  Event "us/mississippi/confederate memorial"  h "Confederate Memorial Day" WDRel Apr 30 Mon -1
-  Event "us/mississippi/jefferson davis"  h "Jefferson Davis Day"          WDRel Jun Mon 1st
+  Event "us/mississippi/robert elee"          h "Robert E.Lee Day"         WDRel Jan Mon 3rd  
+  Event "us/mississippi/confederate memorial" h "Confederate Memorial Day" WDRel Apr 30 Mon -1
+  Event "us/mississippi/jefferson davis"      h "Jefferson Davis Day"      WDRel Jun Mon 1st  
 
 
 # us/missouri
 Region "us/missouri"
   Include "us"
-  Add   "us/columbus"                   h # "Columbus Day"                 WDRel Oct Mon 2nd
-  Add   "us/election"                   h # "Election Day"                 WDRel Nov Mon 1st
-  Event "us/missouri/missouri admission"  h "Missouri Admission Day"       Fixed Aug 10
-  Add   "us/memorial"                   h # "Memorial Day"                 WDRel May 30 Mon -1
-  Event "us/missouri/truman"            h "Truman Day"                     Fixed May  8
-  Add   "us/lincolns"                   h # "Lincoln's Birthday"           Fixed Feb 12
+  Add   "us/columbus"                    h # "Columbus Day"           WDRel Oct Mon 2nd  
+  Add   "us/election"                    h # "Election Day"           WDRel Nov Mon 1st  
+  Event "us/missouri/missouri admission" h   "Missouri Admission Day" Fixed Aug 10       
+  Add   "us/memorial"                    h # "Memorial Day"           WDRel May 30 Mon -1
+  Event "us/missouri/truman"             h   "Truman Day"             Fixed May  8       
+  Add   "us/lincolns"                    h # "Lincoln's Birthday"     Fixed Feb 12       
 
 
 # us/montana
 Region "us/montana"
   Include "us"
-  Add   "us/lincolns"                   h # "Lincoln's Birthday"           Fixed Feb 12
-  Add   "us/columbus"                   h # "Columbus Day"                 WDRel Oct Mon 2nd
-  Event "us/montana/election"           h "Election Day"                   WDRel Nov Tue 1st
-  Add   "us/memorial"                   h # "Memorial Day"                 WDRel May 30 Mon -1
+  Add   "us/lincolns"             h # "Lincoln's Birthday"    Fixed Feb 12       
+  Add   "us/columbus"             h # "Columbus Day"          WDRel Oct Mon 2nd  
+  Event "us/montana/election"     h   "Election Day"          WDRel Nov Tue 1st  
+  Add   "us/memorial"             h # "Memorial Day"          WDRel May 30 Mon -1
 
 
 # us/nebraska
 Region "us/nebraska"
   Include "us"
-  Add   "us/columbus"                   h # "Columbus Day"                 WDRel Oct Mon 2nd
-  Event "us/nebraska/nebraska state"    h "Nebraska State Day"             Fixed Mar  1
-  Add   "us/day after thanksgiving"     h # "Day after Thanksgiving Day"   WDRel Nov  2 Fri +4
-  Add   "us/presidents"                 h # "Presidents Day"               WDRel Feb Mon 3rd
-  Event "us/nebraska/arbor"             h "Arbor Day"                      Fixed Apr 22
-  Add   "us/memorial"                   h # "Memorial Day"                 WDRel May 30 Mon -1
+  Add   "us/columbus"                h # "Columbus Day"               WDRel Oct Mon 2nd  
+  Event "us/nebraska/nebraska state" h   "Nebraska State Day"         Fixed Mar  1       
+  Add   "us/day after thanksgiving"  h # "Day after Thanksgiving Day" WDRel Nov  2 Fri +4
+  Add   "us/presidents"              h # "Presidents Day"             WDRel Feb Mon 3rd  
+  Event "us/nebraska/arbor"          h   "Arbor Day"                  Fixed Apr 22       
+  Add   "us/memorial"                h # "Memorial Day"               WDRel May 30 Mon -1
 
 
 # us/nevada
 Region "us/nevada"
   Include "us"
-  Event "us/nevada/nevada"              h "Nevada Day"                     Fixed Oct 31
-  Add   "us/memorial"                   h # "Memorial Day"                 WDRel May 30 Mon -1
+  Event "us/nevada/nevada"        h   "Nevada Day"            Fixed Oct 31       
+  Add   "us/memorial"             h # "Memorial Day"          WDRel May 30 Mon -1
 
 
 # us/new hampshire
 Region "us/new hampshire"
   Include "us"
-  Add   "us/columbus"                   h # "Columbus Day"                 WDRel Oct Mon 2nd
-  Event "us/new hampshire/memorial"     h "Memorial Day"                   Fixed May 30
-  Add   "us/day after thanksgiving"     h # "Day after Thanksgiving Day"   WDRel Nov  2 Fri +4
-  Add   "us/election"                   h # "Election Day"                 WDRel Nov Mon 1st
-  Event "us/new hampshire/fast"         h "Fast Day"                       WDRel Apr Mon 4th
-  Event "us/new hampshire/new hampshire admission"  h "New Hampshire Admission Day" Fixed Jun 21
+  Add   "us/columbus"                              h # "Columbus Day"                WDRel Oct Mon 2nd  
+  Event "us/new hampshire/memorial"                h   "Memorial Day"                Fixed May 30       
+  Add   "us/day after thanksgiving"                h # "Day after Thanksgiving Day"  WDRel Nov  2 Fri +4
+  Add   "us/election"                              h # "Election Day"                WDRel Nov Mon 1st  
+  Event "us/new hampshire/fast"                    h   "Fast Day"                    WDRel Apr Mon 4th  
+  Event "us/new hampshire/new hampshire admission" h   "New Hampshire Admission Day" Fixed Jun 21       
 
 
 # us/new jersey
 Region "us/new jersey"
   Include "us"
-  Event "us/new jersey/new jersey admission"  h "New Jersey Admission Day" Fixed Dec 18
-  Add   "us/lincolns"                   h # "Lincoln's Birthday"           Fixed Feb 12
-  Add   "us/columbus"                   h # "Columbus Day"                 WDRel Oct Mon 2nd
-  Add   "c/good friday"                 h # "Good Friday"                  Easter -2
-  Add   "us/memorial"                   h # "Memorial Day"                 WDRel May 30 Mon -1
-  Add   "us/election"                   h # "Election Day"                 WDRel Nov Mon 1st
-  Add   "us/martin luther king"         h # "Martin Luther King Day"       Fixed Jan 15
+  Event "us/new jersey/new jersey admission" h   "New Jersey Admission Day" Fixed Dec 18       
+  Add   "us/lincolns"                        h # "Lincoln's Birthday"       Fixed Feb 12       
+  Add   "us/columbus"                        h # "Columbus Day"             WDRel Oct Mon 2nd  
+  Add   "c/good friday"                      h # "Good Friday"              Easter -2          
+  Add   "us/memorial"                        h # "Memorial Day"             WDRel May 30 Mon -1
+  Add   "us/election"                        h # "Election Day"             WDRel Nov Mon 1st  
+  Add   "us/martin luther king"              h # "Martin Luther King Day"   Fixed Jan 15       
 
 
 # us/new mexico
 Region "us/new mexico"
   Include "us"
-  Event "us/new mexico/memorial"        h "Memorial Day"                   Fixed May 25
-  Add   "us/columbus"                   h # "Columbus Day"                 WDRel Oct Mon 2nd
-  Event "us/new mexico/arbor"           h "Arbor Day"                      WDRel Mar Fri 2nd
-  Add   "us/lincolns"                   h # "Lincoln's Birthday"           Fixed Feb 12
+  Event "us/new mexico/memorial"  h   "Memorial Day"          Fixed May 25     
+  Add   "us/columbus"             h # "Columbus Day"          WDRel Oct Mon 2nd
+  Event "us/new mexico/arbor"     h   "Arbor Day"             WDRel Mar Fri 2nd
+  Add   "us/lincolns"             h # "Lincoln's Birthday"    Fixed Feb 12     
 
 
 # us/new york
 Region "us/new york"
   Include "us"
-  Event "us/new york/verrazano"         h "Verrazano Day"                  Fixed Apr 17
-  Event "us/new york/martin luther king"  h "Martin Luther King Day"       WDRel Jan Sun 3rd
-  Event "us/new york/audubon"           h "Audubon Day"                    WDRel Apr Fri 2nd
-  Event "us/new york/flag"             fh "Flag Day"                       WDRel Jun Sun 2nd
-  Add   "us/columbus"                   h # "Columbus Day"                 WDRel Oct Mon 2nd
-  Add   "us/lincolns"                   h # "Lincoln's Birthday"           Fixed Feb 12
-  Event "us/new york/new york ratification"  h "New York Ratification Day" Fixed Jul 26
-  Add   "us/election"                   h # "Election Day"                 WDRel Nov Mon 1st
-  Add   "us/memorial"                   h # "Memorial Day"                 WDRel May 30 Mon -1
+  Event "us/new york/verrazano"             h    "Verrazano Day"             Fixed Apr 17       
+  Event "us/new york/martin luther king"    h    "Martin Luther King Day"    WDRel Jan Sun 3rd  
+  Event "us/new york/audubon"               h    "Audubon Day"               WDRel Apr Fri 2nd  
+  Event "us/new york/flag"                  fh   "Flag Day"                  WDRel Jun Sun 2nd  
+  Add   "us/columbus"                       h  # "Columbus Day"              WDRel Oct Mon 2nd  
+  Add   "us/lincolns"                       h  # "Lincoln's Birthday"        Fixed Feb 12       
+  Event "us/new york/new york ratification" h    "New York Ratification Day" Fixed Jul 26       
+  Add   "us/election"                       h  # "Election Day"              WDRel Nov Mon 1st  
+  Add   "us/memorial"                       h  # "Memorial Day"              WDRel May 30 Mon -1
 
 
 # us/north carolina
 Region "us/north carolina"
   Include "us"
-  Add   "c/easter monday"               h # "Easter Monday"                Easter +1
-  Event "us/north carolina/mecklenburg"  h "Mecklenburg Day"               Fixed May 20
-  Event "us/north carolina/confederate memorial"  h "Confederate Memorial Day" Fixed May 10
-  Add   "us/robert e lee"               h # "Robert E. Lee Day"            Fixed Jan 19
-  Event "us/north carolina/halifax resolutions"  h "Halifax Resolutions Day" Fixed Apr 12
-  Add   "us/memorial"                   h # "Memorial Day"                 WDRel May 30 Mon -1
+  Add   "c/easter monday"                        h # "Easter Monday"            Easter +1          
+  Event "us/north carolina/mecklenburg"          h   "Mecklenburg Day"          Fixed May 20       
+  Event "us/north carolina/confederate memorial" h   "Confederate Memorial Day" Fixed May 10       
+  Add   "us/robert e lee"                        h # "Robert E. Lee Day"        Fixed Jan 19       
+  Event "us/north carolina/halifax resolutions"  h   "Halifax Resolutions Day"  Fixed Apr 12       
+  Add   "us/memorial"                            h # "Memorial Day"             WDRel May 30 Mon -1
 
 
 # us/north dakota
 Region "us/north dakota"
   Include "us"
-  Add   "us/memorial"                   h # "Memorial Day"                 WDRel May 30 Mon -1
-  Add   "c/good friday"                 h # "Good Friday"                  Easter -2
-  Event "us/north dakota/north dakota admission"  h "North Dakota Admission Day" Fixed Nov  2
+  Add   "us/memorial"                            h # "Memorial Day"               WDRel May 30 Mon -1
+  Add   "c/good friday"                          h # "Good Friday"                Easter -2          
+  Event "us/north dakota/north dakota admission" h   "North Dakota Admission Day" Fixed Nov  2       
 
 
 # us/ohio
 Region "us/ohio"
   Include "us"
   Without "us/washingtons"
-  Add   "us/columbus"                   h # "Columbus Day"                 WDRel Oct Mon 2nd
-  Add   "us/memorial"                   h # "Memorial Day"                 WDRel May 30 Mon -1
-  Event "us/ohio/martin luther king"    h "Martin Luther King Day"         WDRel Jan Mon 3rd
-  Event "us/ohio/ohio admission"        h "Ohio Admission Day"             Fixed Mar  1
-  Add   "us/washington-lincoln"         h # "Washington-Lincoln Day"       WDRel Feb Mon 3rd
+  Add   "us/columbus"                h # "Columbus Day"           WDRel Oct Mon 2nd  
+  Add   "us/memorial"                h # "Memorial Day"           WDRel May 30 Mon -1
+  Event "us/ohio/martin luther king" h   "Martin Luther King Day" WDRel Jan Mon 3rd  
+  Event "us/ohio/ohio admission"     h   "Ohio Admission Day"     Fixed Mar  1       
+  Add   "us/washington-lincoln"      h # "Washington-Lincoln Day" WDRel Feb Mon 3rd  
 
 
 # us/oklahoma
 Region "us/oklahoma"
   Include "us"
-  Event "us/oklahoma/bird"              h "Bird Day"                       Fixed May  1
-  Event "us/oklahoma/indian"            h "Indian Day"                     Fixed Aug 12
-  Add   "mothers"                       h # "Mother's Day"                 WDRel May Sun 2nd
-  Event "us/oklahoma/oklahoma statehood"  h "Oklahoma Statehood Day"       Fixed Nov 16
-  Add   "us/columbus"                   h # "Columbus Day"                 WDRel Oct Mon 2nd
-  Event "us/oklahoma/cherokee strip"    h "Cherokee Strip Day"             Fixed Sep 16
-  Event "us/oklahoma/oklahoma"          h "Oklahoma Day"                   Fixed Apr 22
-  Event "us/oklahoma/oklahoma historical"  h "Oklahoma Historical Day"     Fixed Oct 10
-  Add   "us/election"                   h # "Election Day"                 WDRel Nov Mon 1st
-  Event "us/oklahoma/senior citizens"   h "Senior Citizens Day"            Fixed Jun  9
-  Add   "us/thomas jeffersons"          h # "Thomas Jefferson's Birthday"  Fixed Apr 13
-  Event "us/oklahoma/will rogers"       h "Will Rogers Day"                Fixed Nov  4
-  Add   "us/memorial"                   h # "Memorial Day"                 WDRel May 30 Mon -1
+  Event "us/oklahoma/bird"                h   "Bird Day"                    Fixed May  1       
+  Event "us/oklahoma/indian"              h   "Indian Day"                  Fixed Aug 12       
+  Add   "mothers"                         h # "Mother's Day"                WDRel May Sun 2nd  
+  Event "us/oklahoma/oklahoma statehood"  h   "Oklahoma Statehood Day"      Fixed Nov 16       
+  Add   "us/columbus"                     h # "Columbus Day"                WDRel Oct Mon 2nd  
+  Event "us/oklahoma/cherokee strip"      h   "Cherokee Strip Day"          Fixed Sep 16       
+  Event "us/oklahoma/oklahoma"            h   "Oklahoma Day"                Fixed Apr 22       
+  Event "us/oklahoma/oklahoma historical" h   "Oklahoma Historical Day"     Fixed Oct 10       
+  Add   "us/election"                     h # "Election Day"                WDRel Nov Mon 1st  
+  Event "us/oklahoma/senior citizens"     h   "Senior Citizens Day"         Fixed Jun  9       
+  Add   "us/thomas jeffersons"            h # "Thomas Jefferson's Birthday" Fixed Apr 13       
+  Event "us/oklahoma/will rogers"         h   "Will Rogers Day"             Fixed Nov  4       
+  Add   "us/memorial"                     h # "Memorial Day"                WDRel May 30 Mon -1
 
 
 # us/oregon
 Region "us/oregon"
   Include "us"
-  Add   "us/memorial"                   h # "Memorial Day"                 WDRel May 30 Mon -1
-  Event "us/oregon/lincolns"            h "Lincoln's Birthday"             WDRel Feb Mon 1st
-  Event "us/oregon/oregon statehood"    h "Oregon Statehood Day"           Fixed Feb 14
+  Add   "us/memorial"                h # "Memorial Day"         WDRel May 30 Mon -1
+  Event "us/oregon/lincolns"         h   "Lincoln's Birthday"   WDRel Feb Mon 1st  
+  Event "us/oregon/oregon statehood" h   "Oregon Statehood Day" Fixed Feb 14       
 
 
 # us/pennsylvania
 Region "us/pennsylvania"
   Include "us"
-  Add   "us/election"                   h # "Election Day"                 WDRel Nov Mon 1st
-  Event "us/pennsylvania/charter"       h "Charter Day"                    Fixed Mar  4
-  Add   "us/columbus"                   h # "Columbus Day"                 WDRel Oct Mon 2nd
-  Event "us/pennsylvania/barry"         h "Barry Day"                      Fixed Sep 13
-  Add   "c/good friday"                 h # "Good Friday"                  Easter -2
-  Event "us/pennsylvania/pennsylvania admission"  h "Pennsylvania Admission Day" Fixed Dec 12
-  Add   "us/memorial"                   h # "Memorial Day"                 WDRel May 30 Mon -1
-  Add   "us/flag"                      fh # "Flag Day"                     Fixed Jun 14
-  Add   "us/martin luther king"         h # "Martin Luther King Day"       Fixed Jan 15
-  Add   "us/presidents"                 h # "Presidents Day"               WDRel Feb Mon 3rd
+  Add   "us/election"                            h  # "Election Day"               WDRel Nov Mon 1st  
+  Event "us/pennsylvania/charter"                h    "Charter Day"                Fixed Mar  4       
+  Add   "us/columbus"                            h  # "Columbus Day"               WDRel Oct Mon 2nd  
+  Event "us/pennsylvania/barry"                  h    "Barry Day"                  Fixed Sep 13       
+  Add   "c/good friday"                          h  # "Good Friday"                Easter -2          
+  Event "us/pennsylvania/pennsylvania admission" h    "Pennsylvania Admission Day" Fixed Dec 12       
+  Add   "us/memorial"                            h  # "Memorial Day"               WDRel May 30 Mon -1
+  Add   "us/flag"                                fh # "Flag Day"                   Fixed Jun 14       
+  Add   "us/martin luther king"                  h  # "Martin Luther King Day"     Fixed Jan 15       
+  Add   "us/presidents"                          h  # "Presidents Day"             WDRel Feb Mon 3rd  
 
 
 # us/rhode island
 Region "us/rhode island"
   Include "us"
-  Event "us/rhode island/rhode island admission"  h "Rhode Island Admission Day" Fixed May 29
-  Event "us/rhode island/victory"       h "Victory Day"                    WDRel Aug Mon 2nd
-  Event "us/rhode island/arbor"         h "Arbor Day"                      WDRel May Fri 2nd
-  Add   "us/columbus"                   h # "Columbus Day"                 WDRel Oct Mon 2nd
-  Add   "us/memorial"                   h # "Memorial Day"                 WDRel May 30 Mon -1
-  Event "us/rhode island/rhode island independence"  h "Rhode Island Independence Day" Fixed May  4
-  Add   "us/election"                   h # "Election Day"                 WDRel Nov Mon 1st
+  Event "us/rhode island/rhode island admission"    h   "Rhode Island Admission Day"    Fixed May 29       
+  Event "us/rhode island/victory"                   h   "Victory Day"                   WDRel Aug Mon 2nd  
+  Event "us/rhode island/arbor"                     h   "Arbor Day"                     WDRel May Fri 2nd  
+  Add   "us/columbus"                               h # "Columbus Day"                  WDRel Oct Mon 2nd  
+  Add   "us/memorial"                               h # "Memorial Day"                  WDRel May 30 Mon -1
+  Event "us/rhode island/rhode island independence" h   "Rhode Island Independence Day" Fixed May  4       
+  Add   "us/election"                               h # "Election Day"                  WDRel Nov Mon 1st  
 
 
 # us/south carolina
 Region "us/south carolina"
   Include "us"
-  Event "us/south carolina/confederate memorial"  h "Confederate Memorial Day" Fixed May 10
-  Add   "us/jefferson davis"            h # "Jefferson Davis Day"          Fixed Jun  3
-  Event "us/south carolina/south carolina admission"  h "South Carolina Admission Day" Fixed May 23
-  Add   "us/robert e lee"               h # "Robert E. Lee Day"            Fixed Jan 19
-  Add   "us/election"                   h # "Election Day"                 WDRel Nov Mon 1st
-  Add   "us/martin luther king"         h # "Martin Luther King Day"       Fixed Jan 15
+  Event "us/south carolina/confederate memorial"     h   "Confederate Memorial Day"     Fixed May 10     
+  Add   "us/jefferson davis"                         h # "Jefferson Davis Day"          Fixed Jun  3     
+  Event "us/south carolina/south carolina admission" h   "South Carolina Admission Day" Fixed May 23     
+  Add   "us/robert e lee"                            h # "Robert E. Lee Day"            Fixed Jan 19     
+  Add   "us/election"                                h # "Election Day"                 WDRel Nov Mon 1st
+  Add   "us/martin luther king"                      h # "Martin Luther King Day"       Fixed Jan 15     
 
 
 # us/south dakota
 Region "us/south dakota"
   Include "us"
-  Event "us/south dakota/south dakota admission"  h "South Dakota Admission Day" Fixed Nov  2
-  Event "us/south dakota/memorial"      h "Memorial Day"                   Fixed May 30
-  Event "us/south dakota/pioneers"      h "Pioneers' Day"                  WDRel Oct Mon 2nd
-  Add   "us/presidents"                 h # "Presidents Day"               WDRel Feb Mon 3rd
+  Event "us/south dakota/south dakota admission" h   "South Dakota Admission Day" Fixed Nov  2     
+  Event "us/south dakota/memorial"               h   "Memorial Day"               Fixed May 30     
+  Event "us/south dakota/pioneers"               h   "Pioneers' Day"              WDRel Oct Mon 2nd
+  Add   "us/presidents"                          h # "Presidents Day"             WDRel Feb Mon 3rd
 
 
 # us/tennessee
 Region "us/tennessee"
   Include "us"
-  Add   "c/good friday"                 h # "Good Friday"                  Easter -2
-  Event "us/tennessee/tennesse statehood"  h "Tennesse Statehood Day"      Fixed Jun  1
-  Add   "us/columbus"                   h # "Columbus Day"                 WDRel Oct Mon 2nd
-  Add   "us/memorial"                   h # "Memorial Day"                 WDRel May 30 Mon -1
-  Event "us/tennessee/confederate memorial"  h "Confederate Memorial Day"  Fixed Jun  3
-  Add   "us/election"                   h # "Election Day"                 WDRel Nov Mon 1st
+  Add   "c/good friday"                     h # "Good Friday"              Easter -2          
+  Event "us/tennessee/tennesse statehood"   h   "Tennesse Statehood Day"   Fixed Jun  1       
+  Add   "us/columbus"                       h # "Columbus Day"             WDRel Oct Mon 2nd  
+  Add   "us/memorial"                       h # "Memorial Day"             WDRel May 30 Mon -1
+  Event "us/tennessee/confederate memorial" h   "Confederate Memorial Day" Fixed Jun  3       
+  Add   "us/election"                       h # "Election Day"             WDRel Nov Mon 1st  
 
 
 # us/texas
 Region "us/texas"
   Include "us"
-  Event "us/texas/san jacinto"          h "San Jacinto Day"                Fixed Apr 21
-  Event "us/texas/confederate heroes"   h "Confederate Heroes Day"         Fixed Jan 19
-  Event "us/texas/alamo"                h "Alamo Day"                      Fixed Mar  6
-  Add   "us/columbus"                   h # "Columbus Day"                 WDRel Oct Mon 2nd
-  Event "us/texas/austin"               h "Austin Day"                     Fixed Nov  3
-  Event "us/texas/juneteenth"           h "Juneteenth"                     Fixed Jun 19
-  Event "us/texas/lyndon b johnsons"    h "Lyndon B. Johnson's Birthday"   Fixed Aug 27
-  Event "us/texas/texas pioneers"       h "Texas Pioneers' Day"            Fixed Aug 12
-  Event "us/texas/texas admission"      h "Texas Admission Day"            Fixed Dec 29
-  Add   "us/memorial"                   h # "Memorial Day"                 WDRel May 30 Mon -1
-  Event "us/texas/texas independence"   h "Texas Independence Day"         Fixed Mar  2
-  Add   "us/election"                   h # "Election Day"                 WDRel Nov Mon 1st
+  Event "us/texas/san jacinto"        h   "San Jacinto Day"              Fixed Apr 21       
+  Event "us/texas/confederate heroes" h   "Confederate Heroes Day"       Fixed Jan 19       
+  Event "us/texas/alamo"              h   "Alamo Day"                    Fixed Mar  6       
+  Add   "us/columbus"                 h # "Columbus Day"                 WDRel Oct Mon 2nd  
+  Event "us/texas/austin"             h   "Austin Day"                   Fixed Nov  3       
+  Event "us/texas/juneteenth"         h   "Juneteenth"                   Fixed Jun 19       
+  Event "us/texas/lyndon b johnsons"  h   "Lyndon B. Johnson's Birthday" Fixed Aug 27       
+  Event "us/texas/texas pioneers"     h   "Texas Pioneers' Day"          Fixed Aug 12       
+  Event "us/texas/texas admission"    h   "Texas Admission Day"          Fixed Dec 29       
+  Add   "us/memorial"                 h # "Memorial Day"                 WDRel May 30 Mon -1
+  Event "us/texas/texas independence" h   "Texas Independence Day"       Fixed Mar  2       
+  Add   "us/election"                 h # "Election Day"                 WDRel Nov Mon 1st  
 
 
 # us/utah
 Region "us/utah"
   Include "us"
-  Add   "us/columbus"                   h # "Columbus Day"                 WDRel Oct Mon 2nd
-  Event "us/utah/arbor"                 h "Arbor Day"                      WDRel Apr Fri last
-  Add   "us/lincolns"                   h # "Lincoln's Birthday"           Fixed Feb 12
-  Event "us/utah/utah admission"        h "Utah Admission Day"             Fixed Jan  4
-  Add   "us/memorial"                   h # "Memorial Day"                 WDRel May 30 Mon -1
-  Event "us/utah/pioneer"               h "Pioneer Day"                    Fixed Jul 24
+  Add   "us/columbus"             h # "Columbus Day"          WDRel Oct Mon 2nd  
+  Event "us/utah/arbor"           h   "Arbor Day"             WDRel Apr Fri last 
+  Add   "us/lincolns"             h # "Lincoln's Birthday"    Fixed Feb 12       
+  Event "us/utah/utah admission"  h   "Utah Admission Day"    Fixed Jan  4       
+  Add   "us/memorial"             h # "Memorial Day"          WDRel May 30 Mon -1
+  Event "us/utah/pioneer"         h   "Pioneer Day"           Fixed Jul 24       
 
 
 # us/vermont
 Region "us/vermont"
   Include "us"
-  Add   "us/columbus"                   h # "Columbus Day"                 WDRel Oct Mon 2nd
-  Event "us/vermont/memorial"           h "Memorial Day"                   Fixed May 30
-  Add   "us/lincolns"                   h # "Lincoln's Birthday"           Fixed Feb 12
-  Event "us/vermont/vermont"            h "Vermont Day"                    Fixed Mar  4
-  Event "us/vermont/bennington battle"  h "Bennington Battle Day"          Fixed Aug 16
-  Event "us/vermont/town meeting"       h "Town Meeting Day"               WDRel Mar Tue 1st
+  Add   "us/columbus"                  h # "Columbus Day"          WDRel Oct Mon 2nd
+  Event "us/vermont/memorial"          h   "Memorial Day"          Fixed May 30     
+  Add   "us/lincolns"                  h # "Lincoln's Birthday"    Fixed Feb 12     
+  Event "us/vermont/vermont"           h   "Vermont Day"           Fixed Mar  4     
+  Event "us/vermont/bennington battle" h   "Bennington Battle Day" Fixed Aug 16     
+  Event "us/vermont/town meeting"      h   "Town Meeting Day"      WDRel Mar Tue 1st
 
 
 # us/virginia
 Region "us/virginia"
   Include "us"
-  Event "us/virginia/crater"            h "Crater Day"                     Fixed Jul 30
-  Event "us/virginia/cape henry"        h "Cape Henry Day"                 Fixed Apr 26
-  Add   "us/election"                   h # "Election Day"                 WDRel Nov Mon 1st
-  Add   "us/memorial"                   h # "Memorial Day"                 WDRel May 30 Mon -1
-  Add   "us/columbus"                   h # "Columbus Day"                 WDRel Oct Mon 2nd
-  Event "us/virginia/confederate memorial"  h "Confederate Memorial Day"   Fixed May 30
-  Event "us/virginia/royalist fast"     h "Royalist Fast Day"              Fixed Jan 30
-  Event "us/virginia/jamestown"         h "Jamestown Day"                  Fixed May 13
-  Event "us/virginia/lee-jackson"       h "Lee-Jackson Day"                WDRel Jan Mon 3rd
-  Event "us/virginia/virginia ratification"  h "Virginia Ratification Day" Fixed Jun 25
+  Event "us/virginia/crater"                h   "Crater Day"                Fixed Jul 30       
+  Event "us/virginia/cape henry"            h   "Cape Henry Day"            Fixed Apr 26       
+  Add   "us/election"                       h # "Election Day"              WDRel Nov Mon 1st  
+  Add   "us/memorial"                       h # "Memorial Day"              WDRel May 30 Mon -1
+  Add   "us/columbus"                       h # "Columbus Day"              WDRel Oct Mon 2nd  
+  Event "us/virginia/confederate memorial"  h   "Confederate Memorial Day"  Fixed May 30       
+  Event "us/virginia/royalist fast"         h   "Royalist Fast Day"         Fixed Jan 30       
+  Event "us/virginia/jamestown"             h   "Jamestown Day"             Fixed May 13       
+  Event "us/virginia/lee-jackson"           h   "Lee-Jackson Day"           WDRel Jan Mon 3rd  
+  Event "us/virginia/virginia ratification" h   "Virginia Ratification Day" Fixed Jun 25       
 
 
 # us/washington
 Region "us/washington"
   Include "us"
-  Event "us/washington/washington admission"  h "Washington Admission Day" Fixed Nov 11
-  Add   "us/lincolns"                   h # "Lincoln's Birthday"           Fixed Feb 12
-  Add   "us/memorial"                   h # "Memorial Day"                 WDRel May 30 Mon -1
+  Event "us/washington/washington admission" h   "Washington Admission Day" Fixed Nov 11       
+  Add   "us/lincolns"                        h # "Lincoln's Birthday"       Fixed Feb 12       
+  Add   "us/memorial"                        h # "Memorial Day"             WDRel May 30 Mon -1
 
 
 # us/washington dc
 Region "us/washington dc"
   Include "us"
-  Add   "us/memorial"                   h # "Memorial Day"                 WDRel May 30 Mon -1
-  Add   "us/columbus"                   h # "Columbus Day"                 WDRel Oct Mon 2nd
-  Add   "us/election"                   h # "Election Day"                 WDRel Nov Mon 1st
-  Event "us/washington dc/arbor"        h "Arbor Day"                      WDRel Apr Fri 3rd
+  Add   "us/memorial"             h # "Memorial Day"          WDRel May 30 Mon -1
+  Add   "us/columbus"             h # "Columbus Day"          WDRel Oct Mon 2nd  
+  Add   "us/election"             h # "Election Day"          WDRel Nov Mon 1st  
+  Event "us/washington dc/arbor"  h   "Arbor Day"             WDRel Apr Fri 3rd  
 
 
 # us/west virginia
 Region "us/west virginia"
   Include "us"
   Without "us/washingtons"
-  Add   "us/columbus"                   h # "Columbus Day"                 WDRel Oct Mon 2nd
-  Add   "us/memorial"                   h # "Memorial Day"                 WDRel May 30 Mon -1
-  Add   "us/election"                   h # "Election Day"                 WDRel Nov Mon 1st
-  Event "us/west virginia/west virginia"  h "West Virginia Day"            Fixed Jun 20
-  Add   "us/lincolns"                   h # "Lincoln's Birthday"           Fixed Feb 12
-  Add   "us/washington"                 h # "Washington Day"               WDRel Feb Mon 3rd
+  Add   "us/columbus"                    h # "Columbus Day"       WDRel Oct Mon 2nd  
+  Add   "us/memorial"                    h # "Memorial Day"       WDRel May 30 Mon -1
+  Add   "us/election"                    h # "Election Day"       WDRel Nov Mon 1st  
+  Event "us/west virginia/west virginia" h   "West Virginia Day"  Fixed Jun 20       
+  Add   "us/lincolns"                    h # "Lincoln's Birthday" Fixed Feb 12       
+  Add   "us/washington"                  h # "Washington Day"     WDRel Feb Mon 3rd  
 
 
 # us/wisconsin
 Region "us/wisconsin"
   Include "us"
   Without "us/washingtons"
-  Add   "us/election"                   h # "Election Day"                 WDRel Nov Mon 1st
-  Add   "us/washington-lincoln"         h # "Washington-Lincoln Day"       WDRel Feb Mon 3rd
-  Add   "us/columbus"                   h # "Columbus Day"                 WDRel Oct Mon 2nd
-  Add   "c/good friday"                 h # "Good Friday"                  Easter -2
-  Event "us/wisconsin/wisconsin"        h "Wisconsin Day"                  Fixed May 29
-  Add   "us/memorial"                   h # "Memorial Day"                 WDRel May 30 Mon -1
-  Event "us/wisconsin/primary election"  h "Primary Election Day"          WDRel Sep Tue 1st
+  Add   "us/election"                   h # "Election Day"           WDRel Nov Mon 1st  
+  Add   "us/washington-lincoln"         h # "Washington-Lincoln Day" WDRel Feb Mon 3rd  
+  Add   "us/columbus"                   h # "Columbus Day"           WDRel Oct Mon 2nd  
+  Add   "c/good friday"                 h # "Good Friday"            Easter -2          
+  Event "us/wisconsin/wisconsin"        h   "Wisconsin Day"          Fixed May 29       
+  Add   "us/memorial"                   h # "Memorial Day"           WDRel May 30 Mon -1
+  Event "us/wisconsin/primary election" h   "Primary Election Day"   WDRel Sep Tue 1st  
 
 
 # us/wyoming
 Region "us/wyoming"
   Include "us"
   Without "us/washingtons"
-  Add   "us/memorial"                   h # "Memorial Day"                 WDRel May 30 Mon -1
-  Event "us/wyoming/arbor"              h "Arbor Day"                      WDRel Apr Mon last
-  Add   "us/election"                   h # "Election Day"                 WDRel Nov Mon 1st
-  Add   "us/columbus"                   h # "Columbus Day"                 WDRel Oct Mon 2nd
-  Event "us/wyoming/wyoming"            h "Wyoming Day"                    Fixed Dec 10
-  Add   "us/washington-lincoln"         h # "Washington-Lincoln Day"       WDRel Feb Mon 3rd
-  Event "us/wyoming/primary election"   h "Primary Election Day"           WDRel Sep Tue 2nd
-  Event "us/wyoming/wyoming statehood"  - "Wyoming Statehood Day"          Fixed Jul 10
+  Add   "us/memorial"                  h # "Memorial Day"           WDRel May 30 Mon -1
+  Event "us/wyoming/arbor"             h   "Arbor Day"              WDRel Apr Mon last 
+  Add   "us/election"                  h # "Election Day"           WDRel Nov Mon 1st  
+  Add   "us/columbus"                  h # "Columbus Day"           WDRel Oct Mon 2nd  
+  Event "us/wyoming/wyoming"           h   "Wyoming Day"            Fixed Dec 10       
+  Add   "us/washington-lincoln"        h # "Washington-Lincoln Day" WDRel Feb Mon 3rd  
+  Event "us/wyoming/primary election"  h   "Primary Election Day"   WDRel Sep Tue 2nd  
+  Event "us/wyoming/wyoming statehood" -   "Wyoming Statehood Day"  Fixed Jul 10       
 
 
 # vanuatu
-Region "vanuatu"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "unity"                         - # "Unity Day"                    Fixed Feb 22
-  Add   "c/easter"                      - # "Easter"                       Easter +0
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Add   "c/ascension"                   - # "Ascension"                    Easter +39
-  Event "vanuatu/independence"          - "Independence Day"               Fixed Jul 30
-  Add   "c/assumption"                  - # "Assumption Day"               Fixed Aug 15
-  Event "vanuatu/constitution"          - "Constitution Day"               Fixed Oct  5
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "vu"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1
+  Add   "unity"                   - # "Unity Day"             Fixed Feb 22
+  Add   "c/easter"                - # "Easter"                Easter +0   
+  Add   "labor"                   - # "Labor Day"             Fixed May  1
+  Add   "c/ascension"             - # "Ascension"             Easter +39  
+  Event "vu/independence"         -   "Independence Day"      Fixed Jul 30
+  Add   "c/assumption"            - # "Assumption Day"        Fixed Aug 15
+  Event "vu/constitution"         -   "Constitution Day"      Fixed Oct  5
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25
 
 
 # vatican city
 Region "vatican city"
-  Event "vatican city/world peace"      - "World Peace Day"                Fixed Jan  1
-  Add   "saints/mary mother"            - # "Mary, Mother of God"          Fixed Jan  1
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "c/epiphany"                    - # "Epiphany"                     Fixed Jan  6
-  Event "vatican city/lateranensi pacts"  - "Anniversary of Lateranensi Pacts" Fixed Feb 11
-  Add   "saints/joseph"                 - # "St. Joseph"                   Fixed Mar 19
-  Add   "c/holy thursday"               - # "Holy Thursday"                Easter -3
-  Add   "c/good friday"                 - # "Good Friday"                  Easter -2
-  Add   "c/easter"                      - # "Easter"                       Easter +0
-  Add   "saints/joseph the worker"      - # "St. Joseph the Worker"        Fixed May  1
-  Add   "c/ascension"                   - # "Ascension"                    Easter +39
-  Add   "c/pentecost"                   - # "Pentecost"                    Easter +49
-  Add   "c/corpus christi"              - # "Corpus Christi"               Easter +60
-  Add   "saints/paul"                   - # "St. Paul"                     Fixed Jun 29
-  Add   "saints/peter"                  - # "St. Peter"                    Fixed Jun 29
-  Add   "c/assumption"                  - # "Assumption Day"               Fixed Aug 15
-  Event "vatican city/pope election"    - "Anniversary of the Pope's election" Fixed Oct 16
-  Add   "c/all saints"                  - # "All Saints Day"               Fixed Nov  1
-  Add   "c/all souls"                   - # "All Souls Day"                Fixed Nov  2
-  Add   "c/immaculate conception"       - # "Immaculate Conception"        Fixed Dec  8
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
-  Add   "saints/stephen"                - # "St. Stephen"                  Fixed Dec 26
+  Event "vatican city/world peace"       -   "World Peace Day"                    Fixed Jan  1
+  Add   "saints/mary mother"             - # "Mary, Mother of God"                Fixed Jan  1
+  Add   "new year"                       - # "New Year's Day"                     Fixed Jan  1
+  Add   "c/epiphany"                     - # "Epiphany"                           Fixed Jan  6
+  Event "vatican city/lateranensi pacts" -   "Anniversary of Lateranensi Pacts"   Fixed Feb 11
+  Add   "saints/joseph"                  - # "St. Joseph"                         Fixed Mar 19
+  Add   "c/holy thursday"                - # "Holy Thursday"                      Easter -3   
+  Add   "c/good friday"                  - # "Good Friday"                        Easter -2   
+  Add   "c/easter"                       - # "Easter"                             Easter +0   
+  Add   "saints/joseph the worker"       - # "St. Joseph the Worker"              Fixed May  1
+  Add   "c/ascension"                    - # "Ascension"                          Easter +39  
+  Add   "c/pentecost"                    - # "Pentecost"                          Easter +49  
+  Add   "c/corpus christi"               - # "Corpus Christi"                     Easter +60  
+  Add   "saints/paul"                    - # "St. Paul"                           Fixed Jun 29
+  Add   "saints/peter"                   - # "St. Peter"                          Fixed Jun 29
+  Add   "c/assumption"                   - # "Assumption Day"                     Fixed Aug 15
+  Event "vatican city/pope election"     -   "Anniversary of the Pope's election" Fixed Oct 16
+  Add   "c/all saints"                   - # "All Saints Day"                     Fixed Nov  1
+  Add   "c/all souls"                    - # "All Souls Day"                      Fixed Nov  2
+  Add   "c/immaculate conception"        - # "Immaculate Conception"              Fixed Dec  8
+  Add   "c/christmas"                    - # "Christmas Day"                      Fixed Dec 25
+  Add   "saints/stephen"                 - # "St. Stephen"                        Fixed Dec 26
 
 
 # venezuela
-Region "venezuela"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "c/epiphany"                    - # "Epiphany"                     Fixed Jan  6
-  Event "venezuela/teachers"            - "Teacher's Day"                  Fixed Jan 15
-  Add   "c/easter"                      - # "Easter"                       Easter +0
-  Event "venezuela/declaration of independence"  - "Declaration of Independence" Fixed Apr 19
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Add   "c/ascension"                   - # "Ascension"                    Easter +39
-  Event "venezuela/battle of carabobo"  - "Battle of Carabobo Day"         Fixed Jun 24
-  Add   "saints/paul"                   - # "St. Paul"                     Fixed Jun 29
-  Add   "saints/peter"                  - # "St. Peter"                    Fixed Jun 29
-  Event "venezuela/independence"        - "Independence Day"               Fixed Jul  5
-  Event "venezuela/bolivars"            - "Bolivar's Birthday"             Fixed Jul 24
-  Add   "c/assumption"                  - # "Assumption Day"               Fixed Aug 15
-  Event "venezuela/civil servants"      - "Civil Servants' Day"            Fixed Sep  4
-  Add   "columbus"                      - # "Columbus Day"                 Fixed Oct 12
-  Add   "c/all saints"                  - # "All Saints Day"               Fixed Nov  1
-  Add   "c/immaculate conception"       - # "Immaculate Conception"        Fixed Dec  8
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
-  Add   "new years eve"                 - # "New Year's Eve"               Fixed Dec 31
+Region "ve"
+  Add   "new year"                       - # "New Year's Day"              Fixed Jan  1
+  Add   "c/epiphany"                     - # "Epiphany"                    Fixed Jan  6
+  Event "ve/teachers"                    -   "Teacher's Day"               Fixed Jan 15
+  Add   "c/easter"                       - # "Easter"                      Easter +0   
+  Event "ve/declaration of independence" -   "Declaration of Independence" Fixed Apr 19
+  Add   "labor"                          - # "Labor Day"                   Fixed May  1
+  Add   "c/ascension"                    - # "Ascension"                   Easter +39  
+  Event "ve/battle of carabobo"          -   "Battle of Carabobo Day"      Fixed Jun 24
+  Add   "saints/paul"                    - # "St. Paul"                    Fixed Jun 29
+  Add   "saints/peter"                   - # "St. Peter"                   Fixed Jun 29
+  Event "ve/independence"                -   "Independence Day"            Fixed Jul  5
+  Event "ve/bolivars"                    -   "Bolivar's Birthday"          Fixed Jul 24
+  Add   "c/assumption"                   - # "Assumption Day"              Fixed Aug 15
+  Event "ve/civil servants"              -   "Civil Servants' Day"         Fixed Sep  4
+  Add   "columbus"                       - # "Columbus Day"                Fixed Oct 12
+  Add   "c/all saints"                   - # "All Saints Day"              Fixed Nov  1
+  Add   "c/immaculate conception"        - # "Immaculate Conception"       Fixed Dec  8
+  Add   "c/christmas"                    - # "Christmas Day"               Fixed Dec 25
+  Add   "new years eve"                  - # "New Year's Eve"              Fixed Dec 31
 
 
 # vietnam
 Region "vietnam"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "vietnam/founding of the communist party"  - "Founding of the Communist Party" Fixed Feb  3
-  Event "vietnam/emperor-founder hung vuongs"  - "Emperor-Founder Hung Vuong's Day" Fixed Apr  7
-  Event "vietnam/liberation of saigon"  - "Liberation of Saigon"           Fixed Apr 30
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Event "vietnam/independence"          - "Independence Day"               Fixed Jun 14
-  Event "vietnam/day of the nation"     - "Day of the Nation"              Fixed Sep  2
+  Add   "new year"                                - # "New Year's Day"                   Fixed Jan  1
+  Event "vietnam/founding of the communist party" -   "Founding of the Communist Party"  Fixed Feb  3
+  Event "vietnam/emperor-founder hung vuongs"     -   "Emperor-Founder Hung Vuong's Day" Fixed Apr  7
+  Event "vietnam/liberation of saigon"            -   "Liberation of Saigon"             Fixed Apr 30
+  Add   "labor"                                   - # "Labor Day"                        Fixed May  1
+  Event "vietnam/independence"                    -   "Independence Day"                 Fixed Jun 14
+  Event "vietnam/day of the nation"               -   "Day of the Nation"                Fixed Sep  2
 
 
 # virgin islands
 Region "virgin islands"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "virgin islands/transfer"       - "Transfer Day"                   WDRel Mar Mon last
-  Add   "c/easter"                      - # "Easter"                       Easter +0
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Event "virgin islands/organic act"    - "Organic Act Day"                WDRel Jun Mon 3rd
-  Event "virgin islands/danish west indies emancipation"  - "Danish West Indies Emancipation Day" Fixed Jul  3
-  Event "virgin islands/hurricane supplication"  - "Hurricane Supplication Day" WDRel Jul Mon 4th
-  Event "virgin islands/nicole robin"   - "Nicole Robin Day"               Fixed Aug  4
-  Add   "columbus"                      - # "Columbus Day"                 Fixed Oct 12
-  Event "virgin islands/hurricane thanksgiving"  - "Hurricane Thanksgiving Day" WDRel Oct Mon 3rd
-  Event "virgin islands/liberty"        - "Liberty Day"                    WDRel Nov Mon 1st
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+  Add   "new year"                                       - # "New Year's Day"                      Fixed Jan  1      
+  Event "virgin islands/transfer"                        -   "Transfer Day"                        WDRel Mar Mon last
+  Add   "c/easter"                                       - # "Easter"                              Easter +0         
+  Add   "labor"                                          - # "Labor Day"                           Fixed May  1      
+  Event "virgin islands/organic act"                     -   "Organic Act Day"                     WDRel Jun Mon 3rd 
+  Event "virgin islands/danish west indies emancipation" -   "Danish West Indies Emancipation Day" Fixed Jul  3      
+  Event "virgin islands/hurricane supplication"          -   "Hurricane Supplication Day"          WDRel Jul Mon 4th 
+  Event "virgin islands/nicole robin"                    -   "Nicole Robin Day"                    Fixed Aug  4      
+  Add   "columbus"                                       - # "Columbus Day"                        Fixed Oct 12      
+  Event "virgin islands/hurricane thanksgiving"          -   "Hurricane Thanksgiving Day"          WDRel Oct Mon 3rd 
+  Event "virgin islands/liberty"                         -   "Liberty Day"                         WDRel Nov Mon 1st 
+  Add   "c/christmas"                                    - # "Christmas Day"                       Fixed Dec 25      
 
 
 # western samoa
 Region "western samoa"
-  Add   "new year 2d"                   - # "New Year"                     Fixed Jan  1  2 days
-  Add   "c/easter"                      - # "Easter"                       Easter +0
-  Add   "anzac"                         - # "ANZAC Day"                    Fixed Apr 25
-  Event "western samoa/independence"    - "Independence Celebration Day"   Fixed Jun  1
-  Event "western samoa/independence2"   - "Independence Celebration"       Fixed Jun  1  3 days
-  Add   "c/whitmonday"                  - # "Whitmonday"                   Easter +50
-  Event "western samoa/white sunday"    - "White Sunday"                   WDRel Oct Sun 2nd
-  Event "western samoa/arbor"           - "Arbor Day"                      WDRel Nov Fri 1st
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
-  Add   "c/boxing"                      - # "Boxing Day"                   Fixed Dec 26
+  Add   "new year 2d"                 - # "New Year"                     Fixed Jan  1  2 days
+  Add   "c/easter"                    - # "Easter"                       Easter +0           
+  Add   "anzac"                       - # "ANZAC Day"                    Fixed Apr 25        
+  Event "western samoa/independence"  -   "Independence Celebration Day" Fixed Jun  1        
+  Event "western samoa/independence2" -   "Independence Celebration"     Fixed Jun  1  3 days
+  Add   "c/whitmonday"                - # "Whitmonday"                   Easter +50          
+  Event "western samoa/white sunday"  -   "White Sunday"                 WDRel Oct Sun 2nd   
+  Event "western samoa/arbor"         -   "Arbor Day"                    WDRel Nov Fri 1st   
+  Add   "c/christmas"                 - # "Christmas Day"                Fixed Dec 25        
+  Add   "c/boxing"                    - # "Boxing Day"                   Fixed Dec 26        
+
+
 
 
 # yemen
-Region "yemen"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "womens"                        - # "Int. Women's Day"             Fixed Mar  8
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Event "yemen/corrective movement"     - "Corrective Movement Anniversary" Fixed Jun 13
-  Event "yemen/national"                - "National Day"                   Fixed Oct 14
+Region "ye"
+  Add   "new year"                - # "New Year's Day"                  Fixed Jan  1
+  Add   "womens"                  - # "Int. Women's Day"                Fixed Mar  8
+  Add   "labor"                   - # "Labor Day"                       Fixed May  1
+  Event "ye/corrective movement"  -   "Corrective Movement Anniversary" Fixed Jun 13
+  Event "ye/national"             -   "National Day"                    Fixed Oct 14
 
 
 # yugoslavia
-Region "yugoslavia"
-  Add   "new year 2d"                   - # "New Year"                     Fixed Jan  1  2 days
-  Add   "orthodox/christmas"            - # "Christmas Day"                Julian_Fixed Dec 25
-  Add   "orthodox/new year"             - # "Orthodox New Year"            Julian_Fixed Jan  1
-  Event "yugoslavia/constitution"       - "Constitution Day (Serbia)"      Fixed Mar 28
-  Event "yugoslavia/national"           - "National Day"                   Fixed Apr 27
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Event "yugoslavia/victory"            - "Victory Day"                    Fixed May  9
-  Event "yugoslavia/freedom fighters"   - "Freedom Fighters' Day"          Fixed Jul  4
-  Event "yugoslavia/freedom serbia"     - "Freedom Rising Day (Serbia)"    Fixed Jul  7
-  Event "yugoslavia/freedom montenegro"  - "Freedom Rising Day (Montenegro)" Fixed Jul 14
-  Event "yugoslavia/republic"           - "Republic Day"                   Fixed Nov 29
-
-
-# zaire
-Region "zaire"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Event "zaire/day of the martyrs for independence"  - "Day of the Martyrs for Independence" Fixed Jan  4
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Event "zaire/mpr"                     - "MPR Day"                        Fixed May 20
-  Event "zaire/constitution"            - "Constitution Day"               Fixed Jun 24
-  Event "zaire/independence"            - "Independence Day"               Fixed Jun 30
-  Event "zaire/parents"                 - "Parent's Day"                   Fixed Aug  1
-  Event "zaire/presidents"              - "President's Day"                Fixed Oct 14
-  Event "zaire/youth/presidents"        - "Youth Day/President's Birthday" Fixed Oct 14
-  Event "zaire/naming"                  - "Naming Day"                     Fixed Oct 27
-  Event "zaire/armed forces"            - "Armed Forces Day"               Fixed Nov 17
-  Event "zaire/new regime"              - "New Regime Day"                 Fixed Nov 24
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "yu"
+  Add   "new year 2d"             - # "New Year"                        Fixed Jan  1  2 days
+  Add   "orthodox/christmas"      - # "Christmas Day"                   Julian_Fixed Dec 25 
+  Add   "orthodox/new year"       - # "Orthodox New Year"               Julian_Fixed Jan  1 
+  Event "yu/constitution"         -   "Constitution Day (Serbia)"       Fixed Mar 28        
+  Event "yu/national"             -   "National Day"                    Fixed Apr 27        
+  Add   "labor"                   - # "Labor Day"                       Fixed May  1        
+  Event "yu/victory"              -   "Victory Day"                     Fixed May  9        
+  Event "yu/freedom fighters"     -   "Freedom Fighters' Day"           Fixed Jul  4        
+  Event "yu/freedom serbia"       -   "Freedom Rising Day (Serbia)"     Fixed Jul  7        
+  Event "yu/freedom montenegro"   -   "Freedom Rising Day (Montenegro)" Fixed Jul 14        
+  Event "yu/republic"             -   "Republic Day"                    Fixed Nov 29        
+
+
+# za�re
+Region "zr"
+  Add   "new year"                - # "New Year's Day"                      Fixed Jan  1
+  Event "zr/martyrs"              -   "Day of the Martyrs for Independence" Fixed Jan  4
+  Add   "labor"                   - # "Labor Day"                           Fixed May  1
+  Event "zr/mpr"                  -   "MPR Day"                             Fixed May 20
+  Event "zr/constitution"         -   "Constitution Day"                    Fixed Jun 24
+  Event "zr/independence"         -   "Independence Day"                    Fixed Jun 30
+  Event "zr/parents"              -   "Parent's Day"                        Fixed Aug  1
+  Event "zr/presidents"           -   "President's Day"                     Fixed Oct 14
+  Event "zr/youth/presidents"     -   "Youth Day/President's Birthday"      Fixed Oct 14
+  Event "zr/naming"               -   "Naming Day"                          Fixed Oct 27
+  Event "zr/armed forces"         -   "Armed Forces Day"                    Fixed Nov 17
+  Event "zr/new regime"           -   "New Regime Day"                      Fixed Nov 24
+  Add   "c/christmas"             - # "Christmas Day"                       Fixed Dec 25
 
 
 # zambia
-Region "zambia"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "unity"                         - # "Unity Day"                    Fixed Feb 22
-  Event "zambia/youth2"                 - "Youth Day"                      WDRel Mar Sat 2nd
-  Add   "c/easter"                      - # "Easter"                       Easter +0
-  Add   "labor"                         - # "Labor Day"                    Fixed May  1
-  Add   "africa"                        - # "Africa Day"                   Fixed May 25
-  Event "zambia/heroes"                 - "Heroes' Day"                    WDRel Jul Mon 1st
-  Event "zambia/unity"                  - "Unity Day"                      WDRel Jul Tue 1st
-  Event "zambia/farmers"                - "Farmers' Day"                   WDRel Aug Mon 1st
-  Event "zambia/youth"                  - "Youth Day"                      WDRel Aug Mon 2nd
-  Event "zambia/independence"           - "Independence Day"               Fixed Oct 24
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "zm"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1     
+  Add   "unity"                   - # "Unity Day"             Fixed Feb 22     
+  Event "zm/youth2"               -   "Youth Day"             WDRel Mar Sat 2nd
+  Add   "c/easter"                - # "Easter"                Easter +0        
+  Add   "labor"                   - # "Labor Day"             Fixed May  1     
+  Add   "africa"                  - # "Africa Day"            Fixed May 25     
+  Event "zm/heroes"               -   "Heroes' Day"           WDRel Jul Mon 1st
+  Event "zm/unity"                -   "Unity Day"             WDRel Jul Tue 1st
+  Event "zm/farmers"              -   "Farmers' Day"          WDRel Aug Mon 1st
+  Event "zm/youth"                -   "Youth Day"             WDRel Aug Mon 2nd
+  Event "zm/independence"         -   "Independence Day"      Fixed Oct 24     
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25     
 
 
 # zimbabwe
-Region "zimbabwe"
-  Add   "new year"                      - # "New Year's Day"               Fixed Jan  1
-  Add   "c/easter"                      - # "Easter"                       Easter +0
-  Event "zimbabwe/independence"         - "Independence Day"               Fixed Apr 18
-  Event "zimbabwe/workers"              - "Workers' Day"                   Fixed May  1
-  Add   "africa"                        - # "Africa Day"                   Fixed May 25
-  Event "zimbabwe/heroess"              - "Heroes' Days"                   Fixed Aug 11  2 days
-  Add   "c/christmas"                   - # "Christmas Day"                Fixed Dec 25
+Region "zw"
+  Add   "new year"                - # "New Year's Day"        Fixed Jan  1        
+  Add   "c/easter"                - # "Easter"                Easter +0           
+  Event "zw/independence"         -   "Independence Day"      Fixed Apr 18        
+  Event "zw/workers"              -   "Workers' Day"          Fixed May  1        
+  Add   "africa"                  - # "Africa Day"            Fixed May 25        
+  Event "zw/heroess"              -   "Heroes' Days"          Fixed Aug 11  2 days
+  Add   "c/christmas"             - # "Christmas Day"         Fixed Dec 25        
+
+
+