From e508bee0ed52a1fcfa3b834bfe0c50102a071c14 Mon Sep 17 00:00:00 2001
From: Dianne Skoll <dianne@skoll.ca>
Date: Sun, 10 Nov 2024 11:04:16 -0500
Subject: [PATCH] Correct implementation of _move_holiday.

---
 include/holidays/ar.rem    |  8 ++++----
 include/holidays/bz.rem    | 20 ++++++++++----------
 include/holidays/cl.rem    |  6 +++---
 include/holidays/co.rem    | 20 ++++++++++----------
 include/holidays/cr.rem    |  6 +++---
 include/holidays/do.rem    |  8 ++++----
 include/holidays/es/an.rem |  4 ++--
 include/holidays/es/ar.rem |  4 ++--
 include/holidays/es/as.rem |  4 ++--
 include/holidays/es/cl.rem |  4 ++--
 include/holidays/es/cn.rem |  2 +-
 include/holidays/es/ex.rem |  2 +-
 include/holidays/es/mc.rem |  4 ++--
 include/holidays/es/md.rem |  2 +-
 include/holidays/es/ml.rem |  2 +-
 include/holidays/es/ri.rem |  2 +-
 include/holidays/gt.rem    |  2 +-
 include/holidays/im.rem    |  2 +-
 include/holidays/mc.rem    |  2 +-
 include/holidays/to.rem    |  6 +++---
 include/holidays/uy.rem    |  6 +++---
 21 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/include/holidays/ar.rem b/include/holidays/ar.rem
index b71c5784..e22f593e 100644
--- a/include/holidays/ar.rem
+++ b/include/holidays/ar.rem
@@ -13,23 +13,23 @@ OMIT 1 May MSG Día del Trabajo
 OMIT 25 May MSG Día de la Revolución de Mayo
 REM 15 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 17)) == 3] MSG Paso a la Inmortalidad del General Don Martín Miguel de Güemes (observado)
 REM 16 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 17)) == 2] MSG Paso a la Inmortalidad del General Don Martín Miguel de Güemes (observado)
-OMIT 17 June MSG Paso a la Inmortalidad del General Don Martín Miguel de Güemes
+REM 17 June SCANFROM -28 ADDOMIT SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4] MSG Paso a la Inmortalidad del General Don Martín Miguel de Güemes (observado)
 OMIT 20 June MSG Paso a la Inmortalidad del General Don Manuel Belgrano
 REM 21 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 17)) == 4] MSG Paso a la Inmortalidad del General Don Martín Miguel de Güemes (observado)
 OMIT 9 July MSG Día de la Independencia
 REM 15 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 17)) == 3] MSG Paso a la Inmortalidad del General Don José de San Martin (observado)
 REM 16 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 17)) == 2] MSG Paso a la Inmortalidad del General Don José de San Martin (observado)
-OMIT 17 August MSG Paso a la Inmortalidad del General Don José de San Martin
+REM 17 August SCANFROM -28 ADDOMIT SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5] MSG Paso a la Inmortalidad del General Don José de San Martin (observado)
 REM 20 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 17)) == 5] MSG Paso a la Inmortalidad del General Don José de San Martin (observado)
 REM 21 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 17)) == 4] MSG Paso a la Inmortalidad del General Don José de San Martin (observado)
 REM 10 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 12)) == 3] MSG Día del Respeto a la Diversidad Cultural (observado)
 REM 11 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 12)) == 2] MSG Día del Respeto a la Diversidad Cultural (observado)
-OMIT 12 October MSG Día del Respeto a la Diversidad Cultural
+REM 12 October SCANFROM -28 ADDOMIT SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5] MSG Día del Respeto a la Diversidad Cultural (observado)
 REM 15 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 12)) == 5] MSG Día del Respeto a la Diversidad Cultural (observado)
 REM 16 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 12)) == 4] MSG Día del Respeto a la Diversidad Cultural (observado)
 REM 18 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 20)) == 3] MSG Día de la Soberanía Nacional (observado)
 REM 19 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 20)) == 2] MSG Día de la Soberanía Nacional (observado)
-OMIT 20 November MSG Día de la Soberanía Nacional
+REM 20 November SCANFROM -28 ADDOMIT SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5] MSG Día de la Soberanía Nacional (observado)
 REM 23 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 20)) == 5] MSG Día de la Soberanía Nacional (observado)
 REM 24 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 20)) == 4] MSG Día de la Soberanía Nacional (observado)
 OMIT 8 December MSG Inmaculada Concepción de María
diff --git a/include/holidays/bz.rem b/include/holidays/bz.rem
index 234e133b..b7538865 100644
--- a/include/holidays/bz.rem
+++ b/include/holidays/bz.rem
@@ -3,39 +3,39 @@
 # Derived from the Python holidays project at
 # https://github.com/vacanza/holidays
 
-OMIT 1 January MSG New Year's Day
+REM 1 January SCANFROM -28 ADDOMIT SATISFY [$Tw != 0] MSG New Year's Day (observed)
 REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-OMIT 15 January MSG George Price Day
+REM 15 January SCANFROM -28 ADDOMIT SATISFY [$Tw != 0] MSG George Price Day (observed)
 REM 16 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 15)) == 0] MSG George Price Day (observed)
 REM 6 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 9)) == 4] MSG National Heroes and Benefactors Day (observed)
 REM 7 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 9)) == 3] MSG National Heroes and Benefactors Day (observed)
 REM 8 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 9)) == 2] MSG National Heroes and Benefactors Day (observed)
-OMIT 9 March MSG National Heroes and Benefactors Day
+REM 9 March SCANFROM -28 ADDOMIT SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 0] MSG National Heroes and Benefactors Day (observed)
 REM 10 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 9)) == 0] MSG National Heroes and Benefactors Day (observed)
 REM 12 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 9)) == 5] MSG National Heroes and Benefactors Day (observed)
 OMIT [easterdate($Uy)-2] MSG Good Friday
 OMIT [easterdate($Uy)-1] MSG Holy Saturday
 OMIT [easterdate($Uy)+1] MSG Easter Monday
-OMIT 1 May MSG Labour Day
+REM 1 May SCANFROM -28 ADDOMIT SATISFY [$Tw != 0] MSG Labour Day (observed)
 REM 2 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Labour Day (observed)
 REM 29 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 1)) == 4] MSG Emancipation Day (observed)
 REM 30 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 1)) == 3] MSG Emancipation Day (observed)
 REM 31 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 1)) == 2] MSG Emancipation Day (observed)
-OMIT 1 August MSG Emancipation Day
+REM 1 August SCANFROM -28 ADDOMIT SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 0] MSG Emancipation Day (observed)
 REM 2 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 1)) == 0] MSG Emancipation Day (observed)
 REM 4 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 1)) == 5] MSG Emancipation Day (observed)
-OMIT 10 September MSG Saint George's Caye Day
+REM 10 September SCANFROM -28 ADDOMIT SATISFY [$Tw != 0] MSG Saint George's Caye Day (observed)
 REM 11 September SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 9, 10)) == 0] MSG Saint George's Caye Day (observed)
-OMIT 21 September MSG Independence Day
+REM 21 September SCANFROM -28 ADDOMIT SATISFY [$Tw != 0] MSG Independence Day (observed)
 REM 22 September SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 9, 21)) == 0] MSG Independence Day (observed)
 REM 9 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 12)) == 4] MSG Indigenous Peoples' Resistance Day (observed)
 REM 10 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 12)) == 3] MSG Indigenous Peoples' Resistance Day (observed)
 REM 11 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 12)) == 2] MSG Indigenous Peoples' Resistance Day (observed)
-OMIT 12 October MSG Indigenous Peoples' Resistance Day
+REM 12 October SCANFROM -28 ADDOMIT SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 0] MSG Indigenous Peoples' Resistance Day (observed)
 REM 13 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 12)) == 0] MSG Indigenous Peoples' Resistance Day (observed)
 REM 15 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 12)) == 5] MSG Indigenous Peoples' Resistance Day (observed)
-OMIT 19 November MSG Garifuna Settlement Day
+REM 19 November SCANFROM -28 ADDOMIT SATISFY [$Tw != 0] MSG Garifuna Settlement Day (observed)
 REM 20 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 19)) == 0] MSG Garifuna Settlement Day (observed)
 OMIT 25 December MSG Christmas Day
-OMIT 26 December MSG Boxing Day
+REM 26 December SCANFROM -28 ADDOMIT SATISFY [$Tw != 0] MSG Boxing Day (observed)
 REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
diff --git a/include/holidays/cl.rem b/include/holidays/cl.rem
index c65e854a..feb82285 100644
--- a/include/holidays/cl.rem
+++ b/include/holidays/cl.rem
@@ -20,7 +20,7 @@ REM [datepart(soleq(1, $U-28))] ADDOMIT MSG Día Nacional de los Pueblos Indíge
 REM 26 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 29)) == 4] MSG San Pedro y San Pablo
 REM 27 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 29)) == 3] MSG San Pedro y San Pablo
 REM 28 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 29)) == 2] MSG San Pedro y San Pablo
-OMIT 29 June MSG San Pedro y San Pablo
+REM 29 June SCANFROM -28 ADDOMIT SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5] MSG San Pedro y San Pablo
 REM 2 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 29)) == 5] MSG San Pedro y San Pablo
 OMIT 16 July MSG Virgen del Carmen
 OMIT 15 August MSG Asunción de la Virgen
@@ -31,10 +31,10 @@ REM 20 September SCANFROM -28 ADDOMIT SATISFY [$Tw == 5] MSG Fiestas Patrias
 REM 9 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 12)) == 4] MSG Día del Encuentro de dos Mundos
 REM 10 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 12)) == 3] MSG Día del Encuentro de dos Mundos
 REM 11 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 12)) == 2] MSG Día del Encuentro de dos Mundos
-OMIT 12 October MSG Día del Encuentro de dos Mundos
+REM 12 October SCANFROM -28 ADDOMIT SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5] MSG Día del Encuentro de dos Mundos
 REM 15 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 12)) == 5] MSG Día del Encuentro de dos Mundos
 REM 27 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 31)) == 2] MSG Día Nacional de las Iglesias Evangélicas y Protestantes
-OMIT 31 October MSG Día Nacional de las Iglesias Evangélicas y Protestantes
+REM 31 October SCANFROM -28 ADDOMIT SATISFY [$Tw != 2 && $Tw != 3] MSG Día Nacional de las Iglesias Evangélicas y Protestantes
 OMIT 1 November MSG Día de Todos los Santos
 REM 2 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 31)) == 3] MSG Día Nacional de las Iglesias Evangélicas y Protestantes
 OMIT 8 December MSG La Inmaculada Concepción
diff --git a/include/holidays/co.rem b/include/holidays/co.rem
index 6cc35f21..7fc1a828 100644
--- a/include/holidays/co.rem
+++ b/include/holidays/co.rem
@@ -4,14 +4,14 @@
 # https://github.com/vacanza/holidays
 
 OMIT 1 January MSG Año Nuevo
-OMIT 6 January MSG Día de los Reyes Magos
+REM 6 January SCANFROM -28 ADDOMIT SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 6 && $Tw != 0] MSG Día de los Reyes Magos (observado)
 REM 7 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 6)) == 0] MSG Día de los Reyes Magos (observado)
 REM 8 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 6)) == 6] MSG Día de los Reyes Magos (observado)
 REM 9 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 6)) == 5] MSG Día de los Reyes Magos (observado)
 REM 10 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 6)) == 4] MSG Día de los Reyes Magos (observado)
 REM 11 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 6)) == 3] MSG Día de los Reyes Magos (observado)
 REM 12 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 6)) == 2] MSG Día de los Reyes Magos (observado)
-OMIT 19 March MSG Día de San José
+REM 19 March SCANFROM -28 ADDOMIT SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 6 && $Tw != 0] MSG Día de San José (observado)
 REM 20 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 19)) == 0] MSG Día de San José (observado)
 REM 21 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 19)) == 6] MSG Día de San José (observado)
 REM 22 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 19)) == 5] MSG Día de San José (observado)
@@ -21,28 +21,28 @@ REM 25 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 19)) == 2] MSG
 OMIT [easterdate($Uy)-3] MSG Jueves Santo
 OMIT [easterdate($Uy)-2] MSG Viernes Santo
 OMIT 1 May MSG Día del Trabajo
+REM 9 May SCANFROM -28 ADDOMIT SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 6 && $Tw != 0] MSG Ascensión del señor (observado)
 REM 10 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 9)) == 0] MSG Ascensión del señor (observado)
 REM 11 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 9)) == 6] MSG Ascensión del señor (observado)
 REM 12 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 9)) == 5] MSG Ascensión del señor (observado)
 REM 13 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 9)) == 4] MSG Ascensión del señor (observado)
 REM 14 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 9)) == 3] MSG Ascensión del señor (observado)
 REM 15 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 9)) == 2] MSG Ascensión del señor (observado)
-OMIT [easterdate($Uy)+39] MSG Ascensión del señor
+REM 30 May SCANFROM -28 ADDOMIT SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 6 && $Tw != 0] MSG Corpus Christi (observado)
 REM 31 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 30)) == 0] MSG Corpus Christi (observado)
 REM 1 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 30)) == 6] MSG Corpus Christi (observado)
 REM 2 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 30)) == 5] MSG Corpus Christi (observado)
 REM 3 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 30)) == 4] MSG Corpus Christi (observado)
 REM 4 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 30)) == 3] MSG Corpus Christi (observado)
 REM 5 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 30)) == 2] MSG Corpus Christi (observado)
+REM 7 June SCANFROM -28 ADDOMIT SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 6 && $Tw != 0] MSG Sagrado Corazón (observado)
 REM 8 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 7)) == 0] MSG Sagrado Corazón (observado)
 REM 9 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 7)) == 6] MSG Sagrado Corazón (observado)
 REM 10 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 7)) == 5] MSG Sagrado Corazón (observado)
 REM 11 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 7)) == 4] MSG Sagrado Corazón (observado)
 REM 12 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 7)) == 3] MSG Sagrado Corazón (observado)
-OMIT [easterdate($Uy)+60] MSG Corpus Christi
 REM 13 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 7)) == 2] MSG Sagrado Corazón (observado)
-OMIT [easterdate($Uy)+68] MSG Sagrado Corazón
-OMIT 29 June MSG San Pedro y San Pablo
+REM 29 June SCANFROM -28 ADDOMIT SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 6 && $Tw != 0] MSG San Pedro y San Pablo (observado)
 REM 30 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 29)) == 0] MSG San Pedro y San Pablo (observado)
 REM 1 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 29)) == 6] MSG San Pedro y San Pablo (observado)
 REM 2 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 29)) == 5] MSG San Pedro y San Pablo (observado)
@@ -51,28 +51,28 @@ REM 4 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 29)) == 3] MSG Sa
 REM 5 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 29)) == 2] MSG San Pedro y San Pablo (observado)
 OMIT 20 July MSG Día de la Independencia
 OMIT 7 August MSG Batalla de Boyacá
-OMIT 15 August MSG La Asunción
+REM 15 August SCANFROM -28 ADDOMIT SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 6 && $Tw != 0] MSG La Asunción (observado)
 REM 16 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 15)) == 0] MSG La Asunción (observado)
 REM 17 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 15)) == 6] MSG La Asunción (observado)
 REM 18 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 15)) == 5] MSG La Asunción (observado)
 REM 19 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 15)) == 4] MSG La Asunción (observado)
 REM 20 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 15)) == 3] MSG La Asunción (observado)
 REM 21 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 15)) == 2] MSG La Asunción (observado)
-OMIT 12 October MSG Día de la Raza
+REM 12 October SCANFROM -28 ADDOMIT SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 6 && $Tw != 0] MSG Día de la Raza (observado)
 REM 13 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 12)) == 0] MSG Día de la Raza (observado)
 REM 14 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 12)) == 6] MSG Día de la Raza (observado)
 REM 15 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 12)) == 5] MSG Día de la Raza (observado)
 REM 16 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 12)) == 4] MSG Día de la Raza (observado)
 REM 17 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 12)) == 3] MSG Día de la Raza (observado)
 REM 18 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 12)) == 2] MSG Día de la Raza (observado)
-OMIT 1 November MSG Día de Todos los Santos
+REM 1 November SCANFROM -28 ADDOMIT SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 6 && $Tw != 0] MSG Día de Todos los Santos (observado)
 REM 2 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 1)) == 0] MSG Día de Todos los Santos (observado)
 REM 3 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 1)) == 6] MSG Día de Todos los Santos (observado)
 REM 4 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 1)) == 5] MSG Día de Todos los Santos (observado)
 REM 5 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 1)) == 4] MSG Día de Todos los Santos (observado)
 REM 6 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 1)) == 3] MSG Día de Todos los Santos (observado)
 REM 7 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 1)) == 2] MSG Día de Todos los Santos (observado)
-OMIT 11 November MSG Independencia de Cartagena
+REM 11 November SCANFROM -28 ADDOMIT SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 6 && $Tw != 0] MSG Independencia de Cartagena (observado)
 REM 12 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 11)) == 0] MSG Independencia de Cartagena (observado)
 REM 13 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 11)) == 6] MSG Independencia de Cartagena (observado)
 REM 14 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 11)) == 5] MSG Independencia de Cartagena (observado)
diff --git a/include/holidays/cr.rem b/include/holidays/cr.rem
index e8e6e2d8..061c670a 100644
--- a/include/holidays/cr.rem
+++ b/include/holidays/cr.rem
@@ -6,7 +6,7 @@
 OMIT 1 January MSG Año Nuevo
 REM 9 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 11)) == 3] MSG Día de Juan Santamaría (observado)
 REM 10 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 11)) == 2] MSG Día de Juan Santamaría (observado)
-OMIT 11 April MSG Día de Juan Santamaría
+REM 11 April SCANFROM -28 ADDOMIT SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 6 && $Tw != 0] MSG Día de Juan Santamaría (observado)
 OMIT [easterdate($Uy)-3] MSG Jueves Santo
 REM 12 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 11)) == 0] MSG Día de Juan Santamaría (observado)
 OMIT [easterdate($Uy)-2] MSG Viernes Santo
@@ -16,14 +16,14 @@ REM 15 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 11)) == 4] MSG
 OMIT 1 May MSG Día Internacional del Trabajo
 REM 23 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 25)) == 3] MSG Anexión del Partido de Nicoya a Costa Rica (observado)
 REM 24 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 25)) == 2] MSG Anexión del Partido de Nicoya a Costa Rica (observado)
-OMIT 25 July MSG Anexión del Partido de Nicoya a Costa Rica
+REM 25 July SCANFROM -28 ADDOMIT SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 6 && $Tw != 0] MSG Anexión del Partido de Nicoya a Costa Rica (observado)
 REM 26 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 25)) == 0] MSG Anexión del Partido de Nicoya a Costa Rica (observado)
 REM 27 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 25)) == 6] MSG Anexión del Partido de Nicoya a Costa Rica (observado)
 REM 28 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 25)) == 5] MSG Anexión del Partido de Nicoya a Costa Rica (observado)
 REM 29 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 25)) == 4] MSG Anexión del Partido de Nicoya a Costa Rica (observado)
 REM 13 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 15)) == 3] MSG Día de la Madre (observado)
 REM 14 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 15)) == 2] MSG Día de la Madre (observado)
-OMIT 15 August MSG Día de la Madre
+REM 15 August SCANFROM -28 ADDOMIT SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 6 && $Tw != 0] MSG Día de la Madre (observado)
 REM 16 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 15)) == 0] MSG Día de la Madre (observado)
 REM 17 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 15)) == 6] MSG Día de la Madre (observado)
 REM 18 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 15)) == 5] MSG Día de la Madre (observado)
diff --git a/include/holidays/do.rem b/include/holidays/do.rem
index 6092f895..4ca2d29c 100644
--- a/include/holidays/do.rem
+++ b/include/holidays/do.rem
@@ -6,20 +6,20 @@
 OMIT 1 January MSG Año Nuevo
 REM 4 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 6)) == 3] MSG Día de los Santos Reyes
 REM 5 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 6)) == 2] MSG Día de los Santos Reyes
-OMIT 6 January MSG Día de los Santos Reyes
+REM 6 January SCANFROM -28 ADDOMIT SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5] MSG Día de los Santos Reyes
 REM 9 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 6)) == 5] MSG Día de los Santos Reyes
 REM 10 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 6)) == 4] MSG Día de los Santos Reyes
 OMIT 21 January MSG Día de la Altagracia
 REM 24 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 26)) == 3] MSG Día de Duarte
 REM 25 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 26)) == 2] MSG Día de Duarte
-OMIT 26 January MSG Día de Duarte
+REM 26 January SCANFROM -28 ADDOMIT SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5] MSG Día de Duarte
 REM 29 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 26)) == 5] MSG Día de Duarte
 REM 30 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 26)) == 4] MSG Día de Duarte
 OMIT 27 February MSG Día de Independencia
 OMIT [easterdate($Uy)-2] MSG Viernes Santo
 REM 29 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 3] MSG Día del Trabajo
 REM 30 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 2] MSG Día del Trabajo
-OMIT 1 May MSG Día del Trabajo
+REM 1 May SCANFROM -28 ADDOMIT SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 0] MSG Día del Trabajo
 REM 2 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Día del Trabajo
 REM 4 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 5] MSG Día del Trabajo
 REM 5 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 4] MSG Día del Trabajo
@@ -28,7 +28,7 @@ OMIT 16 August MSG Día de la Restauración
 OMIT 24 September MSG Día de las Mercedes
 REM 4 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 6)) == 3] MSG Día de la Constitución
 REM 5 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 6)) == 2] MSG Día de la Constitución
-OMIT 6 November MSG Día de la Constitución
+REM 6 November SCANFROM -28 ADDOMIT SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5] MSG Día de la Constitución
 REM 9 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 6)) == 5] MSG Día de la Constitución
 REM 10 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 6)) == 4] MSG Día de la Constitución
 OMIT 25 December MSG Día de Navidad
diff --git a/include/holidays/es/an.rem b/include/holidays/es/an.rem
index 27e707dc..1bf1dbf6 100644
--- a/include/holidays/es/an.rem
+++ b/include/holidays/es/an.rem
@@ -9,8 +9,8 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/es.rem
 
-OMIT 28 February MSG Día de Andalucia
+REM 28 February SCANFROM -28 ADDOMIT SATISFY [$Tw != 0] MSG Lunes siguiente a Día de Andalucia
 REM 29 February SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 2, 28)) == 0] MSG Lunes siguiente a Día de Andalucia
 OMIT [easterdate($Uy)-3] MSG Jueves Santo
-OMIT 8 December MSG Inmaculada Concepción
+REM 8 December SCANFROM -28 ADDOMIT SATISFY [$Tw != 0] MSG Lunes siguiente a Inmaculada Concepción
 REM 9 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 8)) == 0] MSG Lunes siguiente a Inmaculada Concepción
diff --git a/include/holidays/es/ar.rem b/include/holidays/es/ar.rem
index 0ff3f781..3ed88888 100644
--- a/include/holidays/es/ar.rem
+++ b/include/holidays/es/ar.rem
@@ -10,7 +10,7 @@
 # also include [$SysInclude]/es.rem
 
 OMIT [easterdate($Uy)-3] MSG Jueves Santo
-OMIT 23 April MSG Día de San Jorge
+REM 23 April SCANFROM -28 ADDOMIT SATISFY [$Tw != 0] MSG Lunes siguiente a Día de San Jorge
 REM 24 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 23)) == 0] MSG Lunes siguiente a Día de San Jorge
-OMIT 8 December MSG Inmaculada Concepción
+REM 8 December SCANFROM -28 ADDOMIT SATISFY [$Tw != 0] MSG Lunes siguiente a Inmaculada Concepción
 REM 9 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 8)) == 0] MSG Lunes siguiente a Inmaculada Concepción
diff --git a/include/holidays/es/as.rem b/include/holidays/es/as.rem
index 6df0f108..6ce7d54c 100644
--- a/include/holidays/es/as.rem
+++ b/include/holidays/es/as.rem
@@ -10,7 +10,7 @@
 # also include [$SysInclude]/es.rem
 
 OMIT [easterdate($Uy)-3] MSG Jueves Santo
-OMIT 8 September MSG Día de Asturias
+REM 8 September SCANFROM -28 ADDOMIT SATISFY [$Tw != 0] MSG Lunes siguiente a Día de Asturias
 REM 9 September SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 9, 8)) == 0] MSG Lunes siguiente a Día de Asturias
-OMIT 8 December MSG Inmaculada Concepción
+REM 8 December SCANFROM -28 ADDOMIT SATISFY [$Tw != 0] MSG Lunes siguiente a Inmaculada Concepción
 REM 9 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 8)) == 0] MSG Lunes siguiente a Inmaculada Concepción
diff --git a/include/holidays/es/cl.rem b/include/holidays/es/cl.rem
index 13c47a92..b64a8117 100644
--- a/include/holidays/es/cl.rem
+++ b/include/holidays/es/cl.rem
@@ -10,7 +10,7 @@
 # also include [$SysInclude]/es.rem
 
 OMIT [easterdate($Uy)-3] MSG Jueves Santo
-OMIT 23 April MSG Fiesta de Castilla y León
+REM 23 April SCANFROM -28 ADDOMIT SATISFY [$Tw != 0] MSG Lunes siguiente a Fiesta de Castilla y León
 REM 24 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 23)) == 0] MSG Lunes siguiente a Fiesta de Castilla y León
-OMIT 8 December MSG Inmaculada Concepción
+REM 8 December SCANFROM -28 ADDOMIT SATISFY [$Tw != 0] MSG Lunes siguiente a Inmaculada Concepción
 REM 9 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 8)) == 0] MSG Lunes siguiente a Inmaculada Concepción
diff --git a/include/holidays/es/cn.rem b/include/holidays/es/cn.rem
index 7948a358..5a20d2c1 100644
--- a/include/holidays/es/cn.rem
+++ b/include/holidays/es/cn.rem
@@ -10,5 +10,5 @@
 # also include [$SysInclude]/es.rem
 
 OMIT [easterdate($Uy)-3] MSG Jueves Santo
-OMIT 30 May MSG Día de Canarias
+REM 30 May SCANFROM -28 ADDOMIT SATISFY [$Tw != 0] MSG Lunes siguiente a Día de Canarias
 REM 31 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 30)) == 0] MSG Lunes siguiente a Día de Canarias
diff --git a/include/holidays/es/ex.rem b/include/holidays/es/ex.rem
index aed3a031..546b5a05 100644
--- a/include/holidays/es/ex.rem
+++ b/include/holidays/es/ex.rem
@@ -11,5 +11,5 @@
 
 OMIT [easterdate($Uy)-47] MSG Martes de Carnaval
 OMIT [easterdate($Uy)-3] MSG Jueves Santo
-OMIT 8 December MSG Inmaculada Concepción
+REM 8 December SCANFROM -28 ADDOMIT SATISFY [$Tw != 0] MSG Lunes siguiente a Inmaculada Concepción
 REM 9 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 8)) == 0] MSG Lunes siguiente a Inmaculada Concepción
diff --git a/include/holidays/es/mc.rem b/include/holidays/es/mc.rem
index 81119f39..969b6e4b 100644
--- a/include/holidays/es/mc.rem
+++ b/include/holidays/es/mc.rem
@@ -9,8 +9,8 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/es.rem
 
-OMIT 19 March MSG San José
+REM 19 March SCANFROM -28 ADDOMIT SATISFY [$Tw != 0] MSG Lunes siguiente a San José
 REM 20 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 19)) == 0] MSG Lunes siguiente a San José
 OMIT [easterdate($Uy)-3] MSG Jueves Santo
-OMIT 8 December MSG Inmaculada Concepción
+REM 8 December SCANFROM -28 ADDOMIT SATISFY [$Tw != 0] MSG Lunes siguiente a Inmaculada Concepción
 REM 9 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 8)) == 0] MSG Lunes siguiente a Inmaculada Concepción
diff --git a/include/holidays/es/md.rem b/include/holidays/es/md.rem
index 4f63e52b..12ad3f0a 100644
--- a/include/holidays/es/md.rem
+++ b/include/holidays/es/md.rem
@@ -10,6 +10,6 @@
 # also include [$SysInclude]/es.rem
 
 OMIT [easterdate($Uy)-3] MSG Jueves Santo
-OMIT 2 May MSG Fiesta de la Comunidad de Madrid
+REM 2 May SCANFROM -28 ADDOMIT SATISFY [$Tw != 0] MSG Lunes siguiente a Fiesta de la Comunidad de Madrid
 REM 3 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 2)) == 0] MSG Lunes siguiente a Fiesta de la Comunidad de Madrid
 OMIT 25 July MSG Santiago Apóstol
diff --git a/include/holidays/es/ml.rem b/include/holidays/es/ml.rem
index fc3f474d..6ab49c7c 100644
--- a/include/holidays/es/ml.rem
+++ b/include/holidays/es/ml.rem
@@ -10,5 +10,5 @@
 # also include [$SysInclude]/es.rem
 
 OMIT [easterdate($Uy)-3] MSG Jueves Santo
-OMIT 8 December MSG Inmaculada Concepción
+REM 8 December SCANFROM -28 ADDOMIT SATISFY [$Tw != 0] MSG Lunes siguiente a Inmaculada Concepción
 REM 9 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 8)) == 0] MSG Lunes siguiente a Inmaculada Concepción
diff --git a/include/holidays/es/ri.rem b/include/holidays/es/ri.rem
index 1fda645a..bf225813 100644
--- a/include/holidays/es/ri.rem
+++ b/include/holidays/es/ri.rem
@@ -11,5 +11,5 @@
 
 OMIT [easterdate($Uy)-3] MSG Jueves Santo
 OMIT [easterdate($Uy)+1] MSG Lunes de Pascua
-OMIT 9 June MSG Día de La Rioja
+REM 9 June SCANFROM -28 ADDOMIT SATISFY [$Tw != 0] MSG Lunes siguiente a Día de La Rioja
 REM 10 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 9)) == 0] MSG Lunes siguiente a Día de La Rioja
diff --git a/include/holidays/gt.rem b/include/holidays/gt.rem
index 08832501..0f1b6b3a 100644
--- a/include/holidays/gt.rem
+++ b/include/holidays/gt.rem
@@ -10,7 +10,7 @@ OMIT [easterdate($Uy)-1] MSG Sabado Santo
 OMIT 1 May MSG Día del Trabajo
 REM 28 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 30)) == 3] MSG Día del Ejército
 REM 29 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 30)) == 2] MSG Día del Ejército
-OMIT 30 June MSG Día del Ejército
+REM 30 June SCANFROM -28 ADDOMIT SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 6 && $Tw != 0] MSG Día del Ejército
 REM 1 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 30)) == 0] MSG Día del Ejército
 REM 2 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 30)) == 6] MSG Día del Ejército
 REM 3 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 30)) == 5] MSG Día del Ejército
diff --git a/include/holidays/im.rem b/include/holidays/im.rem
index a60aa71d..c0eb1f3b 100644
--- a/include/holidays/im.rem
+++ b/include/holidays/im.rem
@@ -11,7 +11,7 @@ OMIT [easterdate($Uy)+1] MSG Easter Monday
 REM First Monday in May SCANFROM -28 ADDOMIT MSG May Day
 REM Last Monday in May SCANFROM -28 ADDOMIT MSG Spring Bank Holiday
 REM First Friday in June SCANFROM -28 ADDOMIT MSG TT Bank Holiday
-OMIT 5 July MSG Tynwald Day
+REM 5 July SCANFROM -28 ADDOMIT SATISFY [$Tw != 6 && $Tw != 0] MSG Tynwald Day
 REM 6 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 5)) == 0] MSG Tynwald Day
 REM 7 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 5)) == 6] MSG Tynwald Day
 REM Last Monday in August SCANFROM -28 ADDOMIT MSG Late Summer Bank Holiday
diff --git a/include/holidays/mc.rem b/include/holidays/mc.rem
index 249b56db..e72b0668 100644
--- a/include/holidays/mc.rem
+++ b/include/holidays/mc.rem
@@ -18,7 +18,7 @@ OMIT 1 November MSG La Toussaint
 REM 2 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 1)) == 0] MSG La Toussaint (observé)
 OMIT 19 November MSG La Fête du Prince
 REM 20 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 19)) == 0] MSG La Fête du Prince (observé)
-OMIT 8 December MSG L'Immaculée Conception
+REM 8 December SCANFROM -28 ADDOMIT SATISFY [$Tw != 0] MSG L'Immaculée Conception
 REM 9 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 8)) == 0] MSG L'Immaculée Conception
 OMIT 25 December MSG Noël
 REM 26 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Noël (observé)
diff --git a/include/holidays/to.rem b/include/holidays/to.rem
index 1e515536..e22c2f8d 100644
--- a/include/holidays/to.rem
+++ b/include/holidays/to.rem
@@ -9,7 +9,7 @@ OMIT [easterdate($Uy)+1] MSG Monite 'o e Toetu'u
 OMIT 25 April MSG 'Aho Anzac
 REM 2 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 4)) == 3] MSG 'Aho Tau'ataina (fakatokanga'i)
 REM 3 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 4)) == 2] MSG 'Aho Tau'ataina (fakatokanga'i)
-OMIT 4 June MSG 'Aho Tau'ataina
+REM 4 June SCANFROM -28 ADDOMIT SATISFY [$Tw != 0] MSG 'Aho Tau'ataina (fakatokanga'i)
 REM 5 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 4)) == 0] MSG 'Aho Tau'ataina (fakatokanga'i)
 REM 6 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 4)) == 6] MSG 'Aho Tau'ataina (fakatokanga'i)
 REM 7 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 4)) == 5] MSG 'Aho Tau'ataina (fakatokanga'i)
@@ -20,14 +20,14 @@ OMIT 17 September MSG 'Aho 'Alo'i 'o e 'Ea ki he Kalauni 'o Tonga
 REM 18 September SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 9, 17)) == 0] MSG 'Aho 'Alo'i 'o e 'Ea ki he Kalauni 'o Tonga (fakatokanga'i)
 REM 2 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 4)) == 3] MSG 'Aho Konisitutone (fakatokanga'i)
 REM 3 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 4)) == 2] MSG 'Aho Konisitutone (fakatokanga'i)
-OMIT 4 November MSG 'Aho Konisitutone
+REM 4 November SCANFROM -28 ADDOMIT SATISFY [$Tw != 0] MSG 'Aho Konisitutone (fakatokanga'i)
 REM 5 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 4)) == 0] MSG 'Aho Konisitutone (fakatokanga'i)
 REM 6 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 4)) == 6] MSG 'Aho Konisitutone (fakatokanga'i)
 REM 7 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 4)) == 5] MSG 'Aho Konisitutone (fakatokanga'i)
 REM 8 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 4)) == 4] MSG 'Aho Konisitutone (fakatokanga'i)
 REM 2 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 4)) == 3] MSG 'Aho Fakamanatu 'o e Hilifaki Kalauni 'o 'Ene 'Afio ko Siaosi Tupou I (fakatokanga'i)
 REM 3 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 4)) == 2] MSG 'Aho Fakamanatu 'o e Hilifaki Kalauni 'o 'Ene 'Afio ko Siaosi Tupou I (fakatokanga'i)
-OMIT 4 December MSG 'Aho Fakamanatu 'o e Hilifaki Kalauni 'o 'Ene 'Afio ko Siaosi Tupou I
+REM 4 December SCANFROM -28 ADDOMIT SATISFY [$Tw != 0] MSG 'Aho Fakamanatu 'o e Hilifaki Kalauni 'o 'Ene 'Afio ko Siaosi Tupou I (fakatokanga'i)
 REM 5 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 4)) == 0] MSG 'Aho Fakamanatu 'o e Hilifaki Kalauni 'o 'Ene 'Afio ko Siaosi Tupou I (fakatokanga'i)
 REM 6 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 4)) == 6] MSG 'Aho Fakamanatu 'o e Hilifaki Kalauni 'o 'Ene 'Afio ko Siaosi Tupou I (fakatokanga'i)
 REM 7 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 4)) == 5] MSG 'Aho Fakamanatu 'o e Hilifaki Kalauni 'o 'Ene 'Afio ko Siaosi Tupou I (fakatokanga'i)
diff --git a/include/holidays/uy.rem b/include/holidays/uy.rem
index 535af4c1..0277c24c 100644
--- a/include/holidays/uy.rem
+++ b/include/holidays/uy.rem
@@ -18,18 +18,18 @@ REM [easterdate($Uy)-3] MSG Semana de Turismo
 REM [easterdate($Uy)-2] MSG Semana de Turismo
 REM 17 April SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 19)) == 3] MSG Desembarco de los 33 Orientales
 REM 18 April SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 19)) == 2] MSG Desembarco de los 33 Orientales
-REM 19 April MSG Desembarco de los 33 Orientales
+REM 19 April SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5] MSG Desembarco de los 33 Orientales
 REM 22 April SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 19)) == 5] MSG Desembarco de los 33 Orientales
 REM 23 April SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 19)) == 4] MSG Desembarco de los 33 Orientales
 REM 16 May SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 18)) == 3] MSG Batalla de Las Piedras
 REM 17 May SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 18)) == 2] MSG Batalla de Las Piedras
-REM 18 May MSG Batalla de Las Piedras
+REM 18 May SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5] MSG Batalla de Las Piedras
 REM 21 May SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 18)) == 5] MSG Batalla de Las Piedras
 REM 22 May SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 18)) == 4] MSG Batalla de Las Piedras
 REM 19 June MSG Natalicio de Artigas
 REM 10 October SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 3] MSG Día de la Diversidad Cultural
 REM 11 October SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 2] MSG Día de la Diversidad Cultural
-REM 12 October MSG Día de la Diversidad Cultural
+REM 12 October SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5] MSG Día de la Diversidad Cultural
 REM 15 October SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 5] MSG Día de la Diversidad Cultural
 REM 16 October SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 4] MSG Día de la Diversidad Cultural
 REM 2 November MSG Día de los Difuntos