diff --git a/README.rst b/README.rst
index 84cd2a36f..8cdeb74da 100644
--- a/README.rst
+++ b/README.rst
@@ -361,8 +361,8 @@ All other default values are highlighted with bold:
    * - Cyprus
      - CY
      -
-     - **el**, en_US
-     -
+     - **el**, en_CY, en_US, uk
+     - BANK, OPTIONAL
    * - Czechia
      - CZ
      -
diff --git a/holidays/countries/cyprus.py b/holidays/countries/cyprus.py
index a1abc00e6..8022faafa 100644
--- a/holidays/countries/cyprus.py
+++ b/holidays/countries/cyprus.py
@@ -9,10 +9,11 @@
 #  Website: https://github.com/dr-prodigy/python-holidays
 #  License: MIT (see LICENSE file)
 
-
+from datetime import timedelta as td
 from gettext import gettext as tr
 
 from holidays.calendars.julian_revised import JULIAN_REVISED_CALENDAR
+from holidays.constants import BANK, OPTIONAL, PUBLIC
 from holidays.groups import ChristianHolidays, InternationalHolidays
 from holidays.holiday_base import HolidayBase
 
@@ -22,12 +23,14 @@ class Cyprus(HolidayBase, ChristianHolidays, InternationalHolidays):
     Cyprus holidays.
 
     References:
-     - https://en.wikipedia.org/wiki/Public_holidays_in_Cyprus
+         - https://en.wikipedia.org/wiki/Public_holidays_in_Cyprus
+         - https://www.centralbank.cy/en/the-bank/working-hours-bank-holidays
     """
 
     country = "CY"
     default_language = "el"
-    supported_languages = ("el", "en_US")
+    supported_categories = (BANK, OPTIONAL, PUBLIC)
+    supported_languages = ("el", "en_CY", "en_US", "uk")
 
     def __init__(self, *args, **kwargs):
         ChristianHolidays.__init__(self, JULIAN_REVISED_CALENDAR)
@@ -35,20 +38,23 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
     def _populate_public_holidays(self):
-        # New Years Day.
+        if self._year <= 1960:
+            return None
+
+        # New Year's Day.
         self._add_new_years_day(tr("Πρωτοχρονιά"))
 
         # Epiphany.
-        self._add_epiphany_day(tr("Θεοφάνεια"))
+        self._add_epiphany_day(tr("Ημέρα των Θεοφανίων"))
 
-        # Clean Monday.
+        # Green Monday.
         self._add_ash_monday(tr("Καθαρά Δευτέρα"))
 
         # Greek Independence Day.
-        self._add_holiday_mar_25(tr("Εικοστή Πέμπτη Μαρτίου"))
+        self._add_holiday_mar_25(tr("Ημέρα της Ελληνικής Ανεξαρτησίας"))
 
         # Cyprus National Day.
-        self._add_holiday_apr_1(tr("1η Απριλίου"))
+        self._add_holiday_apr_1(tr("Εθνική Ημέρα Κύπρου"))
 
         # Good Friday.
         self._add_good_friday(tr("Μεγάλη Παρασκευή"))
@@ -57,31 +63,46 @@ def _populate_public_holidays(self):
         self._add_easter_sunday(tr("Κυριακή του Πάσχα"))
 
         # Easter Monday.
-        self._add_easter_monday(tr("Δευτέρα του Πάσχα"))
+        self._add_easter_monday(tr("Δευτέρα της Διακαινησίμου"))
 
-        # Labour Day.
-        self._add_labor_day(tr("Εργατική Πρωτομαγιά"))
+        # Labor Day.
+        self._add_labor_day(tr("Πρωτομαγιά"))
 
-        # Monday of the Holy Spirit.
+        # Whit Monday.
         self._add_whit_monday(tr("Δευτέρα του Αγίου Πνεύματος"))
 
-        # Assumption of Mary.
+        # Assumption Day.
         self._add_assumption_of_mary_day(tr("Κοίμηση της Θεοτόκου"))
 
-        # Cyprus Independence Day.
-        self._add_holiday_oct_1(tr("Ημέρα Ανεξαρτησίας της Κύπρου"))
+        if self._year >= 1979:
+            # Cyprus Independence Day.
+            self._add_holiday_oct_1(tr("Ημέρα της Κυπριακής Ανεξαρτησίας"))
 
         # Ochi Day.
         self._add_holiday_oct_28(tr("Ημέρα του Όχι"))
 
-        # Christmas Eve.
-        self._add_christmas_eve(tr("Παραμονή Χριστουγέννων"))
-
         # Christmas Day.
         self._add_christmas_day(tr("Χριστούγεννα"))
 
         # Day After Christmas.
-        self._add_christmas_day_two(tr("Δεύτερη μέρα Χριστουγέννων"))
+        self._add_christmas_day_two(tr("Επομένη Χριστουγέννων"))
+
+    def _populate_bank_holidays(self):
+        if self._year <= 1960:
+            return None
+
+        # Easter Tuesday.
+        self._add_holiday(tr("Τρίτη της Διακαινησίμου"), self._easter_sunday + td(days=+2))
+
+    def _populate_optional_holidays(self):
+        if self._year <= 1960:
+            return None
+
+        # Holy Saturday.
+        self._add_holy_saturday(tr("Μεγάλο Σάββατο"))
+
+        # Christmas Eve.
+        self._add_christmas_eve(tr("Παραμονή Χριστουγέννων"))
 
 
 class CY(Cyprus):
diff --git a/holidays/locale/el/LC_MESSAGES/CY.po b/holidays/locale/el/LC_MESSAGES/CY.po
index c9ae0ab41..bc1473a33 100644
--- a/holidays/locale/el/LC_MESSAGES/CY.po
+++ b/holidays/locale/el/LC_MESSAGES/CY.po
@@ -3,7 +3,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Python Holidays 0.20\n"
+"Project-Id-Version: Python Holidays 0.41\n"
 "POT-Creation-Date: 2023-02-15 11:50-0800\n"
 "PO-Revision-Date: 2023-02-16 08:50-0800\n"
 "Last-Translator: Arkadii Yakovets <ark@cho.red>\n"
@@ -15,24 +15,24 @@ msgstr ""
 "Generated-By: Lingua 4.15.0\n"
 "X-Generator: Poedit 3.2.2\n"
 
-#. New Years Day.
+#. New Year's Day.
 msgid "Πρωτοχρονιά"
 msgstr ""
 
 #. Epiphany.
-msgid "Θεοφάνεια"
+msgid "Ημέρα των Θεοφανίων"
 msgstr ""
 
-#. Clean Monday.
+#. Green Monday.
 msgid "Καθαρά Δευτέρα"
 msgstr ""
 
 #. Greek Independence Day.
-msgid "Εικοστή Πέμπτη Μαρτίου"
+msgid "Ημέρα της Ελληνικής Ανεξαρτησίας"
 msgstr ""
 
 #. Cyprus National Day.
-msgid "1η Απριλίου"
+msgid "Εθνική Ημέρα Κύπρου"
 msgstr ""
 
 #. Good Friday.
@@ -44,23 +44,23 @@ msgid "Κυριακή του Πάσχα"
 msgstr ""
 
 #. Easter Monday.
-msgid "Δευτέρα του Πάσχα"
+msgid "Δευτέρα της Διακαινησίμου"
 msgstr ""
 
-#. Labour Day.
-msgid "Εργατική Πρωτομαγιά"
+#. Labor Day.
+msgid "Πρωτομαγιά"
 msgstr ""
 
-#. Monday of the Holy Spirit.
+#. Whit Monday.
 msgid "Δευτέρα του Αγίου Πνεύματος"
 msgstr ""
 
-#. Assumption of Mary.
+#. Assumption Day.
 msgid "Κοίμηση της Θεοτόκου"
 msgstr ""
 
 #. Cyprus Independence Day.
-msgid "Ημέρα Ανεξαρτησίας της Κύπρου"
+msgid "Ημέρα της Κυπριακής Ανεξαρτησίας"
 msgstr ""
 
 #. Ochi Day.
@@ -76,5 +76,13 @@ msgid "Χριστούγεννα"
 msgstr ""
 
 #. Day After Christmas.
-msgid "Δεύτερη μέρα Χριστουγέννων"
+msgid "Επομένη Χριστουγέννων"
+msgstr ""
+
+#. Easter Tuesday.
+msgid "Τρίτη της Διακαινησίμου"
+msgstr ""
+
+#. Holy Saturday.
+msgid "Μεγάλο Σάββατο"
 msgstr ""
diff --git a/holidays/locale/en_CY/LC_MESSAGES/CY.po b/holidays/locale/en_CY/LC_MESSAGES/CY.po
new file mode 100644
index 000000000..b39a1606a
--- /dev/null
+++ b/holidays/locale/en_CY/LC_MESSAGES/CY.po
@@ -0,0 +1,89 @@
+# Cyprus holidays en_CY localization.
+# Authors: ~Jhellico <jhellico@gmail.com>, (c) 2024.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Python Holidays 0.41\n"
+"POT-Creation-Date: 2023-02-15 11:50-0800\n"
+"PO-Revision-Date: 2024-01-05 13:33+0200\n"
+"Last-Translator: ~Jhellico <jhellico@gmail.com>\n"
+"Language-Team: Python Holidays localization team\n"
+"Language: en_CY\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Generated-By: Lingua 4.15.0\n"
+"X-Generator: Poedit 3.4\n"
+
+#. New Year's Day.
+msgid "Πρωτοχρονιά"
+msgstr "New Year's Day"
+
+#. Epiphany.
+msgid "Ημέρα των Θεοφανίων"
+msgstr "Epiphany"
+
+#. Green Monday.
+msgid "Καθαρά Δευτέρα"
+msgstr "Green Monday"
+
+#. Greek Independence Day.
+msgid "Ημέρα της Ελληνικής Ανεξαρτησίας"
+msgstr "Greek Independence Day"
+
+#. Cyprus National Day.
+msgid "Εθνική Ημέρα Κύπρου"
+msgstr "Cyprus National Day"
+
+#. Good Friday.
+msgid "Μεγάλη Παρασκευή"
+msgstr "Good Friday"
+
+#. Easter Sunday.
+msgid "Κυριακή του Πάσχα"
+msgstr "Easter Sunday"
+
+#. Easter Monday.
+msgid "Δευτέρα της Διακαινησίμου"
+msgstr "Easter Monday"
+
+#. Labor Day.
+msgid "Πρωτομαγιά"
+msgstr "Labour Day"
+
+#. Whit Monday.
+msgid "Δευτέρα του Αγίου Πνεύματος"
+msgstr "Pentecost"
+
+#. Assumption Day.
+msgid "Κοίμηση της Θεοτόκου"
+msgstr "Assumption Day"
+
+#. Cyprus Independence Day.
+msgid "Ημέρα της Κυπριακής Ανεξαρτησίας"
+msgstr "Cyprus Independence Day"
+
+#. Ochi Day.
+msgid "Ημέρα του Όχι"
+msgstr "Ochi Day"
+
+#. Christmas Eve.
+msgid "Παραμονή Χριστουγέννων"
+msgstr "Christmas Eve"
+
+#. Christmas Day.
+msgid "Χριστούγεννα"
+msgstr "Christmas Day"
+
+#. Day After Christmas.
+msgid "Επομένη Χριστουγέννων"
+msgstr "Day After Christmas"
+
+#. Easter Tuesday.
+msgid "Τρίτη της Διακαινησίμου"
+msgstr "Easter Tuesday"
+
+#. Holy Saturday.
+msgid "Μεγάλο Σάββατο"
+msgstr "Holy Saturday"
diff --git a/holidays/locale/en_US/LC_MESSAGES/CY.po b/holidays/locale/en_US/LC_MESSAGES/CY.po
index 1024b617f..97adfd0af 100644
--- a/holidays/locale/en_US/LC_MESSAGES/CY.po
+++ b/holidays/locale/en_US/LC_MESSAGES/CY.po
@@ -3,10 +3,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Python Holidays 0.20\n"
+"Project-Id-Version: Python Holidays 0.41\n"
 "POT-Creation-Date: 2023-02-15 11:50-0800\n"
-"PO-Revision-Date: 2023-02-15 11:58-0800\n"
-"Last-Translator: Arkadii Yakovets <ark@cho.red>\n"
+"PO-Revision-Date: 2024-01-05 13:23+0200\n"
+"Last-Translator: ~Jhellico <jhellico@gmail.com>\n"
 "Language-Team: Python Holidays localization team\n"
 "Language: en_US\n"
 "MIME-Version: 1.0\n"
@@ -14,26 +14,26 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Lingua 4.15.0\n"
-"X-Generator: Poedit 3.2.2\n"
+"X-Generator: Poedit 3.4\n"
 
-#. New Years Day.
+#. New Year's Day.
 msgid "Πρωτοχρονιά"
 msgstr "New Year's Day"
 
 #. Epiphany.
-msgid "Θεοφάνεια"
+msgid "Ημέρα των Θεοφανίων"
 msgstr "Epiphany"
 
-#. Clean Monday.
+#. Green Monday.
 msgid "Καθαρά Δευτέρα"
-msgstr "Clean Monday"
+msgstr "Green Monday"
 
 #. Greek Independence Day.
-msgid "Εικοστή Πέμπτη Μαρτίου"
+msgid "Ημέρα της Ελληνικής Ανεξαρτησίας"
 msgstr "Greek Independence Day"
 
 #. Cyprus National Day.
-msgid "1η Απριλίου"
+msgid "Εθνική Ημέρα Κύπρου"
 msgstr "Cyprus National Day"
 
 #. Good Friday.
@@ -45,28 +45,28 @@ msgid "Κυριακή του Πάσχα"
 msgstr "Easter Sunday"
 
 #. Easter Monday.
-msgid "Δευτέρα του Πάσχα"
+msgid "Δευτέρα της Διακαινησίμου"
 msgstr "Easter Monday"
 
-#. Labour Day.
-msgid "Εργατική Πρωτομαγιά"
+#. Labor Day.
+msgid "Πρωτομαγιά"
 msgstr "Labor Day"
 
-#. Monday of the Holy Spirit.
+#. Whit Monday.
 msgid "Δευτέρα του Αγίου Πνεύματος"
-msgstr "Monday of the Holy Spirit"
+msgstr "Whit Monday"
 
-#. Assumption of Mary.
+#. Assumption Day.
 msgid "Κοίμηση της Θεοτόκου"
-msgstr "Assumption of Mary"
+msgstr "Assumption Day"
 
 #. Cyprus Independence Day.
-msgid "Ημέρα Ανεξαρτησίας της Κύπρου"
+msgid "Ημέρα της Κυπριακής Ανεξαρτησίας"
 msgstr "Cyprus Independence Day"
 
 #. Ochi Day.
 msgid "Ημέρα του Όχι"
-msgstr "Ochi Day"
+msgstr "Greek National Day"
 
 #. Christmas Eve.
 msgid "Παραμονή Χριστουγέννων"
@@ -77,5 +77,13 @@ msgid "Χριστούγεννα"
 msgstr "Christmas Day"
 
 #. Day After Christmas.
-msgid "Δεύτερη μέρα Χριστουγέννων"
+msgid "Επομένη Χριστουγέννων"
 msgstr "Day After Christmas"
+
+#. Easter Tuesday.
+msgid "Τρίτη της Διακαινησίμου"
+msgstr "Easter Tuesday"
+
+#. Holy Saturday.
+msgid "Μεγάλο Σάββατο"
+msgstr "Holy Saturday"
diff --git a/holidays/locale/uk/LC_MESSAGES/CY.po b/holidays/locale/uk/LC_MESSAGES/CY.po
new file mode 100644
index 000000000..61df6c954
--- /dev/null
+++ b/holidays/locale/uk/LC_MESSAGES/CY.po
@@ -0,0 +1,89 @@
+# Cyprus holidays uk localization.
+# Authors: ~Jhellico <jhellico@gmail.com>, (c) 2024.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Python Holidays 0.41\n"
+"POT-Creation-Date: 2023-02-15 11:50-0800\n"
+"PO-Revision-Date: 2024-01-05 14:18+0200\n"
+"Last-Translator: ~Jhellico <jhellico@gmail.com>\n"
+"Language-Team: Python Holidays localization team\n"
+"Language: uk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n"
+"Generated-By: Lingua 4.15.0\n"
+"X-Generator: Poedit 3.4\n"
+
+#. New Year's Day.
+msgid "Πρωτοχρονιά"
+msgstr "Новий рік"
+
+#. Epiphany.
+msgid "Ημέρα των Θεοφανίων"
+msgstr "Богоявлення"
+
+#. Green Monday.
+msgid "Καθαρά Δευτέρα"
+msgstr "Чистий понеділок"
+
+#. Greek Independence Day.
+msgid "Ημέρα της Ελληνικής Ανεξαρτησίας"
+msgstr "День незалежності Греції"
+
+#. Cyprus National Day.
+msgid "Εθνική Ημέρα Κύπρου"
+msgstr "Національне свято Кіпру"
+
+#. Good Friday.
+msgid "Μεγάλη Παρασκευή"
+msgstr "Страсна пʼятниця"
+
+#. Easter Sunday.
+msgid "Κυριακή του Πάσχα"
+msgstr "Великдень"
+
+#. Easter Monday.
+msgid "Δευτέρα της Διακαινησίμου"
+msgstr "Великодній понеділок"
+
+#. Labor Day.
+msgid "Πρωτομαγιά"
+msgstr "День праці"
+
+#. Whit Monday.
+msgid "Δευτέρα του Αγίου Πνεύματος"
+msgstr "День Святого Духа"
+
+#. Assumption Day.
+msgid "Κοίμηση της Θεοτόκου"
+msgstr "Успіння Пресвятої Богородиці"
+
+#. Cyprus Independence Day.
+msgid "Ημέρα της Κυπριακής Ανεξαρτησίας"
+msgstr "День незалежності Кіпру"
+
+#. Ochi Day.
+msgid "Ημέρα του Όχι"
+msgstr "День Охі"
+
+#. Christmas Eve.
+msgid "Παραμονή Χριστουγέννων"
+msgstr "Святий вечір"
+
+#. Christmas Day.
+msgid "Χριστούγεννα"
+msgstr "Різдво Христове"
+
+#. Day After Christmas.
+msgid "Επομένη Χριστουγέννων"
+msgstr "Другий день Різдва"
+
+#. Easter Tuesday.
+msgid "Τρίτη της Διακαινησίμου"
+msgstr "Великодній вівторок"
+
+#. Holy Saturday.
+msgid "Μεγάλο Σάββατο"
+msgstr "Велика субота"
diff --git a/snapshots/countries/CY_COMMON.json b/snapshots/countries/CY_COMMON.json
index 932ce6baf..17d64cda1 100644
--- a/snapshots/countries/CY_COMMON.json
+++ b/snapshots/countries/CY_COMMON.json
@@ -1,1607 +1,1587 @@
 {
-    "1950-01-01": "New Year's Day",
-    "1950-01-06": "Epiphany",
-    "1950-02-20": "Clean Monday",
-    "1950-03-25": "Greek Independence Day",
-    "1950-04-01": "Cyprus National Day",
-    "1950-04-07": "Good Friday",
-    "1950-04-09": "Easter Sunday",
-    "1950-04-10": "Easter Monday",
-    "1950-05-01": "Labor Day",
-    "1950-05-29": "Monday of the Holy Spirit",
-    "1950-08-15": "Assumption of Mary",
-    "1950-10-01": "Cyprus Independence Day",
-    "1950-10-28": "Ochi Day",
-    "1950-12-24": "Christmas Eve",
-    "1950-12-25": "Christmas Day",
-    "1950-12-26": "Day After Christmas",
-    "1951-01-01": "New Year's Day",
-    "1951-01-06": "Epiphany",
-    "1951-03-12": "Clean Monday",
-    "1951-03-25": "Greek Independence Day",
-    "1951-04-01": "Cyprus National Day",
-    "1951-04-27": "Good Friday",
-    "1951-04-29": "Easter Sunday",
-    "1951-04-30": "Easter Monday",
-    "1951-05-01": "Labor Day",
-    "1951-06-18": "Monday of the Holy Spirit",
-    "1951-08-15": "Assumption of Mary",
-    "1951-10-01": "Cyprus Independence Day",
-    "1951-10-28": "Ochi Day",
-    "1951-12-24": "Christmas Eve",
-    "1951-12-25": "Christmas Day",
-    "1951-12-26": "Day After Christmas",
-    "1952-01-01": "New Year's Day",
-    "1952-01-06": "Epiphany",
-    "1952-03-03": "Clean Monday",
-    "1952-03-25": "Greek Independence Day",
-    "1952-04-01": "Cyprus National Day",
-    "1952-04-18": "Good Friday",
-    "1952-04-20": "Easter Sunday",
-    "1952-04-21": "Easter Monday",
-    "1952-05-01": "Labor Day",
-    "1952-06-09": "Monday of the Holy Spirit",
-    "1952-08-15": "Assumption of Mary",
-    "1952-10-01": "Cyprus Independence Day",
-    "1952-10-28": "Ochi Day",
-    "1952-12-24": "Christmas Eve",
-    "1952-12-25": "Christmas Day",
-    "1952-12-26": "Day After Christmas",
-    "1953-01-01": "New Year's Day",
-    "1953-01-06": "Epiphany",
-    "1953-02-16": "Clean Monday",
-    "1953-03-25": "Greek Independence Day",
-    "1953-04-01": "Cyprus National Day",
-    "1953-04-03": "Good Friday",
-    "1953-04-05": "Easter Sunday",
-    "1953-04-06": "Easter Monday",
-    "1953-05-01": "Labor Day",
-    "1953-05-25": "Monday of the Holy Spirit",
-    "1953-08-15": "Assumption of Mary",
-    "1953-10-01": "Cyprus Independence Day",
-    "1953-10-28": "Ochi Day",
-    "1953-12-24": "Christmas Eve",
-    "1953-12-25": "Christmas Day",
-    "1953-12-26": "Day After Christmas",
-    "1954-01-01": "New Year's Day",
-    "1954-01-06": "Epiphany",
-    "1954-03-08": "Clean Monday",
-    "1954-03-25": "Greek Independence Day",
-    "1954-04-01": "Cyprus National Day",
-    "1954-04-23": "Good Friday",
-    "1954-04-25": "Easter Sunday",
-    "1954-04-26": "Easter Monday",
-    "1954-05-01": "Labor Day",
-    "1954-06-14": "Monday of the Holy Spirit",
-    "1954-08-15": "Assumption of Mary",
-    "1954-10-01": "Cyprus Independence Day",
-    "1954-10-28": "Ochi Day",
-    "1954-12-24": "Christmas Eve",
-    "1954-12-25": "Christmas Day",
-    "1954-12-26": "Day After Christmas",
-    "1955-01-01": "New Year's Day",
-    "1955-01-06": "Epiphany",
-    "1955-02-28": "Clean Monday",
-    "1955-03-25": "Greek Independence Day",
-    "1955-04-01": "Cyprus National Day",
-    "1955-04-15": "Good Friday",
-    "1955-04-17": "Easter Sunday",
-    "1955-04-18": "Easter Monday",
-    "1955-05-01": "Labor Day",
-    "1955-06-06": "Monday of the Holy Spirit",
-    "1955-08-15": "Assumption of Mary",
-    "1955-10-01": "Cyprus Independence Day",
-    "1955-10-28": "Ochi Day",
-    "1955-12-24": "Christmas Eve",
-    "1955-12-25": "Christmas Day",
-    "1955-12-26": "Day After Christmas",
-    "1956-01-01": "New Year's Day",
-    "1956-01-06": "Epiphany",
-    "1956-03-19": "Clean Monday",
-    "1956-03-25": "Greek Independence Day",
-    "1956-04-01": "Cyprus National Day",
-    "1956-05-01": "Labor Day",
-    "1956-05-04": "Good Friday",
-    "1956-05-06": "Easter Sunday",
-    "1956-05-07": "Easter Monday",
-    "1956-06-25": "Monday of the Holy Spirit",
-    "1956-08-15": "Assumption of Mary",
-    "1956-10-01": "Cyprus Independence Day",
-    "1956-10-28": "Ochi Day",
-    "1956-12-24": "Christmas Eve",
-    "1956-12-25": "Christmas Day",
-    "1956-12-26": "Day After Christmas",
-    "1957-01-01": "New Year's Day",
-    "1957-01-06": "Epiphany",
-    "1957-03-04": "Clean Monday",
-    "1957-03-25": "Greek Independence Day",
-    "1957-04-01": "Cyprus National Day",
-    "1957-04-19": "Good Friday",
-    "1957-04-21": "Easter Sunday",
-    "1957-04-22": "Easter Monday",
-    "1957-05-01": "Labor Day",
-    "1957-06-10": "Monday of the Holy Spirit",
-    "1957-08-15": "Assumption of Mary",
-    "1957-10-01": "Cyprus Independence Day",
-    "1957-10-28": "Ochi Day",
-    "1957-12-24": "Christmas Eve",
-    "1957-12-25": "Christmas Day",
-    "1957-12-26": "Day After Christmas",
-    "1958-01-01": "New Year's Day",
-    "1958-01-06": "Epiphany",
-    "1958-02-24": "Clean Monday",
-    "1958-03-25": "Greek Independence Day",
-    "1958-04-01": "Cyprus National Day",
-    "1958-04-11": "Good Friday",
-    "1958-04-13": "Easter Sunday",
-    "1958-04-14": "Easter Monday",
-    "1958-05-01": "Labor Day",
-    "1958-06-02": "Monday of the Holy Spirit",
-    "1958-08-15": "Assumption of Mary",
-    "1958-10-01": "Cyprus Independence Day",
-    "1958-10-28": "Ochi Day",
-    "1958-12-24": "Christmas Eve",
-    "1958-12-25": "Christmas Day",
-    "1958-12-26": "Day After Christmas",
-    "1959-01-01": "New Year's Day",
-    "1959-01-06": "Epiphany",
-    "1959-03-16": "Clean Monday",
-    "1959-03-25": "Greek Independence Day",
-    "1959-04-01": "Cyprus National Day",
-    "1959-05-01": "Good Friday; Labor Day",
-    "1959-05-03": "Easter Sunday",
-    "1959-05-04": "Easter Monday",
-    "1959-06-22": "Monday of the Holy Spirit",
-    "1959-08-15": "Assumption of Mary",
-    "1959-10-01": "Cyprus Independence Day",
-    "1959-10-28": "Ochi Day",
-    "1959-12-24": "Christmas Eve",
-    "1959-12-25": "Christmas Day",
-    "1959-12-26": "Day After Christmas",
-    "1960-01-01": "New Year's Day",
-    "1960-01-06": "Epiphany",
-    "1960-02-29": "Clean Monday",
-    "1960-03-25": "Greek Independence Day",
-    "1960-04-01": "Cyprus National Day",
-    "1960-04-15": "Good Friday",
-    "1960-04-17": "Easter Sunday",
-    "1960-04-18": "Easter Monday",
-    "1960-05-01": "Labor Day",
-    "1960-06-06": "Monday of the Holy Spirit",
-    "1960-08-15": "Assumption of Mary",
-    "1960-10-01": "Cyprus Independence Day",
-    "1960-10-28": "Ochi Day",
-    "1960-12-24": "Christmas Eve",
-    "1960-12-25": "Christmas Day",
-    "1960-12-26": "Day After Christmas",
     "1961-01-01": "New Year's Day",
     "1961-01-06": "Epiphany",
-    "1961-02-20": "Clean Monday",
+    "1961-02-20": "Green Monday",
     "1961-03-25": "Greek Independence Day",
     "1961-04-01": "Cyprus National Day",
     "1961-04-07": "Good Friday",
+    "1961-04-08": "Holy Saturday",
     "1961-04-09": "Easter Sunday",
     "1961-04-10": "Easter Monday",
+    "1961-04-11": "Easter Tuesday",
     "1961-05-01": "Labor Day",
-    "1961-05-29": "Monday of the Holy Spirit",
-    "1961-08-15": "Assumption of Mary",
-    "1961-10-01": "Cyprus Independence Day",
-    "1961-10-28": "Ochi Day",
+    "1961-05-29": "Whit Monday",
+    "1961-08-15": "Assumption Day",
+    "1961-10-28": "Greek National Day",
     "1961-12-24": "Christmas Eve",
     "1961-12-25": "Christmas Day",
     "1961-12-26": "Day After Christmas",
     "1962-01-01": "New Year's Day",
     "1962-01-06": "Epiphany",
-    "1962-03-12": "Clean Monday",
+    "1962-03-12": "Green Monday",
     "1962-03-25": "Greek Independence Day",
     "1962-04-01": "Cyprus National Day",
     "1962-04-27": "Good Friday",
+    "1962-04-28": "Holy Saturday",
     "1962-04-29": "Easter Sunday",
     "1962-04-30": "Easter Monday",
-    "1962-05-01": "Labor Day",
-    "1962-06-18": "Monday of the Holy Spirit",
-    "1962-08-15": "Assumption of Mary",
-    "1962-10-01": "Cyprus Independence Day",
-    "1962-10-28": "Ochi Day",
+    "1962-05-01": "Easter Tuesday; Labor Day",
+    "1962-06-18": "Whit Monday",
+    "1962-08-15": "Assumption Day",
+    "1962-10-28": "Greek National Day",
     "1962-12-24": "Christmas Eve",
     "1962-12-25": "Christmas Day",
     "1962-12-26": "Day After Christmas",
     "1963-01-01": "New Year's Day",
     "1963-01-06": "Epiphany",
-    "1963-02-25": "Clean Monday",
+    "1963-02-25": "Green Monday",
     "1963-03-25": "Greek Independence Day",
     "1963-04-01": "Cyprus National Day",
     "1963-04-12": "Good Friday",
+    "1963-04-13": "Holy Saturday",
     "1963-04-14": "Easter Sunday",
     "1963-04-15": "Easter Monday",
+    "1963-04-16": "Easter Tuesday",
     "1963-05-01": "Labor Day",
-    "1963-06-03": "Monday of the Holy Spirit",
-    "1963-08-15": "Assumption of Mary",
-    "1963-10-01": "Cyprus Independence Day",
-    "1963-10-28": "Ochi Day",
+    "1963-06-03": "Whit Monday",
+    "1963-08-15": "Assumption Day",
+    "1963-10-28": "Greek National Day",
     "1963-12-24": "Christmas Eve",
     "1963-12-25": "Christmas Day",
     "1963-12-26": "Day After Christmas",
     "1964-01-01": "New Year's Day",
     "1964-01-06": "Epiphany",
-    "1964-03-16": "Clean Monday",
+    "1964-03-16": "Green Monday",
     "1964-03-25": "Greek Independence Day",
     "1964-04-01": "Cyprus National Day",
     "1964-05-01": "Good Friday; Labor Day",
+    "1964-05-02": "Holy Saturday",
     "1964-05-03": "Easter Sunday",
     "1964-05-04": "Easter Monday",
-    "1964-06-22": "Monday of the Holy Spirit",
-    "1964-08-15": "Assumption of Mary",
-    "1964-10-01": "Cyprus Independence Day",
-    "1964-10-28": "Ochi Day",
+    "1964-05-05": "Easter Tuesday",
+    "1964-06-22": "Whit Monday",
+    "1964-08-15": "Assumption Day",
+    "1964-10-28": "Greek National Day",
     "1964-12-24": "Christmas Eve",
     "1964-12-25": "Christmas Day",
     "1964-12-26": "Day After Christmas",
     "1965-01-01": "New Year's Day",
     "1965-01-06": "Epiphany",
-    "1965-03-08": "Clean Monday",
+    "1965-03-08": "Green Monday",
     "1965-03-25": "Greek Independence Day",
     "1965-04-01": "Cyprus National Day",
     "1965-04-23": "Good Friday",
+    "1965-04-24": "Holy Saturday",
     "1965-04-25": "Easter Sunday",
     "1965-04-26": "Easter Monday",
+    "1965-04-27": "Easter Tuesday",
     "1965-05-01": "Labor Day",
-    "1965-06-14": "Monday of the Holy Spirit",
-    "1965-08-15": "Assumption of Mary",
-    "1965-10-01": "Cyprus Independence Day",
-    "1965-10-28": "Ochi Day",
+    "1965-06-14": "Whit Monday",
+    "1965-08-15": "Assumption Day",
+    "1965-10-28": "Greek National Day",
     "1965-12-24": "Christmas Eve",
     "1965-12-25": "Christmas Day",
     "1965-12-26": "Day After Christmas",
     "1966-01-01": "New Year's Day",
     "1966-01-06": "Epiphany",
-    "1966-02-21": "Clean Monday",
+    "1966-02-21": "Green Monday",
     "1966-03-25": "Greek Independence Day",
     "1966-04-01": "Cyprus National Day",
     "1966-04-08": "Good Friday",
+    "1966-04-09": "Holy Saturday",
     "1966-04-10": "Easter Sunday",
     "1966-04-11": "Easter Monday",
+    "1966-04-12": "Easter Tuesday",
     "1966-05-01": "Labor Day",
-    "1966-05-30": "Monday of the Holy Spirit",
-    "1966-08-15": "Assumption of Mary",
-    "1966-10-01": "Cyprus Independence Day",
-    "1966-10-28": "Ochi Day",
+    "1966-05-30": "Whit Monday",
+    "1966-08-15": "Assumption Day",
+    "1966-10-28": "Greek National Day",
     "1966-12-24": "Christmas Eve",
     "1966-12-25": "Christmas Day",
     "1966-12-26": "Day After Christmas",
     "1967-01-01": "New Year's Day",
     "1967-01-06": "Epiphany",
-    "1967-03-13": "Clean Monday",
+    "1967-03-13": "Green Monday",
     "1967-03-25": "Greek Independence Day",
     "1967-04-01": "Cyprus National Day",
     "1967-04-28": "Good Friday",
+    "1967-04-29": "Holy Saturday",
     "1967-04-30": "Easter Sunday",
     "1967-05-01": "Easter Monday; Labor Day",
-    "1967-06-19": "Monday of the Holy Spirit",
-    "1967-08-15": "Assumption of Mary",
-    "1967-10-01": "Cyprus Independence Day",
-    "1967-10-28": "Ochi Day",
+    "1967-05-02": "Easter Tuesday",
+    "1967-06-19": "Whit Monday",
+    "1967-08-15": "Assumption Day",
+    "1967-10-28": "Greek National Day",
     "1967-12-24": "Christmas Eve",
     "1967-12-25": "Christmas Day",
     "1967-12-26": "Day After Christmas",
     "1968-01-01": "New Year's Day",
     "1968-01-06": "Epiphany",
-    "1968-03-04": "Clean Monday",
+    "1968-03-04": "Green Monday",
     "1968-03-25": "Greek Independence Day",
     "1968-04-01": "Cyprus National Day",
     "1968-04-19": "Good Friday",
+    "1968-04-20": "Holy Saturday",
     "1968-04-21": "Easter Sunday",
     "1968-04-22": "Easter Monday",
+    "1968-04-23": "Easter Tuesday",
     "1968-05-01": "Labor Day",
-    "1968-06-10": "Monday of the Holy Spirit",
-    "1968-08-15": "Assumption of Mary",
-    "1968-10-01": "Cyprus Independence Day",
-    "1968-10-28": "Ochi Day",
+    "1968-06-10": "Whit Monday",
+    "1968-08-15": "Assumption Day",
+    "1968-10-28": "Greek National Day",
     "1968-12-24": "Christmas Eve",
     "1968-12-25": "Christmas Day",
     "1968-12-26": "Day After Christmas",
     "1969-01-01": "New Year's Day",
     "1969-01-06": "Epiphany",
-    "1969-02-24": "Clean Monday",
+    "1969-02-24": "Green Monday",
     "1969-03-25": "Greek Independence Day",
     "1969-04-01": "Cyprus National Day",
     "1969-04-11": "Good Friday",
+    "1969-04-12": "Holy Saturday",
     "1969-04-13": "Easter Sunday",
     "1969-04-14": "Easter Monday",
+    "1969-04-15": "Easter Tuesday",
     "1969-05-01": "Labor Day",
-    "1969-06-02": "Monday of the Holy Spirit",
-    "1969-08-15": "Assumption of Mary",
-    "1969-10-01": "Cyprus Independence Day",
-    "1969-10-28": "Ochi Day",
+    "1969-06-02": "Whit Monday",
+    "1969-08-15": "Assumption Day",
+    "1969-10-28": "Greek National Day",
     "1969-12-24": "Christmas Eve",
     "1969-12-25": "Christmas Day",
     "1969-12-26": "Day After Christmas",
     "1970-01-01": "New Year's Day",
     "1970-01-06": "Epiphany",
-    "1970-03-09": "Clean Monday",
+    "1970-03-09": "Green Monday",
     "1970-03-25": "Greek Independence Day",
     "1970-04-01": "Cyprus National Day",
     "1970-04-24": "Good Friday",
+    "1970-04-25": "Holy Saturday",
     "1970-04-26": "Easter Sunday",
     "1970-04-27": "Easter Monday",
+    "1970-04-28": "Easter Tuesday",
     "1970-05-01": "Labor Day",
-    "1970-06-15": "Monday of the Holy Spirit",
-    "1970-08-15": "Assumption of Mary",
-    "1970-10-01": "Cyprus Independence Day",
-    "1970-10-28": "Ochi Day",
+    "1970-06-15": "Whit Monday",
+    "1970-08-15": "Assumption Day",
+    "1970-10-28": "Greek National Day",
     "1970-12-24": "Christmas Eve",
     "1970-12-25": "Christmas Day",
     "1970-12-26": "Day After Christmas",
     "1971-01-01": "New Year's Day",
     "1971-01-06": "Epiphany",
-    "1971-03-01": "Clean Monday",
+    "1971-03-01": "Green Monday",
     "1971-03-25": "Greek Independence Day",
     "1971-04-01": "Cyprus National Day",
     "1971-04-16": "Good Friday",
+    "1971-04-17": "Holy Saturday",
     "1971-04-18": "Easter Sunday",
     "1971-04-19": "Easter Monday",
+    "1971-04-20": "Easter Tuesday",
     "1971-05-01": "Labor Day",
-    "1971-06-07": "Monday of the Holy Spirit",
-    "1971-08-15": "Assumption of Mary",
-    "1971-10-01": "Cyprus Independence Day",
-    "1971-10-28": "Ochi Day",
+    "1971-06-07": "Whit Monday",
+    "1971-08-15": "Assumption Day",
+    "1971-10-28": "Greek National Day",
     "1971-12-24": "Christmas Eve",
     "1971-12-25": "Christmas Day",
     "1971-12-26": "Day After Christmas",
     "1972-01-01": "New Year's Day",
     "1972-01-06": "Epiphany",
-    "1972-02-21": "Clean Monday",
+    "1972-02-21": "Green Monday",
     "1972-03-25": "Greek Independence Day",
     "1972-04-01": "Cyprus National Day",
     "1972-04-07": "Good Friday",
+    "1972-04-08": "Holy Saturday",
     "1972-04-09": "Easter Sunday",
     "1972-04-10": "Easter Monday",
+    "1972-04-11": "Easter Tuesday",
     "1972-05-01": "Labor Day",
-    "1972-05-29": "Monday of the Holy Spirit",
-    "1972-08-15": "Assumption of Mary",
-    "1972-10-01": "Cyprus Independence Day",
-    "1972-10-28": "Ochi Day",
+    "1972-05-29": "Whit Monday",
+    "1972-08-15": "Assumption Day",
+    "1972-10-28": "Greek National Day",
     "1972-12-24": "Christmas Eve",
     "1972-12-25": "Christmas Day",
     "1972-12-26": "Day After Christmas",
     "1973-01-01": "New Year's Day",
     "1973-01-06": "Epiphany",
-    "1973-03-12": "Clean Monday",
+    "1973-03-12": "Green Monday",
     "1973-03-25": "Greek Independence Day",
     "1973-04-01": "Cyprus National Day",
     "1973-04-27": "Good Friday",
+    "1973-04-28": "Holy Saturday",
     "1973-04-29": "Easter Sunday",
     "1973-04-30": "Easter Monday",
-    "1973-05-01": "Labor Day",
-    "1973-06-18": "Monday of the Holy Spirit",
-    "1973-08-15": "Assumption of Mary",
-    "1973-10-01": "Cyprus Independence Day",
-    "1973-10-28": "Ochi Day",
+    "1973-05-01": "Easter Tuesday; Labor Day",
+    "1973-06-18": "Whit Monday",
+    "1973-08-15": "Assumption Day",
+    "1973-10-28": "Greek National Day",
     "1973-12-24": "Christmas Eve",
     "1973-12-25": "Christmas Day",
     "1973-12-26": "Day After Christmas",
     "1974-01-01": "New Year's Day",
     "1974-01-06": "Epiphany",
-    "1974-02-25": "Clean Monday",
+    "1974-02-25": "Green Monday",
     "1974-03-25": "Greek Independence Day",
     "1974-04-01": "Cyprus National Day",
     "1974-04-12": "Good Friday",
+    "1974-04-13": "Holy Saturday",
     "1974-04-14": "Easter Sunday",
     "1974-04-15": "Easter Monday",
+    "1974-04-16": "Easter Tuesday",
     "1974-05-01": "Labor Day",
-    "1974-06-03": "Monday of the Holy Spirit",
-    "1974-08-15": "Assumption of Mary",
-    "1974-10-01": "Cyprus Independence Day",
-    "1974-10-28": "Ochi Day",
+    "1974-06-03": "Whit Monday",
+    "1974-08-15": "Assumption Day",
+    "1974-10-28": "Greek National Day",
     "1974-12-24": "Christmas Eve",
     "1974-12-25": "Christmas Day",
     "1974-12-26": "Day After Christmas",
     "1975-01-01": "New Year's Day",
     "1975-01-06": "Epiphany",
-    "1975-03-17": "Clean Monday",
+    "1975-03-17": "Green Monday",
     "1975-03-25": "Greek Independence Day",
     "1975-04-01": "Cyprus National Day",
     "1975-05-01": "Labor Day",
     "1975-05-02": "Good Friday",
+    "1975-05-03": "Holy Saturday",
     "1975-05-04": "Easter Sunday",
     "1975-05-05": "Easter Monday",
-    "1975-06-23": "Monday of the Holy Spirit",
-    "1975-08-15": "Assumption of Mary",
-    "1975-10-01": "Cyprus Independence Day",
-    "1975-10-28": "Ochi Day",
+    "1975-05-06": "Easter Tuesday",
+    "1975-06-23": "Whit Monday",
+    "1975-08-15": "Assumption Day",
+    "1975-10-28": "Greek National Day",
     "1975-12-24": "Christmas Eve",
     "1975-12-25": "Christmas Day",
     "1975-12-26": "Day After Christmas",
     "1976-01-01": "New Year's Day",
     "1976-01-06": "Epiphany",
-    "1976-03-08": "Clean Monday",
+    "1976-03-08": "Green Monday",
     "1976-03-25": "Greek Independence Day",
     "1976-04-01": "Cyprus National Day",
     "1976-04-23": "Good Friday",
+    "1976-04-24": "Holy Saturday",
     "1976-04-25": "Easter Sunday",
     "1976-04-26": "Easter Monday",
+    "1976-04-27": "Easter Tuesday",
     "1976-05-01": "Labor Day",
-    "1976-06-14": "Monday of the Holy Spirit",
-    "1976-08-15": "Assumption of Mary",
-    "1976-10-01": "Cyprus Independence Day",
-    "1976-10-28": "Ochi Day",
+    "1976-06-14": "Whit Monday",
+    "1976-08-15": "Assumption Day",
+    "1976-10-28": "Greek National Day",
     "1976-12-24": "Christmas Eve",
     "1976-12-25": "Christmas Day",
     "1976-12-26": "Day After Christmas",
     "1977-01-01": "New Year's Day",
     "1977-01-06": "Epiphany",
-    "1977-02-21": "Clean Monday",
+    "1977-02-21": "Green Monday",
     "1977-03-25": "Greek Independence Day",
     "1977-04-01": "Cyprus National Day",
     "1977-04-08": "Good Friday",
+    "1977-04-09": "Holy Saturday",
     "1977-04-10": "Easter Sunday",
     "1977-04-11": "Easter Monday",
+    "1977-04-12": "Easter Tuesday",
     "1977-05-01": "Labor Day",
-    "1977-05-30": "Monday of the Holy Spirit",
-    "1977-08-15": "Assumption of Mary",
-    "1977-10-01": "Cyprus Independence Day",
-    "1977-10-28": "Ochi Day",
+    "1977-05-30": "Whit Monday",
+    "1977-08-15": "Assumption Day",
+    "1977-10-28": "Greek National Day",
     "1977-12-24": "Christmas Eve",
     "1977-12-25": "Christmas Day",
     "1977-12-26": "Day After Christmas",
     "1978-01-01": "New Year's Day",
     "1978-01-06": "Epiphany",
-    "1978-03-13": "Clean Monday",
+    "1978-03-13": "Green Monday",
     "1978-03-25": "Greek Independence Day",
     "1978-04-01": "Cyprus National Day",
     "1978-04-28": "Good Friday",
+    "1978-04-29": "Holy Saturday",
     "1978-04-30": "Easter Sunday",
     "1978-05-01": "Easter Monday; Labor Day",
-    "1978-06-19": "Monday of the Holy Spirit",
-    "1978-08-15": "Assumption of Mary",
-    "1978-10-01": "Cyprus Independence Day",
-    "1978-10-28": "Ochi Day",
+    "1978-05-02": "Easter Tuesday",
+    "1978-06-19": "Whit Monday",
+    "1978-08-15": "Assumption Day",
+    "1978-10-28": "Greek National Day",
     "1978-12-24": "Christmas Eve",
     "1978-12-25": "Christmas Day",
     "1978-12-26": "Day After Christmas",
     "1979-01-01": "New Year's Day",
     "1979-01-06": "Epiphany",
-    "1979-03-05": "Clean Monday",
+    "1979-03-05": "Green Monday",
     "1979-03-25": "Greek Independence Day",
     "1979-04-01": "Cyprus National Day",
     "1979-04-20": "Good Friday",
+    "1979-04-21": "Holy Saturday",
     "1979-04-22": "Easter Sunday",
     "1979-04-23": "Easter Monday",
+    "1979-04-24": "Easter Tuesday",
     "1979-05-01": "Labor Day",
-    "1979-06-11": "Monday of the Holy Spirit",
-    "1979-08-15": "Assumption of Mary",
+    "1979-06-11": "Whit Monday",
+    "1979-08-15": "Assumption Day",
     "1979-10-01": "Cyprus Independence Day",
-    "1979-10-28": "Ochi Day",
+    "1979-10-28": "Greek National Day",
     "1979-12-24": "Christmas Eve",
     "1979-12-25": "Christmas Day",
     "1979-12-26": "Day After Christmas",
     "1980-01-01": "New Year's Day",
     "1980-01-06": "Epiphany",
-    "1980-02-18": "Clean Monday",
+    "1980-02-18": "Green Monday",
     "1980-03-25": "Greek Independence Day",
     "1980-04-01": "Cyprus National Day",
     "1980-04-04": "Good Friday",
+    "1980-04-05": "Holy Saturday",
     "1980-04-06": "Easter Sunday",
     "1980-04-07": "Easter Monday",
+    "1980-04-08": "Easter Tuesday",
     "1980-05-01": "Labor Day",
-    "1980-05-26": "Monday of the Holy Spirit",
-    "1980-08-15": "Assumption of Mary",
+    "1980-05-26": "Whit Monday",
+    "1980-08-15": "Assumption Day",
     "1980-10-01": "Cyprus Independence Day",
-    "1980-10-28": "Ochi Day",
+    "1980-10-28": "Greek National Day",
     "1980-12-24": "Christmas Eve",
     "1980-12-25": "Christmas Day",
     "1980-12-26": "Day After Christmas",
     "1981-01-01": "New Year's Day",
     "1981-01-06": "Epiphany",
-    "1981-03-09": "Clean Monday",
+    "1981-03-09": "Green Monday",
     "1981-03-25": "Greek Independence Day",
     "1981-04-01": "Cyprus National Day",
     "1981-04-24": "Good Friday",
+    "1981-04-25": "Holy Saturday",
     "1981-04-26": "Easter Sunday",
     "1981-04-27": "Easter Monday",
+    "1981-04-28": "Easter Tuesday",
     "1981-05-01": "Labor Day",
-    "1981-06-15": "Monday of the Holy Spirit",
-    "1981-08-15": "Assumption of Mary",
+    "1981-06-15": "Whit Monday",
+    "1981-08-15": "Assumption Day",
     "1981-10-01": "Cyprus Independence Day",
-    "1981-10-28": "Ochi Day",
+    "1981-10-28": "Greek National Day",
     "1981-12-24": "Christmas Eve",
     "1981-12-25": "Christmas Day",
     "1981-12-26": "Day After Christmas",
     "1982-01-01": "New Year's Day",
     "1982-01-06": "Epiphany",
-    "1982-03-01": "Clean Monday",
+    "1982-03-01": "Green Monday",
     "1982-03-25": "Greek Independence Day",
     "1982-04-01": "Cyprus National Day",
     "1982-04-16": "Good Friday",
+    "1982-04-17": "Holy Saturday",
     "1982-04-18": "Easter Sunday",
     "1982-04-19": "Easter Monday",
+    "1982-04-20": "Easter Tuesday",
     "1982-05-01": "Labor Day",
-    "1982-06-07": "Monday of the Holy Spirit",
-    "1982-08-15": "Assumption of Mary",
+    "1982-06-07": "Whit Monday",
+    "1982-08-15": "Assumption Day",
     "1982-10-01": "Cyprus Independence Day",
-    "1982-10-28": "Ochi Day",
+    "1982-10-28": "Greek National Day",
     "1982-12-24": "Christmas Eve",
     "1982-12-25": "Christmas Day",
     "1982-12-26": "Day After Christmas",
     "1983-01-01": "New Year's Day",
     "1983-01-06": "Epiphany",
-    "1983-03-21": "Clean Monday",
+    "1983-03-21": "Green Monday",
     "1983-03-25": "Greek Independence Day",
     "1983-04-01": "Cyprus National Day",
     "1983-05-01": "Labor Day",
     "1983-05-06": "Good Friday",
+    "1983-05-07": "Holy Saturday",
     "1983-05-08": "Easter Sunday",
     "1983-05-09": "Easter Monday",
-    "1983-06-27": "Monday of the Holy Spirit",
-    "1983-08-15": "Assumption of Mary",
+    "1983-05-10": "Easter Tuesday",
+    "1983-06-27": "Whit Monday",
+    "1983-08-15": "Assumption Day",
     "1983-10-01": "Cyprus Independence Day",
-    "1983-10-28": "Ochi Day",
+    "1983-10-28": "Greek National Day",
     "1983-12-24": "Christmas Eve",
     "1983-12-25": "Christmas Day",
     "1983-12-26": "Day After Christmas",
     "1984-01-01": "New Year's Day",
     "1984-01-06": "Epiphany",
-    "1984-03-05": "Clean Monday",
+    "1984-03-05": "Green Monday",
     "1984-03-25": "Greek Independence Day",
     "1984-04-01": "Cyprus National Day",
     "1984-04-20": "Good Friday",
+    "1984-04-21": "Holy Saturday",
     "1984-04-22": "Easter Sunday",
     "1984-04-23": "Easter Monday",
+    "1984-04-24": "Easter Tuesday",
     "1984-05-01": "Labor Day",
-    "1984-06-11": "Monday of the Holy Spirit",
-    "1984-08-15": "Assumption of Mary",
+    "1984-06-11": "Whit Monday",
+    "1984-08-15": "Assumption Day",
     "1984-10-01": "Cyprus Independence Day",
-    "1984-10-28": "Ochi Day",
+    "1984-10-28": "Greek National Day",
     "1984-12-24": "Christmas Eve",
     "1984-12-25": "Christmas Day",
     "1984-12-26": "Day After Christmas",
     "1985-01-01": "New Year's Day",
     "1985-01-06": "Epiphany",
-    "1985-02-25": "Clean Monday",
+    "1985-02-25": "Green Monday",
     "1985-03-25": "Greek Independence Day",
     "1985-04-01": "Cyprus National Day",
     "1985-04-12": "Good Friday",
+    "1985-04-13": "Holy Saturday",
     "1985-04-14": "Easter Sunday",
     "1985-04-15": "Easter Monday",
+    "1985-04-16": "Easter Tuesday",
     "1985-05-01": "Labor Day",
-    "1985-06-03": "Monday of the Holy Spirit",
-    "1985-08-15": "Assumption of Mary",
+    "1985-06-03": "Whit Monday",
+    "1985-08-15": "Assumption Day",
     "1985-10-01": "Cyprus Independence Day",
-    "1985-10-28": "Ochi Day",
+    "1985-10-28": "Greek National Day",
     "1985-12-24": "Christmas Eve",
     "1985-12-25": "Christmas Day",
     "1985-12-26": "Day After Christmas",
     "1986-01-01": "New Year's Day",
     "1986-01-06": "Epiphany",
-    "1986-03-17": "Clean Monday",
+    "1986-03-17": "Green Monday",
     "1986-03-25": "Greek Independence Day",
     "1986-04-01": "Cyprus National Day",
     "1986-05-01": "Labor Day",
     "1986-05-02": "Good Friday",
+    "1986-05-03": "Holy Saturday",
     "1986-05-04": "Easter Sunday",
     "1986-05-05": "Easter Monday",
-    "1986-06-23": "Monday of the Holy Spirit",
-    "1986-08-15": "Assumption of Mary",
+    "1986-05-06": "Easter Tuesday",
+    "1986-06-23": "Whit Monday",
+    "1986-08-15": "Assumption Day",
     "1986-10-01": "Cyprus Independence Day",
-    "1986-10-28": "Ochi Day",
+    "1986-10-28": "Greek National Day",
     "1986-12-24": "Christmas Eve",
     "1986-12-25": "Christmas Day",
     "1986-12-26": "Day After Christmas",
     "1987-01-01": "New Year's Day",
     "1987-01-06": "Epiphany",
-    "1987-03-02": "Clean Monday",
+    "1987-03-02": "Green Monday",
     "1987-03-25": "Greek Independence Day",
     "1987-04-01": "Cyprus National Day",
     "1987-04-17": "Good Friday",
+    "1987-04-18": "Holy Saturday",
     "1987-04-19": "Easter Sunday",
     "1987-04-20": "Easter Monday",
+    "1987-04-21": "Easter Tuesday",
     "1987-05-01": "Labor Day",
-    "1987-06-08": "Monday of the Holy Spirit",
-    "1987-08-15": "Assumption of Mary",
+    "1987-06-08": "Whit Monday",
+    "1987-08-15": "Assumption Day",
     "1987-10-01": "Cyprus Independence Day",
-    "1987-10-28": "Ochi Day",
+    "1987-10-28": "Greek National Day",
     "1987-12-24": "Christmas Eve",
     "1987-12-25": "Christmas Day",
     "1987-12-26": "Day After Christmas",
     "1988-01-01": "New Year's Day",
     "1988-01-06": "Epiphany",
-    "1988-02-22": "Clean Monday",
+    "1988-02-22": "Green Monday",
     "1988-03-25": "Greek Independence Day",
     "1988-04-01": "Cyprus National Day",
     "1988-04-08": "Good Friday",
+    "1988-04-09": "Holy Saturday",
     "1988-04-10": "Easter Sunday",
     "1988-04-11": "Easter Monday",
+    "1988-04-12": "Easter Tuesday",
     "1988-05-01": "Labor Day",
-    "1988-05-30": "Monday of the Holy Spirit",
-    "1988-08-15": "Assumption of Mary",
+    "1988-05-30": "Whit Monday",
+    "1988-08-15": "Assumption Day",
     "1988-10-01": "Cyprus Independence Day",
-    "1988-10-28": "Ochi Day",
+    "1988-10-28": "Greek National Day",
     "1988-12-24": "Christmas Eve",
     "1988-12-25": "Christmas Day",
     "1988-12-26": "Day After Christmas",
     "1989-01-01": "New Year's Day",
     "1989-01-06": "Epiphany",
-    "1989-03-13": "Clean Monday",
+    "1989-03-13": "Green Monday",
     "1989-03-25": "Greek Independence Day",
     "1989-04-01": "Cyprus National Day",
     "1989-04-28": "Good Friday",
+    "1989-04-29": "Holy Saturday",
     "1989-04-30": "Easter Sunday",
     "1989-05-01": "Easter Monday; Labor Day",
-    "1989-06-19": "Monday of the Holy Spirit",
-    "1989-08-15": "Assumption of Mary",
+    "1989-05-02": "Easter Tuesday",
+    "1989-06-19": "Whit Monday",
+    "1989-08-15": "Assumption Day",
     "1989-10-01": "Cyprus Independence Day",
-    "1989-10-28": "Ochi Day",
+    "1989-10-28": "Greek National Day",
     "1989-12-24": "Christmas Eve",
     "1989-12-25": "Christmas Day",
     "1989-12-26": "Day After Christmas",
     "1990-01-01": "New Year's Day",
     "1990-01-06": "Epiphany",
-    "1990-02-26": "Clean Monday",
+    "1990-02-26": "Green Monday",
     "1990-03-25": "Greek Independence Day",
     "1990-04-01": "Cyprus National Day",
     "1990-04-13": "Good Friday",
+    "1990-04-14": "Holy Saturday",
     "1990-04-15": "Easter Sunday",
     "1990-04-16": "Easter Monday",
+    "1990-04-17": "Easter Tuesday",
     "1990-05-01": "Labor Day",
-    "1990-06-04": "Monday of the Holy Spirit",
-    "1990-08-15": "Assumption of Mary",
+    "1990-06-04": "Whit Monday",
+    "1990-08-15": "Assumption Day",
     "1990-10-01": "Cyprus Independence Day",
-    "1990-10-28": "Ochi Day",
+    "1990-10-28": "Greek National Day",
     "1990-12-24": "Christmas Eve",
     "1990-12-25": "Christmas Day",
     "1990-12-26": "Day After Christmas",
     "1991-01-01": "New Year's Day",
     "1991-01-06": "Epiphany",
-    "1991-02-18": "Clean Monday",
+    "1991-02-18": "Green Monday",
     "1991-03-25": "Greek Independence Day",
     "1991-04-01": "Cyprus National Day",
     "1991-04-05": "Good Friday",
+    "1991-04-06": "Holy Saturday",
     "1991-04-07": "Easter Sunday",
     "1991-04-08": "Easter Monday",
+    "1991-04-09": "Easter Tuesday",
     "1991-05-01": "Labor Day",
-    "1991-05-27": "Monday of the Holy Spirit",
-    "1991-08-15": "Assumption of Mary",
+    "1991-05-27": "Whit Monday",
+    "1991-08-15": "Assumption Day",
     "1991-10-01": "Cyprus Independence Day",
-    "1991-10-28": "Ochi Day",
+    "1991-10-28": "Greek National Day",
     "1991-12-24": "Christmas Eve",
     "1991-12-25": "Christmas Day",
     "1991-12-26": "Day After Christmas",
     "1992-01-01": "New Year's Day",
     "1992-01-06": "Epiphany",
-    "1992-03-09": "Clean Monday",
+    "1992-03-09": "Green Monday",
     "1992-03-25": "Greek Independence Day",
     "1992-04-01": "Cyprus National Day",
     "1992-04-24": "Good Friday",
+    "1992-04-25": "Holy Saturday",
     "1992-04-26": "Easter Sunday",
     "1992-04-27": "Easter Monday",
+    "1992-04-28": "Easter Tuesday",
     "1992-05-01": "Labor Day",
-    "1992-06-15": "Monday of the Holy Spirit",
-    "1992-08-15": "Assumption of Mary",
+    "1992-06-15": "Whit Monday",
+    "1992-08-15": "Assumption Day",
     "1992-10-01": "Cyprus Independence Day",
-    "1992-10-28": "Ochi Day",
+    "1992-10-28": "Greek National Day",
     "1992-12-24": "Christmas Eve",
     "1992-12-25": "Christmas Day",
     "1992-12-26": "Day After Christmas",
     "1993-01-01": "New Year's Day",
     "1993-01-06": "Epiphany",
-    "1993-03-01": "Clean Monday",
+    "1993-03-01": "Green Monday",
     "1993-03-25": "Greek Independence Day",
     "1993-04-01": "Cyprus National Day",
     "1993-04-16": "Good Friday",
+    "1993-04-17": "Holy Saturday",
     "1993-04-18": "Easter Sunday",
     "1993-04-19": "Easter Monday",
+    "1993-04-20": "Easter Tuesday",
     "1993-05-01": "Labor Day",
-    "1993-06-07": "Monday of the Holy Spirit",
-    "1993-08-15": "Assumption of Mary",
+    "1993-06-07": "Whit Monday",
+    "1993-08-15": "Assumption Day",
     "1993-10-01": "Cyprus Independence Day",
-    "1993-10-28": "Ochi Day",
+    "1993-10-28": "Greek National Day",
     "1993-12-24": "Christmas Eve",
     "1993-12-25": "Christmas Day",
     "1993-12-26": "Day After Christmas",
     "1994-01-01": "New Year's Day",
     "1994-01-06": "Epiphany",
-    "1994-03-14": "Clean Monday",
+    "1994-03-14": "Green Monday",
     "1994-03-25": "Greek Independence Day",
     "1994-04-01": "Cyprus National Day",
     "1994-04-29": "Good Friday",
+    "1994-04-30": "Holy Saturday",
     "1994-05-01": "Easter Sunday; Labor Day",
     "1994-05-02": "Easter Monday",
-    "1994-06-20": "Monday of the Holy Spirit",
-    "1994-08-15": "Assumption of Mary",
+    "1994-05-03": "Easter Tuesday",
+    "1994-06-20": "Whit Monday",
+    "1994-08-15": "Assumption Day",
     "1994-10-01": "Cyprus Independence Day",
-    "1994-10-28": "Ochi Day",
+    "1994-10-28": "Greek National Day",
     "1994-12-24": "Christmas Eve",
     "1994-12-25": "Christmas Day",
     "1994-12-26": "Day After Christmas",
     "1995-01-01": "New Year's Day",
     "1995-01-06": "Epiphany",
-    "1995-03-06": "Clean Monday",
+    "1995-03-06": "Green Monday",
     "1995-03-25": "Greek Independence Day",
     "1995-04-01": "Cyprus National Day",
     "1995-04-21": "Good Friday",
+    "1995-04-22": "Holy Saturday",
     "1995-04-23": "Easter Sunday",
     "1995-04-24": "Easter Monday",
+    "1995-04-25": "Easter Tuesday",
     "1995-05-01": "Labor Day",
-    "1995-06-12": "Monday of the Holy Spirit",
-    "1995-08-15": "Assumption of Mary",
+    "1995-06-12": "Whit Monday",
+    "1995-08-15": "Assumption Day",
     "1995-10-01": "Cyprus Independence Day",
-    "1995-10-28": "Ochi Day",
+    "1995-10-28": "Greek National Day",
     "1995-12-24": "Christmas Eve",
     "1995-12-25": "Christmas Day",
     "1995-12-26": "Day After Christmas",
     "1996-01-01": "New Year's Day",
     "1996-01-06": "Epiphany",
-    "1996-02-26": "Clean Monday",
+    "1996-02-26": "Green Monday",
     "1996-03-25": "Greek Independence Day",
     "1996-04-01": "Cyprus National Day",
     "1996-04-12": "Good Friday",
+    "1996-04-13": "Holy Saturday",
     "1996-04-14": "Easter Sunday",
     "1996-04-15": "Easter Monday",
+    "1996-04-16": "Easter Tuesday",
     "1996-05-01": "Labor Day",
-    "1996-06-03": "Monday of the Holy Spirit",
-    "1996-08-15": "Assumption of Mary",
+    "1996-06-03": "Whit Monday",
+    "1996-08-15": "Assumption Day",
     "1996-10-01": "Cyprus Independence Day",
-    "1996-10-28": "Ochi Day",
+    "1996-10-28": "Greek National Day",
     "1996-12-24": "Christmas Eve",
     "1996-12-25": "Christmas Day",
     "1996-12-26": "Day After Christmas",
     "1997-01-01": "New Year's Day",
     "1997-01-06": "Epiphany",
-    "1997-03-10": "Clean Monday",
+    "1997-03-10": "Green Monday",
     "1997-03-25": "Greek Independence Day",
     "1997-04-01": "Cyprus National Day",
     "1997-04-25": "Good Friday",
+    "1997-04-26": "Holy Saturday",
     "1997-04-27": "Easter Sunday",
     "1997-04-28": "Easter Monday",
+    "1997-04-29": "Easter Tuesday",
     "1997-05-01": "Labor Day",
-    "1997-06-16": "Monday of the Holy Spirit",
-    "1997-08-15": "Assumption of Mary",
+    "1997-06-16": "Whit Monday",
+    "1997-08-15": "Assumption Day",
     "1997-10-01": "Cyprus Independence Day",
-    "1997-10-28": "Ochi Day",
+    "1997-10-28": "Greek National Day",
     "1997-12-24": "Christmas Eve",
     "1997-12-25": "Christmas Day",
     "1997-12-26": "Day After Christmas",
     "1998-01-01": "New Year's Day",
     "1998-01-06": "Epiphany",
-    "1998-03-02": "Clean Monday",
+    "1998-03-02": "Green Monday",
     "1998-03-25": "Greek Independence Day",
     "1998-04-01": "Cyprus National Day",
     "1998-04-17": "Good Friday",
+    "1998-04-18": "Holy Saturday",
     "1998-04-19": "Easter Sunday",
     "1998-04-20": "Easter Monday",
+    "1998-04-21": "Easter Tuesday",
     "1998-05-01": "Labor Day",
-    "1998-06-08": "Monday of the Holy Spirit",
-    "1998-08-15": "Assumption of Mary",
+    "1998-06-08": "Whit Monday",
+    "1998-08-15": "Assumption Day",
     "1998-10-01": "Cyprus Independence Day",
-    "1998-10-28": "Ochi Day",
+    "1998-10-28": "Greek National Day",
     "1998-12-24": "Christmas Eve",
     "1998-12-25": "Christmas Day",
     "1998-12-26": "Day After Christmas",
     "1999-01-01": "New Year's Day",
     "1999-01-06": "Epiphany",
-    "1999-02-22": "Clean Monday",
+    "1999-02-22": "Green Monday",
     "1999-03-25": "Greek Independence Day",
     "1999-04-01": "Cyprus National Day",
     "1999-04-09": "Good Friday",
+    "1999-04-10": "Holy Saturday",
     "1999-04-11": "Easter Sunday",
     "1999-04-12": "Easter Monday",
+    "1999-04-13": "Easter Tuesday",
     "1999-05-01": "Labor Day",
-    "1999-05-31": "Monday of the Holy Spirit",
-    "1999-08-15": "Assumption of Mary",
+    "1999-05-31": "Whit Monday",
+    "1999-08-15": "Assumption Day",
     "1999-10-01": "Cyprus Independence Day",
-    "1999-10-28": "Ochi Day",
+    "1999-10-28": "Greek National Day",
     "1999-12-24": "Christmas Eve",
     "1999-12-25": "Christmas Day",
     "1999-12-26": "Day After Christmas",
     "2000-01-01": "New Year's Day",
     "2000-01-06": "Epiphany",
-    "2000-03-13": "Clean Monday",
+    "2000-03-13": "Green Monday",
     "2000-03-25": "Greek Independence Day",
     "2000-04-01": "Cyprus National Day",
     "2000-04-28": "Good Friday",
+    "2000-04-29": "Holy Saturday",
     "2000-04-30": "Easter Sunday",
     "2000-05-01": "Easter Monday; Labor Day",
-    "2000-06-19": "Monday of the Holy Spirit",
-    "2000-08-15": "Assumption of Mary",
+    "2000-05-02": "Easter Tuesday",
+    "2000-06-19": "Whit Monday",
+    "2000-08-15": "Assumption Day",
     "2000-10-01": "Cyprus Independence Day",
-    "2000-10-28": "Ochi Day",
+    "2000-10-28": "Greek National Day",
     "2000-12-24": "Christmas Eve",
     "2000-12-25": "Christmas Day",
     "2000-12-26": "Day After Christmas",
     "2001-01-01": "New Year's Day",
     "2001-01-06": "Epiphany",
-    "2001-02-26": "Clean Monday",
+    "2001-02-26": "Green Monday",
     "2001-03-25": "Greek Independence Day",
     "2001-04-01": "Cyprus National Day",
     "2001-04-13": "Good Friday",
+    "2001-04-14": "Holy Saturday",
     "2001-04-15": "Easter Sunday",
     "2001-04-16": "Easter Monday",
+    "2001-04-17": "Easter Tuesday",
     "2001-05-01": "Labor Day",
-    "2001-06-04": "Monday of the Holy Spirit",
-    "2001-08-15": "Assumption of Mary",
+    "2001-06-04": "Whit Monday",
+    "2001-08-15": "Assumption Day",
     "2001-10-01": "Cyprus Independence Day",
-    "2001-10-28": "Ochi Day",
+    "2001-10-28": "Greek National Day",
     "2001-12-24": "Christmas Eve",
     "2001-12-25": "Christmas Day",
     "2001-12-26": "Day After Christmas",
     "2002-01-01": "New Year's Day",
     "2002-01-06": "Epiphany",
-    "2002-03-18": "Clean Monday",
+    "2002-03-18": "Green Monday",
     "2002-03-25": "Greek Independence Day",
     "2002-04-01": "Cyprus National Day",
     "2002-05-01": "Labor Day",
     "2002-05-03": "Good Friday",
+    "2002-05-04": "Holy Saturday",
     "2002-05-05": "Easter Sunday",
     "2002-05-06": "Easter Monday",
-    "2002-06-24": "Monday of the Holy Spirit",
-    "2002-08-15": "Assumption of Mary",
+    "2002-05-07": "Easter Tuesday",
+    "2002-06-24": "Whit Monday",
+    "2002-08-15": "Assumption Day",
     "2002-10-01": "Cyprus Independence Day",
-    "2002-10-28": "Ochi Day",
+    "2002-10-28": "Greek National Day",
     "2002-12-24": "Christmas Eve",
     "2002-12-25": "Christmas Day",
     "2002-12-26": "Day After Christmas",
     "2003-01-01": "New Year's Day",
     "2003-01-06": "Epiphany",
-    "2003-03-10": "Clean Monday",
+    "2003-03-10": "Green Monday",
     "2003-03-25": "Greek Independence Day",
     "2003-04-01": "Cyprus National Day",
     "2003-04-25": "Good Friday",
+    "2003-04-26": "Holy Saturday",
     "2003-04-27": "Easter Sunday",
     "2003-04-28": "Easter Monday",
+    "2003-04-29": "Easter Tuesday",
     "2003-05-01": "Labor Day",
-    "2003-06-16": "Monday of the Holy Spirit",
-    "2003-08-15": "Assumption of Mary",
+    "2003-06-16": "Whit Monday",
+    "2003-08-15": "Assumption Day",
     "2003-10-01": "Cyprus Independence Day",
-    "2003-10-28": "Ochi Day",
+    "2003-10-28": "Greek National Day",
     "2003-12-24": "Christmas Eve",
     "2003-12-25": "Christmas Day",
     "2003-12-26": "Day After Christmas",
     "2004-01-01": "New Year's Day",
     "2004-01-06": "Epiphany",
-    "2004-02-23": "Clean Monday",
+    "2004-02-23": "Green Monday",
     "2004-03-25": "Greek Independence Day",
     "2004-04-01": "Cyprus National Day",
     "2004-04-09": "Good Friday",
+    "2004-04-10": "Holy Saturday",
     "2004-04-11": "Easter Sunday",
     "2004-04-12": "Easter Monday",
+    "2004-04-13": "Easter Tuesday",
     "2004-05-01": "Labor Day",
-    "2004-05-31": "Monday of the Holy Spirit",
-    "2004-08-15": "Assumption of Mary",
+    "2004-05-31": "Whit Monday",
+    "2004-08-15": "Assumption Day",
     "2004-10-01": "Cyprus Independence Day",
-    "2004-10-28": "Ochi Day",
+    "2004-10-28": "Greek National Day",
     "2004-12-24": "Christmas Eve",
     "2004-12-25": "Christmas Day",
     "2004-12-26": "Day After Christmas",
     "2005-01-01": "New Year's Day",
     "2005-01-06": "Epiphany",
-    "2005-03-14": "Clean Monday",
+    "2005-03-14": "Green Monday",
     "2005-03-25": "Greek Independence Day",
     "2005-04-01": "Cyprus National Day",
     "2005-04-29": "Good Friday",
+    "2005-04-30": "Holy Saturday",
     "2005-05-01": "Easter Sunday; Labor Day",
     "2005-05-02": "Easter Monday",
-    "2005-06-20": "Monday of the Holy Spirit",
-    "2005-08-15": "Assumption of Mary",
+    "2005-05-03": "Easter Tuesday",
+    "2005-06-20": "Whit Monday",
+    "2005-08-15": "Assumption Day",
     "2005-10-01": "Cyprus Independence Day",
-    "2005-10-28": "Ochi Day",
+    "2005-10-28": "Greek National Day",
     "2005-12-24": "Christmas Eve",
     "2005-12-25": "Christmas Day",
     "2005-12-26": "Day After Christmas",
     "2006-01-01": "New Year's Day",
     "2006-01-06": "Epiphany",
-    "2006-03-06": "Clean Monday",
+    "2006-03-06": "Green Monday",
     "2006-03-25": "Greek Independence Day",
     "2006-04-01": "Cyprus National Day",
     "2006-04-21": "Good Friday",
+    "2006-04-22": "Holy Saturday",
     "2006-04-23": "Easter Sunday",
     "2006-04-24": "Easter Monday",
+    "2006-04-25": "Easter Tuesday",
     "2006-05-01": "Labor Day",
-    "2006-06-12": "Monday of the Holy Spirit",
-    "2006-08-15": "Assumption of Mary",
+    "2006-06-12": "Whit Monday",
+    "2006-08-15": "Assumption Day",
     "2006-10-01": "Cyprus Independence Day",
-    "2006-10-28": "Ochi Day",
+    "2006-10-28": "Greek National Day",
     "2006-12-24": "Christmas Eve",
     "2006-12-25": "Christmas Day",
     "2006-12-26": "Day After Christmas",
     "2007-01-01": "New Year's Day",
     "2007-01-06": "Epiphany",
-    "2007-02-19": "Clean Monday",
+    "2007-02-19": "Green Monday",
     "2007-03-25": "Greek Independence Day",
     "2007-04-01": "Cyprus National Day",
     "2007-04-06": "Good Friday",
+    "2007-04-07": "Holy Saturday",
     "2007-04-08": "Easter Sunday",
     "2007-04-09": "Easter Monday",
+    "2007-04-10": "Easter Tuesday",
     "2007-05-01": "Labor Day",
-    "2007-05-28": "Monday of the Holy Spirit",
-    "2007-08-15": "Assumption of Mary",
+    "2007-05-28": "Whit Monday",
+    "2007-08-15": "Assumption Day",
     "2007-10-01": "Cyprus Independence Day",
-    "2007-10-28": "Ochi Day",
+    "2007-10-28": "Greek National Day",
     "2007-12-24": "Christmas Eve",
     "2007-12-25": "Christmas Day",
     "2007-12-26": "Day After Christmas",
     "2008-01-01": "New Year's Day",
     "2008-01-06": "Epiphany",
-    "2008-03-10": "Clean Monday",
+    "2008-03-10": "Green Monday",
     "2008-03-25": "Greek Independence Day",
     "2008-04-01": "Cyprus National Day",
     "2008-04-25": "Good Friday",
+    "2008-04-26": "Holy Saturday",
     "2008-04-27": "Easter Sunday",
     "2008-04-28": "Easter Monday",
+    "2008-04-29": "Easter Tuesday",
     "2008-05-01": "Labor Day",
-    "2008-06-16": "Monday of the Holy Spirit",
-    "2008-08-15": "Assumption of Mary",
+    "2008-06-16": "Whit Monday",
+    "2008-08-15": "Assumption Day",
     "2008-10-01": "Cyprus Independence Day",
-    "2008-10-28": "Ochi Day",
+    "2008-10-28": "Greek National Day",
     "2008-12-24": "Christmas Eve",
     "2008-12-25": "Christmas Day",
     "2008-12-26": "Day After Christmas",
     "2009-01-01": "New Year's Day",
     "2009-01-06": "Epiphany",
-    "2009-03-02": "Clean Monday",
+    "2009-03-02": "Green Monday",
     "2009-03-25": "Greek Independence Day",
     "2009-04-01": "Cyprus National Day",
     "2009-04-17": "Good Friday",
+    "2009-04-18": "Holy Saturday",
     "2009-04-19": "Easter Sunday",
     "2009-04-20": "Easter Monday",
+    "2009-04-21": "Easter Tuesday",
     "2009-05-01": "Labor Day",
-    "2009-06-08": "Monday of the Holy Spirit",
-    "2009-08-15": "Assumption of Mary",
+    "2009-06-08": "Whit Monday",
+    "2009-08-15": "Assumption Day",
     "2009-10-01": "Cyprus Independence Day",
-    "2009-10-28": "Ochi Day",
+    "2009-10-28": "Greek National Day",
     "2009-12-24": "Christmas Eve",
     "2009-12-25": "Christmas Day",
     "2009-12-26": "Day After Christmas",
     "2010-01-01": "New Year's Day",
     "2010-01-06": "Epiphany",
-    "2010-02-15": "Clean Monday",
+    "2010-02-15": "Green Monday",
     "2010-03-25": "Greek Independence Day",
     "2010-04-01": "Cyprus National Day",
     "2010-04-02": "Good Friday",
+    "2010-04-03": "Holy Saturday",
     "2010-04-04": "Easter Sunday",
     "2010-04-05": "Easter Monday",
+    "2010-04-06": "Easter Tuesday",
     "2010-05-01": "Labor Day",
-    "2010-05-24": "Monday of the Holy Spirit",
-    "2010-08-15": "Assumption of Mary",
+    "2010-05-24": "Whit Monday",
+    "2010-08-15": "Assumption Day",
     "2010-10-01": "Cyprus Independence Day",
-    "2010-10-28": "Ochi Day",
+    "2010-10-28": "Greek National Day",
     "2010-12-24": "Christmas Eve",
     "2010-12-25": "Christmas Day",
     "2010-12-26": "Day After Christmas",
     "2011-01-01": "New Year's Day",
     "2011-01-06": "Epiphany",
-    "2011-03-07": "Clean Monday",
+    "2011-03-07": "Green Monday",
     "2011-03-25": "Greek Independence Day",
     "2011-04-01": "Cyprus National Day",
     "2011-04-22": "Good Friday",
+    "2011-04-23": "Holy Saturday",
     "2011-04-24": "Easter Sunday",
     "2011-04-25": "Easter Monday",
+    "2011-04-26": "Easter Tuesday",
     "2011-05-01": "Labor Day",
-    "2011-06-13": "Monday of the Holy Spirit",
-    "2011-08-15": "Assumption of Mary",
+    "2011-06-13": "Whit Monday",
+    "2011-08-15": "Assumption Day",
     "2011-10-01": "Cyprus Independence Day",
-    "2011-10-28": "Ochi Day",
+    "2011-10-28": "Greek National Day",
     "2011-12-24": "Christmas Eve",
     "2011-12-25": "Christmas Day",
     "2011-12-26": "Day After Christmas",
     "2012-01-01": "New Year's Day",
     "2012-01-06": "Epiphany",
-    "2012-02-27": "Clean Monday",
+    "2012-02-27": "Green Monday",
     "2012-03-25": "Greek Independence Day",
     "2012-04-01": "Cyprus National Day",
     "2012-04-13": "Good Friday",
+    "2012-04-14": "Holy Saturday",
     "2012-04-15": "Easter Sunday",
     "2012-04-16": "Easter Monday",
+    "2012-04-17": "Easter Tuesday",
     "2012-05-01": "Labor Day",
-    "2012-06-04": "Monday of the Holy Spirit",
-    "2012-08-15": "Assumption of Mary",
+    "2012-06-04": "Whit Monday",
+    "2012-08-15": "Assumption Day",
     "2012-10-01": "Cyprus Independence Day",
-    "2012-10-28": "Ochi Day",
+    "2012-10-28": "Greek National Day",
     "2012-12-24": "Christmas Eve",
     "2012-12-25": "Christmas Day",
     "2012-12-26": "Day After Christmas",
     "2013-01-01": "New Year's Day",
     "2013-01-06": "Epiphany",
-    "2013-03-18": "Clean Monday",
+    "2013-03-18": "Green Monday",
     "2013-03-25": "Greek Independence Day",
     "2013-04-01": "Cyprus National Day",
     "2013-05-01": "Labor Day",
     "2013-05-03": "Good Friday",
+    "2013-05-04": "Holy Saturday",
     "2013-05-05": "Easter Sunday",
     "2013-05-06": "Easter Monday",
-    "2013-06-24": "Monday of the Holy Spirit",
-    "2013-08-15": "Assumption of Mary",
+    "2013-05-07": "Easter Tuesday",
+    "2013-06-24": "Whit Monday",
+    "2013-08-15": "Assumption Day",
     "2013-10-01": "Cyprus Independence Day",
-    "2013-10-28": "Ochi Day",
+    "2013-10-28": "Greek National Day",
     "2013-12-24": "Christmas Eve",
     "2013-12-25": "Christmas Day",
     "2013-12-26": "Day After Christmas",
     "2014-01-01": "New Year's Day",
     "2014-01-06": "Epiphany",
-    "2014-03-03": "Clean Monday",
+    "2014-03-03": "Green Monday",
     "2014-03-25": "Greek Independence Day",
     "2014-04-01": "Cyprus National Day",
     "2014-04-18": "Good Friday",
+    "2014-04-19": "Holy Saturday",
     "2014-04-20": "Easter Sunday",
     "2014-04-21": "Easter Monday",
+    "2014-04-22": "Easter Tuesday",
     "2014-05-01": "Labor Day",
-    "2014-06-09": "Monday of the Holy Spirit",
-    "2014-08-15": "Assumption of Mary",
+    "2014-06-09": "Whit Monday",
+    "2014-08-15": "Assumption Day",
     "2014-10-01": "Cyprus Independence Day",
-    "2014-10-28": "Ochi Day",
+    "2014-10-28": "Greek National Day",
     "2014-12-24": "Christmas Eve",
     "2014-12-25": "Christmas Day",
     "2014-12-26": "Day After Christmas",
     "2015-01-01": "New Year's Day",
     "2015-01-06": "Epiphany",
-    "2015-02-23": "Clean Monday",
+    "2015-02-23": "Green Monday",
     "2015-03-25": "Greek Independence Day",
     "2015-04-01": "Cyprus National Day",
     "2015-04-10": "Good Friday",
+    "2015-04-11": "Holy Saturday",
     "2015-04-12": "Easter Sunday",
     "2015-04-13": "Easter Monday",
+    "2015-04-14": "Easter Tuesday",
     "2015-05-01": "Labor Day",
-    "2015-06-01": "Monday of the Holy Spirit",
-    "2015-08-15": "Assumption of Mary",
+    "2015-06-01": "Whit Monday",
+    "2015-08-15": "Assumption Day",
     "2015-10-01": "Cyprus Independence Day",
-    "2015-10-28": "Ochi Day",
+    "2015-10-28": "Greek National Day",
     "2015-12-24": "Christmas Eve",
     "2015-12-25": "Christmas Day",
     "2015-12-26": "Day After Christmas",
     "2016-01-01": "New Year's Day",
     "2016-01-06": "Epiphany",
-    "2016-03-14": "Clean Monday",
+    "2016-03-14": "Green Monday",
     "2016-03-25": "Greek Independence Day",
     "2016-04-01": "Cyprus National Day",
     "2016-04-29": "Good Friday",
+    "2016-04-30": "Holy Saturday",
     "2016-05-01": "Easter Sunday; Labor Day",
     "2016-05-02": "Easter Monday",
-    "2016-06-20": "Monday of the Holy Spirit",
-    "2016-08-15": "Assumption of Mary",
+    "2016-05-03": "Easter Tuesday",
+    "2016-06-20": "Whit Monday",
+    "2016-08-15": "Assumption Day",
     "2016-10-01": "Cyprus Independence Day",
-    "2016-10-28": "Ochi Day",
+    "2016-10-28": "Greek National Day",
     "2016-12-24": "Christmas Eve",
     "2016-12-25": "Christmas Day",
     "2016-12-26": "Day After Christmas",
     "2017-01-01": "New Year's Day",
     "2017-01-06": "Epiphany",
-    "2017-02-27": "Clean Monday",
+    "2017-02-27": "Green Monday",
     "2017-03-25": "Greek Independence Day",
     "2017-04-01": "Cyprus National Day",
     "2017-04-14": "Good Friday",
+    "2017-04-15": "Holy Saturday",
     "2017-04-16": "Easter Sunday",
     "2017-04-17": "Easter Monday",
+    "2017-04-18": "Easter Tuesday",
     "2017-05-01": "Labor Day",
-    "2017-06-05": "Monday of the Holy Spirit",
-    "2017-08-15": "Assumption of Mary",
+    "2017-06-05": "Whit Monday",
+    "2017-08-15": "Assumption Day",
     "2017-10-01": "Cyprus Independence Day",
-    "2017-10-28": "Ochi Day",
+    "2017-10-28": "Greek National Day",
     "2017-12-24": "Christmas Eve",
     "2017-12-25": "Christmas Day",
     "2017-12-26": "Day After Christmas",
     "2018-01-01": "New Year's Day",
     "2018-01-06": "Epiphany",
-    "2018-02-19": "Clean Monday",
+    "2018-02-19": "Green Monday",
     "2018-03-25": "Greek Independence Day",
     "2018-04-01": "Cyprus National Day",
     "2018-04-06": "Good Friday",
+    "2018-04-07": "Holy Saturday",
     "2018-04-08": "Easter Sunday",
     "2018-04-09": "Easter Monday",
+    "2018-04-10": "Easter Tuesday",
     "2018-05-01": "Labor Day",
-    "2018-05-28": "Monday of the Holy Spirit",
-    "2018-08-15": "Assumption of Mary",
+    "2018-05-28": "Whit Monday",
+    "2018-08-15": "Assumption Day",
     "2018-10-01": "Cyprus Independence Day",
-    "2018-10-28": "Ochi Day",
+    "2018-10-28": "Greek National Day",
     "2018-12-24": "Christmas Eve",
     "2018-12-25": "Christmas Day",
     "2018-12-26": "Day After Christmas",
     "2019-01-01": "New Year's Day",
     "2019-01-06": "Epiphany",
-    "2019-03-11": "Clean Monday",
+    "2019-03-11": "Green Monday",
     "2019-03-25": "Greek Independence Day",
     "2019-04-01": "Cyprus National Day",
     "2019-04-26": "Good Friday",
+    "2019-04-27": "Holy Saturday",
     "2019-04-28": "Easter Sunday",
     "2019-04-29": "Easter Monday",
+    "2019-04-30": "Easter Tuesday",
     "2019-05-01": "Labor Day",
-    "2019-06-17": "Monday of the Holy Spirit",
-    "2019-08-15": "Assumption of Mary",
+    "2019-06-17": "Whit Monday",
+    "2019-08-15": "Assumption Day",
     "2019-10-01": "Cyprus Independence Day",
-    "2019-10-28": "Ochi Day",
+    "2019-10-28": "Greek National Day",
     "2019-12-24": "Christmas Eve",
     "2019-12-25": "Christmas Day",
     "2019-12-26": "Day After Christmas",
     "2020-01-01": "New Year's Day",
     "2020-01-06": "Epiphany",
-    "2020-03-02": "Clean Monday",
+    "2020-03-02": "Green Monday",
     "2020-03-25": "Greek Independence Day",
     "2020-04-01": "Cyprus National Day",
     "2020-04-17": "Good Friday",
+    "2020-04-18": "Holy Saturday",
     "2020-04-19": "Easter Sunday",
     "2020-04-20": "Easter Monday",
+    "2020-04-21": "Easter Tuesday",
     "2020-05-01": "Labor Day",
-    "2020-06-08": "Monday of the Holy Spirit",
-    "2020-08-15": "Assumption of Mary",
+    "2020-06-08": "Whit Monday",
+    "2020-08-15": "Assumption Day",
     "2020-10-01": "Cyprus Independence Day",
-    "2020-10-28": "Ochi Day",
+    "2020-10-28": "Greek National Day",
     "2020-12-24": "Christmas Eve",
     "2020-12-25": "Christmas Day",
     "2020-12-26": "Day After Christmas",
     "2021-01-01": "New Year's Day",
     "2021-01-06": "Epiphany",
-    "2021-03-15": "Clean Monday",
+    "2021-03-15": "Green Monday",
     "2021-03-25": "Greek Independence Day",
     "2021-04-01": "Cyprus National Day",
     "2021-04-30": "Good Friday",
-    "2021-05-01": "Labor Day",
+    "2021-05-01": "Holy Saturday; Labor Day",
     "2021-05-02": "Easter Sunday",
     "2021-05-03": "Easter Monday",
-    "2021-06-21": "Monday of the Holy Spirit",
-    "2021-08-15": "Assumption of Mary",
+    "2021-05-04": "Easter Tuesday",
+    "2021-06-21": "Whit Monday",
+    "2021-08-15": "Assumption Day",
     "2021-10-01": "Cyprus Independence Day",
-    "2021-10-28": "Ochi Day",
+    "2021-10-28": "Greek National Day",
     "2021-12-24": "Christmas Eve",
     "2021-12-25": "Christmas Day",
     "2021-12-26": "Day After Christmas",
     "2022-01-01": "New Year's Day",
     "2022-01-06": "Epiphany",
-    "2022-03-07": "Clean Monday",
+    "2022-03-07": "Green Monday",
     "2022-03-25": "Greek Independence Day",
     "2022-04-01": "Cyprus National Day",
     "2022-04-22": "Good Friday",
+    "2022-04-23": "Holy Saturday",
     "2022-04-24": "Easter Sunday",
     "2022-04-25": "Easter Monday",
+    "2022-04-26": "Easter Tuesday",
     "2022-05-01": "Labor Day",
-    "2022-06-13": "Monday of the Holy Spirit",
-    "2022-08-15": "Assumption of Mary",
+    "2022-06-13": "Whit Monday",
+    "2022-08-15": "Assumption Day",
     "2022-10-01": "Cyprus Independence Day",
-    "2022-10-28": "Ochi Day",
+    "2022-10-28": "Greek National Day",
     "2022-12-24": "Christmas Eve",
     "2022-12-25": "Christmas Day",
     "2022-12-26": "Day After Christmas",
     "2023-01-01": "New Year's Day",
     "2023-01-06": "Epiphany",
-    "2023-02-27": "Clean Monday",
+    "2023-02-27": "Green Monday",
     "2023-03-25": "Greek Independence Day",
     "2023-04-01": "Cyprus National Day",
     "2023-04-14": "Good Friday",
+    "2023-04-15": "Holy Saturday",
     "2023-04-16": "Easter Sunday",
     "2023-04-17": "Easter Monday",
+    "2023-04-18": "Easter Tuesday",
     "2023-05-01": "Labor Day",
-    "2023-06-05": "Monday of the Holy Spirit",
-    "2023-08-15": "Assumption of Mary",
+    "2023-06-05": "Whit Monday",
+    "2023-08-15": "Assumption Day",
     "2023-10-01": "Cyprus Independence Day",
-    "2023-10-28": "Ochi Day",
+    "2023-10-28": "Greek National Day",
     "2023-12-24": "Christmas Eve",
     "2023-12-25": "Christmas Day",
     "2023-12-26": "Day After Christmas",
     "2024-01-01": "New Year's Day",
     "2024-01-06": "Epiphany",
-    "2024-03-18": "Clean Monday",
+    "2024-03-18": "Green Monday",
     "2024-03-25": "Greek Independence Day",
     "2024-04-01": "Cyprus National Day",
     "2024-05-01": "Labor Day",
     "2024-05-03": "Good Friday",
+    "2024-05-04": "Holy Saturday",
     "2024-05-05": "Easter Sunday",
     "2024-05-06": "Easter Monday",
-    "2024-06-24": "Monday of the Holy Spirit",
-    "2024-08-15": "Assumption of Mary",
+    "2024-05-07": "Easter Tuesday",
+    "2024-06-24": "Whit Monday",
+    "2024-08-15": "Assumption Day",
     "2024-10-01": "Cyprus Independence Day",
-    "2024-10-28": "Ochi Day",
+    "2024-10-28": "Greek National Day",
     "2024-12-24": "Christmas Eve",
     "2024-12-25": "Christmas Day",
     "2024-12-26": "Day After Christmas",
     "2025-01-01": "New Year's Day",
     "2025-01-06": "Epiphany",
-    "2025-03-03": "Clean Monday",
+    "2025-03-03": "Green Monday",
     "2025-03-25": "Greek Independence Day",
     "2025-04-01": "Cyprus National Day",
     "2025-04-18": "Good Friday",
+    "2025-04-19": "Holy Saturday",
     "2025-04-20": "Easter Sunday",
     "2025-04-21": "Easter Monday",
+    "2025-04-22": "Easter Tuesday",
     "2025-05-01": "Labor Day",
-    "2025-06-09": "Monday of the Holy Spirit",
-    "2025-08-15": "Assumption of Mary",
+    "2025-06-09": "Whit Monday",
+    "2025-08-15": "Assumption Day",
     "2025-10-01": "Cyprus Independence Day",
-    "2025-10-28": "Ochi Day",
+    "2025-10-28": "Greek National Day",
     "2025-12-24": "Christmas Eve",
     "2025-12-25": "Christmas Day",
     "2025-12-26": "Day After Christmas",
     "2026-01-01": "New Year's Day",
     "2026-01-06": "Epiphany",
-    "2026-02-23": "Clean Monday",
+    "2026-02-23": "Green Monday",
     "2026-03-25": "Greek Independence Day",
     "2026-04-01": "Cyprus National Day",
     "2026-04-10": "Good Friday",
+    "2026-04-11": "Holy Saturday",
     "2026-04-12": "Easter Sunday",
     "2026-04-13": "Easter Monday",
+    "2026-04-14": "Easter Tuesday",
     "2026-05-01": "Labor Day",
-    "2026-06-01": "Monday of the Holy Spirit",
-    "2026-08-15": "Assumption of Mary",
+    "2026-06-01": "Whit Monday",
+    "2026-08-15": "Assumption Day",
     "2026-10-01": "Cyprus Independence Day",
-    "2026-10-28": "Ochi Day",
+    "2026-10-28": "Greek National Day",
     "2026-12-24": "Christmas Eve",
     "2026-12-25": "Christmas Day",
     "2026-12-26": "Day After Christmas",
     "2027-01-01": "New Year's Day",
     "2027-01-06": "Epiphany",
-    "2027-03-15": "Clean Monday",
+    "2027-03-15": "Green Monday",
     "2027-03-25": "Greek Independence Day",
     "2027-04-01": "Cyprus National Day",
     "2027-04-30": "Good Friday",
-    "2027-05-01": "Labor Day",
+    "2027-05-01": "Holy Saturday; Labor Day",
     "2027-05-02": "Easter Sunday",
     "2027-05-03": "Easter Monday",
-    "2027-06-21": "Monday of the Holy Spirit",
-    "2027-08-15": "Assumption of Mary",
+    "2027-05-04": "Easter Tuesday",
+    "2027-06-21": "Whit Monday",
+    "2027-08-15": "Assumption Day",
     "2027-10-01": "Cyprus Independence Day",
-    "2027-10-28": "Ochi Day",
+    "2027-10-28": "Greek National Day",
     "2027-12-24": "Christmas Eve",
     "2027-12-25": "Christmas Day",
     "2027-12-26": "Day After Christmas",
     "2028-01-01": "New Year's Day",
     "2028-01-06": "Epiphany",
-    "2028-02-28": "Clean Monday",
+    "2028-02-28": "Green Monday",
     "2028-03-25": "Greek Independence Day",
     "2028-04-01": "Cyprus National Day",
     "2028-04-14": "Good Friday",
+    "2028-04-15": "Holy Saturday",
     "2028-04-16": "Easter Sunday",
     "2028-04-17": "Easter Monday",
+    "2028-04-18": "Easter Tuesday",
     "2028-05-01": "Labor Day",
-    "2028-06-05": "Monday of the Holy Spirit",
-    "2028-08-15": "Assumption of Mary",
+    "2028-06-05": "Whit Monday",
+    "2028-08-15": "Assumption Day",
     "2028-10-01": "Cyprus Independence Day",
-    "2028-10-28": "Ochi Day",
+    "2028-10-28": "Greek National Day",
     "2028-12-24": "Christmas Eve",
     "2028-12-25": "Christmas Day",
     "2028-12-26": "Day After Christmas",
     "2029-01-01": "New Year's Day",
     "2029-01-06": "Epiphany",
-    "2029-02-19": "Clean Monday",
+    "2029-02-19": "Green Monday",
     "2029-03-25": "Greek Independence Day",
     "2029-04-01": "Cyprus National Day",
     "2029-04-06": "Good Friday",
+    "2029-04-07": "Holy Saturday",
     "2029-04-08": "Easter Sunday",
     "2029-04-09": "Easter Monday",
+    "2029-04-10": "Easter Tuesday",
     "2029-05-01": "Labor Day",
-    "2029-05-28": "Monday of the Holy Spirit",
-    "2029-08-15": "Assumption of Mary",
+    "2029-05-28": "Whit Monday",
+    "2029-08-15": "Assumption Day",
     "2029-10-01": "Cyprus Independence Day",
-    "2029-10-28": "Ochi Day",
+    "2029-10-28": "Greek National Day",
     "2029-12-24": "Christmas Eve",
     "2029-12-25": "Christmas Day",
     "2029-12-26": "Day After Christmas",
     "2030-01-01": "New Year's Day",
     "2030-01-06": "Epiphany",
-    "2030-03-11": "Clean Monday",
+    "2030-03-11": "Green Monday",
     "2030-03-25": "Greek Independence Day",
     "2030-04-01": "Cyprus National Day",
     "2030-04-26": "Good Friday",
+    "2030-04-27": "Holy Saturday",
     "2030-04-28": "Easter Sunday",
     "2030-04-29": "Easter Monday",
+    "2030-04-30": "Easter Tuesday",
     "2030-05-01": "Labor Day",
-    "2030-06-17": "Monday of the Holy Spirit",
-    "2030-08-15": "Assumption of Mary",
+    "2030-06-17": "Whit Monday",
+    "2030-08-15": "Assumption Day",
     "2030-10-01": "Cyprus Independence Day",
-    "2030-10-28": "Ochi Day",
+    "2030-10-28": "Greek National Day",
     "2030-12-24": "Christmas Eve",
     "2030-12-25": "Christmas Day",
     "2030-12-26": "Day After Christmas",
     "2031-01-01": "New Year's Day",
     "2031-01-06": "Epiphany",
-    "2031-02-24": "Clean Monday",
+    "2031-02-24": "Green Monday",
     "2031-03-25": "Greek Independence Day",
     "2031-04-01": "Cyprus National Day",
     "2031-04-11": "Good Friday",
+    "2031-04-12": "Holy Saturday",
     "2031-04-13": "Easter Sunday",
     "2031-04-14": "Easter Monday",
+    "2031-04-15": "Easter Tuesday",
     "2031-05-01": "Labor Day",
-    "2031-06-02": "Monday of the Holy Spirit",
-    "2031-08-15": "Assumption of Mary",
+    "2031-06-02": "Whit Monday",
+    "2031-08-15": "Assumption Day",
     "2031-10-01": "Cyprus Independence Day",
-    "2031-10-28": "Ochi Day",
+    "2031-10-28": "Greek National Day",
     "2031-12-24": "Christmas Eve",
     "2031-12-25": "Christmas Day",
     "2031-12-26": "Day After Christmas",
     "2032-01-01": "New Year's Day",
     "2032-01-06": "Epiphany",
-    "2032-03-15": "Clean Monday",
+    "2032-03-15": "Green Monday",
     "2032-03-25": "Greek Independence Day",
     "2032-04-01": "Cyprus National Day",
     "2032-04-30": "Good Friday",
-    "2032-05-01": "Labor Day",
+    "2032-05-01": "Holy Saturday; Labor Day",
     "2032-05-02": "Easter Sunday",
     "2032-05-03": "Easter Monday",
-    "2032-06-21": "Monday of the Holy Spirit",
-    "2032-08-15": "Assumption of Mary",
+    "2032-05-04": "Easter Tuesday",
+    "2032-06-21": "Whit Monday",
+    "2032-08-15": "Assumption Day",
     "2032-10-01": "Cyprus Independence Day",
-    "2032-10-28": "Ochi Day",
+    "2032-10-28": "Greek National Day",
     "2032-12-24": "Christmas Eve",
     "2032-12-25": "Christmas Day",
     "2032-12-26": "Day After Christmas",
     "2033-01-01": "New Year's Day",
     "2033-01-06": "Epiphany",
-    "2033-03-07": "Clean Monday",
+    "2033-03-07": "Green Monday",
     "2033-03-25": "Greek Independence Day",
     "2033-04-01": "Cyprus National Day",
     "2033-04-22": "Good Friday",
+    "2033-04-23": "Holy Saturday",
     "2033-04-24": "Easter Sunday",
     "2033-04-25": "Easter Monday",
+    "2033-04-26": "Easter Tuesday",
     "2033-05-01": "Labor Day",
-    "2033-06-13": "Monday of the Holy Spirit",
-    "2033-08-15": "Assumption of Mary",
+    "2033-06-13": "Whit Monday",
+    "2033-08-15": "Assumption Day",
     "2033-10-01": "Cyprus Independence Day",
-    "2033-10-28": "Ochi Day",
+    "2033-10-28": "Greek National Day",
     "2033-12-24": "Christmas Eve",
     "2033-12-25": "Christmas Day",
     "2033-12-26": "Day After Christmas",
     "2034-01-01": "New Year's Day",
     "2034-01-06": "Epiphany",
-    "2034-02-20": "Clean Monday",
+    "2034-02-20": "Green Monday",
     "2034-03-25": "Greek Independence Day",
     "2034-04-01": "Cyprus National Day",
     "2034-04-07": "Good Friday",
+    "2034-04-08": "Holy Saturday",
     "2034-04-09": "Easter Sunday",
     "2034-04-10": "Easter Monday",
+    "2034-04-11": "Easter Tuesday",
     "2034-05-01": "Labor Day",
-    "2034-05-29": "Monday of the Holy Spirit",
-    "2034-08-15": "Assumption of Mary",
+    "2034-05-29": "Whit Monday",
+    "2034-08-15": "Assumption Day",
     "2034-10-01": "Cyprus Independence Day",
-    "2034-10-28": "Ochi Day",
+    "2034-10-28": "Greek National Day",
     "2034-12-24": "Christmas Eve",
     "2034-12-25": "Christmas Day",
     "2034-12-26": "Day After Christmas",
     "2035-01-01": "New Year's Day",
     "2035-01-06": "Epiphany",
-    "2035-03-12": "Clean Monday",
+    "2035-03-12": "Green Monday",
     "2035-03-25": "Greek Independence Day",
     "2035-04-01": "Cyprus National Day",
     "2035-04-27": "Good Friday",
+    "2035-04-28": "Holy Saturday",
     "2035-04-29": "Easter Sunday",
     "2035-04-30": "Easter Monday",
-    "2035-05-01": "Labor Day",
-    "2035-06-18": "Monday of the Holy Spirit",
-    "2035-08-15": "Assumption of Mary",
+    "2035-05-01": "Easter Tuesday; Labor Day",
+    "2035-06-18": "Whit Monday",
+    "2035-08-15": "Assumption Day",
     "2035-10-01": "Cyprus Independence Day",
-    "2035-10-28": "Ochi Day",
+    "2035-10-28": "Greek National Day",
     "2035-12-24": "Christmas Eve",
     "2035-12-25": "Christmas Day",
     "2035-12-26": "Day After Christmas",
     "2036-01-01": "New Year's Day",
     "2036-01-06": "Epiphany",
-    "2036-03-03": "Clean Monday",
+    "2036-03-03": "Green Monday",
     "2036-03-25": "Greek Independence Day",
     "2036-04-01": "Cyprus National Day",
     "2036-04-18": "Good Friday",
+    "2036-04-19": "Holy Saturday",
     "2036-04-20": "Easter Sunday",
     "2036-04-21": "Easter Monday",
+    "2036-04-22": "Easter Tuesday",
     "2036-05-01": "Labor Day",
-    "2036-06-09": "Monday of the Holy Spirit",
-    "2036-08-15": "Assumption of Mary",
+    "2036-06-09": "Whit Monday",
+    "2036-08-15": "Assumption Day",
     "2036-10-01": "Cyprus Independence Day",
-    "2036-10-28": "Ochi Day",
+    "2036-10-28": "Greek National Day",
     "2036-12-24": "Christmas Eve",
     "2036-12-25": "Christmas Day",
     "2036-12-26": "Day After Christmas",
     "2037-01-01": "New Year's Day",
     "2037-01-06": "Epiphany",
-    "2037-02-16": "Clean Monday",
+    "2037-02-16": "Green Monday",
     "2037-03-25": "Greek Independence Day",
     "2037-04-01": "Cyprus National Day",
     "2037-04-03": "Good Friday",
+    "2037-04-04": "Holy Saturday",
     "2037-04-05": "Easter Sunday",
     "2037-04-06": "Easter Monday",
+    "2037-04-07": "Easter Tuesday",
     "2037-05-01": "Labor Day",
-    "2037-05-25": "Monday of the Holy Spirit",
-    "2037-08-15": "Assumption of Mary",
+    "2037-05-25": "Whit Monday",
+    "2037-08-15": "Assumption Day",
     "2037-10-01": "Cyprus Independence Day",
-    "2037-10-28": "Ochi Day",
+    "2037-10-28": "Greek National Day",
     "2037-12-24": "Christmas Eve",
     "2037-12-25": "Christmas Day",
     "2037-12-26": "Day After Christmas",
     "2038-01-01": "New Year's Day",
     "2038-01-06": "Epiphany",
-    "2038-03-08": "Clean Monday",
+    "2038-03-08": "Green Monday",
     "2038-03-25": "Greek Independence Day",
     "2038-04-01": "Cyprus National Day",
     "2038-04-23": "Good Friday",
+    "2038-04-24": "Holy Saturday",
     "2038-04-25": "Easter Sunday",
     "2038-04-26": "Easter Monday",
+    "2038-04-27": "Easter Tuesday",
     "2038-05-01": "Labor Day",
-    "2038-06-14": "Monday of the Holy Spirit",
-    "2038-08-15": "Assumption of Mary",
+    "2038-06-14": "Whit Monday",
+    "2038-08-15": "Assumption Day",
     "2038-10-01": "Cyprus Independence Day",
-    "2038-10-28": "Ochi Day",
+    "2038-10-28": "Greek National Day",
     "2038-12-24": "Christmas Eve",
     "2038-12-25": "Christmas Day",
     "2038-12-26": "Day After Christmas",
     "2039-01-01": "New Year's Day",
     "2039-01-06": "Epiphany",
-    "2039-02-28": "Clean Monday",
+    "2039-02-28": "Green Monday",
     "2039-03-25": "Greek Independence Day",
     "2039-04-01": "Cyprus National Day",
     "2039-04-15": "Good Friday",
+    "2039-04-16": "Holy Saturday",
     "2039-04-17": "Easter Sunday",
     "2039-04-18": "Easter Monday",
+    "2039-04-19": "Easter Tuesday",
     "2039-05-01": "Labor Day",
-    "2039-06-06": "Monday of the Holy Spirit",
-    "2039-08-15": "Assumption of Mary",
+    "2039-06-06": "Whit Monday",
+    "2039-08-15": "Assumption Day",
     "2039-10-01": "Cyprus Independence Day",
-    "2039-10-28": "Ochi Day",
+    "2039-10-28": "Greek National Day",
     "2039-12-24": "Christmas Eve",
     "2039-12-25": "Christmas Day",
     "2039-12-26": "Day After Christmas",
     "2040-01-01": "New Year's Day",
     "2040-01-06": "Epiphany",
-    "2040-03-19": "Clean Monday",
+    "2040-03-19": "Green Monday",
     "2040-03-25": "Greek Independence Day",
     "2040-04-01": "Cyprus National Day",
     "2040-05-01": "Labor Day",
     "2040-05-04": "Good Friday",
+    "2040-05-05": "Holy Saturday",
     "2040-05-06": "Easter Sunday",
     "2040-05-07": "Easter Monday",
-    "2040-06-25": "Monday of the Holy Spirit",
-    "2040-08-15": "Assumption of Mary",
+    "2040-05-08": "Easter Tuesday",
+    "2040-06-25": "Whit Monday",
+    "2040-08-15": "Assumption Day",
     "2040-10-01": "Cyprus Independence Day",
-    "2040-10-28": "Ochi Day",
+    "2040-10-28": "Greek National Day",
     "2040-12-24": "Christmas Eve",
     "2040-12-25": "Christmas Day",
     "2040-12-26": "Day After Christmas",
     "2041-01-01": "New Year's Day",
     "2041-01-06": "Epiphany",
-    "2041-03-04": "Clean Monday",
+    "2041-03-04": "Green Monday",
     "2041-03-25": "Greek Independence Day",
     "2041-04-01": "Cyprus National Day",
     "2041-04-19": "Good Friday",
+    "2041-04-20": "Holy Saturday",
     "2041-04-21": "Easter Sunday",
     "2041-04-22": "Easter Monday",
+    "2041-04-23": "Easter Tuesday",
     "2041-05-01": "Labor Day",
-    "2041-06-10": "Monday of the Holy Spirit",
-    "2041-08-15": "Assumption of Mary",
+    "2041-06-10": "Whit Monday",
+    "2041-08-15": "Assumption Day",
     "2041-10-01": "Cyprus Independence Day",
-    "2041-10-28": "Ochi Day",
+    "2041-10-28": "Greek National Day",
     "2041-12-24": "Christmas Eve",
     "2041-12-25": "Christmas Day",
     "2041-12-26": "Day After Christmas",
     "2042-01-01": "New Year's Day",
     "2042-01-06": "Epiphany",
-    "2042-02-24": "Clean Monday",
+    "2042-02-24": "Green Monday",
     "2042-03-25": "Greek Independence Day",
     "2042-04-01": "Cyprus National Day",
     "2042-04-11": "Good Friday",
+    "2042-04-12": "Holy Saturday",
     "2042-04-13": "Easter Sunday",
     "2042-04-14": "Easter Monday",
+    "2042-04-15": "Easter Tuesday",
     "2042-05-01": "Labor Day",
-    "2042-06-02": "Monday of the Holy Spirit",
-    "2042-08-15": "Assumption of Mary",
+    "2042-06-02": "Whit Monday",
+    "2042-08-15": "Assumption Day",
     "2042-10-01": "Cyprus Independence Day",
-    "2042-10-28": "Ochi Day",
+    "2042-10-28": "Greek National Day",
     "2042-12-24": "Christmas Eve",
     "2042-12-25": "Christmas Day",
     "2042-12-26": "Day After Christmas",
     "2043-01-01": "New Year's Day",
     "2043-01-06": "Epiphany",
-    "2043-03-16": "Clean Monday",
+    "2043-03-16": "Green Monday",
     "2043-03-25": "Greek Independence Day",
     "2043-04-01": "Cyprus National Day",
     "2043-05-01": "Good Friday; Labor Day",
+    "2043-05-02": "Holy Saturday",
     "2043-05-03": "Easter Sunday",
     "2043-05-04": "Easter Monday",
-    "2043-06-22": "Monday of the Holy Spirit",
-    "2043-08-15": "Assumption of Mary",
+    "2043-05-05": "Easter Tuesday",
+    "2043-06-22": "Whit Monday",
+    "2043-08-15": "Assumption Day",
     "2043-10-01": "Cyprus Independence Day",
-    "2043-10-28": "Ochi Day",
+    "2043-10-28": "Greek National Day",
     "2043-12-24": "Christmas Eve",
     "2043-12-25": "Christmas Day",
     "2043-12-26": "Day After Christmas",
     "2044-01-01": "New Year's Day",
     "2044-01-06": "Epiphany",
-    "2044-03-07": "Clean Monday",
+    "2044-03-07": "Green Monday",
     "2044-03-25": "Greek Independence Day",
     "2044-04-01": "Cyprus National Day",
     "2044-04-22": "Good Friday",
+    "2044-04-23": "Holy Saturday",
     "2044-04-24": "Easter Sunday",
     "2044-04-25": "Easter Monday",
+    "2044-04-26": "Easter Tuesday",
     "2044-05-01": "Labor Day",
-    "2044-06-13": "Monday of the Holy Spirit",
-    "2044-08-15": "Assumption of Mary",
+    "2044-06-13": "Whit Monday",
+    "2044-08-15": "Assumption Day",
     "2044-10-01": "Cyprus Independence Day",
-    "2044-10-28": "Ochi Day",
+    "2044-10-28": "Greek National Day",
     "2044-12-24": "Christmas Eve",
     "2044-12-25": "Christmas Day",
     "2044-12-26": "Day After Christmas",
     "2045-01-01": "New Year's Day",
     "2045-01-06": "Epiphany",
-    "2045-02-20": "Clean Monday",
+    "2045-02-20": "Green Monday",
     "2045-03-25": "Greek Independence Day",
     "2045-04-01": "Cyprus National Day",
     "2045-04-07": "Good Friday",
+    "2045-04-08": "Holy Saturday",
     "2045-04-09": "Easter Sunday",
     "2045-04-10": "Easter Monday",
+    "2045-04-11": "Easter Tuesday",
     "2045-05-01": "Labor Day",
-    "2045-05-29": "Monday of the Holy Spirit",
-    "2045-08-15": "Assumption of Mary",
+    "2045-05-29": "Whit Monday",
+    "2045-08-15": "Assumption Day",
     "2045-10-01": "Cyprus Independence Day",
-    "2045-10-28": "Ochi Day",
+    "2045-10-28": "Greek National Day",
     "2045-12-24": "Christmas Eve",
     "2045-12-25": "Christmas Day",
     "2045-12-26": "Day After Christmas",
     "2046-01-01": "New Year's Day",
     "2046-01-06": "Epiphany",
-    "2046-03-12": "Clean Monday",
+    "2046-03-12": "Green Monday",
     "2046-03-25": "Greek Independence Day",
     "2046-04-01": "Cyprus National Day",
     "2046-04-27": "Good Friday",
+    "2046-04-28": "Holy Saturday",
     "2046-04-29": "Easter Sunday",
     "2046-04-30": "Easter Monday",
-    "2046-05-01": "Labor Day",
-    "2046-06-18": "Monday of the Holy Spirit",
-    "2046-08-15": "Assumption of Mary",
+    "2046-05-01": "Easter Tuesday; Labor Day",
+    "2046-06-18": "Whit Monday",
+    "2046-08-15": "Assumption Day",
     "2046-10-01": "Cyprus Independence Day",
-    "2046-10-28": "Ochi Day",
+    "2046-10-28": "Greek National Day",
     "2046-12-24": "Christmas Eve",
     "2046-12-25": "Christmas Day",
     "2046-12-26": "Day After Christmas",
     "2047-01-01": "New Year's Day",
     "2047-01-06": "Epiphany",
-    "2047-03-04": "Clean Monday",
+    "2047-03-04": "Green Monday",
     "2047-03-25": "Greek Independence Day",
     "2047-04-01": "Cyprus National Day",
     "2047-04-19": "Good Friday",
+    "2047-04-20": "Holy Saturday",
     "2047-04-21": "Easter Sunday",
     "2047-04-22": "Easter Monday",
+    "2047-04-23": "Easter Tuesday",
     "2047-05-01": "Labor Day",
-    "2047-06-10": "Monday of the Holy Spirit",
-    "2047-08-15": "Assumption of Mary",
+    "2047-06-10": "Whit Monday",
+    "2047-08-15": "Assumption Day",
     "2047-10-01": "Cyprus Independence Day",
-    "2047-10-28": "Ochi Day",
+    "2047-10-28": "Greek National Day",
     "2047-12-24": "Christmas Eve",
     "2047-12-25": "Christmas Day",
     "2047-12-26": "Day After Christmas",
     "2048-01-01": "New Year's Day",
     "2048-01-06": "Epiphany",
-    "2048-02-17": "Clean Monday",
+    "2048-02-17": "Green Monday",
     "2048-03-25": "Greek Independence Day",
     "2048-04-01": "Cyprus National Day",
     "2048-04-03": "Good Friday",
+    "2048-04-04": "Holy Saturday",
     "2048-04-05": "Easter Sunday",
     "2048-04-06": "Easter Monday",
+    "2048-04-07": "Easter Tuesday",
     "2048-05-01": "Labor Day",
-    "2048-05-25": "Monday of the Holy Spirit",
-    "2048-08-15": "Assumption of Mary",
+    "2048-05-25": "Whit Monday",
+    "2048-08-15": "Assumption Day",
     "2048-10-01": "Cyprus Independence Day",
-    "2048-10-28": "Ochi Day",
+    "2048-10-28": "Greek National Day",
     "2048-12-24": "Christmas Eve",
     "2048-12-25": "Christmas Day",
     "2048-12-26": "Day After Christmas",
     "2049-01-01": "New Year's Day",
     "2049-01-06": "Epiphany",
-    "2049-03-08": "Clean Monday",
+    "2049-03-08": "Green Monday",
     "2049-03-25": "Greek Independence Day",
     "2049-04-01": "Cyprus National Day",
     "2049-04-23": "Good Friday",
+    "2049-04-24": "Holy Saturday",
     "2049-04-25": "Easter Sunday",
     "2049-04-26": "Easter Monday",
+    "2049-04-27": "Easter Tuesday",
     "2049-05-01": "Labor Day",
-    "2049-06-14": "Monday of the Holy Spirit",
-    "2049-08-15": "Assumption of Mary",
+    "2049-06-14": "Whit Monday",
+    "2049-08-15": "Assumption Day",
     "2049-10-01": "Cyprus Independence Day",
-    "2049-10-28": "Ochi Day",
+    "2049-10-28": "Greek National Day",
     "2049-12-24": "Christmas Eve",
     "2049-12-25": "Christmas Day",
     "2049-12-26": "Day After Christmas",
     "2050-01-01": "New Year's Day",
     "2050-01-06": "Epiphany",
-    "2050-02-28": "Clean Monday",
+    "2050-02-28": "Green Monday",
     "2050-03-25": "Greek Independence Day",
     "2050-04-01": "Cyprus National Day",
     "2050-04-15": "Good Friday",
+    "2050-04-16": "Holy Saturday",
     "2050-04-17": "Easter Sunday",
     "2050-04-18": "Easter Monday",
+    "2050-04-19": "Easter Tuesday",
     "2050-05-01": "Labor Day",
-    "2050-06-06": "Monday of the Holy Spirit",
-    "2050-08-15": "Assumption of Mary",
+    "2050-06-06": "Whit Monday",
+    "2050-08-15": "Assumption Day",
     "2050-10-01": "Cyprus Independence Day",
-    "2050-10-28": "Ochi Day",
+    "2050-10-28": "Greek National Day",
     "2050-12-24": "Christmas Eve",
     "2050-12-25": "Christmas Day",
     "2050-12-26": "Day After Christmas"
diff --git a/tests/countries/test_cyprus.py b/tests/countries/test_cyprus.py
index d5069f9b8..ba26f8ed3 100644
--- a/tests/countries/test_cyprus.py
+++ b/tests/countries/test_cyprus.py
@@ -9,8 +9,7 @@
 #  Website: https://github.com/dr-prodigy/python-holidays
 #  License: MIT (see LICENSE file)
 
-from datetime import date
-
+from holidays.constants import BANK, OPTIONAL, PUBLIC
 from holidays.countries.cyprus import Cyprus, CY, CYP
 from tests.common import TestCase
 
@@ -18,142 +17,196 @@
 class TestCyprus(TestCase):
     @classmethod
     def setUpClass(cls):
-        super().setUpClass(Cyprus)
+        super().setUpClass(Cyprus, years=range(2000, 2025))
 
     def test_country_aliases(self):
         self.assertCountryAliases(Cyprus, CY, CYP)
 
+    def test_no_holidays(self):
+        self.assertNoHolidays(Cyprus(categories=(BANK, OPTIONAL, PUBLIC), years=1960))
+
     def test_fixed_holidays(self):
-        years = range(2000, 2025)
-        for y in years:
-            fdays = (
-                (date(y, 1, 1), "Πρωτοχρονιά"),
-                (date(y, 1, 6), "Θεοφάνεια"),
-                (date(y, 3, 25), "Εικοστή Πέμπτη Μαρτίου"),
-                (date(y, 4, 1), "1η Απριλίου"),
-                (date(y, 5, 1), "Εργατική Πρωτομαγιά"),
-                (date(y, 8, 15), "Κοίμηση της Θεοτόκου"),
-                (date(y, 10, 28), "Ημέρα του Όχι"),
-                (date(y, 12, 25), "Χριστούγεννα"),
-                (date(y, 12, 26), "Δεύτερη μέρα Χριστουγέννων"),
-            )
-
-        for d, dstr in fdays:
-            self.assertIn(d, self.holidays)
-            self.assertIn(dstr, self.holidays[d])
-
-    def test_cy_clean_monday(self):
-        checkdates = (
-            date(2018, 2, 19),
-            date(2019, 3, 11),
-            date(2020, 3, 2),
-            date(2021, 3, 15),
-            date(2022, 3, 7),
-            date(2023, 2, 27),
-            date(2024, 3, 18),
+        fdays = (
+            (1, 1, "Πρωτοχρονιά"),
+            (1, 6, "Ημέρα των Θεοφανίων"),
+            (3, 25, "Ημέρα της Ελληνικής Ανεξαρτησίας"),
+            (4, 1, "Εθνική Ημέρα Κύπρου"),
+            (5, 1, "Πρωτομαγιά"),
+            (8, 15, "Κοίμηση της Θεοτόκου"),
+            (10, 1, "Ημέρα της Κυπριακής Ανεξαρτησίας"),
+            (10, 28, "Ημέρα του Όχι"),
+            (12, 25, "Χριστούγεννα"),
+            (12, 26, "Επομένη Χριστουγέννων"),
+        )
+        for y in range(2000, 2025):
+            for m, d, name in fdays:
+                self.assertHolidayName(name, f"{y}-{m}-{d}")
+
+    def test_green_monday(self):
+        self.assertHolidayName(
+            "Καθαρά Δευτέρα",
+            "2018-02-19",
+            "2019-03-11",
+            "2020-03-02",
+            "2021-03-15",
+            "2022-03-07",
+            "2023-02-27",
+            "2024-03-18",
         )
 
-        for d in checkdates:
-            self.assertIn(d, self.holidays)
-            self.assertIn("Καθαρά Δευτέρα", self.holidays[d])
-
-    def test_cy_good_friday(self):
-        checkdates = (
-            date(2018, 4, 6),
-            date(2019, 4, 26),
-            date(2020, 4, 17),
-            date(2021, 4, 30),
-            date(2022, 4, 22),
-            date(2023, 4, 14),
-            date(2024, 5, 3),
+    def test_good_friday(self):
+        self.assertHolidayName(
+            "Μεγάλη Παρασκευή",
+            "2018-04-06",
+            "2019-04-26",
+            "2020-04-17",
+            "2021-04-30",
+            "2022-04-22",
+            "2023-04-14",
+            "2024-05-03",
         )
 
-        for d in checkdates:
-            self.assertIn(d, self.holidays)
-            self.assertIn("Μεγάλη Παρασκευή", self.holidays[d])
-
-    def test_cy_easter_sunday(self):
-        checkdates = (
-            date(2018, 4, 8),
-            date(2019, 4, 28),
-            date(2020, 4, 19),
-            date(2021, 5, 2),
-            date(2022, 4, 24),
-            date(2023, 4, 16),
-            date(2024, 5, 5),
+    def test_easter_sunday(self):
+        self.assertHolidayName(
+            "Κυριακή του Πάσχα",
+            "2018-04-08",
+            "2019-04-28",
+            "2020-04-19",
+            "2021-05-02",
+            "2022-04-24",
+            "2023-04-16",
+            "2024-05-05",
         )
 
-        for d in checkdates:
-            self.assertIn(d, self.holidays)
-            self.assertIn("Κυριακή του Πάσχα", self.holidays[d])
-
-    def test_cy_easter_monday(self):
-        checkdates = (
-            date(2018, 4, 9),
-            date(2019, 4, 29),
-            date(2020, 4, 20),
-            date(2021, 5, 3),
-            date(2022, 4, 25),
-            date(2023, 4, 17),
-            date(2024, 5, 6),
+    def test_easter_monday(self):
+        self.assertHolidayName(
+            "Δευτέρα της Διακαινησίμου",
+            "2018-04-09",
+            "2019-04-29",
+            "2020-04-20",
+            "2021-05-03",
+            "2022-04-25",
+            "2023-04-17",
+            "2024-05-06",
         )
 
-        for d in checkdates:
-            self.assertIn(d, self.holidays)
-            self.assertIn("Δευτέρα του Πάσχα", self.holidays[d])
-
-    def test_cy_monday_of_the_holy_spirit(self):
-        checkdates = (
-            date(2018, 5, 28),
-            date(2019, 6, 17),
-            date(2020, 6, 8),
-            date(2021, 6, 21),
-            date(2022, 6, 13),
-            date(2023, 6, 5),
-            date(2024, 6, 24),
+    def test_whit_monday(self):
+        self.assertHolidayName(
+            "Δευτέρα του Αγίου Πνεύματος",
+            "2018-05-28",
+            "2019-06-17",
+            "2020-06-08",
+            "2021-06-21",
+            "2022-06-13",
+            "2023-06-05",
+            "2024-06-24",
         )
 
-        for d in checkdates:
-            self.assertIn(d, self.holidays)
-            self.assertIn("Δευτέρα του Αγίου Πνεύματος", self.holidays[d])
+    def test_cyprus_independence_day(self):
+        name = "Ημέρα της Κυπριακής Ανεξαρτησίας"
+        self.assertHolidayName(name, (f"{year}-10-01" for year in range(1979, 2025)))
+        self.assertNoHolidayName(name, Cyprus(years=range(1961, 1979)))
+
+    def test_bank_2023(self):
+        self.assertHolidays(
+            Cyprus(categories=BANK, years=2023),
+            ("2023-04-18", "Τρίτη της Διακαινησίμου"),
+        )
+
+    def test_optional_2023(self):
+        self.assertHolidays(
+            Cyprus(categories=OPTIONAL, years=2023),
+            ("2023-04-15", "Μεγάλο Σάββατο"),
+            ("2023-12-24", "Παραμονή Χριστουγέννων"),
+        )
 
     def test_l10n_default(self):
         self.assertLocalizedHolidays(
-            ("2022-01-01", "Πρωτοχρονιά"),
-            ("2022-01-06", "Θεοφάνεια"),
-            ("2022-03-07", "Καθαρά Δευτέρα"),
-            ("2022-03-25", "Εικοστή Πέμπτη Μαρτίου"),
-            ("2022-04-01", "1η Απριλίου"),
-            ("2022-04-22", "Μεγάλη Παρασκευή"),
-            ("2022-04-24", "Κυριακή του Πάσχα"),
-            ("2022-04-25", "Δευτέρα του Πάσχα"),
-            ("2022-05-01", "Εργατική Πρωτομαγιά"),
-            ("2022-06-13", "Δευτέρα του Αγίου Πνεύματος"),
-            ("2022-08-15", "Κοίμηση της Θεοτόκου"),
-            ("2022-10-01", "Ημέρα Ανεξαρτησίας της Κύπρου"),
-            ("2022-10-28", "Ημέρα του Όχι"),
-            ("2022-12-24", "Παραμονή Χριστουγέννων"),
-            ("2022-12-25", "Χριστούγεννα"),
-            ("2022-12-26", "Δεύτερη μέρα Χριστουγέννων"),
+            ("2023-01-01", "Πρωτοχρονιά"),
+            ("2023-01-06", "Ημέρα των Θεοφανίων"),
+            ("2023-02-27", "Καθαρά Δευτέρα"),
+            ("2023-03-25", "Ημέρα της Ελληνικής Ανεξαρτησίας"),
+            ("2023-04-01", "Εθνική Ημέρα Κύπρου"),
+            ("2023-04-14", "Μεγάλη Παρασκευή"),
+            ("2023-04-15", "Μεγάλο Σάββατο"),
+            ("2023-04-16", "Κυριακή του Πάσχα"),
+            ("2023-04-17", "Δευτέρα της Διακαινησίμου"),
+            ("2023-04-18", "Τρίτη της Διακαινησίμου"),
+            ("2023-05-01", "Πρωτομαγιά"),
+            ("2023-06-05", "Δευτέρα του Αγίου Πνεύματος"),
+            ("2023-08-15", "Κοίμηση της Θεοτόκου"),
+            ("2023-10-01", "Ημέρα της Κυπριακής Ανεξαρτησίας"),
+            ("2023-10-28", "Ημέρα του Όχι"),
+            ("2023-12-24", "Παραμονή Χριστουγέννων"),
+            ("2023-12-25", "Χριστούγεννα"),
+            ("2023-12-26", "Επομένη Χριστουγέννων"),
+        )
+
+    def test_l10n_en_cy(self):
+        self.assertLocalizedHolidays(
+            "en_CY",
+            ("2023-01-01", "New Year's Day"),
+            ("2023-01-06", "Epiphany"),
+            ("2023-02-27", "Green Monday"),
+            ("2023-03-25", "Greek Independence Day"),
+            ("2023-04-01", "Cyprus National Day"),
+            ("2023-04-14", "Good Friday"),
+            ("2023-04-15", "Holy Saturday"),
+            ("2023-04-16", "Easter Sunday"),
+            ("2023-04-17", "Easter Monday"),
+            ("2023-04-18", "Easter Tuesday"),
+            ("2023-05-01", "Labour Day"),
+            ("2023-06-05", "Pentecost"),
+            ("2023-08-15", "Assumption Day"),
+            ("2023-10-01", "Cyprus Independence Day"),
+            ("2023-10-28", "Ochi Day"),
+            ("2023-12-24", "Christmas Eve"),
+            ("2023-12-25", "Christmas Day"),
+            ("2023-12-26", "Day After Christmas"),
         )
 
     def test_l10n_en_us(self):
         self.assertLocalizedHolidays(
             "en_US",
-            ("2022-01-01", "New Year's Day"),
-            ("2022-01-06", "Epiphany"),
-            ("2022-03-07", "Clean Monday"),
-            ("2022-03-25", "Greek Independence Day"),
-            ("2022-04-01", "Cyprus National Day"),
-            ("2022-04-22", "Good Friday"),
-            ("2022-04-24", "Easter Sunday"),
-            ("2022-04-25", "Easter Monday"),
-            ("2022-05-01", "Labor Day"),
-            ("2022-06-13", "Monday of the Holy Spirit"),
-            ("2022-08-15", "Assumption of Mary"),
-            ("2022-10-01", "Cyprus Independence Day"),
-            ("2022-10-28", "Ochi Day"),
-            ("2022-12-24", "Christmas Eve"),
-            ("2022-12-25", "Christmas Day"),
-            ("2022-12-26", "Day After Christmas"),
+            ("2023-01-01", "New Year's Day"),
+            ("2023-01-06", "Epiphany"),
+            ("2023-02-27", "Green Monday"),
+            ("2023-03-25", "Greek Independence Day"),
+            ("2023-04-01", "Cyprus National Day"),
+            ("2023-04-14", "Good Friday"),
+            ("2023-04-15", "Holy Saturday"),
+            ("2023-04-16", "Easter Sunday"),
+            ("2023-04-17", "Easter Monday"),
+            ("2023-04-18", "Easter Tuesday"),
+            ("2023-05-01", "Labor Day"),
+            ("2023-06-05", "Whit Monday"),
+            ("2023-08-15", "Assumption Day"),
+            ("2023-10-01", "Cyprus Independence Day"),
+            ("2023-10-28", "Greek National Day"),
+            ("2023-12-24", "Christmas Eve"),
+            ("2023-12-25", "Christmas Day"),
+            ("2023-12-26", "Day After Christmas"),
+        )
+
+    def test_l10n_uk(self):
+        self.assertLocalizedHolidays(
+            "uk",
+            ("2023-01-01", "Новий рік"),
+            ("2023-01-06", "Богоявлення"),
+            ("2023-02-27", "Чистий понеділок"),
+            ("2023-03-25", "День незалежності Греції"),
+            ("2023-04-01", "Національне свято Кіпру"),
+            ("2023-04-14", "Страсна пʼятниця"),
+            ("2023-04-15", "Велика субота"),
+            ("2023-04-16", "Великдень"),
+            ("2023-04-17", "Великодній понеділок"),
+            ("2023-04-18", "Великодній вівторок"),
+            ("2023-05-01", "День праці"),
+            ("2023-06-05", "День Святого Духа"),
+            ("2023-08-15", "Успіння Пресвятої Богородиці"),
+            ("2023-10-01", "День незалежності Кіпру"),
+            ("2023-10-28", "День Охі"),
+            ("2023-12-24", "Святий вечір"),
+            ("2023-12-25", "Різдво Христове"),
+            ("2023-12-26", "Другий день Різдва"),
         )