diff --git a/src/plugins/lib/holidays.xml b/src/plugins/lib/holidays.xml
index 1cc666fe5..c9dd98b89 100644
--- a/src/plugins/lib/holidays.xml
+++ b/src/plugins/lib/holidays.xml
@@ -3,66 +3,67 @@
   <country name="">
   </country>  
   <country name="United States">
-    <date name="New Year's Eve" value="*/12/31" type="national" />
-    <date name="New Year's Day" value="*/1/1" type="national" />
-    <date name="Inauguration Day" value="1997/1/20" type="national" />
-    <date name="Inauguration Day" value="2001/1/20" type="national" />
-    <date name="Inauguration Day" value="2005/1/20" type="national" />
-    <date name="Inauguration Day" value="2009/1/20" type="national" />
-    <date name="Inauguration Day" value="2013/1/20" type="national" />
-    <date name="Inauguration Day" value="2017/1/20" type="national" />
-    <date name="ML Kings's Birthday" value="*/3/mon/jan" type="secular" />
-    <date name="Groundhog Day" value="*/2/2" type="secular" />
-    <date name="Lincoln's Birthday" value="*/2/12" type="secular" />
-    <date name="Valentine's Day" value="*/2/14" type="secular" />
-    <date name="Presidents' Day" value="*/3/mon/feb" type="secular" />
-    <date name="Washington's Birthday" value="*/2/22" type="secular" />
-    <date name="St. Patrick's Day" value="*/3/17" type="secular" />
-    <date name="April Fool's Day" value="*/4/1" type="secular" />
-    <date name="Arbor Day" value="*/-1/fri/apr" type="secular" />
-    <date name="Earth Day" value="*/4/22" type="secular" />
-    <date name="Daylight Saving begins" value="1999/4/4" type="informational" />
-    <date name="Daylight Saving begins" value="2000/4/2" type="informational" />
-    <date name="Daylight Saving begins" value="2001/4/1" type="informational" />
-    <date name="Daylight Saving begins" value="2002/4/7" type="informational" />
-    <date name="Daylight Saving begins" value="2003/4/6" type="informational" />
-    <date name="Daylight Saving begins" value="2004/4/4" type="informational" />
-    <date name="Daylight Saving begins" value="2005/4/3" type="informational" />
-    <date name="Daylight Saving begins" value="2006/4/2" type="informational" />
-    <date name="Daylight Saving begins" value="2007/3/11" type="informational" />
-    <date name="Daylight Saving begins" value="2008/3/9" type="informational" />
-    <date name="Daylight Saving begins" value="2009/3/8" type="informational" />
-    <date name="Daylight Saving begins" value="2010/3/14" type="informational" />
-    <date name="Daylight Saving begins" value="2011/3/13" type="informational" />
-    <date name="Daylight Saving begins" value="2012/3/11" type="informational" />
-    <date name="Daylight Saving begins" value="2013/3/10" type="informational" />
-    <date name="Daylight Saving begins" value="2014/3/9" type="informational" />
-    <date name="Daylight Saving begins" value="2015/3/8" type="informational" />
-    <date name="Daylight Saving begins" value="2016/3/13" type="informational" />
-    <date name="Daylight Saving begins" value="2017/3/12" type="informational" />
-    <date name="Daylight Saving begins" value="2018/3/11" type="informational" />
-    <date name="Daylight Saving begins" value="2019/3/10" type="informational" />
-    <date name="Income Taxes due" value="1999/4/15" type="national" />
-    <date name="Income Taxes due" value="2000/4/17" type="national" />
-    <date name="Income Taxes due" value="2001/4/16" type="national" />
-    <date name="Income Taxes due" value="2002/4/15" type="national" />
-    <date name="Income Taxes due" value="2003/4/15" type="national" />
-    <date name="Income Taxes due" value="2004/4/15" type="national" />
-    <date name="Income Taxes due" value="2005/4/15" type="national" />
-    <date name="Income Taxes due" value="2006/4/17" type="national" />
-    <date name="Income Taxes due" value="2007/4/16" type="national" />
-    <date name="Income Taxes due" value="2008/4/15" type="national" />
-    <date name="Income Taxes due" value="2009/4/15" type="national" />
-    <date name="Income Taxes due" value="2010/4/15" type="national" />
-    <date name="Income Taxes due" value="2011/4/15" type="national" />
-    <date name="Income Taxes due" value="2012/4/16" type="national" />
-    <date name="Income Taxes due" value="2013/4/15" type="national" />
-    <date name="Income Taxes due" value="2014/4/15" type="national" />
-    <date name="Income Taxes due" value="2015/4/15" type="national" />
-    <date name="Income Taxes due" value="2016/4/15" type="national" />
-    <date name="Income Taxes due" value="2017/4/17" type="national" />
-    <date name="Income Taxes due" value="2018/4/16" type="national" />
-    <date name="Income Taxes due" value="2019/4/15" type="national" />
+    <date name="New Year's Eve" value="*/12/31" type="National" />
+    <date name="New Year's Day" value="*/1/1" type="National" />
+    <date name="Inauguration Day" value="1997/1/20" type="National" />
+    <date name="Inauguration Day" value="2001/1/20" type="National" />
+    <date name="Inauguration Day" value="2005/1/20" type="National" />
+    <date name="Inauguration Day" value="2009/1/20" type="National" />
+    <date name="Inauguration Day" value="2013/1/20" type="National" />
+    <date name="Inauguration Day" value="2017/1/20" type="National" />
+    <date name="ML Kings's Birthday" value="*/3/mon/jan" type="Secular" />
+    <date name="Groundhog Day" value="*/2/2" type="Secular" />
+    <date name="Lincoln's Birthday" value="*/2/12" type="Secular" />
+    <date name="Super Bowl" value="*/1/sun/feb" type="Secular" />
+    <date name="Valentine's Day" value="*/2/14" type="Secular" />
+    <date name="Presidents' Day" value="*/3/mon/feb" type="Secular" />
+    <date name="Washington's Birthday" value="*/3/mon/feb" type="Secular" />
+    <date name="St. Patrick's Day" value="*/3/17" type="Secular" />
+    <date name="April Fool's Day" value="*/4/1" type="Secular" />
+    <date name="Arbor Day" value="*/-1/fri/apr" type="Secular" />
+    <date name="Earth Day" value="*/4/22" type="Secular" />
+    <date name="Daylight Saving begins" value="1999/4/4" type="Informational" />
+    <date name="Daylight Saving begins" value="2000/4/2" type="Informational" />
+    <date name="Daylight Saving begins" value="2001/4/1" type="Informational" />
+    <date name="Daylight Saving begins" value="2002/4/7" type="Informational" />
+    <date name="Daylight Saving begins" value="2003/4/6" type="Informational" />
+    <date name="Daylight Saving begins" value="2004/4/4" type="Informational" />
+    <date name="Daylight Saving begins" value="2005/4/3" type="Informational" />
+    <date name="Daylight Saving begins" value="2006/4/2" type="Informational" />
+    <date name="Daylight Saving begins" value="2007/3/11" type="Informational" />
+    <date name="Daylight Saving begins" value="2008/3/9" type="Informational" />
+    <date name="Daylight Saving begins" value="2009/3/8" type="Informational" />
+    <date name="Daylight Saving begins" value="2010/3/14" type="Informational" />
+    <date name="Daylight Saving begins" value="2011/3/13" type="Informational" />
+    <date name="Daylight Saving begins" value="2012/3/11" type="Informational" />
+    <date name="Daylight Saving begins" value="2013/3/10" type="Informational" />
+    <date name="Daylight Saving begins" value="2014/3/9" type="Informational" />
+    <date name="Daylight Saving begins" value="2015/3/8" type="Informational" />
+    <date name="Daylight Saving begins" value="2016/3/13" type="Informational" />
+    <date name="Daylight Saving begins" value="2017/3/12" type="Informational" />
+    <date name="Daylight Saving begins" value="2018/3/11" type="Informational" />
+    <date name="Daylight Saving begins" value="2019/3/10" type="Informational" />
+    <date name="Income Taxes due" value="1999/4/15" type="National" />
+    <date name="Income Taxes due" value="2000/4/17" type="National" />
+    <date name="Income Taxes due" value="2001/4/16" type="National" />
+    <date name="Income Taxes due" value="2002/4/15" type="National" />
+    <date name="Income Taxes due" value="2003/4/15" type="National" />
+    <date name="Income Taxes due" value="2004/4/15" type="National" />
+    <date name="Income Taxes due" value="2005/4/15" type="National" />
+    <date name="Income Taxes due" value="2006/4/17" type="National" />
+    <date name="Income Taxes due" value="2007/4/16" type="National" />
+    <date name="Income Taxes due" value="2008/4/15" type="National" />
+    <date name="Income Taxes due" value="2009/4/15" type="National" />
+    <date name="Income Taxes due" value="2010/4/15" type="National" />
+    <date name="Income Taxes due" value="2011/4/15" type="National" />
+    <date name="Income Taxes due" value="2012/4/16" type="National" />
+    <date name="Income Taxes due" value="2013/4/15" type="National" />
+    <date name="Income Taxes due" value="2014/4/15" type="National" />
+    <date name="Income Taxes due" value="2015/4/15" type="National" />
+    <date name="Income Taxes due" value="2016/4/15" type="National" />
+    <date name="Income Taxes due" value="2017/4/17" type="National" />
+    <date name="Income Taxes due" value="2018/4/16" type="National" />
+    <date name="Income Taxes due" value="2019/4/15" type="National" />
     <date name="Ash Wednesday" value="1999/2/17" type="religious" />
     <date name="Ash Wednesday" value="1999/2/17" type="religious" />
     <date name="Ash Wednesday" value="2000/3/8" type="religious" />
@@ -113,39 +114,39 @@
     <date name="Passover" value="2009/4/09" type="religious" />
     <date name="Passover" value="2010/3/30" type="religious" />
     <date name="Passover" value="2011/4/19" type="religious" />
-    <date name="Assistants' Day" value="*/-1/sat/apr" offset="-3" type="secular" />
-    <date name="Cinco de Mayo" value="*/5/5" type="secular" />
-    <date name="Armed Forces Day" value="*/3/sat/may" type="secular" />
-    <date name="Mothers' Day" value="*/2/sun/may" type="secular" />
-    <date name="Memorial Day" value="*/-1/mon/may" type="secular" />
-    <date name="Flag Day" value="*/6/14" type="secular" />
-    <date name="Fathers' Day" value="*/3/sun/jun" type="secular" />
-    <date name="Independence Day" value="*/7/4" type="national" />
-    <date name="Parents' Day" value="*/4/sun/jul" type="secular" />
-    <date name="Labor Day" value="*/1/mon/sep" type="national" />
-    <date name="Grandparents' Day" value="*/1/mon/sep" offset="6" type="secular" />
-    <date name="Daylight Saving ends" value="1999/10/31" type="informational" />
-    <date name="Daylight Saving ends" value="2000/10/29" type="informational" />
-    <date name="Daylight Saving ends" value="2001/10/28" type="informational" />
-    <date name="Daylight Saving ends" value="2002/10/27" type="informational" />
-    <date name="Daylight Saving ends" value="2003/10/26" type="informational" />
-    <date name="Daylight Saving ends" value="2004/10/31" type="informational" />
-    <date name="Daylight Saving ends" value="2005/10/30" type="informational" />
-    <date name="Daylight Saving ends" value="2006/10/29" type="informational" />
-    <date name="Daylight Saving ends" value="2007/11/4" type="informational" />
-    <date name="Daylight Saving ends" value="2008/11/2" type="informational" />
-    <date name="Daylight Saving ends" value="2009/11/1" type="informational" />
-    <date name="Daylight Saving ends" value="2010/11/7" type="informational" />
-    <date name="Daylight Saving ends" value="2011/11/6" type="informational" />
-    <date name="Daylight Saving ends" value="2012/11/4" type="informational" />
-    <date name="Daylight Saving ends" value="2013/11/3" type="informational" />
-    <date name="Daylight Saving ends" value="2014/11/2" type="informational" />
-    <date name="Daylight Saving ends" value="2015/11/1" type="informational" />
-    <date name="Daylight Saving ends" value="2016/11/6" type="informational" />
-    <date name="Daylight Saving ends" value="2017/11/5" type="informational" />
-    <date name="Daylight Saving ends" value="2018/11/4" type="informational" />
-    <date name="Daylight Saving ends" value="2019/11/3" type="informational" />
-    <date name="Columbus Day" value="*/2/mon/oct" type="secular" />
+    <date name="Assistants' Day" value="*/-1/sat/apr" offset="-3" type="Secular" />
+    <date name="Cinco de Mayo" value="*/5/5" type="Secular" />
+    <date name="Armed Forces Day" value="*/3/sat/may" type="Secular" />
+    <date name="Mothers' Day" value="*/2/sun/may" type="Secular" />
+    <date name="Memorial Day" value="*/-1/mon/may" type="Secular" />
+    <date name="Flag Day" value="*/6/14" type="Secular" />
+    <date name="Fathers' Day" value="*/3/sun/jun" type="Secular" />
+    <date name="Independence Day" value="*/7/4" type="National" />
+    <date name="Parents' Day" value="*/4/sun/jul" type="Secular" />
+    <date name="Labor Day" value="*/1/mon/sep" type="National" />
+    <date name="Grandparents' Day" value="*/1/mon/sep" offset="6" type="Secular" />
+    <date name="Daylight Saving ends" value="1999/10/31" type="Informational" />
+    <date name="Daylight Saving ends" value="2000/10/29" type="Informational" />
+    <date name="Daylight Saving ends" value="2001/10/28" type="Informational" />
+    <date name="Daylight Saving ends" value="2002/10/27" type="Informational" />
+    <date name="Daylight Saving ends" value="2003/10/26" type="Informational" />
+    <date name="Daylight Saving ends" value="2004/10/31" type="Informational" />
+    <date name="Daylight Saving ends" value="2005/10/30" type="Informational" />
+    <date name="Daylight Saving ends" value="2006/10/29" type="Informational" />
+    <date name="Daylight Saving ends" value="2007/11/4" type="Informational" />
+    <date name="Daylight Saving ends" value="2008/11/2" type="Informational" />
+    <date name="Daylight Saving ends" value="2009/11/1" type="Informational" />
+    <date name="Daylight Saving ends" value="2010/11/7" type="Informational" />
+    <date name="Daylight Saving ends" value="2011/11/6" type="Informational" />
+    <date name="Daylight Saving ends" value="2012/11/4" type="Informational" />
+    <date name="Daylight Saving ends" value="2013/11/3" type="Informational" />
+    <date name="Daylight Saving ends" value="2014/11/2" type="Informational" />
+    <date name="Daylight Saving ends" value="2015/11/1" type="Informational" />
+    <date name="Daylight Saving ends" value="2016/11/6" type="Informational" />
+    <date name="Daylight Saving ends" value="2017/11/5" type="Informational" />
+    <date name="Daylight Saving ends" value="2018/11/4" type="Informational" />
+    <date name="Daylight Saving ends" value="2019/11/3" type="Informational" />
+    <date name="Columbus Day" value="*/2/mon/oct" type="Secular" />
     <date name="Ramadan begins" value="2006/09/24" type="religious" />
     <date name="Ramadan begins" value="2007/09/13" type="religious" />
     <date name="Ramadan begins" value="2008/09/2" type="religious" />
@@ -156,11 +157,11 @@
     <date name="Yom Kippur" value="2008/10/09" type="religious" />
     <date name="Yom Kippur" value="2009/09/28" type="religious" />
     <date name="Yom Kippur" value="2010/09/18" type="religious" />
-    <date name="United Nations Day" value="*/10/24" type="secular" />
-    <date name="Halloween" value="*/10/31" type="secular" />
-    <date name="Election Day" value="*/11/2" offset="tue" type="secular" />
-    <date name="Veterans Day" value="*/11/11" type="national" />
-    <date name="Thanksgiving" value="*/4/thu/nov" type="national" />
+    <date name="United Nations Day" value="*/10/24" type="Secular" />
+    <date name="Halloween" value="*/10/31" type="Secular" />
+    <date name="Election Day" value="*/11/2" offset="tue" type="Secular" />
+    <date name="Veterans Day" value="*/11/11" type="National" />
+    <date name="Thanksgiving" value="*/4/thu/nov" type="National" />
     <date name="Hanukkah begins" value="2004/12/07" type="religious" />
     <date name="Hanukkah begins" value="2005/12/25" type="religious" />
     <date name="Hanukkah begins" value="2006/12/15" type="religious" />
@@ -168,17 +169,17 @@
     <date name="Hanukkah begins" value="2008/12/21" type="religious" />
     <date name="Hanukkah begins" value="2009/12/11" type="religious" />
     <date name="Hanukkah begins" value="2010/12/01" type="religious" />
-    <date name="Christmas" value="*/12/25" type="national" />
+    <date name="Christmas" value="*/12/25" type="National" />
     <date name="Kwanzaa begins" value="*/12/26" type="religious" />
   </country>
   <country name="Canada">
-    <date name="New Year's Day" value="*/1/1" type="national" />
-    <date name="Groundhog Day" value="*/2/2" type="secular" />
-    <date name="Valentine's Day" value="*/2/14" type="secular" />
-    <date name="Flag Day" value="*/2/15" type="secular" />
-    <date name="St. Patrick's Day" value="*/3/17" type="secular" />
-    <date name="April Fool's Day" value="*/4/1" type="secular" />
-    <date name="Daylight Savings begins" value="*/1/sun/apr" type="informational" />
+    <date name="New Year's Day" value="*/1/1" type="National" />
+    <date name="Groundhog Day" value="*/2/2" type="Secular" />
+    <date name="Valentine's Day" value="*/2/14" type="Secular" />
+    <date name="Flag Day" value="*/2/15" type="Secular" />
+    <date name="St. Patrick's Day" value="*/3/17" type="Secular" />
+    <date name="April Fool's Day" value="*/4/1" type="Secular" />
+    <date name="Daylight Savings begins" value="*/1/sun/apr" type="Informational" />
     <date name="Ash Wednesday" value="1999/2/17" type="religious" />
     <date name="Ash Wednesday" value="1999/2/17" type="religious" />
     <date name="Ash Wednesday" value="2000/3/8" type="religious" />
@@ -229,17 +230,17 @@
     <date name="Passover" value="2009/4/09" type="religious" />
     <date name="Passover" value="2010/3/30" type="religious" />
     <date name="Passover" value="2011/4/19" type="religious" />
-    <date name="Earth Day" value="*/4/22" type="secular" />
-    <date name="Mother's Day" value="*/2/sun/may" type="secular" />
-    <date name="Victoria Day" value="*/5/24" offset="-mon" type="national" />
-    <date name="Father's Day" value="*/3/sun/jun" type="secular" />
-    <date name="St-Jean Baptiste (QC)" value="*/6/24" type="national" />
-    <date name="Canada Day" value="*/7/1" type="national" />
-    <date name="Civic Holiday" value="*/1/mon/aug" type="national" />
-    <date name="Labour Day" value="*/1/mon/sep" type="national" />
-    <date name="Grandparent's Day" value="*/2/sun/sep" offset="6" type="secular" />
-    <date name="Thanksgiving" value="*/2/mon/oct" type="national" />
-    <date name="Daylight Savings ends" value="*/-1/sun/oct" type="informational" />
+    <date name="Earth Day" value="*/4/22" type="Secular" />
+    <date name="Mother's Day" value="*/2/sun/may" type="Secular" />
+    <date name="Victoria Day" value="*/5/24" offset="-mon" type="National" />
+    <date name="Father's Day" value="*/3/sun/jun" type="Secular" />
+    <date name="St-Jean Baptiste (QC)" value="*/6/24" type="National" />
+    <date name="Canada Day" value="*/7/1" type="National" />
+    <date name="Civic Holiday" value="*/1/mon/aug" type="National" />
+    <date name="Labour Day" value="*/1/mon/sep" type="National" />
+    <date name="Grandparent's Day" value="*/2/sun/sep" offset="6" type="Secular" />
+    <date name="Thanksgiving" value="*/2/mon/oct" type="National" />
+    <date name="Daylight Savings ends" value="*/-1/sun/oct" type="Informational" />
     <date name="Yom Kippur" value="2005/10/13" type="religious" />
     <date name="Yom Kippur" value="2006/10/02" type="religious" />
     <date name="Yom Kippur" value="2007/9/27" type="religious" />
@@ -249,8 +250,8 @@
     <date name="Ramadan begins" value="2006/9/24" type="religious" />
     <date name="Ramadan begins" value="2007/9/13" type="religious" />
     <date name="Ramadan begins" value="2008/9/2" type="religious" />
-    <date name="Halloween" value="*/10/31" type="secular" />
-    <date name="Rememberance Day" value="*/11/11" type="national" />
+    <date name="Halloween" value="*/10/31" type="Secular" />
+    <date name="Rememberance Day" value="*/11/11" type="National" />
     <date name="Hanukkah begins" value="2004/12/07" type="religious" />
     <date name="Hanukkah begins" value="2005/12/25" type="religious" />
     <date name="Hanukkah begins" value="2006/12/15" type="religious" />
@@ -258,11 +259,11 @@
     <date name="Hanukkah begins" value="2008/12/21" type="religious" />
     <date name="Hanukkah begins" value="2009/12/11" type="religious" />
     <date name="Hanukkah begins" value="2010/12/01" type="religious" />
-    <date name="Christmas" value="*/12/25" type="national" />
-    <date name="Boxing Day" value="*/12/26" type="national" />
+    <date name="Christmas" value="*/12/25" type="National" />
+    <date name="Boxing Day" value="*/12/26" type="National" />
   </country>
   <country name="Česká republika">
-    <date name="Nový rok" value="*/1/1" type="national" />
+    <date name="Nový rok" value="*/1/1" type="National" />
     <date name="Easter" value="1999/4/5" type="religious" />
     <date name="Easter" value="2000/4/26" type="religious" />
     <date name="Easter" value="2001/4/16" type="religious" />
@@ -284,19 +285,19 @@
     <date name="Easter" value="2017/4/17" type="religious" />
     <date name="Easter" value="2018/4/2" type="religious" />
     <date name="Easter" value="2019/4/22" type="religious" />
-    <date name="Svátek práce" value="*/5/1" type="national" />
-    <date name="Den osvobození od fašismu" value="*/5/8" type="national" />
-    <date name="Den slovanských věrozvěstů Cyrila a Metoděje" value="*/7/5" type="national" />
-    <date name="Den upálení mistra Jana Husa" value="*/7/6" type="national" />
-    <date name="Den české státnosti" value="*/9/28" type="national" />
-    <date name="Den vzniku samostatného československého státu" value="*/10/28" type="national" />
-    <date name="Den boje za svobodu a demokracii" value="*/11/17" type="national" />
+    <date name="Svátek práce" value="*/5/1" type="National" />
+    <date name="Den osvobození od fašismu" value="*/5/8" type="National" />
+    <date name="Den slovanských věrozvěstů Cyrila a Metoděje" value="*/7/5" type="National" />
+    <date name="Den upálení mistra Jana Husa" value="*/7/6" type="National" />
+    <date name="Den české státnosti" value="*/9/28" type="National" />
+    <date name="Den vzniku samostatného československého státu" value="*/10/28" type="National" />
+    <date name="Den boje za svobodu a demokracii" value="*/11/17" type="National" />
     <date name="Štědrý den" value="*/12/24" type="religious" />
-    <date name="1. svátek vánoční" value="*/12/25" type="national" />
-    <date name="2. svátek vánoční" value="*/12/26" type="national" />
+    <date name="1. svátek vánoční" value="*/12/25" type="National" />
+    <date name="2. svátek vánoční" value="*/12/26" type="National" />
   </country>
   <country name="Chile">
-    <date name="Año nuevo" value="*/1/1" type="national" />
+    <date name="Año nuevo" value="*/1/1" type="National" />
     <date name="Viernes Santo" value="2007/4/6" type="religious" />
     <date name="Viernes Santo" value="2008/3/21" type="religious" />
     <date name="Viernes Santo" value="2009/4/10" type="religious" />
@@ -306,32 +307,32 @@
     <date name="Viernes Santo" value="2013/3/29" type="religious" />
     <date name="Viernes Santo" value="2014/4/18" type="religious" />
     <date name="Viernes Santo" value="2015/4/3" type="religious" />
-    <date name="Día del Trabajador" value="*/5/1" type="national" />
-    <date name="Día de las Glorias Navales" value="*/5/21" type="national" />
+    <date name="Día del Trabajador" value="*/5/1" type="National" />
+    <date name="Día de las Glorias Navales" value="*/5/21" type="National" />
     <date name="San Pedro y San Pablo" value="*/6/29" type="religious" />
     <date name="Día de la Virgen del Carmen" value="*/7/16" type="religious" />
     <date name="Asunción de la Virgen" value="*/8/15" type="religious" />
-    <date name="Fiestas Patrias" value="*/9/18" type="national" />
-    <date name="Glorias del Ejército" value="*/9/19" type="national" />
-    <date name="Día de la Raza" value="*/10/12" type="national" />
+    <date name="Fiestas Patrias" value="*/9/18" type="National" />
+    <date name="Glorias del Ejército" value="*/9/19" type="National" />
+    <date name="Día de la Raza" value="*/10/12" type="National" />
     <date name="Todos los Santos" value="*/11/1" type="religious" />
     <date name="Inmaculada Concepción" value="*/12/8" type="religious" />
-    <date name="Navidad" value="*/12/25" type="national" /> 
+    <date name="Navidad" value="*/12/25" type="National" /> 
   </country>
   <country name="China">
-    <date name="Chinese New Year" value="2006/1/29" type="national" />
+    <date name="Chinese New Year" value="2006/1/29" type="National" />
   </country>
   <country name="Deutschland">
-    <date name="Neujahr" type="national" value="*/1/1" />
+    <date name="Neujahr" type="National" value="*/1/1" />
     <date name="Hl. Drei Könige BW,BY,ST" type="religious" value="*/1/6" />
     <date name="Karfreitag" type="religious" value="> easter(y)" offset="-2" />
     <date name="Ostermontag" type="religious" value="> easter(y)" offset="+1" />
-    <date name="Maifeiertag" type="national" value="*/5/1" />
+    <date name="Maifeiertag" type="National" value="*/5/1" />
     <date name="Christi Himmelfahrt" type="religious" value="> easter(y)" offset="+39" />
     <date name="Pfingstmontag" type="religious" value="> easter(y)" offset="+50" />
     <date name="Fronleichnam BW, BY, HE, NW, RP, SL" type="religious" value="> easter(y)" offset="+60" />
     <date name="Mariä Himmelfahrt SL" type="religious" value="*/8/15" />
-    <date name="Tag der Deutschen Einheit" type="national" value="*/10/3" />
+    <date name="Tag der Deutschen Einheit" type="National" value="*/10/3" />
     <date name="Reformationstag BB, MV, SN, ST, TH" type="religious" value="*/10/31" />
     <date name="Allerheiligen BW, BY, NW, RP, SL" type="religious" value="*/11/1" />
     <date name="Buß- u. Bettag SN" type="religious" value="*/11/23"  offset="-wed"/>
@@ -424,35 +425,35 @@
     <date name="Helluntaipäivä" value="2013/5/19" type="religious" />
     <date name="Helluntaipäivä" value="2014/6/8" type="religious" />
     <date name="Helluntaipäivä" value="2015/5/24" type="religious" />
-    <date name="Uudenvuodenpäivä" value="*/1/1" type="national" />
-    <date name="Vainojen uhrien muistopäivä" value="*/1/27" type="national" />
-    <date name="J. L. Runebergin päivä" value="*/2/5" type="national" />
-    <date name="Ystävänpäivä" value="*/2/14" type="national" />
-    <date name="Kalevalan päivä" value="*/2/28" type="national" />
-    <date name="Minna Canthin päivä" value="*/3/19" type="national" />
-    <date name="Mikael Agricolan päivä" value="*/4/9" type="national" />
-    <date name="Veteraanipäivä" value="*/4/27" type="national" />
-    <date name="Vappu" value="*/5/1" type="national" />
-    <date name="Eurooppa-päivä" value="*/9/5" type="national" />
-    <date name="J. V. Snelmannin päivä" value="*/5/12" type="national" />
-    <date name="Puolustusvoimain lippujuhlan päivä" value="*/6/4" type="national" />
-    <date name="Eino Leinon päivä" value="*/7/6" type="national" />
-    <date name="Aleksis Kiven päivä" value="*/10/10" type="national" />
-    <date name="YK:n päivä" value="*/10/24" type="national" />
-    <date name="Ruotsalaisuuden päivä" value="*/11/6" type="national" />
-    <date name="Lasten oikeuksien päivä" value="*/11/20" type="national" />
-    <date name="Itsenäisyyspäivä" value="*/12/6" type="national" />
-    <date name="Äitienpäivä" value="*/2/sun/may" type="national" />
-    <date name="Juhannuspäivä" value="*/3/sat/jun" type="national" />
-    <date name="Isänpäivä" value="*/2/sun/nov" type="national" />
-    <date name="Kaatuneiden muistopäivä" value="*/3/sun/may" type="national" />
+    <date name="Uudenvuodenpäivä" value="*/1/1" type="National" />
+    <date name="Vainojen uhrien muistopäivä" value="*/1/27" type="National" />
+    <date name="J. L. Runebergin päivä" value="*/2/5" type="National" />
+    <date name="Ystävänpäivä" value="*/2/14" type="National" />
+    <date name="Kalevalan päivä" value="*/2/28" type="National" />
+    <date name="Minna Canthin päivä" value="*/3/19" type="National" />
+    <date name="Mikael Agricolan päivä" value="*/4/9" type="National" />
+    <date name="Veteraanipäivä" value="*/4/27" type="National" />
+    <date name="Vappu" value="*/5/1" type="National" />
+    <date name="Eurooppa-päivä" value="*/9/5" type="National" />
+    <date name="J. V. Snelmannin päivä" value="*/5/12" type="National" />
+    <date name="Puolustusvoimain lippujuhlan päivä" value="*/6/4" type="National" />
+    <date name="Eino Leinon päivä" value="*/7/6" type="National" />
+    <date name="Aleksis Kiven päivä" value="*/10/10" type="National" />
+    <date name="YK:n päivä" value="*/10/24" type="National" />
+    <date name="Ruotsalaisuuden päivä" value="*/11/6" type="National" />
+    <date name="Lasten oikeuksien päivä" value="*/11/20" type="National" />
+    <date name="Itsenäisyyspäivä" value="*/12/6" type="National" />
+    <date name="Äitienpäivä" value="*/2/sun/may" type="National" />
+    <date name="Juhannuspäivä" value="*/3/sat/jun" type="National" />
+    <date name="Isänpäivä" value="*/2/sun/nov" type="National" />
+    <date name="Kaatuneiden muistopäivä" value="*/3/sun/may" type="National" />
   </country>
   <country name="France">
-    <date name="Jour de l'an" value="*/1/1" type="national" />
-    <date name="Fête du travail" value="*/5/1" type="national" />
-    <date name="Victoire 1945" value="*/5/8" type="national" />
-    <date name="Fête nationale" value="*/7/14" type="national" />
-    <date name="Armistice 1918" value="*/11/11" type="national" />
+    <date name="Jour de l'an" value="*/1/1" type="National" />
+    <date name="Fête du travail" value="*/5/1" type="National" />
+    <date name="Victoire 1945" value="*/5/8" type="National" />
+    <date name="Fête Nationale" value="*/7/14" type="National" />
+    <date name="Armistice 1918" value="*/11/11" type="National" />
     <date name="Pâques" value="2007/4/8" type="religious" />
     <date name="Pâques" value="2008/3/23" type="religious" />
     <date name="Pâques" value="2009/4/12" type="religious" />
@@ -491,47 +492,47 @@
     <date name="début Kwanzaa" value="*/12/26" type="religious" />
   </country>
   <country name="Sverige - röda dagar">
-    <date name="Nyårsdagen" value="*/1/1" type="national" />
-    <date name="Trettondagen" value="*/1/5" type="national" />
-    <date name="Långfredagen" value="2007/4/6" type="national" />
-    <date name="Påskdagen" value="2007/4/8" type="national" />
-    <date name="Annandag Påsk" value="2007/4/9" type="national" />
-    <date name="Långfredagen" value="2008/3/21" type="national" />
-    <date name="Påskdagen" value="2008/3/23" type="national" />
-    <date name="Annandag Påsk" value="2008/3/24" type="national" />
-    <date name="Långfredagen" value="2009/4/10" type="national" />
-    <date name="Påskdagen" value="2009/4/12" type="national" />
-    <date name="Annandag Påsk" value="2009/4/13" type="national" />
-    <date name="Långfredagen" value="2010/4/2" type="national" />
-    <date name="Påskdagen" value="2010/4/4" type="national" />
-    <date name="Annandag Påsk" value="2010/4/5" type="national" />
-    <date name="Långfredagen" value="2011/4/21" type="national" />
-    <date name="Påskdagen" value="2011/4/24" type="national" />
-    <date name="Annandag Påsk" value="2011/4/25" type="national" />
-    <date name="Långfredagen" value="2012/4/6" type="national" />
-    <date name="Påskdagen" value="2012/4/8" type="national" />
-    <date name="Annandag Påsk" value="2012/4/9" type="national" />
-    <date name="Långfredagen" value="2013/3/29" type="national" />
-    <date name="Påskdagen" value="2013/3/31" type="national" />
-    <date name="Annandag Påsk" value="2013/4/1" type="national" />
-    <date name="Långfredagen" value="2014/4/18" type="national" />
-    <date name="Påskdagen" value="2014/4/20" type="national" />
-    <date name="Annandag Påsk" value="2014/4/21" type="national" />
-    <date name="Långfredagen" value="2015/4/3" type="national" />
-    <date name="Påskdagen" value="2015/4/5" type="national" />
-    <date name="Annandag Påsk" value="2015/4/6" type="national" />
-    <date name="Första Maj" value="*/5/1" type="national" />
-    <date name="Kristi Himmelfärdsdag" value="2009/5/21" type="national" />
-    <date name="Kristi Himmelfärdsdag" value="2010/5/13" type="national" />
-    <date name="Kristi Himmelfärdsdag" value="2011/6/2" type="national" />
-    <date name="Kristi Himmelfärdsdag" value="2012/5/17" type="national" />
-    <date name="Kristi Himmelfärdsdag" value="2013/5/9" type="national" />
-    <date name="Kristi Himmelfärdsdag" value="2014/5/29" type="national" />
-    <date name="Kristi Himmelfärdsdag" value="2015/5/14" type="national" />
-    <date name="Nationaldag" value="*/6/6" type="national" />
-    <date name="Midsommardagen" value="*/3/sat/jun" type="national" />
-    <date name="Allahelgonadagen" value="*/1/sat/nov" type="national" />
-    <date name="Juldagen" value="*/12/25" type="national" />
-    <date name="Annandag Jul" value="*/12/26" type="national" />
+    <date name="Nyårsdagen" value="*/1/1" type="National" />
+    <date name="Trettondagen" value="*/1/5" type="National" />
+    <date name="Långfredagen" value="2007/4/6" type="National" />
+    <date name="Påskdagen" value="2007/4/8" type="National" />
+    <date name="Annandag Påsk" value="2007/4/9" type="National" />
+    <date name="Långfredagen" value="2008/3/21" type="National" />
+    <date name="Påskdagen" value="2008/3/23" type="National" />
+    <date name="Annandag Påsk" value="2008/3/24" type="National" />
+    <date name="Långfredagen" value="2009/4/10" type="National" />
+    <date name="Påskdagen" value="2009/4/12" type="National" />
+    <date name="Annandag Påsk" value="2009/4/13" type="National" />
+    <date name="Långfredagen" value="2010/4/2" type="National" />
+    <date name="Påskdagen" value="2010/4/4" type="National" />
+    <date name="Annandag Påsk" value="2010/4/5" type="National" />
+    <date name="Långfredagen" value="2011/4/21" type="National" />
+    <date name="Påskdagen" value="2011/4/24" type="National" />
+    <date name="Annandag Påsk" value="2011/4/25" type="National" />
+    <date name="Långfredagen" value="2012/4/6" type="National" />
+    <date name="Påskdagen" value="2012/4/8" type="National" />
+    <date name="Annandag Påsk" value="2012/4/9" type="National" />
+    <date name="Långfredagen" value="2013/3/29" type="National" />
+    <date name="Påskdagen" value="2013/3/31" type="National" />
+    <date name="Annandag Påsk" value="2013/4/1" type="National" />
+    <date name="Långfredagen" value="2014/4/18" type="National" />
+    <date name="Påskdagen" value="2014/4/20" type="National" />
+    <date name="Annandag Påsk" value="2014/4/21" type="National" />
+    <date name="Långfredagen" value="2015/4/3" type="National" />
+    <date name="Påskdagen" value="2015/4/5" type="National" />
+    <date name="Annandag Påsk" value="2015/4/6" type="National" />
+    <date name="Första Maj" value="*/5/1" type="National" />
+    <date name="Kristi Himmelfärdsdag" value="2009/5/21" type="National" />
+    <date name="Kristi Himmelfärdsdag" value="2010/5/13" type="National" />
+    <date name="Kristi Himmelfärdsdag" value="2011/6/2" type="National" />
+    <date name="Kristi Himmelfärdsdag" value="2012/5/17" type="National" />
+    <date name="Kristi Himmelfärdsdag" value="2013/5/9" type="National" />
+    <date name="Kristi Himmelfärdsdag" value="2014/5/29" type="National" />
+    <date name="Kristi Himmelfärdsdag" value="2015/5/14" type="National" />
+    <date name="Nationaldag" value="*/6/6" type="National" />
+    <date name="Midsommardagen" value="*/3/sat/jun" type="National" />
+    <date name="Allahelgonadagen" value="*/1/sat/nov" type="National" />
+    <date name="Juldagen" value="*/12/25" type="National" />
+    <date name="Annandag Jul" value="*/12/26" type="National" />
   </country>
 </calendar>