diff --git a/holidays/holidays.qrc b/holidays/holidays.qrc
--- a/holidays/holidays.qrc
+++ b/holidays/holidays.qrc
@@ -129,7 +129,7 @@
plan2/holiday_th_en-gb
plan2/holiday_tr_en-gb
plan2/holiday_tr_tr
- plan2/holiday_tw_zh
+ plan2/holiday_tw_zh-tw
plan2/holiday_ua_uk
plan2/holiday_us_en-us
plan2/holiday_uy_es
diff --git a/holidays/plan2/holiday_tw_zh b/holidays/plan2/holiday_tw_zh
deleted file mode 100644
--- a/holidays/plan2/holiday_tw_zh
+++ /dev/null
@@ -1,133 +0,0 @@
-::
-:: Country: Taiwan
-::
-:: Language: Traditional Chinese
-::
-:: Author: Ricky Lindén
-::
-:: Updated: 2020-04-16
-::
-:: Source: https://www.timeanddate.com/holidays/taiwan/
-:: https://en.wikipedia.org/wiki/Public_holidays_in_Taiwan
-::
-
-:: Metadata
-country "TW"
-language "tw_zh"
-:name "optional - defaults to country name"
-:description "National holiday's for Taiwan"
-
-:: Public Holidays
-: Republic Day/New Year's Day
-"中華民國開國紀念日 / 元旦" public on January 1
-: Chinese New Year's Eve
-"農曆除夕" public on January 24
-: Spring festival
-"春節" public on January 23 - 29
-: Make up Day for Lunar New Year Holiday
-"春節補假" public on February 15
-: Peace Memorial Day
-"228和平紀念日" public on February 28
-: Children's Day
-"兒童節" public on April 4
-: Tomb Sweeping Day holiday
-"清明節 補假" public on April 3
-: Tomb Sweeping Day
-"淸明節" public on April 4
-: Labor Day
-"勞動節" public on May 1
-: Make up Day for Dragon Boat Festival holiday
-"端午節 補假" public on June 20
-: Dragon Boat Festival
-"端午節" public on June 25
-: Dragon Boat Festival holiday
-"端午節 (放假日)" public on June 26
-: Make up Day for Mid Autumn Festival Holiday
-"中秋節 補假" public on September 26
-: Mid-Autumn Festival
-"中秋節" public on October 1
-: Mid-Autumn Festival holiday
-"中秋節 (放假日)" public on October 2
-: National Day observed
-"中華民國國慶日 (放假日)" public on October 9
-: National Day
-"中華民國國慶日" public on October 10
-: Taiwan's Retrocession Day
-"臺灣光復節" public on October 25
-
-:: Religious
-: Earth God's Birthday
-"土地公誕辰" religious on February 4
-: Kuan Yin's Birthday
-"觀世音菩薩聖誕" religious on March 12
-: God of Medicine's Birthday
-"保生大帝誕辰" religious on April 7
-: Easter Sunday
-"復活節" religious on April 12
-: Matsu's Birthday
-"媽祖聖誕" religious on April 15
-: Buddha's Birthday
-"佛誕日" religious on April 30
-: Kuan Kung's Birthday
-"關聖帝君生日" religious on July 3
-: Chen Huang's Birthday
-"城隍誕辰" religious on July 3
-: Hungry Ghost Festival
-"中元節" religious on September 2
-
-:: Financial
-
-:: Cultural
-: Farmer's Day
-"農民節" cultural on February 4
-: Lantern Festival
-"元宵節" cultural on February 8
-: International Women's Day
-"國際婦女節" cultural on March 8
-: Arbor Day
-"植樹節" cultural on March 12
-: Youth Day
-"青年節" cultural on March 29
-: Literary Day
-"文藝節" cultural on May 4
-: Mother's Day
-"母親節" cultural on May 10
-: Father's Day
-"父親節" cultural on August 8
-: Chinese Valentine's Day
-"七夕節" cultural on August 25
-: Armed Forces Day
-"軍人節" cultural on September 3
-: Teacher's Day
-"教師節" cultural on September 28
-: Double Ninth Day
-"重陽節" cultural on October 25
-: Halloween
-"萬聖節" cultural on October 31
-: Sun Yat-sen's birthday
-"國父誕辰紀念日" cultural on November 12
-: Saisiat Festival
-"賽夏節" cultural on November 29
-: Constitution Day
-"行憲紀念日" cultural on December 25
-: Christmas Day
-"聖誕節" cultural on December 25
-
-:: School
-
-:: Daylight Saving
-
-:: Seasons
-: March Equinox
-"春分" seasonal on March 20
-: Jun Solstice
-"夏至" seasonal on June 21
-: September Equinox
-"秋分" seasonal on September 22
-: December Solstice
-"冬至" seasonal on December 21
-: Dōngzhì Festival
-"冬至" seasonal on December 21
-
-:: Name Days
-
diff --git a/holidays/plan2/holiday_tw_zh-tw b/holidays/plan2/holiday_tw_zh-tw
new file mode 100644
--- /dev/null
+++ b/holidays/plan2/holiday_tw_zh-tw
@@ -0,0 +1,81 @@
+::
+:: 國家：中華民國（臺灣）
+::
+:: 語言：中文
+::
+:: 作者：Ricky Lindén
+::
+:: 更新日期：2020-05-04
+::
+:: 來源：https://law.moj.gov.tw/LawClass/LawAll.aspx?pcode=D0020033
+::
+
+:: 元資料
+country "TW"
+language "zh_TW"
+:name "可選 - 預設為國家名"
+description "中華民國（臺灣）紀念日及節日"
+
+:: 應放假之紀念日及節日
+
+: Republic Day/New Year's Day
+"中華民國開國紀念日" public commemorative on January 1
+
+: Peace Memorial Day
+"和平紀念日" public commemorative on ((year >= 1997) ? [February 28] : noop)
+
+: Children's Day
+"兒童節" public on ((year >= 2011) ? [April 4] : noop)
+
+: National Day
+"國慶日" public commemorative on October 10
+
+:: 應放假之紀念日及節日（以農曆為基礎）
+
+: Chinese New Year's Eve
+"農曆除夕" public cultural on 24 January 2020
+: Spring Festival
+"春節" public cultural on 25 January 2020 length 5 days
+: Tomb Sweeping Day
+"民族掃墓節" public cultural on 4 April 2020
+: Dragon Boat Festival
+"端午節" public cultural on 25 June 2020
+: Mid-Autumn Festival
+"中秋節" public cultural on 1 October 2020
+
+:: Substitute holidays
+:: 補假
+
+"兒童節補假" public on 3 April 2020
+"民族掃墓節補假" public on 2 April 2020
+
+:: 其他紀念日
+
+"國父逝世紀念日" commemorative on March 12
+"植樹節" commemorative on March 12
+"反侵略日" commemorative on ((year >= 2006) ? [March 14] : noop)
+"革命先烈紀念日" commemorative on March 29
+"解嚴紀念日" commemorative on ((year >= 2007) ? [July 15] : noop)
+"孔子誕辰紀念日" commemorative on September 28
+"臺灣聯合國日" commemorative on October 24
+"國父誕辰紀念日" commemorative on November 12
+"行憲紀念日" commemorative on December 25
+
+"佛陀誕辰紀念日" commemorative religious on 30 April 2020
+
+:: 其他節日
+
+"婦女節" commemorative on March 8
+"青年節" commemorative on March 29
+"勞動節" commemorative on May 1
+"軍人節" commemorative on September 3
+"教師節" commemorative on September 28
+"臺灣光復節" commemorative on October 25
+"中華文化復興節" commemorative on November 12
+
+"道教節" commemorative on 25 January 2020
+
+:: Historical
+:: 已廢除假期
+
+"婦女節、兒童節合併假期" public on ((year >= 1991) && (year <= 1997) ? [April 4] : noop)