diff --git a/holidays/holidays.qrc b/holidays/holidays.qrc
index 4114b74..45c0109 100644
--- a/holidays/holidays.qrc
+++ b/holidays/holidays.qrc
@@ -1,122 +1,133 @@
plan2/holiday_ar_es
plan2/holiday_at_de
plan2/holiday_au-act_en-gb
plan2/holiday_au-nsw_en-gb
plan2/holiday_au-nt_en-gb
plan2/holiday_au-qld_en-gb
plan2/holiday_au-sa_en-gb
plan2/holiday_au-tas_en-gb
plan2/holiday_au-vic_en-gb
plan2/holiday_au-wa_en-gb
plan2/holiday_ba-srp_sr
plan2/holiday_ba-srp_sr@ijekavian
plan2/holiday_ba-srp_sr@ijekavianlatin
plan2/holiday_ba-srp_sr@latin
plan2/holiday_bb_en-gb
plan2/holiday_be_fr
plan2/holiday_be_nl
plan2/holiday_be_wa
plan2/holiday_bg_bg
plan2/holiday_br_pt-br
plan2/holiday_by_be
plan2/holiday_ca-qc_fr
plan2/holiday_ca_en-gb
plan2/holiday_ch_de
plan2/holiday_ch_fr
plan2/holiday_ch_it
plan2/holiday_cl_es
plan2/holiday_cm_en
plan2/holiday_cm_fr
plan2/holiday_cn_zh-cn
plan2/holiday_co_es
plan2/holiday_cr_en
plan2/holiday_cr_es
plan2/holiday_cz_cs
+ plan2/holiday_de-bb_de
+ plan2/holiday_de-bw_de
plan2/holiday_de-by_de
+ plan2/holiday_de-hh_de
+ plan2/holiday_de-mv_de
+ plan2/holiday_de-nw_de
+ plan2/holiday_de-rp_de
+ plan2/holiday_de-sh_de
+ plan2/holiday_de-sl_de
+ plan2/holiday_de-sn_de
+ plan2/holiday_de-st_de
+ plan2/holiday_de-th_de
plan2/holiday_de_de
plan2/holiday_dk_da
plan2/holiday_dz_ar
plan2/holiday_dz_fr
plan2/holiday_ee_et
plan2/holiday_eg_ar
plan2/holiday_es-ct_ca
plan2/holiday_es_es
plan2/holiday_fi_fi
plan2/holiday_fr_fr
plan2/holiday_gb-eaw_en-gb
plan2/holiday_gb-nir_en-gb
plan2/holiday_gb-sct_en-gb
plan2/holiday_gf_fr
plan2/holiday_gp_fr
plan2/holiday_gr_el
plan2/holiday_gr_el_nameday
plan2/holiday_gt_es
plan2/holiday_hk_en-gb
plan2/holiday_hk_zh-cn
plan2/holiday_hr_hr
plan2/holiday_hu_hu
plan2/holiday_id_en-us
plan2/holiday_id_id
plan2/holiday_ie_en-gb
plan2/holiday_ie_ga
plan2/holiday_il_en-us
plan2/holiday_il_he
plan2/holiday_in_en-gb
plan2/holiday_ir_en-us
plan2/holiday_ir_fa
plan2/holiday_is_is
plan2/holiday_it-bz_de
plan2/holiday_it_it
plan2/holiday_jm_en-gb
plan2/holiday_jp_en-us
plan2/holiday_jp_ja
plan2/holiday_kr_ko
plan2/holiday_kz_kk
plan2/holiday_kz_ru
plan2/holiday_lt_lt
plan2/holiday_lu_fr
plan2/holiday_lu_lb
plan2/holiday_lv_lv
plan2/holiday_ma_ar
plan2/holiday_ma_fr
plan2/holiday_mq_fr
plan2/holiday_mu_en
plan2/holiday_mx_es
plan2/holiday_na_en-gb
plan2/holiday_nc_fr
plan2/holiday_nl_nl
plan2/holiday_no_nb
plan2/holiday_no_nn
plan2/holiday_nz_en-gb
plan2/holiday_pa_en
plan2/holiday_pa_es
plan2/holiday_pe_es
plan2/holiday_pf_fr
plan2/holiday_pl_pl
plan2/holiday_pt_pt
plan2/holiday_py_es
plan2/holiday_re_fr
plan2/holiday_ro_ro
plan2/holiday_rs_sr
plan2/holiday_rs_sr@ijekavian
plan2/holiday_rs_sr@ijekavianlatin
plan2/holiday_rs_sr@latin
plan2/holiday_ru_ru
plan2/holiday_se_sv
plan2/holiday_sg_en-gb
plan2/holiday_si_sl
plan2/holiday_sk_sk
plan2/holiday_sm_it
plan2/holiday_th_en-gb
plan2/holiday_tr_en-gb
plan2/holiday_tr_tr
plan2/holiday_ua_uk
plan2/holiday_us_en-us
plan2/holiday_uy_es
plan2/holiday_wf_fr
plan2/holiday_yt_fr
plan2/holiday_za_en-gb
diff --git a/holidays/plan2/holiday_de-bb_de b/holidays/plan2/holiday_de-bb_de
new file mode 100644
index 0000000..ffa90d9
--- /dev/null
+++ b/holidays/plan2/holiday_de-bb_de
@@ -0,0 +1,66 @@
+::
+:: Country: Germany
+::
+:: Language: German
+::
+:: Author: Tobias Leupold
+::
+:: Updated: 2018-03-25
+::
+:: Source:
+:: https://www.bmi.bund.de/DE/themen/verfassung/staatliche-symbole/nationale-feiertage/nationale-feiertage-artikel.html
+:: https://de.wikipedia.org/wiki/Gesetzliche_Feiertage_in_Deutschland
+::
+
+:: Metadata
+country "DE"
+language "de"
+:name "optional - defaults to country name"
+description "Feiertage für Deutschland (Brandenburg)"
+
+:: ---------- This part is specific for Brandenburg ----------
+
+"Reformationstag" public on 31.10.
+
+:: ---------- This part is shared across all Federal States of Germany ----------
+
+:: Public Holidays
+"Neujahr" public on 1.1.
+"Karfreitag" public on easter minus 2 days
+"Ostermontag" public on easter plus 1 days
+"Christi Himmelfahrt" public on easter plus 39 days
+"Pfingstmontag" public on easter plus 50 days
+"1. Mai" public on 1.5.
+"Tag der Deutschen Einheit" public on 3.10.
+"1. Weihnachtsfeiertag" public on 25.12.
+"2. Weihnachtsfeiertag" public on 26.12.
+
+:: Religious
+"Gründonnerstag" religious on easter minus 3 days
+"Ostersonntag" religious on easter
+"Pfingstsonntag" religious on easter plus 49 days
+"Nikolaus" religious on 6.12.
+"1. Advent" religious on sunday before december 24 minus 21 days
+"2. Advent" religious on sunday before december 24 minus 14 days
+"3. Advent" religious on sunday before december 24 minus 7 days
+"4. Advent" religious on sunday before december 24
+"Heiliger Abend" religious on december 24
+
+:: Financial
+
+:: Cultural
+"Silvester" cultural on december 31
+"Rosenmontag" cultural on easter minus 48 days
+"Faschingsdienstag" cultural on easter minus 47 days
+"Aschermittwoch" cultural on easter minus 46 days
+"Muttertag" cultural on second sunday in may
+
+:: School
+
+:: Daylight Saving
+"Beginn der Sommerzeit" seasonal on last sunday in march
+"Beginn der Winterzeit" seasonal on last sunday in october
+
+:: Seasons
+
+:: Name Days
diff --git a/holidays/plan2/holiday_de-bw_de b/holidays/plan2/holiday_de-bw_de
new file mode 100644
index 0000000..131b279
--- /dev/null
+++ b/holidays/plan2/holiday_de-bw_de
@@ -0,0 +1,69 @@
+::
+:: Country: Germany
+::
+:: Language: German
+::
+:: Author: Tobias Leupold
+::
+:: Updated: 2018-03-25
+::
+:: Source:
+:: https://www.bmi.bund.de/DE/themen/verfassung/staatliche-symbole/nationale-feiertage/nationale-feiertage-artikel.html
+:: https://de.wikipedia.org/wiki/Gesetzliche_Feiertage_in_Deutschland
+:: https://im.baden-wuerttemberg.de/de/service/feiertage/
+::
+
+:: Metadata
+country "DE"
+language "de"
+:name "optional - defaults to country name"
+description "Feiertage für Deutschland (Baden-Württemberg)"
+
+:: ---------- This part is specific for Baden-Wuerttemberg ----------
+
+"Heilige Drei Könige" public on 6.1.
+"Fronleichnam" public on easter plus 60 days
+"Allerheiligen" public on 1.11.
+
+:: ---------- This part is shared across all Federal States of Germany ----------
+
+:: Public Holidays
+"Neujahr" public on 1.1.
+"Karfreitag" public on easter minus 2 days
+"Ostermontag" public on easter plus 1 days
+"Christi Himmelfahrt" public on easter plus 39 days
+"Pfingstmontag" public on easter plus 50 days
+"1. Mai" public on 1.5.
+"Tag der Deutschen Einheit" public on 3.10.
+"1. Weihnachtsfeiertag" public on 25.12.
+"2. Weihnachtsfeiertag" public on 26.12.
+
+:: Religious
+"Gründonnerstag" religious on easter minus 3 days
+"Ostersonntag" religious on easter
+"Pfingstsonntag" religious on easter plus 49 days
+"Nikolaus" religious on 6.12.
+"1. Advent" religious on sunday before december 24 minus 21 days
+"2. Advent" religious on sunday before december 24 minus 14 days
+"3. Advent" religious on sunday before december 24 minus 7 days
+"4. Advent" religious on sunday before december 24
+"Heiliger Abend" religious on december 24
+
+:: Financial
+
+:: Cultural
+"Silvester" cultural on december 31
+"Rosenmontag" cultural on easter minus 48 days
+"Faschingsdienstag" cultural on easter minus 47 days
+"Aschermittwoch" cultural on easter minus 46 days
+"Muttertag" cultural on second sunday in may
+
+:: School
+
+:: Daylight Saving
+"Beginn der Sommerzeit" seasonal on last sunday in march
+"Beginn der Winterzeit" seasonal on last sunday in october
+
+:: Seasons
+
+:: Name Days
diff --git a/holidays/plan2/holiday_de-by_de b/holidays/plan2/holiday_de-by_de
index d6dc5e1..93d0e27 100644
--- a/holidays/plan2/holiday_de-by_de
+++ b/holidays/plan2/holiday_de-by_de
@@ -1,93 +1,71 @@
::
-:: Country: Germany, Bavaria
+:: Country: Germany
::
:: Language: German
::
-:: Author: Burkhard Ludwig
+:: Author: Tobias Leupold
::
-:: Updated:
+:: Updated: 2018-03-25
::
:: Source:
-::
-:: Hints (to be understood by germans)
-::
-:: Schwalben...
-:: An OCULI da kommen sie
-:: An MARIÄ GEBURT, da sind sie wieder furt.
-:: Geranien...
-:: pflanzt man auf dem Balkon nach den Eisheiligen (PANKRAZ bis kalte SOPHIE)
-:: Gänse...
-:: Wer einen guten Braten macht hat auch ein gutes Herz. (MARTINI)
-:: Spargel...
-:: wird bis höchstens JOHANNI gestochen.
-:: Regen...
-:: Wenns ans SIEBENSCHLÄFER regnet, so regnet's sieben Wochen.
+:: https://www.bmi.bund.de/DE/themen/verfassung/staatliche-symbole/nationale-feiertage/nationale-feiertage-artikel.html
+:: https://de.wikipedia.org/wiki/Gesetzliche_Feiertage_in_Deutschland
+:: https://www.stmi.bayern.de/suk/bayern/feiertage/index.php
::
:: Metadata
-country "DE-BY"
+country "DE"
language "de"
:name "optional - defaults to country name"
-:description "(please add description in source language) National holiday file for Bavaria"
+description "Feiertage für Deutschland (Bayern)"
+
+:: ---------- This part is specific for Bavaria ----------
+
+"Heilige Drei Könige" public on 6.1.
+"Fronleichnam" public on easter plus 60 days
+"Mariä Himmelfahrt (regional)" public on 15.8.
+"Allerheiligen" public on 1.11.
+"Buß- und Bettag (schulfrei)" public on wednesday before 23.11.
+
+:: ---------- This part is shared across all Federal States of Germany ----------
:: Public Holidays
-"Neujahr" public on january 1
-"Hl. 3 Könige" public on january 6
-"Karfreitag" public cultural on easter minus 2 days
-"Ostern" public cultural on easter length 2 days
-"Pfingsten" public cultural on easter plus 49 days length 2 days
-"Christi Himmelfahrt" public cultural on easter plus 39 days
-"Fronleichnam" public cultural on easter plus 60 days
-"1. Mai" public on may 1
-"Mariä Himmelfahrt" public cultural on august 15
-"Einheitstag" public on october 3
-"Allerheiligen" public on november 1
-::No longer a public holiday (except in Saxony), per Bug 355073
-::"Buß- und Bettag" public on sunday before december 24 minus 32 days
-"Weihnachten" public cultural on december 25 length 2 days
+"Neujahr" public on 1.1.
+"Karfreitag" public on easter minus 2 days
+"Ostermontag" public on easter plus 1 days
+"Christi Himmelfahrt" public on easter plus 39 days
+"Pfingstmontag" public on easter plus 50 days
+"1. Mai" public on 1.5.
+"Tag der Deutschen Einheit" public on 3.10.
+"1. Weihnachtsfeiertag" public on 25.12.
+"2. Weihnachtsfeiertag" public on 26.12.
:: Religious
-"Lichtmeß" religious on february 2
-"Rosenmontag" religious on easter minus 48 days
-"Fasching" religious on easter minus 47 days
-"Aschermittwoch" religious on easter minus 46 days
-"1. Fastensonntag" religious on easter minus 42 days
-"2. Fastensonntag" religious on easter minus 35 days
-"3. Fastensonntag" religious on easter minus 28 days
-"Oculi" religious on easter minus 28 days
-"4. Fastensonntag" religious on easter minus 21 days
-"5. Fastensonntag" religious on easter minus 14 days
-"Palmsonntag" religious on easter minus 7 days
-"Pankraz" religious on may 11
-"Servaz" religious on may 12
-"Bonifaz" religious on may 13
-"Sophie" religious on may 14
-"Johanni" religious on june 24
-"Siebenschläfer" religious on june 27
-"Mariä Geburt" religious on september 8
-"Martini" religious on november 11
-"Nikolaus" religious on december 6
-"Christkönig" religious on sunday before december 23 minus 28 days
-"1. Advent" religious on sunday before december 24 minus 21 days
-"2. Advent" religious on sunday before december 24 minus 14 days
-"3. Advent" religious on sunday before december 24 minus 7 days
-"4. Advent" religious on sunday before december 24
-"Hl. Abend" religious on december 24
-"Silvester" religious on december 31
+"Gründonnerstag" religious on easter minus 3 days
+"Ostersonntag" religious on easter
+"Pfingstsonntag" religious on easter plus 49 days
+"Nikolaus" religious on 6.12.
+"1. Advent" religious on sunday before december 24 minus 21 days
+"2. Advent" religious on sunday before december 24 minus 14 days
+"3. Advent" religious on sunday before december 24 minus 7 days
+"4. Advent" religious on sunday before december 24
+"Heiliger Abend" religious on december 24
:: Financial
:: Cultural
-"Muttertag" cultural on second sunday in may
-"Karwoche" cultural on easter minus 6 days length 6 days
-"1. Wies'nsonntag" cultural on first sunday in october minus 14 days
+"Silvester" cultural on december 31
+"Rosenmontag" cultural on easter minus 48 days
+"Faschingsdienstag" cultural on easter minus 47 days
+"Aschermittwoch" cultural on easter minus 46 days
+"Muttertag" cultural on second sunday in may
:: School
:: Daylight Saving
-"Sommerzeit" seasonal on last sunday in march
-"Winterzeit" seasonal on last sunday in october
+"Beginn der Sommerzeit" seasonal on last sunday in march
+"Beginn der Winterzeit" seasonal on last sunday in october
:: Seasons
:: Name Days
diff --git a/holidays/plan2/holiday_de-hh_de b/holidays/plan2/holiday_de-hh_de
new file mode 100644
index 0000000..e5aaae7
--- /dev/null
+++ b/holidays/plan2/holiday_de-hh_de
@@ -0,0 +1,67 @@
+::
+:: Country: Germany
+::
+:: Language: German
+::
+:: Author: Tobias Leupold
+::
+:: Updated: 2018-03-25
+::
+:: Source:
+:: https://www.bmi.bund.de/DE/themen/verfassung/staatliche-symbole/nationale-feiertage/nationale-feiertage-artikel.html
+:: https://de.wikipedia.org/wiki/Gesetzliche_Feiertage_in_Deutschland
+:: https://innen.hessen.de/buerger-staat/gesetzliche-feiertage
+::
+
+:: Metadata
+country "DE"
+language "de"
+:name "optional - defaults to country name"
+description "Feiertage für Deutschland (Hessen)"
+
+:: ---------- This part is specific for Hesse ----------
+
+"Fronleichnam" public on easter plus 60 days
+
+:: ---------- This part is shared across all Federal States of Germany ----------
+
+:: Public Holidays
+"Neujahr" public on 1.1.
+"Karfreitag" public on easter minus 2 days
+"Ostermontag" public on easter plus 1 days
+"Christi Himmelfahrt" public on easter plus 39 days
+"Pfingstmontag" public on easter plus 50 days
+"1. Mai" public on 1.5.
+"Tag der Deutschen Einheit" public on 3.10.
+"1. Weihnachtsfeiertag" public on 25.12.
+"2. Weihnachtsfeiertag" public on 26.12.
+
+:: Religious
+"Gründonnerstag" religious on easter minus 3 days
+"Ostersonntag" religious on easter
+"Pfingstsonntag" religious on easter plus 49 days
+"Nikolaus" religious on 6.12.
+"1. Advent" religious on sunday before december 24 minus 21 days
+"2. Advent" religious on sunday before december 24 minus 14 days
+"3. Advent" religious on sunday before december 24 minus 7 days
+"4. Advent" religious on sunday before december 24
+"Heiliger Abend" religious on december 24
+
+:: Financial
+
+:: Cultural
+"Silvester" cultural on december 31
+"Rosenmontag" cultural on easter minus 48 days
+"Faschingsdienstag" cultural on easter minus 47 days
+"Aschermittwoch" cultural on easter minus 46 days
+"Muttertag" cultural on second sunday in may
+
+:: School
+
+:: Daylight Saving
+"Beginn der Sommerzeit" seasonal on last sunday in march
+"Beginn der Winterzeit" seasonal on last sunday in october
+
+:: Seasons
+
+:: Name Days
diff --git a/holidays/plan2/holiday_de-mv_de b/holidays/plan2/holiday_de-mv_de
new file mode 100644
index 0000000..abbca1e
--- /dev/null
+++ b/holidays/plan2/holiday_de-mv_de
@@ -0,0 +1,66 @@
+::
+:: Country: Germany
+::
+:: Language: German
+::
+:: Author: Tobias Leupold
+::
+:: Updated: 2018-03-25
+::
+:: Source:
+:: https://www.bmi.bund.de/DE/themen/verfassung/staatliche-symbole/nationale-feiertage/nationale-feiertage-artikel.html
+:: https://de.wikipedia.org/wiki/Gesetzliche_Feiertage_in_Deutschland
+::
+
+:: Metadata
+country "DE"
+language "de"
+:name "optional - defaults to country name"
+description "Feiertage für Deutschland (Mecklenburg-Vorpommern)"
+
+:: ---------- This part is specific for Mecklenburg-Hither Pomerania ----------
+
+"Reformationstag" public on 31.10.
+
+:: ---------- This part is shared across all Federal States of Germany ----------
+
+:: Public Holidays
+"Neujahr" public on 1.1.
+"Karfreitag" public on easter minus 2 days
+"Ostermontag" public on easter plus 1 days
+"Christi Himmelfahrt" public on easter plus 39 days
+"Pfingstmontag" public on easter plus 50 days
+"1. Mai" public on 1.5.
+"Tag der Deutschen Einheit" public on 3.10.
+"1. Weihnachtsfeiertag" public on 25.12.
+"2. Weihnachtsfeiertag" public on 26.12.
+
+:: Religious
+"Gründonnerstag" religious on easter minus 3 days
+"Ostersonntag" religious on easter
+"Pfingstsonntag" religious on easter plus 49 days
+"Nikolaus" religious on 6.12.
+"1. Advent" religious on sunday before december 24 minus 21 days
+"2. Advent" religious on sunday before december 24 minus 14 days
+"3. Advent" religious on sunday before december 24 minus 7 days
+"4. Advent" religious on sunday before december 24
+"Heiliger Abend" religious on december 24
+
+:: Financial
+
+:: Cultural
+"Silvester" cultural on december 31
+"Rosenmontag" cultural on easter minus 48 days
+"Faschingsdienstag" cultural on easter minus 47 days
+"Aschermittwoch" cultural on easter minus 46 days
+"Muttertag" cultural on second sunday in may
+
+:: School
+
+:: Daylight Saving
+"Beginn der Sommerzeit" seasonal on last sunday in march
+"Beginn der Winterzeit" seasonal on last sunday in october
+
+:: Seasons
+
+:: Name Days
diff --git a/holidays/plan2/holiday_de-nw_de b/holidays/plan2/holiday_de-nw_de
new file mode 100644
index 0000000..def8076
--- /dev/null
+++ b/holidays/plan2/holiday_de-nw_de
@@ -0,0 +1,67 @@
+::
+:: Country: Germany
+::
+:: Language: German
+::
+:: Author: Tobias Leupold
+::
+:: Updated: 2018-03-25
+::
+:: Source:
+:: https://www.bmi.bund.de/DE/themen/verfassung/staatliche-symbole/nationale-feiertage/nationale-feiertage-artikel.html
+:: https://de.wikipedia.org/wiki/Gesetzliche_Feiertage_in_Deutschland
+::
+
+:: Metadata
+country "DE"
+language "de"
+:name "optional - defaults to country name"
+description "Feiertage für Deutschland (Nordrhein-Westfalen)"
+
+:: ---------- This part is specific for North Rhine-Westphalia ----------
+
+"Fronleichnam" public on easter plus 60 days
+"Allerheiligen" public on 1.11.
+
+:: ---------- This part is shared across all Federal States of Germany ----------
+
+:: Public Holidays
+"Neujahr" public on 1.1.
+"Karfreitag" public on easter minus 2 days
+"Ostermontag" public on easter plus 1 days
+"Christi Himmelfahrt" public on easter plus 39 days
+"Pfingstmontag" public on easter plus 50 days
+"1. Mai" public on 1.5.
+"Tag der Deutschen Einheit" public on 3.10.
+"1. Weihnachtsfeiertag" public on 25.12.
+"2. Weihnachtsfeiertag" public on 26.12.
+
+:: Religious
+"Gründonnerstag" religious on easter minus 3 days
+"Ostersonntag" religious on easter
+"Pfingstsonntag" religious on easter plus 49 days
+"Nikolaus" religious on 6.12.
+"1. Advent" religious on sunday before december 24 minus 21 days
+"2. Advent" religious on sunday before december 24 minus 14 days
+"3. Advent" religious on sunday before december 24 minus 7 days
+"4. Advent" religious on sunday before december 24
+"Heiliger Abend" religious on december 24
+
+:: Financial
+
+:: Cultural
+"Silvester" cultural on december 31
+"Rosenmontag" cultural on easter minus 48 days
+"Faschingsdienstag" cultural on easter minus 47 days
+"Aschermittwoch" cultural on easter minus 46 days
+"Muttertag" cultural on second sunday in may
+
+:: School
+
+:: Daylight Saving
+"Beginn der Sommerzeit" seasonal on last sunday in march
+"Beginn der Winterzeit" seasonal on last sunday in october
+
+:: Seasons
+
+:: Name Days
diff --git a/holidays/plan2/holiday_de-rp_de b/holidays/plan2/holiday_de-rp_de
new file mode 100644
index 0000000..95bfb0f
--- /dev/null
+++ b/holidays/plan2/holiday_de-rp_de
@@ -0,0 +1,67 @@
+::
+:: Country: Germany
+::
+:: Language: German
+::
+:: Author: Tobias Leupold
+::
+:: Updated: 2018-03-25
+::
+:: Source:
+:: https://www.bmi.bund.de/DE/themen/verfassung/staatliche-symbole/nationale-feiertage/nationale-feiertage-artikel.html
+:: https://de.wikipedia.org/wiki/Gesetzliche_Feiertage_in_Deutschland
+::
+
+:: Metadata
+country "DE"
+language "de"
+:name "optional - defaults to country name"
+description "Feiertage für Deutschland (Rheinland-Pfalz)"
+
+:: ---------- This part is specific for Rhineland-Palatinate ----------
+
+"Fronleichnam" public on easter plus 60 days
+"Allerheiligen" public on 1.11.
+
+:: ---------- This part is shared across all Federal States of Germany ----------
+
+:: Public Holidays
+"Neujahr" public on 1.1.
+"Karfreitag" public on easter minus 2 days
+"Ostermontag" public on easter plus 1 days
+"Christi Himmelfahrt" public on easter plus 39 days
+"Pfingstmontag" public on easter plus 50 days
+"1. Mai" public on 1.5.
+"Tag der Deutschen Einheit" public on 3.10.
+"1. Weihnachtsfeiertag" public on 25.12.
+"2. Weihnachtsfeiertag" public on 26.12.
+
+:: Religious
+"Gründonnerstag" religious on easter minus 3 days
+"Ostersonntag" religious on easter
+"Pfingstsonntag" religious on easter plus 49 days
+"Nikolaus" religious on 6.12.
+"1. Advent" religious on sunday before december 24 minus 21 days
+"2. Advent" religious on sunday before december 24 minus 14 days
+"3. Advent" religious on sunday before december 24 minus 7 days
+"4. Advent" religious on sunday before december 24
+"Heiliger Abend" religious on december 24
+
+:: Financial
+
+:: Cultural
+"Silvester" cultural on december 31
+"Rosenmontag" cultural on easter minus 48 days
+"Faschingsdienstag" cultural on easter minus 47 days
+"Aschermittwoch" cultural on easter minus 46 days
+"Muttertag" cultural on second sunday in may
+
+:: School
+
+:: Daylight Saving
+"Beginn der Sommerzeit" seasonal on last sunday in march
+"Beginn der Winterzeit" seasonal on last sunday in october
+
+:: Seasons
+
+:: Name Days
diff --git a/holidays/plan2/holiday_de-sh_de b/holidays/plan2/holiday_de-sh_de
new file mode 100644
index 0000000..521386f
--- /dev/null
+++ b/holidays/plan2/holiday_de-sh_de
@@ -0,0 +1,66 @@
+::
+:: Country: Germany
+::
+:: Language: German
+::
+:: Author: Tobias Leupold
+::
+:: Updated: 2018-03-25
+::
+:: Source:
+:: https://www.bmi.bund.de/DE/themen/verfassung/staatliche-symbole/nationale-feiertage/nationale-feiertage-artikel.html
+:: https://de.wikipedia.org/wiki/Gesetzliche_Feiertage_in_Deutschland
+::
+
+:: Metadata
+country "DE"
+language "de"
+:name "optional - defaults to country name"
+description "Feiertage für Deutschland (Schleswig-Holstein)"
+
+:: ---------- This part is specific for Schleswig-Holstein ----------
+
+"Reformationstag" public on 31.10.
+
+:: ---------- This part is shared across all Federal States of Germany ----------
+
+:: Public Holidays
+"Neujahr" public on 1.1.
+"Karfreitag" public on easter minus 2 days
+"Ostermontag" public on easter plus 1 days
+"Christi Himmelfahrt" public on easter plus 39 days
+"Pfingstmontag" public on easter plus 50 days
+"1. Mai" public on 1.5.
+"Tag der Deutschen Einheit" public on 3.10.
+"1. Weihnachtsfeiertag" public on 25.12.
+"2. Weihnachtsfeiertag" public on 26.12.
+
+:: Religious
+"Gründonnerstag" religious on easter minus 3 days
+"Ostersonntag" religious on easter
+"Pfingstsonntag" religious on easter plus 49 days
+"Nikolaus" religious on 6.12.
+"1. Advent" religious on sunday before december 24 minus 21 days
+"2. Advent" religious on sunday before december 24 minus 14 days
+"3. Advent" religious on sunday before december 24 minus 7 days
+"4. Advent" religious on sunday before december 24
+"Heiliger Abend" religious on december 24
+
+:: Financial
+
+:: Cultural
+"Silvester" cultural on december 31
+"Rosenmontag" cultural on easter minus 48 days
+"Faschingsdienstag" cultural on easter minus 47 days
+"Aschermittwoch" cultural on easter minus 46 days
+"Muttertag" cultural on second sunday in may
+
+:: School
+
+:: Daylight Saving
+"Beginn der Sommerzeit" seasonal on last sunday in march
+"Beginn der Winterzeit" seasonal on last sunday in october
+
+:: Seasons
+
+:: Name Days
diff --git a/holidays/plan2/holiday_de-sl_de b/holidays/plan2/holiday_de-sl_de
new file mode 100644
index 0000000..bc5f7ac
--- /dev/null
+++ b/holidays/plan2/holiday_de-sl_de
@@ -0,0 +1,68 @@
+::
+:: Country: Germany
+::
+:: Language: German
+::
+:: Author: Tobias Leupold
+::
+:: Updated: 2018-03-25
+::
+:: Source:
+:: https://www.bmi.bund.de/DE/themen/verfassung/staatliche-symbole/nationale-feiertage/nationale-feiertage-artikel.html
+:: https://de.wikipedia.org/wiki/Gesetzliche_Feiertage_in_Deutschland
+::
+
+:: Metadata
+country "DE"
+language "de"
+:name "optional - defaults to country name"
+description "Feiertage für Deutschland (Saarland)"
+
+:: ---------- This part is specific for Saarland ----------
+
+"Fronleichnam" public on easter plus 60 days
+"Mariä Himmelfahrt" public on 15.8.
+"Allerheiligen" public on 1.11.
+
+:: ---------- This part is shared across all Federal States of Germany ----------
+
+:: Public Holidays
+"Neujahr" public on 1.1.
+"Karfreitag" public on easter minus 2 days
+"Ostermontag" public on easter plus 1 days
+"Christi Himmelfahrt" public on easter plus 39 days
+"Pfingstmontag" public on easter plus 50 days
+"1. Mai" public on 1.5.
+"Tag der Deutschen Einheit" public on 3.10.
+"1. Weihnachtsfeiertag" public on 25.12.
+"2. Weihnachtsfeiertag" public on 26.12.
+
+:: Religious
+"Gründonnerstag" religious on easter minus 3 days
+"Ostersonntag" religious on easter
+"Pfingstsonntag" religious on easter plus 49 days
+"Nikolaus" religious on 6.12.
+"1. Advent" religious on sunday before december 24 minus 21 days
+"2. Advent" religious on sunday before december 24 minus 14 days
+"3. Advent" religious on sunday before december 24 minus 7 days
+"4. Advent" religious on sunday before december 24
+"Heiliger Abend" religious on december 24
+
+:: Financial
+
+:: Cultural
+"Silvester" cultural on december 31
+"Rosenmontag" cultural on easter minus 48 days
+"Faschingsdienstag" cultural on easter minus 47 days
+"Aschermittwoch" cultural on easter minus 46 days
+"Muttertag" cultural on second sunday in may
+
+:: School
+
+:: Daylight Saving
+"Beginn der Sommerzeit" seasonal on last sunday in march
+"Beginn der Winterzeit" seasonal on last sunday in october
+
+:: Seasons
+
+:: Name Days
diff --git a/holidays/plan2/holiday_de-sn_de b/holidays/plan2/holiday_de-sn_de
new file mode 100644
index 0000000..4f1c1c6
--- /dev/null
+++ b/holidays/plan2/holiday_de-sn_de
@@ -0,0 +1,68 @@
+::
+:: Country: Germany
+::
+:: Language: German
+::
+:: Author: Tobias Leupold
+::
+:: Updated: 2018-03-25
+::
+:: Source:
+:: https://www.bmi.bund.de/DE/themen/verfassung/staatliche-symbole/nationale-feiertage/nationale-feiertage-artikel.html
+:: https://de.wikipedia.org/wiki/Gesetzliche_Feiertage_in_Deutschland
+::
+
+:: Metadata
+country "DE"
+language "de"
+:name "optional - defaults to country name"
+description "Feiertage für Deutschland (Sachsen)"
+
+:: ---------- This part is specific for Saxony ----------
+
+"Fronleichnam (regional)" public on easter plus 60 days
+"Reformationstag" public on 31.10.
+"Buß- und Bettag" public on wednesday before 23.11.
+
+:: ---------- This part is shared across all Federal States of Germany ----------
+
+:: Public Holidays
+"Neujahr" public on 1.1.
+"Karfreitag" public on easter minus 2 days
+"Ostermontag" public on easter plus 1 days
+"Christi Himmelfahrt" public on easter plus 39 days
+"Pfingstmontag" public on easter plus 50 days
+"1. Mai" public on 1.5.
+"Tag der Deutschen Einheit" public on 3.10.
+"1. Weihnachtsfeiertag" public on 25.12.
+"2. Weihnachtsfeiertag" public on 26.12.
+
+:: Religious
+"Gründonnerstag" religious on easter minus 3 days
+"Ostersonntag" religious on easter
+"Pfingstsonntag" religious on easter plus 49 days
+"Nikolaus" religious on 6.12.
+"1. Advent" religious on sunday before december 24 minus 21 days
+"2. Advent" religious on sunday before december 24 minus 14 days
+"3. Advent" religious on sunday before december 24 minus 7 days
+"4. Advent" religious on sunday before december 24
+"Heiliger Abend" religious on december 24
+
+:: Financial
+
+:: Cultural
+"Silvester" cultural on december 31
+"Rosenmontag" cultural on easter minus 48 days
+"Faschingsdienstag" cultural on easter minus 47 days
+"Aschermittwoch" cultural on easter minus 46 days
+"Muttertag" cultural on second sunday in may
+
+:: School
+
+:: Daylight Saving
+"Beginn der Sommerzeit" seasonal on last sunday in march
+"Beginn der Winterzeit" seasonal on last sunday in october
+
+:: Seasons
+
+:: Name Days
diff --git a/holidays/plan2/holiday_de-st_de b/holidays/plan2/holiday_de-st_de
new file mode 100644
index 0000000..a60d857
--- /dev/null
+++ b/holidays/plan2/holiday_de-st_de
@@ -0,0 +1,67 @@
+::
+:: Country: Germany
+::
+:: Language: German
+::
+:: Author: Tobias Leupold
+::
+:: Updated: 2018-03-25
+::
+:: Source:
+:: https://www.bmi.bund.de/DE/themen/verfassung/staatliche-symbole/nationale-feiertage/nationale-feiertage-artikel.html
+:: https://de.wikipedia.org/wiki/Gesetzliche_Feiertage_in_Deutschland
+::
+
+:: Metadata
+country "DE"
+language "de"
+:name "optional - defaults to country name"
+description "Feiertage für Deutschland (Sachsen-Anhalt)"
+
+:: ---------- This part is specific for Saxony-Anhalt ----------
+
+"Heilige Drei Könige" public on 6.1.
+"Reformationstag" public on 31.10.
+
+:: ---------- This part is shared across all Federal States of Germany ----------
+
+:: Public Holidays
+"Neujahr" public on 1.1.
+"Karfreitag" public on easter minus 2 days
+"Ostermontag" public on easter plus 1 days
+"Christi Himmelfahrt" public on easter plus 39 days
+"Pfingstmontag" public on easter plus 50 days
+"1. Mai" public on 1.5.
+"Tag der Deutschen Einheit" public on 3.10.
+"1. Weihnachtsfeiertag" public on 25.12.
+"2. Weihnachtsfeiertag" public on 26.12.
+
+:: Religious
+"Gründonnerstag" religious on easter minus 3 days
+"Ostersonntag" religious on easter
+"Pfingstsonntag" religious on easter plus 49 days
+"Nikolaus" religious on 6.12.
+"1. Advent" religious on sunday before december 24 minus 21 days
+"2. Advent" religious on sunday before december 24 minus 14 days
+"3. Advent" religious on sunday before december 24 minus 7 days
+"4. Advent" religious on sunday before december 24
+"Heiliger Abend" religious on december 24
+
+:: Financial
+
+:: Cultural
+"Silvester" cultural on december 31
+"Rosenmontag" cultural on easter minus 48 days
+"Faschingsdienstag" cultural on easter minus 47 days
+"Aschermittwoch" cultural on easter minus 46 days
+"Muttertag" cultural on second sunday in may
+
+:: School
+
+:: Daylight Saving
+"Beginn der Sommerzeit" seasonal on last sunday in march
+"Beginn der Winterzeit" seasonal on last sunday in october
+
+:: Seasons
+
+:: Name Days
diff --git a/holidays/plan2/holiday_de-th_de b/holidays/plan2/holiday_de-th_de
new file mode 100644
index 0000000..3cd5229
--- /dev/null
+++ b/holidays/plan2/holiday_de-th_de
@@ -0,0 +1,67 @@
+::
+:: Country: Germany
+::
+:: Language: German
+::
+:: Author: Tobias Leupold
+::
+:: Updated: 2018-03-25
+::
+:: Source:
+:: https://www.bmi.bund.de/DE/themen/verfassung/staatliche-symbole/nationale-feiertage/nationale-feiertage-artikel.html
+:: https://de.wikipedia.org/wiki/Gesetzliche_Feiertage_in_Deutschland
+::
+
+:: Metadata
+country "DE"
+language "de"
+:name "optional - defaults to country name"
+description "Feiertage für Deutschland (Thüringen)"
+
+:: ---------- This part is specific for Thuringia ----------
+
+"Fronleichnam (regional)" public on easter plus 60 days
+"Reformationstag" public on 31.10.
+
+:: ---------- This part is shared across all Federal States of Germany ----------
+
+:: Public Holidays
+"Neujahr" public on 1.1.
+"Karfreitag" public on easter minus 2 days
+"Ostermontag" public on easter plus 1 days
+"Christi Himmelfahrt" public on easter plus 39 days
+"Pfingstmontag" public on easter plus 50 days
+"1. Mai" public on 1.5.
+"Tag der Deutschen Einheit" public on 3.10.
+"1. Weihnachtsfeiertag" public on 25.12.
+"2. Weihnachtsfeiertag" public on 26.12.
+
+:: Religious
+"Gründonnerstag" religious on easter minus 3 days
+"Ostersonntag" religious on easter
+"Pfingstsonntag" religious on easter plus 49 days
+"Nikolaus" religious on 6.12.
+"1. Advent" religious on sunday before december 24 minus 21 days
+"2. Advent" religious on sunday before december 24 minus 14 days
+"3. Advent" religious on sunday before december 24 minus 7 days
+"4. Advent" religious on sunday before december 24
+"Heiliger Abend" religious on december 24
+
+:: Financial
+
+:: Cultural
+"Silvester" cultural on december 31
+"Rosenmontag" cultural on easter minus 48 days
+"Faschingsdienstag" cultural on easter minus 47 days
+"Aschermittwoch" cultural on easter minus 46 days
+"Muttertag" cultural on second sunday in may
+
+:: School
+
+:: Daylight Saving
+"Beginn der Sommerzeit" seasonal on last sunday in march
+"Beginn der Winterzeit" seasonal on last sunday in october
+
+:: Seasons
+
+:: Name Days
diff --git a/holidays/plan2/holiday_de_de b/holidays/plan2/holiday_de_de
index 9b09e6f..72d4a85 100644
--- a/holidays/plan2/holiday_de_de
+++ b/holidays/plan2/holiday_de_de
@@ -1,58 +1,62 @@
::
:: Country: Germany
::
:: Language: German
::
-:: Author:
+:: Author: Tobias Leupold
::
-:: Updated:
+:: Updated: 2018-03-25
::
:: Source:
+:: https://www.bmi.bund.de/DE/themen/verfassung/staatliche-symbole/nationale-feiertage/nationale-feiertage-artikel.html
+:: https://de.wikipedia.org/wiki/Gesetzliche_Feiertage_in_Deutschland
::
:: Metadata
country "DE"
language "de"
:name "optional - defaults to country name"
-:description "(please add description in source language) National holiday file for Germany"
+description "Feiertage für Deutschland"
+
+:: ---------- This part is shared across all Federal States of Germany ----------
:: Public Holidays
-"Neujahr" public on 1.1.
-"Karfreitag" public on easter minus 2 days
-"Ostern" public on easter length 2 days
-"Pfingsten" public on easter plus 49 days length 2 days
-"Christi Himmelfahrt" public on easter plus 39 days
-"1. Mai" public on 1.5.
-"Tag d. Einheit" public on 3.10.
-"Weihnachten" public on 25.12. length 2 days
+"Neujahr" public on 1.1.
+"Karfreitag" public on easter minus 2 days
+"Ostermontag" public on easter plus 1 days
+"Christi Himmelfahrt" public on easter plus 39 days
+"Pfingstmontag" public on easter plus 50 days
+"1. Mai" public on 1.5.
+"Tag der Deutschen Einheit" public on 3.10.
+"1. Weihnachtsfeiertag" public on 25.12.
+"2. Weihnachtsfeiertag" public on 26.12.
:: Religious
-"Hl. 3 Könige" religious on january 6
-"Rosenmontag" religious on easter minus 48 days
-"Fasching" religious on easter minus 47 days
-"Aschermittwoch" religious on easter minus 46 days
-"Fronleichnam" religious on easter plus 60 days
-"Reformationstag" religious on october 31
-"Allerheiligen" religious on november 1
-"Buß & Bettag" religious on sunday before december 24 minus 32 days
-"1. Advent" religious on sunday before december 24 minus 21 days
-"2. Advent" religious on sunday before december 24 minus 14 days
-"3. Advent" religious on sunday before december 24 minus 7 days
-"4. Advent" religious on sunday before december 24
-"Hl. Abend" religious on december 24
-"Silvester" religious on december 31
+"Gründonnerstag" religious on easter minus 3 days
+"Ostersonntag" religious on easter
+"Pfingstsonntag" religious on easter plus 49 days
+"Nikolaus" religious on 6.12.
+"1. Advent" religious on sunday before december 24 minus 21 days
+"2. Advent" religious on sunday before december 24 minus 14 days
+"3. Advent" religious on sunday before december 24 minus 7 days
+"4. Advent" religious on sunday before december 24
+"Heiliger Abend" religious on december 24
:: Financial
:: Cultural
-"Muttertag" cultural on second sunday in may
+"Silvester" cultural on december 31
+"Rosenmontag" cultural on easter minus 48 days
+"Faschingsdienstag" cultural on easter minus 47 days
+"Aschermittwoch" cultural on easter minus 46 days
+"Muttertag" cultural on second sunday in may
:: School
:: Daylight Saving
-"Sommerzeit" seasonal on last sunday in march
-"Winterzeit" seasonal on last sunday in october
+"Beginn der Sommerzeit" seasonal on last sunday in march
+"Beginn der Winterzeit" seasonal on last sunday in october
:: Seasons
:: Name Days