diff --git a/include/holidays/ad/02.rem b/include/holidays/ad/02.rem
index 13496b03..95cd90e2 100644
--- a/include/holidays/ad/02.rem
+++ b/include/holidays/ad/02.rem
@@ -9,6 +9,6 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/ad.rem
 
-REM Third Saturday in July SCANFROM -28 ADDOMIT MSG Canillo Annual Festival
+REM Third Saturday in July ADDOMIT SCANFROM -28 MSG Canillo Annual Festival
 REM Sunday 16 July ADDOMIT SCANFROM -28 MSG Canillo Annual Festival
 REM Monday 17 July ADDOMIT SCANFROM -28 MSG Canillo Annual Festival
diff --git a/include/holidays/ad/07.rem b/include/holidays/ad/07.rem
index 0aa91a51..8c61d956 100644
--- a/include/holidays/ad/07.rem
+++ b/include/holidays/ad/07.rem
@@ -9,6 +9,6 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/ad.rem
 
-REM First Saturday in August SCANFROM -28 ADDOMIT MSG Andorra la Vella Annual Festival
+REM First Saturday in August ADDOMIT SCANFROM -28 MSG Andorra la Vella Annual Festival
 REM Sunday 2 August ADDOMIT SCANFROM -28 MSG Andorra la Vella Annual Festival
 REM Monday 3 August ADDOMIT SCANFROM -28 MSG Andorra la Vella Annual Festival
diff --git a/include/holidays/ao.rem b/include/holidays/ao.rem
index 30805a09..12af3981 100644
--- a/include/holidays/ao.rem
+++ b/include/holidays/ao.rem
@@ -4,36 +4,36 @@
 # https://github.com/vacanza/holidays
 
 OMIT 1 January MSG Dia do Ano Novo
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 4] MSG Dia do Ano Novo (ponte)
-REM 3 February SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 2, 4)) == 2] MSG Dia do Início da Luta Armada de Libertação Nacional (ponte)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 4] MSG Dia do Ano Novo (ponte)
+REM 3 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 4)) == 2] MSG Dia do Início da Luta Armada de Libertação Nacional (ponte)
 OMIT 4 February MSG Dia do Início da Luta Armada de Libertação Nacional
-REM 5 February SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 2, 4)) == 4] MSG Dia do Início da Luta Armada de Libertação Nacional (ponte)
-REM 12 February SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 2, 13)) == 2] MSG Dia do Carnaval (ponte)
-REM 14 February SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 2, 13)) == 4] MSG Dia do Carnaval (ponte)
+REM 5 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 4)) == 4] MSG Dia do Início da Luta Armada de Libertação Nacional (ponte)
+REM 12 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 13)) == 2] MSG Dia do Carnaval (ponte)
+REM 14 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 13)) == 4] MSG Dia do Carnaval (ponte)
 OMIT [easterdate($Uy)-47] MSG Dia do Carnaval
-REM 7 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 8)) == 2] MSG Dia Internacional da Mulher (ponte)
+REM 7 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 8)) == 2] MSG Dia Internacional da Mulher (ponte)
 OMIT 8 March MSG Dia Internacional da Mulher
-REM 9 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 8)) == 4] MSG Dia Internacional da Mulher (ponte)
-REM 22 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 23)) == 2] MSG Dia da Libertação da África Austral (ponte)
+REM 9 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 8)) == 4] MSG Dia Internacional da Mulher (ponte)
+REM 22 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 23)) == 2] MSG Dia da Libertação da África Austral (ponte)
 OMIT 23 March MSG Dia da Libertação da África Austral
-REM 24 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 23)) == 4] MSG Dia da Libertação da África Austral (ponte)
-REM 3 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 4)) == 2] MSG Dia da Paz e Reconciliação Nacional (ponte)
+REM 24 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 23)) == 4] MSG Dia da Libertação da África Austral (ponte)
+REM 3 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 4)) == 2] MSG Dia da Paz e Reconciliação Nacional (ponte)
 OMIT 4 April MSG Dia da Paz e Reconciliação Nacional
-REM 5 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 4)) == 4] MSG Dia da Paz e Reconciliação Nacional (ponte)
+REM 5 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 4)) == 4] MSG Dia da Paz e Reconciliação Nacional (ponte)
 OMIT [easterdate($Uy)-2] MSG Sexta-Feira Santa
-REM 30 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 2] MSG Dia Internacional do Trabalhador (ponte)
+REM 30 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 2] MSG Dia Internacional do Trabalhador (ponte)
 OMIT 1 May MSG Dia Internacional do Trabalhador
-REM 2 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 4] MSG Dia Internacional do Trabalhador (ponte)
-REM 16 September SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 9, 17)) == 2] MSG Dia do Fundador da Nação e do Herói Nacional (ponte)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 4] MSG Dia Internacional do Trabalhador (ponte)
+REM 16 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 17)) == 2] MSG Dia do Fundador da Nação e do Herói Nacional (ponte)
 OMIT 17 September MSG Dia do Fundador da Nação e do Herói Nacional
-REM 18 September SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 9, 17)) == 4] MSG Dia do Fundador da Nação e do Herói Nacional (ponte)
-REM 1 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 2)) == 2] MSG Dia dos Finados (ponte)
+REM 18 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 17)) == 4] MSG Dia do Fundador da Nação e do Herói Nacional (ponte)
+REM 1 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 2)) == 2] MSG Dia dos Finados (ponte)
 OMIT 2 November MSG Dia dos Finados
-REM 3 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 2)) == 4] MSG Dia dos Finados (ponte)
-REM 10 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 11)) == 2] MSG Dia da Independência Nacional (ponte)
+REM 3 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 2)) == 4] MSG Dia dos Finados (ponte)
+REM 10 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 2] MSG Dia da Independência Nacional (ponte)
 OMIT 11 November MSG Dia da Independência Nacional
-REM 12 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 11)) == 4] MSG Dia da Independência Nacional (ponte)
-REM 24 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 2] MSG Dia de Natal e da Família (ponte)
+REM 12 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 4] MSG Dia da Independência Nacional (ponte)
+REM 24 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 2] MSG Dia de Natal e da Família (ponte)
 OMIT 25 December MSG Dia de Natal e da Família
-REM 26 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 4] MSG Dia de Natal e da Família (ponte)
-REM 31 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 2] MSG Dia do Ano Novo (ponte)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 4] MSG Dia de Natal e da Família (ponte)
+REM 31 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 2] MSG Dia do Ano Novo (ponte)
diff --git a/include/holidays/ar.rem b/include/holidays/ar.rem
index e22f593e..42cf2dae 100644
--- a/include/holidays/ar.rem
+++ b/include/holidays/ar.rem
@@ -11,26 +11,26 @@ OMIT 2 April MSG Día del Veterano y de los Caidos en la Guerra de Malvinas
 OMIT [easterdate($Uy)-2] MSG Viernes Santo
 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)
-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)
+REM 15 June ADDOMIT SCANFROM -28 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 ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 17)) == 2] MSG Paso a la Inmortalidad del General Don Martín Miguel de Güemes (observado)
+REM 17 June ADDOMIT SCANFROM -28 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)
+REM 21 June ADDOMIT SCANFROM -28 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)
-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)
-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)
-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)
+REM 15 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 17)) == 3] MSG Paso a la Inmortalidad del General Don José de San Martin (observado)
+REM 16 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 17)) == 2] MSG Paso a la Inmortalidad del General Don José de San Martin (observado)
+REM 17 August ADDOMIT SCANFROM -28 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 ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 17)) == 5] MSG Paso a la Inmortalidad del General Don José de San Martin (observado)
+REM 21 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 17)) == 4] MSG Paso a la Inmortalidad del General Don José de San Martin (observado)
+REM 10 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 3] MSG Día del Respeto a la Diversidad Cultural (observado)
+REM 11 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 2] MSG Día del Respeto a la Diversidad Cultural (observado)
+REM 12 October ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5] MSG Día del Respeto a la Diversidad Cultural (observado)
+REM 15 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 5] MSG Día del Respeto a la Diversidad Cultural (observado)
+REM 16 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 4] MSG Día del Respeto a la Diversidad Cultural (observado)
+REM 18 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 20)) == 3] MSG Día de la Soberanía Nacional (observado)
+REM 19 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 20)) == 2] MSG Día de la Soberanía Nacional (observado)
+REM 20 November ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5] MSG Día de la Soberanía Nacional (observado)
+REM 23 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 20)) == 5] MSG Día de la Soberanía Nacional (observado)
+REM 24 November ADDOMIT SCANFROM -28 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
 OMIT 25 December MSG Navidad
diff --git a/include/holidays/as.rem b/include/holidays/as.rem
index eb8c8d24..e51497e4 100644
--- a/include/holidays/as.rem
+++ b/include/holidays/as.rem
@@ -4,33 +4,33 @@
 # https://github.com/vacanza/holidays
 
 OMIT 1 January MSG New Year's Day
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM Third Monday in January SCANFROM -28 ADDOMIT MSG Martin Luther King Jr. Day
-REM Third Monday in February SCANFROM -28 ADDOMIT MSG Washington's Birthday
-REM 16 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 17)) == 6] MSG American Samoa Flag Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM Third Monday in January ADDOMIT SCANFROM -28 MSG Martin Luther King Jr. Day
+REM Third Monday in February ADDOMIT SCANFROM -28 MSG Washington's Birthday
+REM 16 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 17)) == 6] MSG American Samoa Flag Day (observed)
 OMIT 17 April MSG American Samoa Flag Day
-REM 18 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 17)) == 0] MSG American Samoa Flag Day (observed)
-REM Last Monday in May SCANFROM -28 ADDOMIT MSG Memorial Day
-REM 18 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 19)) == 6] MSG Juneteenth National Independence Day (observed)
+REM 18 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 17)) == 0] MSG American Samoa Flag Day (observed)
+REM Last Monday in May ADDOMIT SCANFROM -28 MSG Memorial Day
+REM 18 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 19)) == 6] MSG Juneteenth National Independence Day (observed)
 OMIT 19 June MSG Juneteenth National Independence Day
-REM 20 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 19)) == 0] MSG Juneteenth National Independence Day (observed)
-REM 3 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 4)) == 6] MSG Independence Day (observed)
+REM 20 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 19)) == 0] MSG Juneteenth National Independence Day (observed)
+REM 3 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 4)) == 6] MSG Independence Day (observed)
 OMIT 4 July MSG Independence Day
-REM 5 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 4)) == 0] MSG Independence Day (observed)
-REM 15 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 16)) == 6] MSG Manu'a Islands Cession Day (observed)
+REM 5 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 4)) == 0] MSG Independence Day (observed)
+REM 15 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 16)) == 6] MSG Manu'a Islands Cession Day (observed)
 OMIT 16 July MSG Manu'a Islands Cession Day
-REM 17 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 16)) == 0] MSG Manu'a Islands Cession Day (observed)
-REM First Monday in September SCANFROM -28 ADDOMIT MSG Labor Day
-REM Second Monday in October SCANFROM -28 ADDOMIT MSG Columbus Day
-REM Second Sunday in October SCANFROM -28 ADDOMIT MSG White Sunday
-REM 10 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 11)) == 6] MSG Veterans Day (observed)
+REM 17 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 16)) == 0] MSG Manu'a Islands Cession Day (observed)
+REM First Monday in September ADDOMIT SCANFROM -28 MSG Labor Day
+REM Second Monday in October ADDOMIT SCANFROM -28 MSG Columbus Day
+REM Second Sunday in October ADDOMIT SCANFROM -28 MSG White Sunday
+REM 10 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 6] MSG Veterans Day (observed)
 OMIT 11 November MSG Veterans Day
-REM 12 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 11)) == 0] MSG Veterans Day (observed)
-REM Fourth Thursday in November SCANFROM -28 ADDOMIT MSG Thanksgiving
-REM 24 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
+REM 12 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 0] MSG Veterans Day (observed)
+REM Fourth Thursday in November ADDOMIT SCANFROM -28 MSG Thanksgiving
+REM 24 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
 OMIT 25 December MSG Christmas Day
-REM 26 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 31 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 31 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
 
 # Optional holidays
 REM 14 February MSG Valentine's Day
diff --git a/include/holidays/au/act.rem b/include/holidays/au/act.rem
index 317acca5..7f5f4a67 100644
--- a/include/holidays/au/act.rem
+++ b/include/holidays/au/act.rem
@@ -9,18 +9,18 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/au.rem
 
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
-REM Second Monday in March SCANFROM -28 ADDOMIT MSG Canberra Day
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM Second Monday in March ADDOMIT SCANFROM -28 MSG Canberra Day
 OMIT [easterdate($Uy)-1] MSG Easter Saturday
 OMIT [easterdate($Uy)] MSG Easter Sunday
 REM Monday 27 May ADDOMIT SCANFROM -28 MSG Reconciliation Day
-REM Second Monday in June SCANFROM -28 ADDOMIT MSG King's Birthday
-REM First Monday in October SCANFROM -28 ADDOMIT MSG Labour Day
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+REM Second Monday in June ADDOMIT SCANFROM -28 MSG King's Birthday
+REM First Monday in October ADDOMIT SCANFROM -28 MSG Labour Day
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
 
 # Optional holidays
 REM First Monday in August SCANFROM -28 MSG Bank Holiday
diff --git a/include/holidays/au/nsw.rem b/include/holidays/au/nsw.rem
index 883079b7..614d64a5 100644
--- a/include/holidays/au/nsw.rem
+++ b/include/holidays/au/nsw.rem
@@ -9,16 +9,16 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/au.rem
 
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
 OMIT [easterdate($Uy)-1] MSG Easter Saturday
 OMIT [easterdate($Uy)] MSG Easter Sunday
-REM Second Monday in June SCANFROM -28 ADDOMIT MSG King's Birthday
-REM First Monday in October SCANFROM -28 ADDOMIT MSG Labour Day
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+REM Second Monday in June ADDOMIT SCANFROM -28 MSG King's Birthday
+REM First Monday in October ADDOMIT SCANFROM -28 MSG Labour Day
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
 
 # Optional holidays
 REM First Monday in August SCANFROM -28 MSG Bank Holiday
diff --git a/include/holidays/au/nt.rem b/include/holidays/au/nt.rem
index c5a77504..bac2fd23 100644
--- a/include/holidays/au/nt.rem
+++ b/include/holidays/au/nt.rem
@@ -9,18 +9,18 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/au.rem
 
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
 OMIT [easterdate($Uy)-1] MSG Easter Saturday
 OMIT [easterdate($Uy)] MSG Easter Sunday
-REM First Monday in May SCANFROM -28 ADDOMIT MSG May Day
-REM Second Monday in June SCANFROM -28 ADDOMIT MSG King's Birthday
-REM First Monday in August SCANFROM -28 ADDOMIT MSG Picnic Day
-REM 26 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 1] MSG Boxing Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+REM First Monday in May ADDOMIT SCANFROM -28 MSG May Day
+REM Second Monday in June ADDOMIT SCANFROM -28 MSG King's Birthday
+REM First Monday in August ADDOMIT SCANFROM -28 MSG Picnic Day
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 1] MSG Boxing Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
 
 # Optional holidays
 REM 24 December MSG Christmas Eve (from 7pm)
diff --git a/include/holidays/au/qld.rem b/include/holidays/au/qld.rem
index a3a9e1e1..5b9c66ca 100644
--- a/include/holidays/au/qld.rem
+++ b/include/holidays/au/qld.rem
@@ -9,14 +9,14 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/au.rem
 
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
 OMIT [easterdate($Uy)-1] MSG Easter Saturday
 OMIT [easterdate($Uy)] MSG Easter Sunday
-REM First Monday in May SCANFROM -28 ADDOMIT MSG Labour Day
+REM First Monday in May ADDOMIT SCANFROM -28 MSG Labour Day
 REM Wednesday 10 August ADDOMIT SCANFROM -28 MSG The Royal Queensland Show
-REM First Monday in October SCANFROM -28 ADDOMIT MSG King's Birthday
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+REM First Monday in October ADDOMIT SCANFROM -28 MSG King's Birthday
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
diff --git a/include/holidays/au/sa.rem b/include/holidays/au/sa.rem
index dd3a5f36..fce118ee 100644
--- a/include/holidays/au/sa.rem
+++ b/include/holidays/au/sa.rem
@@ -9,19 +9,19 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/au.rem
 
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
-REM Second Monday in March SCANFROM -28 ADDOMIT MSG Adelaide Cup Day
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM Second Monday in March ADDOMIT SCANFROM -28 MSG Adelaide Cup Day
 OMIT [easterdate($Uy)-1] MSG Easter Saturday
 OMIT [easterdate($Uy)] MSG Easter Sunday
-REM Second Monday in June SCANFROM -28 ADDOMIT MSG King's Birthday
-REM First Monday in October SCANFROM -28 ADDOMIT MSG Labour Day
+REM Second Monday in June ADDOMIT SCANFROM -28 MSG King's Birthday
+REM First Monday in October ADDOMIT SCANFROM -28 MSG Labour Day
 OMIT 26 December MSG Proclamation Day
-REM 26 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 1] MSG Proclamation Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Proclamation Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Proclamation Day (observed)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 1] MSG Proclamation Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Proclamation Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Proclamation Day (observed)
 
 # Optional holidays
 REM 24 December MSG Christmas Eve (from 7pm)
diff --git a/include/holidays/au/tas.rem b/include/holidays/au/tas.rem
index d01ba1ea..5bb82aa8 100644
--- a/include/holidays/au/tas.rem
+++ b/include/holidays/au/tas.rem
@@ -9,7 +9,7 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/au.rem
 
-REM Second Monday in March SCANFROM -28 ADDOMIT MSG Eight Hours Day
-REM Second Monday in June SCANFROM -28 ADDOMIT MSG King's Birthday
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
+REM Second Monday in March ADDOMIT SCANFROM -28 MSG Eight Hours Day
+REM Second Monday in June ADDOMIT SCANFROM -28 MSG King's Birthday
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
diff --git a/include/holidays/au/vic.rem b/include/holidays/au/vic.rem
index 70400176..b861bcca 100644
--- a/include/holidays/au/vic.rem
+++ b/include/holidays/au/vic.rem
@@ -9,15 +9,15 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/au.rem
 
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
-REM Second Monday in March SCANFROM -28 ADDOMIT MSG Labour Day
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM Second Monday in March ADDOMIT SCANFROM -28 MSG Labour Day
 OMIT [easterdate($Uy)-1] MSG Easter Saturday
 OMIT [easterdate($Uy)] MSG Easter Sunday
-REM Second Monday in June SCANFROM -28 ADDOMIT MSG King's Birthday
+REM Second Monday in June ADDOMIT SCANFROM -28 MSG King's Birthday
 REM Saturday 1 October --8 ADDOMIT SCANFROM -28 MSG Grand Final Day
-REM First Tuesday in November SCANFROM -28 ADDOMIT MSG Melbourne Cup Day
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+REM First Tuesday in November ADDOMIT SCANFROM -28 MSG Melbourne Cup Day
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
diff --git a/include/holidays/au/wa.rem b/include/holidays/au/wa.rem
index bc1f9dc4..e4c0d25b 100644
--- a/include/holidays/au/wa.rem
+++ b/include/holidays/au/wa.rem
@@ -9,15 +9,15 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/au.rem
 
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
-REM First Monday in March SCANFROM -28 ADDOMIT MSG Labour Day
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM First Monday in March ADDOMIT SCANFROM -28 MSG Labour Day
 OMIT [easterdate($Uy)] MSG Easter Sunday
-REM 26 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 25)) == 0] MSG ANZAC Day (observed)
-REM 27 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 25)) == 6] MSG ANZAC Day (observed)
-REM First Monday in June SCANFROM -28 ADDOMIT MSG Western Australia Day
-REM 26 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 1] MSG Boxing Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+REM 26 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 25)) == 0] MSG ANZAC Day (observed)
+REM 27 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 25)) == 6] MSG ANZAC Day (observed)
+REM First Monday in June ADDOMIT SCANFROM -28 MSG Western Australia Day
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 1] MSG Boxing Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
diff --git a/include/holidays/ba/bih.rem b/include/holidays/ba/bih.rem
index 476a4217..3bb6ef87 100644
--- a/include/holidays/ba/bih.rem
+++ b/include/holidays/ba/bih.rem
@@ -9,13 +9,13 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/ba.rem
 
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG Nova godina (preneseno)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG Nova godina (preneseno)
 OMIT 1 March MSG Dan nezavisnosti
 OMIT [easterdate($Uy)-2] MSG Veliki petak (Katolički)
 OMIT [easterdate($Uy)] MSG Uskrs (Katolički)
 OMIT [easterdate($Uy)] MSG Vaskrs (Pravoslavni)
 OMIT [easterdate($Uy)+1] MSG Uskrsni ponedjeljak (Pravoslavni)
-REM 3 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Međunarodni praznik rada (preneseno)
+REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Međunarodni praznik rada (preneseno)
 OMIT 9 May MSG Dan pobjede nad fašizmom
 OMIT 25 November MSG Dan državnosti
 OMIT 24 December MSG Badnji dan (Katolički)
diff --git a/include/holidays/ba/brc.rem b/include/holidays/ba/brc.rem
index e8601892..f4441d0d 100644
--- a/include/holidays/ba/brc.rem
+++ b/include/holidays/ba/brc.rem
@@ -9,11 +9,11 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/ba.rem
 
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG Nova godina (preneseno)
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG Nova godina (preneseno)
-REM 8 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 7)) == 0] MSG Božić (Pravoslavni) (preneseno)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG Nova godina (preneseno)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG Nova godina (preneseno)
+REM 8 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 7)) == 0] MSG Božić (Pravoslavni) (preneseno)
 OMIT 8 March MSG Dan uspostavljanja Brčko distrikta
-REM 9 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 8)) == 0] MSG Dan uspostavljanja Brčko distrikta (preneseno)
-REM 3 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Međunarodni praznik rada (preneseno)
-REM 3 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 6] MSG Međunarodni praznik rada (preneseno)
-REM 26 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Božić (Katolički) (preneseno)
+REM 9 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 8)) == 0] MSG Dan uspostavljanja Brčko distrikta (preneseno)
+REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Međunarodni praznik rada (preneseno)
+REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 6] MSG Međunarodni praznik rada (preneseno)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Božić (Katolički) (preneseno)
diff --git a/include/holidays/ba/srp.rem b/include/holidays/ba/srp.rem
index 6e212e7c..c756516a 100644
--- a/include/holidays/ba/srp.rem
+++ b/include/holidays/ba/srp.rem
@@ -9,13 +9,13 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/ba.rem
 
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG Nova godina (preneseno)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG Nova godina (preneseno)
 OMIT 14 January MSG Pravoslavna Nova godina
 OMIT [easterdate($Uy)-2] MSG Veliki petak (Katolički)
 OMIT [easterdate($Uy)] MSG Uskrs (Katolički)
 OMIT [easterdate($Uy)] MSG Vaskrs (Pravoslavni)
 OMIT [easterdate($Uy)+1] MSG Uskrsni ponedjeljak (Pravoslavni)
-REM 3 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 6] MSG Međunarodni praznik rada (preneseno)
+REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 6] MSG Međunarodni praznik rada (preneseno)
 OMIT 9 May MSG Dan pobjede nad fašizmom
 OMIT 21 November MSG Dan uspostave Opšteg okvirnog sporazuma za mir u Bosni i Hercegovini
 OMIT 24 December MSG Badnji dan (Katolički)
diff --git a/include/holidays/bb.rem b/include/holidays/bb.rem
index 561341f1..8adbd3bd 100644
--- a/include/holidays/bb.rem
+++ b/include/holidays/bb.rem
@@ -4,23 +4,23 @@
 # https://github.com/vacanza/holidays
 
 OMIT 1 January MSG New Year's Day
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
 OMIT 21 January MSG Errol Barrow Day
-REM 22 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 21)) == 0] MSG Errol Barrow Day (observed)
+REM 22 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 21)) == 0] MSG Errol Barrow Day (observed)
 OMIT [easterdate($Uy)-2] MSG Good Friday
 OMIT [easterdate($Uy)+1] MSG Easter Monday
 OMIT 28 April MSG National Heroes Day
-REM 29 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 28)) == 0] MSG National Heroes Day (observed)
+REM 29 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 28)) == 0] MSG National Heroes Day (observed)
 OMIT 1 May MSG May Day
-REM 2 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG May Day (observed)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG May Day (observed)
 OMIT [easterdate($Uy)+50] MSG Whit Monday
 OMIT 1 August MSG Emancipation Day
-REM First Monday in August SCANFROM -28 ADDOMIT MSG Kadooment Day
-REM 2 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 1)) == 1] MSG Emancipation Day (observed)
-REM 3 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 1)) == 0] MSG Emancipation Day (observed)
+REM First Monday in August ADDOMIT SCANFROM -28 MSG Kadooment Day
+REM 2 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 1)) == 1] MSG Emancipation Day (observed)
+REM 3 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 1)) == 0] MSG Emancipation Day (observed)
 OMIT 30 November MSG Independence Day
-REM 1 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 30)) == 0] MSG Independence Day (observed)
+REM 1 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 30)) == 0] MSG Independence Day (observed)
 OMIT 25 December MSG Christmas Day
 OMIT 26 December MSG Boxing Day
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
diff --git a/include/holidays/bf.rem b/include/holidays/bf.rem
index 3df63d0e..35a64b00 100644
--- a/include/holidays/bf.rem
+++ b/include/holidays/bf.rem
@@ -4,24 +4,24 @@
 # https://github.com/vacanza/holidays
 
 OMIT 1 January MSG New Year's Day
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
 OMIT 3 January MSG Revolution Day
-REM 4 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 3)) == 0] MSG Revolution Day (observed)
+REM 4 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 3)) == 0] MSG Revolution Day (observed)
 OMIT 8 March MSG International Women's Day
-REM 9 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 8)) == 0] MSG International Women's Day (observed)
+REM 9 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 8)) == 0] MSG International Women's Day (observed)
 OMIT [easterdate($Uy)+1] MSG Easter Monday
 OMIT 1 May MSG Labour Day
-REM 2 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Labour Day (observed)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Labour Day (observed)
 OMIT [easterdate($Uy)+39] MSG Ascension Day
 OMIT 5 August MSG Independence Day
-REM 6 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 5)) == 0] MSG Independence Day (observed)
+REM 6 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 5)) == 0] MSG Independence Day (observed)
 OMIT 15 August MSG Assumption Day
-REM 16 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 15)) == 0] MSG Assumption Day (observed)
+REM 16 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 15)) == 0] MSG Assumption Day (observed)
 OMIT 31 October MSG Martyrs' Day
 OMIT 1 November MSG All Saints' Day
-REM 1 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 31)) == 0] MSG Martyrs' Day (observed)
-REM 2 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 1)) == 0] MSG All Saints' Day (observed)
+REM 1 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 31)) == 0] MSG Martyrs' Day (observed)
+REM 2 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 1)) == 0] MSG All Saints' Day (observed)
 OMIT 11 December MSG Proclamation of Independence Day
-REM 12 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 11)) == 0] MSG Proclamation of Independence Day (observed)
+REM 12 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 11)) == 0] MSG Proclamation of Independence Day (observed)
 OMIT 25 December MSG Christmas Day
-REM 26 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
diff --git a/include/holidays/bi.rem b/include/holidays/bi.rem
index beb35003..de5074fc 100644
--- a/include/holidays/bi.rem
+++ b/include/holidays/bi.rem
@@ -4,25 +4,25 @@
 # https://github.com/vacanza/holidays
 
 OMIT 1 January MSG New Year's Day
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
 OMIT 5 February MSG Unity Day
-REM 6 February SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 2, 5)) == 0] MSG Unity Day (observed)
+REM 6 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 5)) == 0] MSG Unity Day (observed)
 OMIT 6 April MSG President Ntaryamira Day
-REM 7 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 6)) == 0] MSG President Ntaryamira Day (observed)
+REM 7 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 6)) == 0] MSG President Ntaryamira Day (observed)
 OMIT 1 May MSG Labour Day
-REM 2 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Labour Day (observed)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Labour Day (observed)
 OMIT [easterdate($Uy)+39] MSG Ascension Day
 OMIT 8 June MSG President Nkurunziza Day
-REM 9 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 8)) == 0] MSG President Nkurunziza Day (observed)
+REM 9 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 8)) == 0] MSG President Nkurunziza Day (observed)
 OMIT 1 July MSG Independence Day
-REM 2 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 1)) == 0] MSG Independence Day (observed)
+REM 2 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 1)) == 0] MSG Independence Day (observed)
 OMIT 15 August MSG Assumption Day
-REM 16 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 15)) == 0] MSG Assumption Day (observed)
+REM 16 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 15)) == 0] MSG Assumption Day (observed)
 OMIT 13 October MSG Prince Louis Rwagasore Day
-REM 14 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 13)) == 0] MSG Prince Louis Rwagasore Day (observed)
+REM 14 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 13)) == 0] MSG Prince Louis Rwagasore Day (observed)
 OMIT 21 October MSG President Ndadaye's Day
-REM 22 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 21)) == 0] MSG President Ndadaye's Day (observed)
+REM 22 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 21)) == 0] MSG President Ndadaye's Day (observed)
 OMIT 1 November MSG All Saints' Day
-REM 2 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 1)) == 0] MSG All Saints' Day (observed)
+REM 2 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 1)) == 0] MSG All Saints' Day (observed)
 OMIT 25 December MSG Christmas Day
-REM 26 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
diff --git a/include/holidays/bn.rem b/include/holidays/bn.rem
index 9c67567f..c27c60b5 100644
--- a/include/holidays/bn.rem
+++ b/include/holidays/bn.rem
@@ -4,17 +4,17 @@
 # https://github.com/vacanza/holidays
 
 OMIT 1 January MSG Awal Tahun Masihi
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG Awal Tahun Masihi (diperhatikan)
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 5] MSG Awal Tahun Masihi (diperhatikan)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG Awal Tahun Masihi (diperhatikan)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 5] MSG Awal Tahun Masihi (diperhatikan)
 OMIT 23 February MSG Hari Kebangsaan
-REM 24 February SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 2, 23)) == 0] MSG Hari Kebangsaan (diperhatikan)
-REM 24 February SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 2, 23)) == 5] MSG Hari Kebangsaan (diperhatikan)
+REM 24 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 23)) == 0] MSG Hari Kebangsaan (diperhatikan)
+REM 24 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 23)) == 5] MSG Hari Kebangsaan (diperhatikan)
 OMIT 31 May MSG Hari Angkatan Bersenjata Diraja Brunei
-REM 1 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 31)) == 0] MSG Hari Angkatan Bersenjata Diraja Brunei (diperhatikan)
-REM 1 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 31)) == 5] MSG Hari Angkatan Bersenjata Diraja Brunei (diperhatikan)
+REM 1 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 31)) == 0] MSG Hari Angkatan Bersenjata Diraja Brunei (diperhatikan)
+REM 1 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 31)) == 5] MSG Hari Angkatan Bersenjata Diraja Brunei (diperhatikan)
 OMIT 15 July MSG Hari Keputeraan KDYMM Sultan Brunei
-REM 16 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 15)) == 0] MSG Hari Keputeraan KDYMM Sultan Brunei (diperhatikan)
-REM 16 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 15)) == 5] MSG Hari Keputeraan KDYMM Sultan Brunei (diperhatikan)
+REM 16 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 15)) == 0] MSG Hari Keputeraan KDYMM Sultan Brunei (diperhatikan)
+REM 16 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 15)) == 5] MSG Hari Keputeraan KDYMM Sultan Brunei (diperhatikan)
 OMIT 25 December MSG Hari Natal
-REM 26 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Hari Natal (diperhatikan)
-REM 26 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 5] MSG Hari Natal (diperhatikan)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Hari Natal (diperhatikan)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 5] MSG Hari Natal (diperhatikan)
diff --git a/include/holidays/bo.rem b/include/holidays/bo.rem
index 2b915509..0b443d12 100644
--- a/include/holidays/bo.rem
+++ b/include/holidays/bo.rem
@@ -11,20 +11,20 @@
 # [$SysInclude]/bo/
 
 OMIT 1 January MSG Año Nuevo
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG Año Nuevo (observado)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG Año Nuevo (observado)
 OMIT 22 January MSG Día de la Creación del Estado Plurinacional de Bolivia
-REM 23 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 22)) == 0] MSG Día de la Creación del Estado Plurinacional de Bolivia (observado)
+REM 23 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 22)) == 0] MSG Día de la Creación del Estado Plurinacional de Bolivia (observado)
 OMIT [easterdate($Uy)-48] MSG Carnaval
 OMIT [easterdate($Uy)-47] MSG Carnaval
 OMIT [easterdate($Uy)-2] MSG Viernes Santo
 OMIT 1 May MSG Día del Trabajo
-REM 2 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Día del Trabajo (observado)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Día del Trabajo (observado)
 OMIT [easterdate($Uy)+60] MSG Corpus Christi
 OMIT 21 June MSG Año Nuevo Aymara Amazónico
-REM 22 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 21)) == 0] MSG Año Nuevo Aymara Amazónico (observado)
+REM 22 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 21)) == 0] MSG Año Nuevo Aymara Amazónico (observado)
 OMIT 6 August MSG Día de la Independencia de Bolivia
-REM 7 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 6)) == 0] MSG Día de la Independencia de Bolivia (observado)
+REM 7 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 6)) == 0] MSG Día de la Independencia de Bolivia (observado)
 OMIT 17 October MSG Día de la Dignidad Nacional
 OMIT 2 November MSG Día de Todos los Difuntos
 OMIT 25 December MSG Navidad
-REM 26 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Navidad (observado)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Navidad (observado)
diff --git a/include/holidays/br/pe.rem b/include/holidays/br/pe.rem
index 70b47d5f..3b3ef5e5 100644
--- a/include/holidays/br/pe.rem
+++ b/include/holidays/br/pe.rem
@@ -9,4 +9,4 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/br.rem
 
-REM First Sunday in March SCANFROM -28 ADDOMIT MSG Revolução Pernambucana
+REM First Sunday in March ADDOMIT SCANFROM -28 MSG Revolução Pernambucana
diff --git a/include/holidays/bs.rem b/include/holidays/bs.rem
index 6a479b68..9d672aca 100644
--- a/include/holidays/bs.rem
+++ b/include/holidays/bs.rem
@@ -4,21 +4,21 @@
 # https://github.com/vacanza/holidays
 
 OMIT 1 January MSG New Year's Day
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
 OMIT 10 January MSG Majority Rule Day
-REM 11 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 10)) == 0] MSG Majority Rule Day (observed)
-REM 12 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 10)) == 6] MSG Majority Rule Day (observed)
+REM 11 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 10)) == 0] MSG Majority Rule Day (observed)
+REM 12 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 10)) == 6] MSG Majority Rule Day (observed)
 OMIT [easterdate($Uy)-2] MSG Good Friday
 OMIT [easterdate($Uy)+1] MSG Easter Monday
-REM First Friday in June SCANFROM -28 ADDOMIT MSG Randol Fawkes Labour Day
+REM First Friday in June ADDOMIT SCANFROM -28 MSG Randol Fawkes Labour Day
 OMIT [easterdate($Uy)+50] MSG Whit Monday
 OMIT 10 July MSG Independence Day
-REM 11 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 10)) == 0] MSG Independence Day (observed)
-REM 12 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 10)) == 6] MSG Independence Day (observed)
-REM First Monday in August SCANFROM -28 ADDOMIT MSG Emancipation Day
-REM Second Monday in October SCANFROM -28 ADDOMIT MSG National Heroes Day
+REM 11 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 10)) == 0] MSG Independence Day (observed)
+REM 12 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 10)) == 6] MSG Independence Day (observed)
+REM First Monday in August ADDOMIT SCANFROM -28 MSG Emancipation Day
+REM Second Monday in October ADDOMIT SCANFROM -28 MSG National Heroes Day
 OMIT 25 December MSG Christmas Day
 OMIT 26 December MSG Boxing Day
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
diff --git a/include/holidays/bw.rem b/include/holidays/bw.rem
index de444d86..4486ceaa 100644
--- a/include/holidays/bw.rem
+++ b/include/holidays/bw.rem
@@ -5,25 +5,25 @@
 
 OMIT 1 January MSG New Year's Day
 OMIT 2 January MSG New Year's Day Holiday
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 2)) == 0] MSG New Year's Day Holiday (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 2)) == 0] MSG New Year's Day Holiday (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 2 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Labour Day (observed)
-REM 3 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 6] MSG Labour Day Holiday
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Labour Day (observed)
+REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 6] MSG Labour Day Holiday
 OMIT [easterdate($Uy)+39] MSG Ascension Day
 OMIT 1 July MSG Sir Seretse Khama Day
-REM 2 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 1)) == 0] MSG Sir Seretse Khama Day (observed)
-REM Third Monday in July SCANFROM -28 ADDOMIT MSG President's Day
+REM 2 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 1)) == 0] MSG Sir Seretse Khama Day (observed)
+REM Third Monday in July ADDOMIT SCANFROM -28 MSG President's Day
 REM Tuesday 16 July ADDOMIT SCANFROM -28 MSG President's Day Holiday
 OMIT 30 September MSG Botswana Day
 OMIT 1 October MSG Botswana Day Holiday
-REM 2 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 1)) == 0] MSG Botswana Day Holiday (observed)
-REM 2 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 9, 30)) == 0] MSG Botswana Day (observed)
+REM 2 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 1)) == 0] MSG Botswana Day Holiday (observed)
+REM 2 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 30)) == 0] MSG Botswana Day (observed)
 OMIT 25 December MSG Christmas Day
 OMIT 26 December MSG Boxing Day
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day Holiday
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day Holiday
diff --git a/include/holidays/bz.rem b/include/holidays/bz.rem
index b7538865..16c4bf4e 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
 
-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)
-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)
-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)
+REM 1 January ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 15 January ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG George Price Day (observed)
+REM 16 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 15)) == 0] MSG George Price Day (observed)
+REM 6 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 9)) == 4] MSG National Heroes and Benefactors Day (observed)
+REM 7 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 9)) == 3] MSG National Heroes and Benefactors Day (observed)
+REM 8 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 9)) == 2] MSG National Heroes and Benefactors Day (observed)
+REM 9 March ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 0] MSG National Heroes and Benefactors Day (observed)
+REM 10 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 9)) == 0] MSG National Heroes and Benefactors Day (observed)
+REM 12 March ADDOMIT SCANFROM -28 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
-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)
-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)
-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)
-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)
-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)
-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)
+REM 1 May ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Labour Day (observed)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Labour Day (observed)
+REM 29 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 1)) == 4] MSG Emancipation Day (observed)
+REM 30 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 1)) == 3] MSG Emancipation Day (observed)
+REM 31 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 1)) == 2] MSG Emancipation Day (observed)
+REM 1 August ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 0] MSG Emancipation Day (observed)
+REM 2 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 1)) == 0] MSG Emancipation Day (observed)
+REM 4 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 1)) == 5] MSG Emancipation Day (observed)
+REM 10 September ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Saint George's Caye Day (observed)
+REM 11 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 10)) == 0] MSG Saint George's Caye Day (observed)
+REM 21 September ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Independence Day (observed)
+REM 22 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 21)) == 0] MSG Independence Day (observed)
+REM 9 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 4] MSG Indigenous Peoples' Resistance Day (observed)
+REM 10 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 3] MSG Indigenous Peoples' Resistance Day (observed)
+REM 11 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 2] MSG Indigenous Peoples' Resistance Day (observed)
+REM 12 October ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 0] MSG Indigenous Peoples' Resistance Day (observed)
+REM 13 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 0] MSG Indigenous Peoples' Resistance Day (observed)
+REM 15 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 5] MSG Indigenous Peoples' Resistance Day (observed)
+REM 19 November ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Garifuna Settlement Day (observed)
+REM 20 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 19)) == 0] MSG Garifuna Settlement Day (observed)
 OMIT 25 December MSG Christmas 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)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Boxing Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
diff --git a/include/holidays/ca.rem b/include/holidays/ca.rem
index dabbf6a6..7c4d4f78 100644
--- a/include/holidays/ca.rem
+++ b/include/holidays/ca.rem
@@ -11,25 +11,25 @@
 # [$SysInclude]/ca/
 
 OMIT 1 January MSG New Year's Day
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
 OMIT [easterdate($Uy)-2] MSG Good Friday
 REM Monday 18 May ADDOMIT SCANFROM -28 MSG Victoria Day
 OMIT 1 July MSG Canada Day
-REM 2 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 1)) == 0] MSG Canada Day (observed)
-REM 3 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 1)) == 6] MSG Canada Day (observed)
-REM First Monday in September SCANFROM -28 ADDOMIT MSG Labour Day
+REM 2 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 1)) == 0] MSG Canada Day (observed)
+REM 3 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 1)) == 6] MSG Canada Day (observed)
+REM First Monday in September ADDOMIT SCANFROM -28 MSG Labour Day
 OMIT 30 September MSG National Day for Truth and Reconciliation
-REM 1 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 9, 30)) == 0] MSG National Day for Truth and Reconciliation (observed)
-REM 2 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 9, 30)) == 6] MSG National Day for Truth and Reconciliation (observed)
-REM Second Monday in October SCANFROM -28 ADDOMIT MSG Thanksgiving Day
+REM 1 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 30)) == 0] MSG National Day for Truth and Reconciliation (observed)
+REM 2 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 30)) == 6] MSG National Day for Truth and Reconciliation (observed)
+REM Second Monday in October ADDOMIT SCANFROM -28 MSG Thanksgiving Day
 OMIT 11 November MSG Remembrance Day
-REM 12 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 11)) == 0] MSG Remembrance Day (observed)
-REM 13 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 11)) == 6] MSG Remembrance Day (observed)
+REM 12 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 0] MSG Remembrance Day (observed)
+REM 13 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 6] MSG Remembrance Day (observed)
 OMIT 25 December MSG Christmas Day
 OMIT 26 December MSG Boxing Day
-REM 26 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 1] MSG Boxing Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 1] MSG Boxing Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
diff --git a/include/holidays/ca/ab.rem b/include/holidays/ca/ab.rem
index c443f0ac..44061e8d 100644
--- a/include/holidays/ca/ab.rem
+++ b/include/holidays/ca/ab.rem
@@ -9,7 +9,7 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/ca.rem
 
-REM Third Monday in February SCANFROM -28 ADDOMIT MSG Family Day
+REM Third Monday in February ADDOMIT SCANFROM -28 MSG Family Day
 
 # Optional holidays
 REM [easterdate($Uy)+1] MSG Easter Monday
diff --git a/include/holidays/ca/bc.rem b/include/holidays/ca/bc.rem
index 94fddf3f..0a67300a 100644
--- a/include/holidays/ca/bc.rem
+++ b/include/holidays/ca/bc.rem
@@ -9,5 +9,5 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/ca.rem
 
-REM Third Monday in February SCANFROM -28 ADDOMIT MSG Family Day
-REM First Monday in August SCANFROM -28 ADDOMIT MSG British Columbia Day
+REM Third Monday in February ADDOMIT SCANFROM -28 MSG Family Day
+REM First Monday in August ADDOMIT SCANFROM -28 MSG British Columbia Day
diff --git a/include/holidays/ca/mb.rem b/include/holidays/ca/mb.rem
index 8e0bcb83..f522b0be 100644
--- a/include/holidays/ca/mb.rem
+++ b/include/holidays/ca/mb.rem
@@ -9,7 +9,7 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/ca.rem
 
-REM Third Monday in February SCANFROM -28 ADDOMIT MSG Louis Riel Day
+REM Third Monday in February ADDOMIT SCANFROM -28 MSG Louis Riel Day
 
 # Optional holidays
 REM First Monday in August SCANFROM -28 MSG Terry Fox Day
diff --git a/include/holidays/ca/nb.rem b/include/holidays/ca/nb.rem
index 48db1125..e434d284 100644
--- a/include/holidays/ca/nb.rem
+++ b/include/holidays/ca/nb.rem
@@ -9,5 +9,5 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/ca.rem
 
-REM Third Monday in February SCANFROM -28 ADDOMIT MSG Family Day
-REM First Monday in August SCANFROM -28 ADDOMIT MSG New Brunswick Day
+REM Third Monday in February ADDOMIT SCANFROM -28 MSG Family Day
+REM First Monday in August ADDOMIT SCANFROM -28 MSG New Brunswick Day
diff --git a/include/holidays/ca/ns.rem b/include/holidays/ca/ns.rem
index 1135acd5..bc91d41e 100644
--- a/include/holidays/ca/ns.rem
+++ b/include/holidays/ca/ns.rem
@@ -9,7 +9,7 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/ca.rem
 
-REM Third Monday in February SCANFROM -28 ADDOMIT MSG Heritage Day
+REM Third Monday in February ADDOMIT SCANFROM -28 MSG Heritage Day
 
 # Optional holidays
 REM First Monday in August SCANFROM -28 MSG Natal Day
diff --git a/include/holidays/ca/nt.rem b/include/holidays/ca/nt.rem
index 719fd74a..cc92d3f8 100644
--- a/include/holidays/ca/nt.rem
+++ b/include/holidays/ca/nt.rem
@@ -10,4 +10,4 @@
 # also include [$SysInclude]/ca.rem
 
 OMIT 21 June MSG National Aboriginal Day
-REM First Monday in August SCANFROM -28 ADDOMIT MSG Civic Holiday
+REM First Monday in August ADDOMIT SCANFROM -28 MSG Civic Holiday
diff --git a/include/holidays/ca/nu.rem b/include/holidays/ca/nu.rem
index ea828796..9dcc9156 100644
--- a/include/holidays/ca/nu.rem
+++ b/include/holidays/ca/nu.rem
@@ -9,7 +9,7 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/ca.rem
 
-REM First Monday in August SCANFROM -28 ADDOMIT MSG Civic Holiday
+REM First Monday in August ADDOMIT SCANFROM -28 MSG Civic Holiday
 
 # Optional holidays
 REM 9 July MSG Nunavut Day
diff --git a/include/holidays/ca/on.rem b/include/holidays/ca/on.rem
index 17520895..7eb16359 100644
--- a/include/holidays/ca/on.rem
+++ b/include/holidays/ca/on.rem
@@ -9,7 +9,7 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/ca.rem
 
-REM Third Monday in February SCANFROM -28 ADDOMIT MSG Family Day
+REM Third Monday in February ADDOMIT SCANFROM -28 MSG Family Day
 
 # Optional holidays
 REM First Monday in August SCANFROM -28 MSG Civic Holiday
diff --git a/include/holidays/ca/pe.rem b/include/holidays/ca/pe.rem
index 6ec6576a..17fff3d6 100644
--- a/include/holidays/ca/pe.rem
+++ b/include/holidays/ca/pe.rem
@@ -9,4 +9,4 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/ca.rem
 
-REM Third Monday in February SCANFROM -28 ADDOMIT MSG Islander Day
+REM Third Monday in February ADDOMIT SCANFROM -28 MSG Islander Day
diff --git a/include/holidays/ca/qc.rem b/include/holidays/ca/qc.rem
index f921e70b..20843487 100644
--- a/include/holidays/ca/qc.rem
+++ b/include/holidays/ca/qc.rem
@@ -11,7 +11,7 @@
 
 REM Monday 18 May ADDOMIT SCANFROM -28 MSG National Patriots' Day
 OMIT 24 June MSG Saint Jean Baptiste Day
-REM 25 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 24)) == 0] MSG Saint Jean Baptiste Day (observed)
+REM 25 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 24)) == 0] MSG Saint Jean Baptiste Day (observed)
 
 # Optional holidays
 REM [easterdate($Uy)+1] MSG Easter Monday
diff --git a/include/holidays/ca/sk.rem b/include/holidays/ca/sk.rem
index a3dc91b4..0a41fcfa 100644
--- a/include/holidays/ca/sk.rem
+++ b/include/holidays/ca/sk.rem
@@ -9,5 +9,5 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/ca.rem
 
-REM Third Monday in February SCANFROM -28 ADDOMIT MSG Family Day
-REM First Monday in August SCANFROM -28 ADDOMIT MSG Saskatchewan Day
+REM Third Monday in February ADDOMIT SCANFROM -28 MSG Family Day
+REM First Monday in August ADDOMIT SCANFROM -28 MSG Saskatchewan Day
diff --git a/include/holidays/ca/yt.rem b/include/holidays/ca/yt.rem
index 75e5e899..3dddfbcd 100644
--- a/include/holidays/ca/yt.rem
+++ b/include/holidays/ca/yt.rem
@@ -10,7 +10,7 @@
 # also include [$SysInclude]/ca.rem
 
 OMIT 21 June MSG National Aboriginal Day
-REM Third Monday in August SCANFROM -28 ADDOMIT MSG Discovery Day
+REM Third Monday in August ADDOMIT SCANFROM -28 MSG Discovery Day
 
 # Optional holidays
 REM Sunday 1 March --9 SCANFROM -28 MSG Heritage Day
diff --git a/include/holidays/ch/ai.rem b/include/holidays/ch/ai.rem
index 8b329c66..aa77fa6e 100644
--- a/include/holidays/ch/ai.rem
+++ b/include/holidays/ch/ai.rem
@@ -16,4 +16,4 @@ OMIT [easterdate($Uy)+60] MSG Fronleichnam
 OMIT 15 August MSG Mariä Himmelfahrt
 OMIT 1 November MSG Allerheiligen
 OMIT 8 December MSG Mariä Empfängnis
-REM 26 December SCANFROM -28 ADDOMIT SATISFY [$Tw != 2 && $Tw != 6] MSG Stephanstag
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 6] MSG Stephanstag
diff --git a/include/holidays/ch/ar.rem b/include/holidays/ch/ar.rem
index 3500c766..90522301 100644
--- a/include/holidays/ch/ar.rem
+++ b/include/holidays/ch/ar.rem
@@ -12,4 +12,4 @@
 OMIT [easterdate($Uy)-2] MSG Karfreitag
 OMIT [easterdate($Uy)+1] MSG Ostermontag
 OMIT [easterdate($Uy)+50] MSG Pfingstmontag
-REM 26 December SCANFROM -28 ADDOMIT SATISFY [$Tw != 2 && $Tw != 6] MSG Stephanstag
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 6] MSG Stephanstag
diff --git a/include/holidays/ch/ne.rem b/include/holidays/ch/ne.rem
index 4801258f..7e5c5781 100644
--- a/include/holidays/ch/ne.rem
+++ b/include/holidays/ch/ne.rem
@@ -9,9 +9,9 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/ch.rem
 
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [$Tw == 1] MSG Berchtoldstag
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [$Tw == 1] MSG Berchtoldstag
 OMIT 1 March MSG Jahrestag der Ausrufung der Republik
 OMIT [easterdate($Uy)-2] MSG Karfreitag
 OMIT 1 May MSG Tag der Arbeit
 OMIT [easterdate($Uy)+60] MSG Fronleichnam
-REM 26 December SCANFROM -28 ADDOMIT SATISFY [$Tw == 1] MSG Stephanstag
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [$Tw == 1] MSG Stephanstag
diff --git a/include/holidays/ch/ur.rem b/include/holidays/ch/ur.rem
index 9fc9c31c..b0e9ee63 100644
--- a/include/holidays/ch/ur.rem
+++ b/include/holidays/ch/ur.rem
@@ -18,4 +18,4 @@ OMIT [easterdate($Uy)+60] MSG Fronleichnam
 OMIT 15 August MSG Mariä Himmelfahrt
 OMIT 1 November MSG Allerheiligen
 OMIT 8 December MSG Mariä Empfängnis
-REM 26 December SCANFROM -28 ADDOMIT SATISFY [$Tw != 2 && $Tw != 6] MSG Stephanstag
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 6] MSG Stephanstag
diff --git a/include/holidays/cl.rem b/include/holidays/cl.rem
index b234f3f5..5c6c8cd9 100644
--- a/include/holidays/cl.rem
+++ b/include/holidays/cl.rem
@@ -11,32 +11,32 @@
 # [$SysInclude]/cl/
 
 OMIT 1 January MSG Año Nuevo
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [$Tw == 1] MSG Feriado nacional
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [$Tw == 1] MSG Feriado nacional
 OMIT [easterdate($Uy)-2] MSG Viernes Santo
 OMIT [easterdate($Uy)-1] MSG Sábado Santo
 OMIT 1 May MSG Día Nacional del Trabajo
 OMIT 21 May MSG Día de las Glorias Navales
 REM [datepart(soleq(1, $U-28))] ADDOMIT MSG Día Nacional de los Pueblos Indígenas
-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
-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
+REM 26 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 29)) == 4] MSG San Pedro y San Pablo
+REM 27 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 29)) == 3] MSG San Pedro y San Pablo
+REM 28 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 29)) == 2] MSG San Pedro y San Pablo
+REM 29 June ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5] MSG San Pedro y San Pablo
+REM 2 July ADDOMIT SCANFROM -28 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
-REM 17 September SCANFROM -28 ADDOMIT SATISFY [$Tw == 1 || $Tw == 5] MSG Fiestas Patrias
+REM 17 September ADDOMIT SCANFROM -28 SATISFY [$Tw == 1 || $Tw == 5] MSG Fiestas Patrias
 OMIT 18 September MSG Día de la Independencia
 OMIT 19 September MSG Día de las Glorias del Ejército
-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
-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
-REM 31 October SCANFROM -28 ADDOMIT SATISFY [$Tw != 2 && $Tw != 3] MSG Día Nacional de las Iglesias Evangélicas y Protestantes
+REM 20 September ADDOMIT SCANFROM -28 SATISFY [$Tw == 5] MSG Fiestas Patrias
+REM 9 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 4] MSG Día del Encuentro de dos Mundos
+REM 10 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 3] MSG Día del Encuentro de dos Mundos
+REM 11 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 2] MSG Día del Encuentro de dos Mundos
+REM 12 October ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5] MSG Día del Encuentro de dos Mundos
+REM 15 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 5] MSG Día del Encuentro de dos Mundos
+REM 27 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 31)) == 2] MSG Día Nacional de las Iglesias Evangélicas y Protestantes
+REM 31 October ADDOMIT SCANFROM -28 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
+REM 2 November ADDOMIT SCANFROM -28 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
 OMIT 25 December MSG Navidad
 
diff --git a/include/holidays/co.rem b/include/holidays/co.rem
index 7fc1a828..7ce27254 100644
--- a/include/holidays/co.rem
+++ b/include/holidays/co.rem
@@ -4,80 +4,80 @@
 # https://github.com/vacanza/holidays
 
 OMIT 1 January MSG Año Nuevo
-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)
-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)
-REM 23 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 19)) == 4] MSG Día de San José (observado)
-REM 24 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 19)) == 3] MSG Día de San José (observado)
-REM 25 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 19)) == 2] MSG Día de San José (observado)
+REM 6 January ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 6 && $Tw != 0] MSG Día de los Reyes Magos (observado)
+REM 7 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 6)) == 0] MSG Día de los Reyes Magos (observado)
+REM 8 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 6)) == 6] MSG Día de los Reyes Magos (observado)
+REM 9 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 6)) == 5] MSG Día de los Reyes Magos (observado)
+REM 10 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 6)) == 4] MSG Día de los Reyes Magos (observado)
+REM 11 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 6)) == 3] MSG Día de los Reyes Magos (observado)
+REM 12 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 6)) == 2] MSG Día de los Reyes Magos (observado)
+REM 19 March ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 6 && $Tw != 0] MSG Día de San José (observado)
+REM 20 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 19)) == 0] MSG Día de San José (observado)
+REM 21 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 19)) == 6] MSG Día de San José (observado)
+REM 22 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 19)) == 5] MSG Día de San José (observado)
+REM 23 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 19)) == 4] MSG Día de San José (observado)
+REM 24 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 19)) == 3] MSG Día de San José (observado)
+REM 25 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 19)) == 2] MSG Día de San José (observado)
 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)
-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)
-REM 13 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 7)) == 2] MSG Sagrado Corazón (observado)
-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)
-REM 3 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 29)) == 4] MSG San Pedro y San Pablo (observado)
-REM 4 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 29)) == 3] MSG San Pedro y San Pablo (observado)
-REM 5 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 29)) == 2] MSG San Pedro y San Pablo (observado)
+REM 9 May ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 6 && $Tw != 0] MSG Ascensión del señor (observado)
+REM 10 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 9)) == 0] MSG Ascensión del señor (observado)
+REM 11 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 9)) == 6] MSG Ascensión del señor (observado)
+REM 12 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 9)) == 5] MSG Ascensión del señor (observado)
+REM 13 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 9)) == 4] MSG Ascensión del señor (observado)
+REM 14 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 9)) == 3] MSG Ascensión del señor (observado)
+REM 15 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 9)) == 2] MSG Ascensión del señor (observado)
+REM 30 May ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 6 && $Tw != 0] MSG Corpus Christi (observado)
+REM 31 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 30)) == 0] MSG Corpus Christi (observado)
+REM 1 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 30)) == 6] MSG Corpus Christi (observado)
+REM 2 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 30)) == 5] MSG Corpus Christi (observado)
+REM 3 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 30)) == 4] MSG Corpus Christi (observado)
+REM 4 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 30)) == 3] MSG Corpus Christi (observado)
+REM 5 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 30)) == 2] MSG Corpus Christi (observado)
+REM 7 June ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 6 && $Tw != 0] MSG Sagrado Corazón (observado)
+REM 8 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 7)) == 0] MSG Sagrado Corazón (observado)
+REM 9 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 7)) == 6] MSG Sagrado Corazón (observado)
+REM 10 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 7)) == 5] MSG Sagrado Corazón (observado)
+REM 11 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 7)) == 4] MSG Sagrado Corazón (observado)
+REM 12 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 7)) == 3] MSG Sagrado Corazón (observado)
+REM 13 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 7)) == 2] MSG Sagrado Corazón (observado)
+REM 29 June ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 6 && $Tw != 0] MSG San Pedro y San Pablo (observado)
+REM 30 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 29)) == 0] MSG San Pedro y San Pablo (observado)
+REM 1 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 29)) == 6] MSG San Pedro y San Pablo (observado)
+REM 2 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 29)) == 5] MSG San Pedro y San Pablo (observado)
+REM 3 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 29)) == 4] MSG San Pedro y San Pablo (observado)
+REM 4 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 29)) == 3] MSG San Pedro y San Pablo (observado)
+REM 5 July ADDOMIT SCANFROM -28 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á
-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)
-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)
-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)
-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)
-REM 15 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 11)) == 4] MSG Independencia de Cartagena (observado)
-REM 16 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 11)) == 3] MSG Independencia de Cartagena (observado)
-REM 17 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 11)) == 2] MSG Independencia de Cartagena (observado)
+REM 15 August ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 6 && $Tw != 0] MSG La Asunción (observado)
+REM 16 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 15)) == 0] MSG La Asunción (observado)
+REM 17 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 15)) == 6] MSG La Asunción (observado)
+REM 18 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 15)) == 5] MSG La Asunción (observado)
+REM 19 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 15)) == 4] MSG La Asunción (observado)
+REM 20 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 15)) == 3] MSG La Asunción (observado)
+REM 21 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 15)) == 2] MSG La Asunción (observado)
+REM 12 October ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 6 && $Tw != 0] MSG Día de la Raza (observado)
+REM 13 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 0] MSG Día de la Raza (observado)
+REM 14 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 6] MSG Día de la Raza (observado)
+REM 15 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 5] MSG Día de la Raza (observado)
+REM 16 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 4] MSG Día de la Raza (observado)
+REM 17 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 3] MSG Día de la Raza (observado)
+REM 18 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 12)) == 2] MSG Día de la Raza (observado)
+REM 1 November ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 6 && $Tw != 0] MSG Día de Todos los Santos (observado)
+REM 2 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 1)) == 0] MSG Día de Todos los Santos (observado)
+REM 3 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 1)) == 6] MSG Día de Todos los Santos (observado)
+REM 4 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 1)) == 5] MSG Día de Todos los Santos (observado)
+REM 5 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 1)) == 4] MSG Día de Todos los Santos (observado)
+REM 6 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 1)) == 3] MSG Día de Todos los Santos (observado)
+REM 7 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 1)) == 2] MSG Día de Todos los Santos (observado)
+REM 11 November ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 6 && $Tw != 0] MSG Independencia de Cartagena (observado)
+REM 12 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 0] MSG Independencia de Cartagena (observado)
+REM 13 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 6] MSG Independencia de Cartagena (observado)
+REM 14 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 5] MSG Independencia de Cartagena (observado)
+REM 15 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 4] MSG Independencia de Cartagena (observado)
+REM 16 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 3] MSG Independencia de Cartagena (observado)
+REM 17 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 2] MSG Independencia de Cartagena (observado)
 OMIT 8 December MSG La Inmaculada Concepción
 OMIT 25 December MSG Navidad
diff --git a/include/holidays/cr.rem b/include/holidays/cr.rem
index 436b4057..641a9013 100644
--- a/include/holidays/cr.rem
+++ b/include/holidays/cr.rem
@@ -4,30 +4,30 @@
 # https://github.com/vacanza/holidays
 
 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)
-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)
+REM 9 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 11)) == 3] MSG Día de Juan Santamaría (observado)
+REM 10 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 11)) == 2] MSG Día de Juan Santamaría (observado)
+REM 11 April ADDOMIT SCANFROM -28 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)
+REM 12 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 11)) == 0] MSG Día de Juan Santamaría (observado)
 OMIT [easterdate($Uy)-2] MSG Viernes Santo
-REM 13 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 11)) == 6] MSG Día de Juan Santamaría (observado)
-REM 14 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 11)) == 5] MSG Día de Juan Santamaría (observado)
-REM 15 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 11)) == 4] MSG Día de Juan Santamaría (observado)
+REM 13 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 11)) == 6] MSG Día de Juan Santamaría (observado)
+REM 14 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 11)) == 5] MSG Día de Juan Santamaría (observado)
+REM 15 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 11)) == 4] MSG Día de Juan Santamaría (observado)
 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)
-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)
-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)
-REM 19 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 15)) == 4] MSG Día de la Madre (observado)
+REM 23 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 25)) == 3] MSG Anexión del Partido de Nicoya a Costa Rica (observado)
+REM 24 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 25)) == 2] MSG Anexión del Partido de Nicoya a Costa Rica (observado)
+REM 25 July ADDOMIT SCANFROM -28 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 ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 25)) == 0] MSG Anexión del Partido de Nicoya a Costa Rica (observado)
+REM 27 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 25)) == 6] MSG Anexión del Partido de Nicoya a Costa Rica (observado)
+REM 28 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 25)) == 5] MSG Anexión del Partido de Nicoya a Costa Rica (observado)
+REM 29 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 25)) == 4] MSG Anexión del Partido de Nicoya a Costa Rica (observado)
+REM 13 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 15)) == 3] MSG Día de la Madre (observado)
+REM 14 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 15)) == 2] MSG Día de la Madre (observado)
+REM 15 August ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 6 && $Tw != 0] MSG Día de la Madre (observado)
+REM 16 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 15)) == 0] MSG Día de la Madre (observado)
+REM 17 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 15)) == 6] MSG Día de la Madre (observado)
+REM 18 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 15)) == 5] MSG Día de la Madre (observado)
+REM 19 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 15)) == 4] MSG Día de la Madre (observado)
 OMIT 15 September MSG Día de la Independencia
 OMIT 25 December MSG Navidad
 
diff --git a/include/holidays/cu.rem b/include/holidays/cu.rem
index c231c00b..90630316 100644
--- a/include/holidays/cu.rem
+++ b/include/holidays/cu.rem
@@ -7,11 +7,11 @@ OMIT 1 January MSG Triunfo de la Revolución
 OMIT 2 January MSG Día de la Victoria
 OMIT [easterdate($Uy)-2] MSG Viernes Santo
 OMIT 1 May MSG Día Internacional de los Trabajadores
-REM 2 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Día Internacional de los Trabajadores (observado)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Día Internacional de los Trabajadores (observado)
 OMIT 25 July MSG Conmemoración del asalto a Moncada
 OMIT 26 July MSG Día de la Rebeldía Nacional
 OMIT 27 July MSG Conmemoración del asalto a Moncada
 OMIT 10 October MSG Inicio de las Guerras de Independencia
-REM 11 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 10)) == 0] MSG Inicio de las Guerras de Independencia (observado)
+REM 11 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 10)) == 0] MSG Inicio de las Guerras de Independencia (observado)
 OMIT 25 December MSG Día de Navidad
 OMIT 31 December MSG Fiesta de Fin de Año
diff --git a/include/holidays/dm.rem b/include/holidays/dm.rem
index 6754be11..31d3effb 100644
--- a/include/holidays/dm.rem
+++ b/include/holidays/dm.rem
@@ -4,19 +4,19 @@
 # https://github.com/vacanza/holidays
 
 OMIT 1 January MSG New Year's Day
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
 OMIT [easterdate($Uy)-48] MSG Carnival Monday
 OMIT [easterdate($Uy)-47] MSG Carnival Tuesday
 OMIT [easterdate($Uy)-2] MSG Good Friday
 OMIT [easterdate($Uy)+1] MSG Easter Monday
-REM First Monday in May SCANFROM -28 ADDOMIT MSG Labour Day
+REM First Monday in May ADDOMIT SCANFROM -28 MSG Labour Day
 OMIT [easterdate($Uy)+50] MSG Whit Monday
-REM First Monday in August SCANFROM -28 ADDOMIT MSG Emancipation Day
+REM First Monday in August ADDOMIT SCANFROM -28 MSG Emancipation Day
 OMIT 3 November MSG Independence Day
 OMIT 4 November MSG National Day of Community Service
-REM 5 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 3)) == 0] MSG Independence Day (observed)
-REM 5 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 4)) == 0] MSG National Day of Community Service (observed)
+REM 5 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 3)) == 0] MSG Independence Day (observed)
+REM 5 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 4)) == 0] MSG National Day of Community Service (observed)
 OMIT 25 December MSG Christmas Day
 OMIT 26 December MSG Boxing Day
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
diff --git a/include/holidays/do.rem b/include/holidays/do.rem
index b0163d00..bd0af84c 100644
--- a/include/holidays/do.rem
+++ b/include/holidays/do.rem
@@ -4,31 +4,31 @@
 # https://github.com/vacanza/holidays
 
 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
-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
+REM 4 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 6)) == 3] MSG Día de los Santos Reyes
+REM 5 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 6)) == 2] MSG Día de los Santos Reyes
+REM 6 January ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5] MSG Día de los Santos Reyes
+REM 9 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 6)) == 5] MSG Día de los Santos Reyes
+REM 10 January ADDOMIT SCANFROM -28 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
-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
+REM 24 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 26)) == 3] MSG Día de Duarte
+REM 25 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 26)) == 2] MSG Día de Duarte
+REM 26 January ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5] MSG Día de Duarte
+REM 29 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 26)) == 5] MSG Día de Duarte
+REM 30 January ADDOMIT SCANFROM -28 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
-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
+REM 29 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 3] MSG Día del Trabajo
+REM 30 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 2] MSG Día del Trabajo
+REM 1 May ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 0] MSG Día del Trabajo
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Día del Trabajo
+REM 4 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 5] MSG Día del Trabajo
+REM 5 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 4] MSG Día del Trabajo
 OMIT [easterdate($Uy)+60] MSG Corpus Christi
 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
-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
+REM 4 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 6)) == 3] MSG Día de la Constitución
+REM 5 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 6)) == 2] MSG Día de la Constitución
+REM 6 November ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5] MSG Día de la Constitución
+REM 9 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 6)) == 5] MSG Día de la Constitución
+REM 10 November ADDOMIT SCANFROM -28 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/ec.rem b/include/holidays/ec.rem
index 3b526cad..20969a7e 100644
--- a/include/holidays/ec.rem
+++ b/include/holidays/ec.rem
@@ -4,43 +4,43 @@
 # https://github.com/vacanza/holidays
 
 OMIT 1 January MSG Año Nuevo
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG Año Nuevo (observado)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG Año Nuevo (observado)
 OMIT [easterdate($Uy)-48] MSG Carnaval
 OMIT [easterdate($Uy)-47] MSG Carnaval
 OMIT [easterdate($Uy)-2] MSG Viernes Santo
-REM 30 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 2] MSG Día del Trabajo (observado)
-REM 30 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 6] MSG Día del Trabajo (observado)
+REM 30 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 2] MSG Día del Trabajo (observado)
+REM 30 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 6] MSG Día del Trabajo (observado)
 OMIT 1 May MSG Día del Trabajo
-REM 2 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Día del Trabajo (observado)
-REM 2 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 4] MSG Día del Trabajo (observado)
-REM 3 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 3] MSG Día del Trabajo (observado)
-REM 23 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 24)) == 2] MSG Batalla de Pichincha (observado)
-REM 23 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 24)) == 6] MSG Batalla de Pichincha (observado)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Día del Trabajo (observado)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 4] MSG Día del Trabajo (observado)
+REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 3] MSG Día del Trabajo (observado)
+REM 23 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 24)) == 2] MSG Batalla de Pichincha (observado)
+REM 23 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 24)) == 6] MSG Batalla de Pichincha (observado)
 OMIT 24 May MSG Batalla de Pichincha
-REM 25 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 24)) == 0] MSG Batalla de Pichincha (observado)
-REM 25 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 24)) == 4] MSG Batalla de Pichincha (observado)
-REM 26 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 24)) == 3] MSG Batalla de Pichincha (observado)
-REM 9 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 10)) == 2] MSG Primer Grito de Independencia (observado)
-REM 9 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 10)) == 6] MSG Primer Grito de Independencia (observado)
+REM 25 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 24)) == 0] MSG Batalla de Pichincha (observado)
+REM 25 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 24)) == 4] MSG Batalla de Pichincha (observado)
+REM 26 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 24)) == 3] MSG Batalla de Pichincha (observado)
+REM 9 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 10)) == 2] MSG Primer Grito de Independencia (observado)
+REM 9 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 10)) == 6] MSG Primer Grito de Independencia (observado)
 OMIT 10 August MSG Primer Grito de Independencia
-REM 11 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 10)) == 0] MSG Primer Grito de Independencia (observado)
-REM 11 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 10)) == 4] MSG Primer Grito de Independencia (observado)
-REM 12 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 10)) == 3] MSG Primer Grito de Independencia (observado)
-REM 8 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 9)) == 2] MSG Independencia de Guayaquil (observado)
-REM 8 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 9)) == 6] MSG Independencia de Guayaquil (observado)
+REM 11 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 10)) == 0] MSG Primer Grito de Independencia (observado)
+REM 11 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 10)) == 4] MSG Primer Grito de Independencia (observado)
+REM 12 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 10)) == 3] MSG Primer Grito de Independencia (observado)
+REM 8 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 9)) == 2] MSG Independencia de Guayaquil (observado)
+REM 8 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 9)) == 6] MSG Independencia de Guayaquil (observado)
 OMIT 9 October MSG Independencia de Guayaquil
-REM 10 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 9)) == 0] MSG Independencia de Guayaquil (observado)
-REM 10 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 9)) == 4] MSG Independencia de Guayaquil (observado)
-REM 11 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 9)) == 3] MSG Independencia de Guayaquil (observado)
-REM 1 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 2)) == 2] MSG Día de los Difuntos (observado)
-REM 1 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 2)) == 6] MSG Día de los Difuntos (observado)
+REM 10 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 9)) == 0] MSG Independencia de Guayaquil (observado)
+REM 10 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 9)) == 4] MSG Independencia de Guayaquil (observado)
+REM 11 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 9)) == 3] MSG Independencia de Guayaquil (observado)
+REM 1 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 2)) == 2] MSG Día de los Difuntos (observado)
+REM 1 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 2)) == 6] MSG Día de los Difuntos (observado)
 OMIT 2 November MSG Día de los Difuntos
 OMIT 3 November MSG Independencia de Cuenca
-REM 4 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 2)) == 3] MSG Día de los Difuntos (observado)
-REM 4 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 3)) == 0] MSG Independencia de Cuenca (observado)
-REM 4 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 3)) == 4] MSG Independencia de Cuenca (observado)
-REM 5 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 3)) == 3] MSG Independencia de Cuenca (observado)
-REM 24 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Día de Navidad (observado)
+REM 4 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 2)) == 3] MSG Día de los Difuntos (observado)
+REM 4 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 3)) == 0] MSG Independencia de Cuenca (observado)
+REM 4 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 3)) == 4] MSG Independencia de Cuenca (observado)
+REM 5 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 3)) == 3] MSG Independencia de Cuenca (observado)
+REM 24 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Día de Navidad (observado)
 OMIT 25 December MSG Día de Navidad
-REM 26 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Día de Navidad (observado)
-REM 31 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG Año Nuevo (observado)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Día de Navidad (observado)
+REM 31 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG Año Nuevo (observado)
diff --git a/include/holidays/es/an.rem b/include/holidays/es/an.rem
index 1bf1dbf6..26f1beed 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
 
-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
+REM 28 February ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Lunes siguiente a Día de Andalucia
+REM 29 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 28)) == 0] MSG Lunes siguiente a Día de Andalucia
 OMIT [easterdate($Uy)-3] MSG Jueves Santo
-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
+REM 8 December ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Lunes siguiente a Inmaculada Concepción
+REM 9 December ADDOMIT SCANFROM -28 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 3ed88888..4cdc363e 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
-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
-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
+REM 23 April ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Lunes siguiente a Día de San Jorge
+REM 24 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 23)) == 0] MSG Lunes siguiente a Día de San Jorge
+REM 8 December ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Lunes siguiente a Inmaculada Concepción
+REM 9 December ADDOMIT SCANFROM -28 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 6ce7d54c..e34255e1 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
-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
-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
+REM 8 September ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Lunes siguiente a Día de Asturias
+REM 9 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 8)) == 0] MSG Lunes siguiente a Día de Asturias
+REM 8 December ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Lunes siguiente a Inmaculada Concepción
+REM 9 December ADDOMIT SCANFROM -28 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 b64a8117..10ed3757 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
-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
-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
+REM 23 April ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Lunes siguiente a Fiesta de Castilla y León
+REM 24 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 23)) == 0] MSG Lunes siguiente a Fiesta de Castilla y León
+REM 8 December ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Lunes siguiente a Inmaculada Concepción
+REM 9 December ADDOMIT SCANFROM -28 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 5a20d2c1..f66747a0 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
-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
+REM 30 May ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Lunes siguiente a Día de Canarias
+REM 31 May ADDOMIT SCANFROM -28 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 546b5a05..a1a53a3e 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
-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
+REM 8 December ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Lunes siguiente a Inmaculada Concepción
+REM 9 December ADDOMIT SCANFROM -28 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 969b6e4b..86922ace 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
 
-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é
+REM 19 March ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Lunes siguiente a San José
+REM 20 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 19)) == 0] MSG Lunes siguiente a San José
 OMIT [easterdate($Uy)-3] MSG Jueves Santo
-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
+REM 8 December ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Lunes siguiente a Inmaculada Concepción
+REM 9 December ADDOMIT SCANFROM -28 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 12ad3f0a..b178ea85 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
-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
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Lunes siguiente a Fiesta de la Comunidad de Madrid
+REM 3 May ADDOMIT SCANFROM -28 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 6ab49c7c..8b44a39e 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
-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
+REM 8 December ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Lunes siguiente a Inmaculada Concepción
+REM 9 December ADDOMIT SCANFROM -28 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 bf225813..7be6677b 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
-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
+REM 9 June ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Lunes siguiente a Día de La Rioja
+REM 10 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 9)) == 0] MSG Lunes siguiente a Día de La Rioja
diff --git a/include/holidays/gb.rem b/include/holidays/gb.rem
index ff95f5f2..4b8511ea 100644
--- a/include/holidays/gb.rem
+++ b/include/holidays/gb.rem
@@ -11,14 +11,14 @@
 # [$SysInclude]/gb/
 
 OMIT 1 January MSG New Year's Day
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
 OMIT [easterdate($Uy)-2] MSG Good Friday
-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 Monday in May ADDOMIT SCANFROM -28 MSG May Day
+REM Last Monday in May ADDOMIT SCANFROM -28 MSG Spring Bank Holiday
 OMIT 25 December MSG Christmas Day
 OMIT 26 December MSG Boxing Day
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
diff --git a/include/holidays/gb/eng.rem b/include/holidays/gb/eng.rem
index 09b9f25b..35704d6e 100644
--- a/include/holidays/gb/eng.rem
+++ b/include/holidays/gb/eng.rem
@@ -10,4 +10,4 @@
 # also include [$SysInclude]/gb.rem
 
 OMIT [easterdate($Uy)+1] MSG Easter Monday
-REM Last Monday in August SCANFROM -28 ADDOMIT MSG Late Summer Bank Holiday
+REM Last Monday in August ADDOMIT SCANFROM -28 MSG Late Summer Bank Holiday
diff --git a/include/holidays/gb/nir.rem b/include/holidays/gb/nir.rem
index ceb1fba6..0663ce51 100644
--- a/include/holidays/gb/nir.rem
+++ b/include/holidays/gb/nir.rem
@@ -10,10 +10,10 @@
 # also include [$SysInclude]/gb.rem
 
 OMIT 17 March MSG Saint Patrick's Day
-REM 18 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 17)) == 0] MSG Saint Patrick's Day (observed)
-REM 19 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 17)) == 6] MSG Saint Patrick's Day (observed)
+REM 18 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 17)) == 0] MSG Saint Patrick's Day (observed)
+REM 19 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 17)) == 6] MSG Saint Patrick's Day (observed)
 OMIT [easterdate($Uy)+1] MSG Easter Monday
 OMIT 12 July MSG Battle of the Boyne
-REM 13 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 12)) == 0] MSG Battle of the Boyne (observed)
-REM 14 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 12)) == 6] MSG Battle of the Boyne (observed)
-REM Last Monday in August SCANFROM -28 ADDOMIT MSG Late Summer Bank Holiday
+REM 13 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 12)) == 0] MSG Battle of the Boyne (observed)
+REM 14 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 12)) == 6] MSG Battle of the Boyne (observed)
+REM Last Monday in August ADDOMIT SCANFROM -28 MSG Late Summer Bank Holiday
diff --git a/include/holidays/gb/sct.rem b/include/holidays/gb/sct.rem
index 6acb4a18..a578b3ff 100644
--- a/include/holidays/gb/sct.rem
+++ b/include/holidays/gb/sct.rem
@@ -10,10 +10,10 @@
 # also include [$SysInclude]/gb.rem
 
 OMIT 2 January MSG New Year Holiday
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 2)) == 1] MSG New Year Holiday (observed)
-REM 4 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 2)) == 0] MSG New Year Holiday (observed)
-REM 4 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 2)) == 6] MSG New Year Holiday (observed)
-REM First Monday in August SCANFROM -28 ADDOMIT MSG Summer Bank Holiday
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 2)) == 1] MSG New Year Holiday (observed)
+REM 4 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 2)) == 0] MSG New Year Holiday (observed)
+REM 4 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 2)) == 6] MSG New Year Holiday (observed)
+REM First Monday in August ADDOMIT SCANFROM -28 MSG Summer Bank Holiday
 OMIT 30 November MSG Saint Andrew's Day
-REM 1 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 30)) == 0] MSG Saint Andrew's Day (observed)
-REM 2 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 30)) == 6] MSG Saint Andrew's Day (observed)
+REM 1 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 30)) == 0] MSG Saint Andrew's Day (observed)
+REM 2 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 30)) == 6] MSG Saint Andrew's Day (observed)
diff --git a/include/holidays/gb/wls.rem b/include/holidays/gb/wls.rem
index de3d4540..b59a4254 100644
--- a/include/holidays/gb/wls.rem
+++ b/include/holidays/gb/wls.rem
@@ -10,4 +10,4 @@
 # also include [$SysInclude]/gb.rem
 
 OMIT [easterdate($Uy)+1] MSG Easter Monday
-REM Last Monday in August SCANFROM -28 ADDOMIT MSG Late Summer Bank Holiday
+REM Last Monday in August ADDOMIT SCANFROM -28 MSG Late Summer Bank Holiday
diff --git a/include/holidays/gh.rem b/include/holidays/gh.rem
index 4006dd7c..35a84ffe 100644
--- a/include/holidays/gh.rem
+++ b/include/holidays/gh.rem
@@ -4,29 +4,29 @@
 # https://github.com/vacanza/holidays
 
 OMIT 1 January MSG New Year's Day
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
 OMIT 7 January MSG Constitution Day
-REM 8 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 7)) == 0] MSG Constitution Day (observed)
-REM 9 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 7)) == 6] MSG Constitution Day (observed)
+REM 8 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 7)) == 0] MSG Constitution Day (observed)
+REM 9 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 7)) == 6] MSG Constitution Day (observed)
 OMIT 6 March MSG Independence Day
-REM 7 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 6)) == 0] MSG Independence Day (observed)
-REM 8 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 6)) == 6] MSG Independence Day (observed)
+REM 7 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 6)) == 0] MSG Independence Day (observed)
+REM 8 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 6)) == 6] MSG Independence Day (observed)
 OMIT [easterdate($Uy)-2] MSG Good Friday
 OMIT [easterdate($Uy)+1] MSG Easter Monday
 OMIT 1 May MSG May Day
-REM 2 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG May Day (observed)
-REM 3 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 6] MSG May Day (observed)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG May Day (observed)
+REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 6] MSG May Day (observed)
 OMIT 4 August MSG Founders' Day
-REM 5 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 4)) == 0] MSG Founders' Day (observed)
-REM 6 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 4)) == 6] MSG Founders' Day (observed)
+REM 5 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 4)) == 0] MSG Founders' Day (observed)
+REM 6 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 4)) == 6] MSG Founders' Day (observed)
 OMIT 21 September MSG Kwame Nkrumah Memorial Day
-REM 22 September SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 9, 21)) == 0] MSG Kwame Nkrumah Memorial Day (observed)
-REM 23 September SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 9, 21)) == 6] MSG Kwame Nkrumah Memorial Day (observed)
-REM First Friday in December SCANFROM -28 ADDOMIT MSG Farmer's Day
+REM 22 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 21)) == 0] MSG Kwame Nkrumah Memorial Day (observed)
+REM 23 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 21)) == 6] MSG Kwame Nkrumah Memorial Day (observed)
+REM First Friday in December ADDOMIT SCANFROM -28 MSG Farmer's Day
 OMIT 25 December MSG Christmas Day
 OMIT 26 December MSG Boxing Day
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
diff --git a/include/holidays/gt.rem b/include/holidays/gt.rem
index 0f1b6b3a..6a546b07 100644
--- a/include/holidays/gt.rem
+++ b/include/holidays/gt.rem
@@ -8,13 +8,13 @@ OMIT [easterdate($Uy)-3] MSG Jueves Santo
 OMIT [easterdate($Uy)-2] MSG Viernes Santo
 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
-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
-REM 4 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 30)) == 4] MSG Día del Ejército
+REM 28 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 30)) == 3] MSG Día del Ejército
+REM 29 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 30)) == 2] MSG Día del Ejército
+REM 30 June ADDOMIT SCANFROM -28 SATISFY [$Tw != 2 && $Tw != 3 && $Tw != 4 && $Tw != 5 && $Tw != 6 && $Tw != 0] MSG Día del Ejército
+REM 1 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 30)) == 0] MSG Día del Ejército
+REM 2 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 30)) == 6] MSG Día del Ejército
+REM 3 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 30)) == 5] MSG Día del Ejército
+REM 4 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 30)) == 4] MSG Día del Ejército
 OMIT 15 August MSG Día de la Asunción
 OMIT 15 September MSG Día de la Independencia
 OMIT 20 October MSG Día de la Revolución
diff --git a/include/holidays/gu.rem b/include/holidays/gu.rem
index 372f7a76..d6c71ead 100644
--- a/include/holidays/gu.rem
+++ b/include/holidays/gu.rem
@@ -4,30 +4,30 @@
 # https://github.com/vacanza/holidays
 
 OMIT 1 January MSG New Year's Day
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM Third Monday in January SCANFROM -28 ADDOMIT MSG Martin Luther King Jr. Day
-REM Third Monday in February SCANFROM -28 ADDOMIT MSG Washington's Birthday
-REM First Monday in March SCANFROM -28 ADDOMIT MSG Guam Discovery Day
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM Third Monday in January ADDOMIT SCANFROM -28 MSG Martin Luther King Jr. Day
+REM Third Monday in February ADDOMIT SCANFROM -28 MSG Washington's Birthday
+REM First Monday in March ADDOMIT SCANFROM -28 MSG Guam Discovery Day
 OMIT [easterdate($Uy)-2] MSG Good Friday
-REM Last Monday in May SCANFROM -28 ADDOMIT MSG Memorial Day
-REM 18 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 19)) == 6] MSG Juneteenth National Independence Day (observed)
+REM Last Monday in May ADDOMIT SCANFROM -28 MSG Memorial Day
+REM 18 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 19)) == 6] MSG Juneteenth National Independence Day (observed)
 OMIT 19 June MSG Juneteenth National Independence Day
-REM 20 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 19)) == 0] MSG Juneteenth National Independence Day (observed)
-REM 3 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 4)) == 6] MSG Independence Day (observed)
+REM 20 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 19)) == 0] MSG Juneteenth National Independence Day (observed)
+REM 3 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 4)) == 6] MSG Independence Day (observed)
 OMIT 4 July MSG Independence Day
-REM 5 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 4)) == 0] MSG Independence Day (observed)
+REM 5 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 4)) == 0] MSG Independence Day (observed)
 OMIT 21 July MSG Liberation Day (Guam)
-REM First Monday in September SCANFROM -28 ADDOMIT MSG Labor Day
+REM First Monday in September ADDOMIT SCANFROM -28 MSG Labor Day
 OMIT 2 November MSG All Souls' Day
-REM 10 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 11)) == 6] MSG Veterans Day (observed)
+REM 10 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 6] MSG Veterans Day (observed)
 OMIT 11 November MSG Veterans Day
-REM 12 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 11)) == 0] MSG Veterans Day (observed)
-REM Fourth Thursday in November SCANFROM -28 ADDOMIT MSG Thanksgiving
+REM 12 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 0] MSG Veterans Day (observed)
+REM Fourth Thursday in November ADDOMIT SCANFROM -28 MSG Thanksgiving
 OMIT 8 December MSG Lady of Camarin Day
-REM 24 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
+REM 24 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
 OMIT 25 December MSG Christmas Day
-REM 26 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 31 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 31 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
 
 # Optional holidays
 REM 14 February MSG Valentine's Day
diff --git a/include/holidays/hn.rem b/include/holidays/hn.rem
index 3a9b20a9..000028a1 100644
--- a/include/holidays/hn.rem
+++ b/include/holidays/hn.rem
@@ -10,7 +10,7 @@ OMIT 14 April MSG Día de las Américas
 OMIT [easterdate($Uy)-1] MSG Sábado de Gloria
 OMIT 1 May MSG Día del Trabajo
 OMIT 15 September MSG Día de la Independencia
-REM First Wednesday in October SCANFROM -28 ADDOMIT MSG Semana Morazánica
+REM First Wednesday in October ADDOMIT SCANFROM -28 MSG Semana Morazánica
 REM Thursday 2 October ADDOMIT SCANFROM -28 MSG Semana Morazánica
 REM Friday 3 October ADDOMIT SCANFROM -28 MSG Semana Morazánica
 OMIT 25 December MSG Navidad
diff --git a/include/holidays/im.rem b/include/holidays/im.rem
index 6483c299..83c98111 100644
--- a/include/holidays/im.rem
+++ b/include/holidays/im.rem
@@ -4,20 +4,20 @@
 # https://github.com/vacanza/holidays
 
 OMIT 1 January MSG New Year's Day
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
 OMIT [easterdate($Uy)-2] MSG Good Friday
 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
-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
+REM First Monday in May ADDOMIT SCANFROM -28 MSG May Day
+REM Last Monday in May ADDOMIT SCANFROM -28 MSG Spring Bank Holiday
+REM First Friday in June ADDOMIT SCANFROM -28 MSG TT Bank Holiday
+REM 5 July ADDOMIT SCANFROM -28 SATISFY [$Tw != 6 && $Tw != 0] MSG Tynwald Day
+REM 6 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 5)) == 0] MSG Tynwald Day
+REM 7 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 5)) == 6] MSG Tynwald Day
+REM Last Monday in August ADDOMIT SCANFROM -28 MSG Late Summer Bank Holiday
 OMIT 25 December MSG Christmas Day
 OMIT 26 December MSG Boxing Day
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
diff --git a/include/holidays/is.rem b/include/holidays/is.rem
index b51fc04a..088a1468 100644
--- a/include/holidays/is.rem
+++ b/include/holidays/is.rem
@@ -14,7 +14,7 @@ OMIT [easterdate($Uy)+39] MSG Uppstigningardagur
 OMIT [easterdate($Uy)+49] MSG Hvítasunnudagur
 OMIT [easterdate($Uy)+50] MSG Annar í hvítasunnu
 OMIT 17 June MSG Þjóðhátíðardagurinn
-REM First Monday in August SCANFROM -28 ADDOMIT MSG Frídagur verslunarmanna
+REM First Monday in August ADDOMIT SCANFROM -28 MSG Frídagur verslunarmanna
 OMIT 24 December MSG Aðfangadagur
 OMIT 25 December MSG Jóladagur
 OMIT 26 December MSG Annar í jólum
diff --git a/include/holidays/it/andria.rem b/include/holidays/it/andria.rem
index 46863511..eaca767e 100644
--- a/include/holidays/it/andria.rem
+++ b/include/holidays/it/andria.rem
@@ -9,4 +9,4 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/it.rem
 
-REM Third Sunday in September SCANFROM -28 ADDOMIT MSG San Riccardo di Andria
+REM Third Sunday in September ADDOMIT SCANFROM -28 MSG San Riccardo di Andria
diff --git a/include/holidays/it/at.rem b/include/holidays/it/at.rem
index 9ed5c4c7..088c77b5 100644
--- a/include/holidays/it/at.rem
+++ b/include/holidays/it/at.rem
@@ -9,4 +9,4 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/it.rem
 
-REM First Tuesday in May SCANFROM -28 ADDOMIT MSG San Secondo di Asti
+REM First Tuesday in May ADDOMIT SCANFROM -28 MSG San Secondo di Asti
diff --git a/include/holidays/it/br.rem b/include/holidays/it/br.rem
index 6095e1f5..956fdf07 100644
--- a/include/holidays/it/br.rem
+++ b/include/holidays/it/br.rem
@@ -9,4 +9,4 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/it.rem
 
-REM First Sunday in September SCANFROM -28 ADDOMIT MSG San Lorenzo da Brindisi
+REM First Sunday in September ADDOMIT SCANFROM -28 MSG San Lorenzo da Brindisi
diff --git a/include/holidays/it/bt.rem b/include/holidays/it/bt.rem
index 3d883626..c718aa26 100644
--- a/include/holidays/it/bt.rem
+++ b/include/holidays/it/bt.rem
@@ -10,5 +10,5 @@
 # also include [$SysInclude]/it.rem
 
 OMIT 3 May MSG San Nicola Pellegrino
-REM Third Sunday in September SCANFROM -28 ADDOMIT MSG San Riccardo di Andria
+REM Third Sunday in September ADDOMIT SCANFROM -28 MSG San Riccardo di Andria
 OMIT 30 December MSG San Ruggero
diff --git a/include/holidays/je.rem b/include/holidays/je.rem
index 64b90207..d99d9715 100644
--- a/include/holidays/je.rem
+++ b/include/holidays/je.rem
@@ -7,10 +7,10 @@ OMIT 1 January MSG New Year's Day
 REM 1 January OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1))==0 || wkdaynum(date($Ty, 1, 1))==6] MSG New Year's Day (substitute day)
 OMIT [easterdate($Uy)-2] MSG Good Friday
 OMIT [easterdate($Uy)+1] MSG Easter Monday
-REM First Monday in May SCANFROM -28 ADDOMIT MSG May Bank Holiday
-REM 9 May SCANFROM -28 ADDOMIT SATISFY [$Tw != 0] MSG Liberation Day
-REM Last Monday in May SCANFROM -28 ADDOMIT MSG Spring Bank Holiday
-REM Last Monday in August SCANFROM -28 ADDOMIT MSG Summer Bank Holiday
+REM First Monday in May ADDOMIT SCANFROM -28 MSG May Bank Holiday
+REM 9 May ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG Liberation Day
+REM Last Monday in May ADDOMIT SCANFROM -28 MSG Spring Bank Holiday
+REM Last Monday in August ADDOMIT SCANFROM -28 MSG Summer Bank Holiday
 OMIT 25 December MSG Christmas Day
 REM 25 December OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25))==0 || wkdaynum(date($Ty, 12, 25))==6] MSG Christmas Day (substitute day)
 OMIT 26 December MSG Boxing Day
diff --git a/include/holidays/jm.rem b/include/holidays/jm.rem
index 0bc335ae..6d3171d5 100644
--- a/include/holidays/jm.rem
+++ b/include/holidays/jm.rem
@@ -4,19 +4,19 @@
 # https://github.com/vacanza/holidays
 
 OMIT 1 January MSG New Year's Day
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
 OMIT [easterdate($Uy)-46] MSG Ash Wednesday
 OMIT [easterdate($Uy)-2] MSG Good Friday
 OMIT [easterdate($Uy)+1] MSG Easter Monday
 OMIT 23 May MSG National Labour Day
-REM 24 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 23)) == 0] MSG National Labour Day (observed)
-REM 25 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 23)) == 6] MSG National Labour Day (observed)
+REM 24 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 23)) == 0] MSG National Labour Day (observed)
+REM 25 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 23)) == 6] MSG National Labour Day (observed)
 OMIT 1 August MSG Emancipation Day
-REM 2 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 1)) == 0] MSG Emancipation Day (observed)
+REM 2 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 1)) == 0] MSG Emancipation Day (observed)
 OMIT 6 August MSG Independence Day
-REM 7 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 6)) == 0] MSG Independence Day (observed)
-REM Third Monday in October SCANFROM -28 ADDOMIT MSG National Heroes Day
+REM 7 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 6)) == 0] MSG Independence Day (observed)
+REM Third Monday in October ADDOMIT SCANFROM -28 MSG National Heroes Day
 OMIT 25 December MSG Christmas Day
 OMIT 26 December MSG Boxing Day
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
diff --git a/include/holidays/ke.rem b/include/holidays/ke.rem
index dea3d0c3..fe5a315b 100644
--- a/include/holidays/ke.rem
+++ b/include/holidays/ke.rem
@@ -4,20 +4,20 @@
 # https://github.com/vacanza/holidays
 
 OMIT 1 January MSG New Year's Day
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
 OMIT [easterdate($Uy)-2] MSG Good Friday
 OMIT [easterdate($Uy)+1] MSG Easter Monday
 OMIT 1 May MSG Labour Day
-REM 2 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Labour Day (observed)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Labour Day (observed)
 OMIT 1 June MSG Madaraka Day
-REM 2 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 1)) == 0] MSG Madaraka Day (observed)
+REM 2 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 1)) == 0] MSG Madaraka Day (observed)
 OMIT 10 October MSG Utamaduni Day
-REM 11 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 10)) == 0] MSG Utamaduni Day (observed)
+REM 11 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 10)) == 0] MSG Utamaduni Day (observed)
 OMIT 20 October MSG Mashujaa Day
-REM 21 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 20)) == 0] MSG Mashujaa Day (observed)
+REM 21 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 20)) == 0] MSG Mashujaa Day (observed)
 OMIT 12 December MSG Jamhuri Day
-REM 13 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 12)) == 0] MSG Jamhuri Day (observed)
+REM 13 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 12)) == 0] MSG Jamhuri Day (observed)
 OMIT 25 December MSG Christmas Day
 OMIT 26 December MSG Boxing Day
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
diff --git a/include/holidays/kn.rem b/include/holidays/kn.rem
index c974af35..1a7b79b3 100644
--- a/include/holidays/kn.rem
+++ b/include/holidays/kn.rem
@@ -5,22 +5,22 @@
 
 OMIT 1 January MSG Carnival Day
 OMIT 2 January MSG Carnival Day - Last Lap
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG Carnival Day (observed)
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 2)) == 0] MSG Carnival Day - Last Lap (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG Carnival Day (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 2)) == 0] MSG Carnival Day - Last Lap (observed)
 OMIT [easterdate($Uy)-2] MSG Good Friday
 OMIT [easterdate($Uy)+1] MSG Easter Monday
-REM First Monday in May SCANFROM -28 ADDOMIT MSG Labour Day
+REM First Monday in May ADDOMIT SCANFROM -28 MSG Labour Day
 OMIT [easterdate($Uy)+50] MSG Whit Monday
-REM First Monday in August SCANFROM -28 ADDOMIT MSG Emancipation Day
+REM First Monday in August ADDOMIT SCANFROM -28 MSG Emancipation Day
 REM Tuesday 2 August ADDOMIT SCANFROM -28 MSG Culturama Day - Last Lap
 OMIT 16 September MSG National Heroes Day
-REM 17 September SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 9, 16)) == 0] MSG National Heroes Day (observed)
+REM 17 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 16)) == 0] MSG National Heroes Day (observed)
 OMIT 19 September MSG Independence Day
-REM 20 September SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 9, 19)) == 0] MSG Independence Day (observed)
+REM 20 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 19)) == 0] MSG Independence Day (observed)
 OMIT 25 December MSG Christmas Day
 OMIT 26 December MSG Boxing Day
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
 
 # Optional holidays
 REM 25 August MSG Kim Collins Day
diff --git a/include/holidays/kr.rem b/include/holidays/kr.rem
index b8ba0387..de0184a9 100644
--- a/include/holidays/kr.rem
+++ b/include/holidays/kr.rem
@@ -5,7 +5,7 @@
 
 OMIT 1 January MSG 신정연휴
 OMIT 1 March MSG 삼일절
-REM Second Wednesday in April SCANFROM -28 ADDOMIT MSG 국회의원 선거일
+REM Second Wednesday in April ADDOMIT SCANFROM -28 MSG 국회의원 선거일
 OMIT 5 May MSG 어린이날
 OMIT 6 June MSG 현충일
 OMIT 15 August MSG 광복절
diff --git a/include/holidays/lt.rem b/include/holidays/lt.rem
index febed55b..f87dc857 100644
--- a/include/holidays/lt.rem
+++ b/include/holidays/lt.rem
@@ -9,8 +9,8 @@ OMIT 11 March MSG Lietuvos nepriklausomybės atkūrimo diena
 OMIT [easterdate($Uy)] MSG Šv. Velykos
 OMIT [easterdate($Uy)+1] MSG Antroji šv. Velykų diena
 OMIT 1 May MSG Tarptautinė darbo diena
-REM First Sunday in May SCANFROM -28 ADDOMIT MSG Motinos diena
-REM First Sunday in June SCANFROM -28 ADDOMIT MSG Tėvo diena
+REM First Sunday in May ADDOMIT SCANFROM -28 MSG Motinos diena
+REM First Sunday in June ADDOMIT SCANFROM -28 MSG Tėvo diena
 OMIT 24 June MSG Rasos ir Joninių diena
 OMIT 6 July MSG Valstybės (Lietuvos karaliaus Mindaugo karūnavimo) ir Tautiškos giesmės diena
 OMIT 15 August MSG Žolinė (Švč. Mergelės Marijos ėmimo į dangų diena)
diff --git a/include/holidays/lv.rem b/include/holidays/lv.rem
index cc3610f0..0667823b 100644
--- a/include/holidays/lv.rem
+++ b/include/holidays/lv.rem
@@ -9,14 +9,14 @@ OMIT [easterdate($Uy)] MSG Lieldienas
 OMIT [easterdate($Uy)+1] MSG Otrās Lieldienas
 OMIT 1 May MSG Darba svētki
 OMIT 4 May MSG Latvijas Republikas Neatkarības atjaunošanas diena
-REM 5 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 4)) == 0] MSG Latvijas Republikas Neatkarības atjaunošanas diena (brīvdiena)
-REM 6 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 4)) == 6] MSG Latvijas Republikas Neatkarības atjaunošanas diena (brīvdiena)
-REM Second Sunday in May SCANFROM -28 ADDOMIT MSG Mātes diena
+REM 5 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 4)) == 0] MSG Latvijas Republikas Neatkarības atjaunošanas diena (brīvdiena)
+REM 6 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 4)) == 6] MSG Latvijas Republikas Neatkarības atjaunošanas diena (brīvdiena)
+REM Second Sunday in May ADDOMIT SCANFROM -28 MSG Mātes diena
 OMIT 23 June MSG Līgo diena
 OMIT 24 June MSG Jāņu diena
 OMIT 18 November MSG Latvijas Republikas proklamēšanas diena
-REM 19 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 18)) == 0] MSG Latvijas Republikas proklamēšanas diena (brīvdiena)
-REM 20 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 18)) == 6] MSG Latvijas Republikas proklamēšanas diena (brīvdiena)
+REM 19 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 18)) == 0] MSG Latvijas Republikas proklamēšanas diena (brīvdiena)
+REM 20 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 18)) == 6] MSG Latvijas Republikas proklamēšanas diena (brīvdiena)
 OMIT 24 December MSG Ziemassvētku vakars
 OMIT 25 December MSG Ziemassvētki
 OMIT 26 December MSG Otrie Ziemassvētki
diff --git a/include/holidays/mc.rem b/include/holidays/mc.rem
index e72b0668..b4bc6362 100644
--- a/include/holidays/mc.rem
+++ b/include/holidays/mc.rem
@@ -4,21 +4,21 @@
 # https://github.com/vacanza/holidays
 
 OMIT 1 January MSG Le jour de l'An
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG Le jour de l'An (observé)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG Le jour de l'An (observé)
 OMIT 27 January MSG La Sainte Dévote
 OMIT [easterdate($Uy)+1] MSG Le lundi de Pâques
 OMIT 1 May MSG Fête de la Travaille
-REM 2 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Fête de la Travaille (observé)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Fête de la Travaille (observé)
 OMIT [easterdate($Uy)+39] MSG L'Ascension
 OMIT [easterdate($Uy)+50] MSG Le lundi de Pentecôte
 OMIT [easterdate($Uy)+60] MSG La Fête Dieu
 OMIT 15 August MSG L'Assomption de Marie
-REM 16 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 15)) == 0] MSG L'Assomption de Marie (observé)
+REM 16 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 15)) == 0] MSG L'Assomption de Marie (observé)
 OMIT 1 November MSG La Toussaint
-REM 2 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 1)) == 0] MSG La Toussaint (observé)
+REM 2 November ADDOMIT SCANFROM -28 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é)
-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
+REM 20 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 19)) == 0] MSG La Fête du Prince (observé)
+REM 8 December ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG L'Immaculée Conception
+REM 9 December ADDOMIT SCANFROM -28 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é)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Noël (observé)
diff --git a/include/holidays/me.rem b/include/holidays/me.rem
index 0934c46a..ab992136 100644
--- a/include/holidays/me.rem
+++ b/include/holidays/me.rem
@@ -5,22 +5,22 @@
 
 OMIT 1 January MSG New Year's Day
 OMIT 2 January MSG New Year's Day
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 2)) == 0] MSG New Year's Day (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 2)) == 0] MSG New Year's Day (observed)
 OMIT [easterdate($Uy)-2] MSG Orthodox Good Friday
 OMIT [easterdate($Uy)] MSG Orthodox Easter Sunday
 OMIT [easterdate($Uy)+1] MSG Orthodox Easter Monday
 OMIT 1 May MSG Labour Day
 OMIT 2 May MSG Labour Day
-REM 3 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Labour Day (observed)
-REM 3 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 2)) == 0] MSG Labour Day (observed)
+REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Labour Day (observed)
+REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 2)) == 0] MSG Labour Day (observed)
 OMIT 21 May MSG Independence Day
 OMIT 22 May MSG Independence Day
-REM 23 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 21)) == 0] MSG Independence Day (observed)
-REM 23 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 22)) == 0] MSG Independence Day (observed)
+REM 23 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 21)) == 0] MSG Independence Day (observed)
+REM 23 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 22)) == 0] MSG Independence Day (observed)
 OMIT 13 July MSG Statehood Day
 OMIT 14 July MSG Statehood Day
-REM 15 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 13)) == 0] MSG Statehood Day (observed)
-REM 15 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 14)) == 0] MSG Statehood Day (observed)
+REM 15 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 13)) == 0] MSG Statehood Day (observed)
+REM 15 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 14)) == 0] MSG Statehood Day (observed)
 OMIT 24 December MSG Orthodox Christmas Eve
 OMIT 25 December MSG Orthodox Christmas
diff --git a/include/holidays/mg.rem b/include/holidays/mg.rem
index 2ada9aad..0be17063 100644
--- a/include/holidays/mg.rem
+++ b/include/holidays/mg.rem
@@ -12,7 +12,7 @@ OMIT 1 May MSG Fetin'ny asa
 OMIT [easterdate($Uy)+39] MSG Fiakaran'ny Jesosy kristy tany an-danitra
 OMIT [easterdate($Uy)+49] MSG Pentekosta
 OMIT [easterdate($Uy)+50] MSG Alatsinain'ny pentekosta
-REM Third Sunday in June SCANFROM -28 ADDOMIT MSG Fetin'ny ray
+REM Third Sunday in June ADDOMIT SCANFROM -28 MSG Fetin'ny ray
 OMIT 26 June MSG Fetin'ny fahaleovantena
 OMIT 15 August MSG Fiakaran'ny Masina Maria tany an-danitra
 OMIT 1 November MSG Fetin'ny olo-masina
diff --git a/include/holidays/mh.rem b/include/holidays/mh.rem
index 70d30b54..72fed25c 100644
--- a/include/holidays/mh.rem
+++ b/include/holidays/mh.rem
@@ -4,17 +4,17 @@
 # https://github.com/vacanza/holidays
 
 OMIT 1 January MSG New Year's Day
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day Holiday
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day Holiday
 OMIT 1 March MSG Nuclear Victims Remembrance Day
-REM 2 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 1)) == 0] MSG Nuclear Victims Remembrance Day Holiday
+REM 2 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 1)) == 0] MSG Nuclear Victims Remembrance Day Holiday
 OMIT [easterdate($Uy)-2] MSG Good Friday
 OMIT 1 May MSG Constitution Day
-REM 2 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Constitution Day Holiday
-REM First Friday in July SCANFROM -28 ADDOMIT MSG Fisherman's Day
-REM First Friday in September SCANFROM -28 ADDOMIT MSG Dri-jerbal Day
-REM Last Friday in September SCANFROM -28 ADDOMIT MSG Manit Day
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Constitution Day Holiday
+REM First Friday in July ADDOMIT SCANFROM -28 MSG Fisherman's Day
+REM First Friday in September ADDOMIT SCANFROM -28 MSG Dri-jerbal Day
+REM Last Friday in September ADDOMIT SCANFROM -28 MSG Manit Day
 OMIT 17 November MSG President's Day
-REM 18 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 17)) == 0] MSG President's Day Holiday
-REM First Friday in December SCANFROM -28 ADDOMIT MSG Gospel Day
+REM 18 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 17)) == 0] MSG President's Day Holiday
+REM First Friday in December ADDOMIT SCANFROM -28 MSG Gospel Day
 OMIT 25 December MSG Christmas Day
-REM 26 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day Holiday
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day Holiday
diff --git a/include/holidays/mp.rem b/include/holidays/mp.rem
index c0adc7c7..712d3c29 100644
--- a/include/holidays/mp.rem
+++ b/include/holidays/mp.rem
@@ -4,37 +4,37 @@
 # https://github.com/vacanza/holidays
 
 OMIT 1 January MSG New Year's Day
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM Third Monday in January SCANFROM -28 ADDOMIT MSG Martin Luther King Jr. Day
-REM Third Monday in February SCANFROM -28 ADDOMIT MSG Washington's Birthday
-REM 23 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 24)) == 6] MSG Commonwealth Covenant Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM Third Monday in January ADDOMIT SCANFROM -28 MSG Martin Luther King Jr. Day
+REM Third Monday in February ADDOMIT SCANFROM -28 MSG Washington's Birthday
+REM 23 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 24)) == 6] MSG Commonwealth Covenant Day (observed)
 OMIT 24 March MSG Commonwealth Covenant Day
-REM 25 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 24)) == 0] MSG Commonwealth Covenant Day (observed)
+REM 25 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 24)) == 0] MSG Commonwealth Covenant Day (observed)
 OMIT [easterdate($Uy)-2] MSG Good Friday
-REM Last Monday in May SCANFROM -28 ADDOMIT MSG Memorial Day
-REM 18 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 19)) == 6] MSG Juneteenth National Independence Day (observed)
+REM Last Monday in May ADDOMIT SCANFROM -28 MSG Memorial Day
+REM 18 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 19)) == 6] MSG Juneteenth National Independence Day (observed)
 OMIT 19 June MSG Juneteenth National Independence Day
-REM 20 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 19)) == 0] MSG Juneteenth National Independence Day (observed)
-REM 3 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 4)) == 6] MSG Independence Day (observed)
+REM 20 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 19)) == 0] MSG Juneteenth National Independence Day (observed)
+REM 3 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 4)) == 6] MSG Independence Day (observed)
 OMIT 4 July MSG Independence Day
-REM 5 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 4)) == 0] MSG Independence Day (observed)
-REM First Monday in September SCANFROM -28 ADDOMIT MSG Labor Day
-REM Second Monday in October SCANFROM -28 ADDOMIT MSG Commonwealth Cultural Day
+REM 5 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 4)) == 0] MSG Independence Day (observed)
+REM First Monday in September ADDOMIT SCANFROM -28 MSG Labor Day
+REM Second Monday in October ADDOMIT SCANFROM -28 MSG Commonwealth Cultural Day
 REM Tuesday 2 November ADDOMIT SCANFROM -28 MSG Election Day
-REM 3 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 4)) == 6] MSG Citizenship Day (observed)
+REM 3 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 4)) == 6] MSG Citizenship Day (observed)
 OMIT 4 November MSG Citizenship Day
-REM 5 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 4)) == 0] MSG Citizenship Day (observed)
-REM 10 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 11)) == 6] MSG Veterans Day (observed)
+REM 5 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 4)) == 0] MSG Citizenship Day (observed)
+REM 10 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 6] MSG Veterans Day (observed)
 OMIT 11 November MSG Veterans Day
-REM 12 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 11)) == 0] MSG Veterans Day (observed)
-REM Fourth Thursday in November SCANFROM -28 ADDOMIT MSG Thanksgiving
-REM 7 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 8)) == 6] MSG Constitution Day (observed)
+REM 12 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 0] MSG Veterans Day (observed)
+REM Fourth Thursday in November ADDOMIT SCANFROM -28 MSG Thanksgiving
+REM 7 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 8)) == 6] MSG Constitution Day (observed)
 OMIT 8 December MSG Constitution Day
-REM 9 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 8)) == 0] MSG Constitution Day (observed)
-REM 24 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
+REM 9 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 8)) == 0] MSG Constitution Day (observed)
+REM 24 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
 OMIT 25 December MSG Christmas Day
-REM 26 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 31 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 31 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
 
 # Optional holidays
 REM 14 February MSG Valentine's Day
diff --git a/include/holidays/mw.rem b/include/holidays/mw.rem
index e758038f..d1e8e307 100644
--- a/include/holidays/mw.rem
+++ b/include/holidays/mw.rem
@@ -4,31 +4,31 @@
 # https://github.com/vacanza/holidays
 
 OMIT 1 January MSG New Year's Day
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
 OMIT 15 January MSG John Chilembwe Day
-REM 16 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 15)) == 0] MSG John Chilembwe Day (observed)
-REM 17 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 15)) == 6] MSG John Chilembwe Day (observed)
+REM 16 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 15)) == 0] MSG John Chilembwe Day (observed)
+REM 17 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 15)) == 6] MSG John Chilembwe Day (observed)
 OMIT 3 March MSG Martyrs Day
-REM 4 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 3)) == 0] MSG Martyrs Day (observed)
-REM 5 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 3)) == 6] MSG Martyrs Day (observed)
+REM 4 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 3)) == 0] MSG Martyrs Day (observed)
+REM 5 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 3)) == 6] MSG Martyrs Day (observed)
 OMIT [easterdate($Uy)-2] MSG Good Friday
 OMIT [easterdate($Uy)+1] MSG Easter Monday
 OMIT 1 May MSG Labour Day
-REM 2 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Labour Day (observed)
-REM 3 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 6] MSG Labour Day (observed)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Labour Day (observed)
+REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 6] MSG Labour Day (observed)
 OMIT 14 May MSG Kamuzu Day
-REM 15 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 14)) == 0] MSG Kamuzu Day (observed)
-REM 16 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 14)) == 6] MSG Kamuzu Day (observed)
+REM 15 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 14)) == 0] MSG Kamuzu Day (observed)
+REM 16 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 14)) == 6] MSG Kamuzu Day (observed)
 OMIT 6 July MSG Independence Day
-REM 7 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 6)) == 0] MSG Independence Day (observed)
-REM 8 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 6)) == 6] MSG Independence Day (observed)
+REM 7 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 6)) == 0] MSG Independence Day (observed)
+REM 8 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 6)) == 6] MSG Independence Day (observed)
 OMIT 15 October MSG Mother's Day
-REM 16 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 15)) == 0] MSG Mother's Day (observed)
-REM 17 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 15)) == 6] MSG Mother's Day (observed)
+REM 16 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 15)) == 0] MSG Mother's Day (observed)
+REM 17 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 15)) == 6] MSG Mother's Day (observed)
 OMIT 25 December MSG Christmas Day
 OMIT 26 December MSG Boxing Day
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
diff --git a/include/holidays/mx.rem b/include/holidays/mx.rem
index 45a2ff82..0c5d73e4 100644
--- a/include/holidays/mx.rem
+++ b/include/holidays/mx.rem
@@ -4,10 +4,10 @@
 # https://github.com/vacanza/holidays
 
 OMIT 1 January MSG Año Nuevo
-REM First Monday in February SCANFROM -28 ADDOMIT MSG Día de la Constitución
-REM Third Monday in March SCANFROM -28 ADDOMIT MSG Natalicio de Benito Juárez
+REM First Monday in February ADDOMIT SCANFROM -28 MSG Día de la Constitución
+REM Third Monday in March ADDOMIT SCANFROM -28 MSG Natalicio de Benito Juárez
 OMIT 1 May MSG Día del Trabajo
 OMIT 16 September MSG Día de la Independencia
 OMIT 1 October MSG Transmisión del Poder Ejecutivo Federal
-REM Third Monday in November SCANFROM -28 ADDOMIT MSG Día de la Revolución
+REM Third Monday in November ADDOMIT SCANFROM -28 MSG Día de la Revolución
 OMIT 25 December MSG Navidad
diff --git a/include/holidays/my.rem b/include/holidays/my.rem
index 45c288c2..73221423 100644
--- a/include/holidays/my.rem
+++ b/include/holidays/my.rem
@@ -12,7 +12,7 @@
 
 OMIT 1 May MSG Hari Pekerja
 REM 1 May OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1))==0 || wkdaynum(date($Ty, 5, 1))==6] MSG Cuti Hari Pekerja
-REM First Monday in June SCANFROM -28 ADDOMIT MSG Hari Keputeraan Rasmi Seri Paduka Baginda Yang di-Pertuan Agong
+REM First Monday in June ADDOMIT SCANFROM -28 MSG Hari Keputeraan Rasmi Seri Paduka Baginda Yang di-Pertuan Agong
 REM 3 June OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 3))==0 || wkdaynum(date($Ty, 6, 3))==6] MSG Cuti Hari Keputeraan Rasmi Seri Paduka Baginda Yang di-Pertuan Agong
 OMIT 31 August MSG Hari Kebangsaan
 REM 31 August OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 31))==0 || wkdaynum(date($Ty, 8, 31))==6] MSG Cuti Hari Kebangsaan
diff --git a/include/holidays/my/07.rem b/include/holidays/my/07.rem
index dafb28c6..ec39f5f3 100644
--- a/include/holidays/my/07.rem
+++ b/include/holidays/my/07.rem
@@ -12,5 +12,5 @@
 OMIT 1 January MSG Tahun Baharu
 REM 1 January OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1))==0 || wkdaynum(date($Ty, 1, 1))==6] MSG Cuti Tahun Baharu
 OMIT 7 July MSG Hari Ulang Tahun Perisytiharan Tapak Warisan Dunia
-REM Second Saturday in July SCANFROM -28 ADDOMIT MSG Hari Jadi Yang di-Pertua Negeri Pulau Pinang
+REM Second Saturday in July ADDOMIT SCANFROM -28 MSG Hari Jadi Yang di-Pertua Negeri Pulau Pinang
 REM 13 July OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 13))==0 || wkdaynum(date($Ty, 7, 13))==6] MSG Cuti Hari Jadi Yang di-Pertua Negeri Pulau Pinang
diff --git a/include/holidays/my/08.rem b/include/holidays/my/08.rem
index a17039f9..2584ceb7 100644
--- a/include/holidays/my/08.rem
+++ b/include/holidays/my/08.rem
@@ -11,4 +11,4 @@
 
 OMIT 1 January MSG Tahun Baharu
 REM 1 January OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1))==0 || wkdaynum(date($Ty, 1, 1))==6] MSG Cuti Tahun Baharu
-REM First Friday in November SCANFROM -28 ADDOMIT MSG Hari Keputeraan Sultan Perak
+REM First Friday in November ADDOMIT SCANFROM -28 MSG Hari Keputeraan Sultan Perak
diff --git a/include/holidays/my/12.rem b/include/holidays/my/12.rem
index dda9dd4a..20fcbc51 100644
--- a/include/holidays/my/12.rem
+++ b/include/holidays/my/12.rem
@@ -14,5 +14,5 @@ REM 1 January OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty
 OMIT [easterdate($Uy)-2] MSG Good Friday
 OMIT 30 May MSG Pesta Kaamatan
 OMIT 31 May MSG Pesta Kaamatan
-REM First Saturday in October SCANFROM -28 ADDOMIT MSG Hari Jadi Yang di-Pertua Negeri Sabah
+REM First Saturday in October ADDOMIT SCANFROM -28 MSG Hari Jadi Yang di-Pertua Negeri Sabah
 OMIT 24 December MSG Christmas Eve
diff --git a/include/holidays/my/13.rem b/include/holidays/my/13.rem
index 2b93d927..999027a0 100644
--- a/include/holidays/my/13.rem
+++ b/include/holidays/my/13.rem
@@ -18,4 +18,4 @@ OMIT 2 June MSG Perayaan Hari Gawai Dayak
 REM 2 June OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 2))==0 || wkdaynum(date($Ty, 6, 2))==6] MSG Cuti Perayaan Hari Gawai Dayak
 OMIT 22 July MSG Hari Kemerdekaan Sarawak
 REM 22 July OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 22))==0 || wkdaynum(date($Ty, 7, 22))==6] MSG Cuti Hari Kemerdekaan Sarawak
-REM Second Saturday in October SCANFROM -28 ADDOMIT MSG Hari Jadi Yang di-Pertua Negeri Sarawak
+REM Second Saturday in October ADDOMIT SCANFROM -28 MSG Hari Jadi Yang di-Pertua Negeri Sarawak
diff --git a/include/holidays/mz.rem b/include/holidays/mz.rem
index 6d74060e..aa7150fa 100644
--- a/include/holidays/mz.rem
+++ b/include/holidays/mz.rem
@@ -4,20 +4,20 @@
 # https://github.com/vacanza/holidays
 
 OMIT 1 January MSG Dia da Fraternidade universal
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG Dia da Fraternidade universal (ponte)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG Dia da Fraternidade universal (ponte)
 OMIT 3 February MSG Dia dos Heróis Moçambicanos
-REM 4 February SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 2, 3)) == 0] MSG Dia dos Heróis Moçambicanos (ponte)
+REM 4 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 3)) == 0] MSG Dia dos Heróis Moçambicanos (ponte)
 OMIT 7 April MSG Dia da Mulher Moçambicana
-REM 8 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 7)) == 0] MSG Dia da Mulher Moçambicana (ponte)
+REM 8 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 7)) == 0] MSG Dia da Mulher Moçambicana (ponte)
 OMIT 1 May MSG Dia Internacional dos Trabalhadores
-REM 2 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Dia Internacional dos Trabalhadores (ponte)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Dia Internacional dos Trabalhadores (ponte)
 OMIT 25 June MSG Dia da Independência Nacional
-REM 26 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 25)) == 0] MSG Dia da Independência Nacional (ponte)
+REM 26 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 25)) == 0] MSG Dia da Independência Nacional (ponte)
 OMIT 7 September MSG Dia da Vitória
-REM 8 September SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 9, 7)) == 0] MSG Dia da Vitória (ponte)
+REM 8 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 7)) == 0] MSG Dia da Vitória (ponte)
 OMIT 25 September MSG Dia das Forças Armadas de Libertação Nacional
-REM 26 September SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 9, 25)) == 0] MSG Dia das Forças Armadas de Libertação Nacional (ponte)
+REM 26 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 25)) == 0] MSG Dia das Forças Armadas de Libertação Nacional (ponte)
 OMIT 4 October MSG Dia da Paz e Reconciliação
-REM 5 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 4)) == 0] MSG Dia da Paz e Reconciliação (ponte)
+REM 5 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 4)) == 0] MSG Dia da Paz e Reconciliação (ponte)
 OMIT 25 December MSG Dia da Família
-REM 26 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Dia da Família (ponte)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Dia da Família (ponte)
diff --git a/include/holidays/na.rem b/include/holidays/na.rem
index ba319970..69948cfe 100644
--- a/include/holidays/na.rem
+++ b/include/holidays/na.rem
@@ -4,22 +4,22 @@
 # https://github.com/vacanza/holidays
 
 OMIT 1 January MSG New Year's Day
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
 OMIT 21 March MSG Independence Day
-REM 22 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 21)) == 0] MSG Independence Day (observed)
+REM 22 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 21)) == 0] MSG Independence Day (observed)
 OMIT [easterdate($Uy)-2] MSG Good Friday
 OMIT [easterdate($Uy)+1] MSG Easter Monday
 OMIT 1 May MSG Workers' Day
-REM 2 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Workers' Day (observed)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Workers' Day (observed)
 OMIT 4 May MSG Cassinga Day
-REM 5 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 4)) == 0] MSG Cassinga Day (observed)
+REM 5 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 4)) == 0] MSG Cassinga Day (observed)
 OMIT [easterdate($Uy)+39] MSG Ascension Day
 OMIT 25 May MSG Africa Day
-REM 26 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 25)) == 0] MSG Africa Day (observed)
+REM 26 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 25)) == 0] MSG Africa Day (observed)
 OMIT 26 August MSG Heroes' Day
-REM 27 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 26)) == 0] MSG Heroes' Day (observed)
+REM 27 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 26)) == 0] MSG Heroes' Day (observed)
 OMIT 10 September MSG Day of the Namibian Women and International Human Rights Day
-REM 11 September SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 9, 10)) == 0] MSG Day of the Namibian Women and International Human Rights Day (observed)
+REM 11 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 10)) == 0] MSG Day of the Namibian Women and International Human Rights Day (observed)
 OMIT 25 December MSG Christmas Day
 OMIT 26 December MSG Family Day
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Family Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Family Day (observed)
diff --git a/include/holidays/nz.rem b/include/holidays/nz.rem
index 80165205..d6b15a4f 100644
--- a/include/holidays/nz.rem
+++ b/include/holidays/nz.rem
@@ -12,23 +12,23 @@
 
 OMIT 1 January MSG New Year's Day
 OMIT 2 January MSG Day after New Year's Day
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
-REM 4 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 2)) == 0] MSG Day after New Year's Day (observed)
-REM 4 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 2)) == 6] MSG Day after New Year's Day (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM 4 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 2)) == 0] MSG Day after New Year's Day (observed)
+REM 4 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 2)) == 6] MSG Day after New Year's Day (observed)
 OMIT 6 February MSG Waitangi Day
-REM 7 February SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 2, 6)) == 0] MSG Waitangi Day (observed)
-REM 8 February SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 2, 6)) == 6] MSG Waitangi Day (observed)
+REM 7 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 6)) == 0] MSG Waitangi Day (observed)
+REM 8 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 6)) == 6] MSG Waitangi Day (observed)
 OMIT [easterdate($Uy)-2] MSG Good Friday
 OMIT [easterdate($Uy)+1] MSG Easter Monday
 OMIT 25 April MSG Anzac Day
-REM 26 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 25)) == 0] MSG Anzac Day (observed)
-REM 27 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 25)) == 6] MSG Anzac Day (observed)
-REM First Monday in June SCANFROM -28 ADDOMIT MSG King's Birthday
-REM Fourth Monday in October SCANFROM -28 ADDOMIT MSG Labour Day
+REM 26 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 25)) == 0] MSG Anzac Day (observed)
+REM 27 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 25)) == 6] MSG Anzac Day (observed)
+REM First Monday in June ADDOMIT SCANFROM -28 MSG King's Birthday
+REM Fourth Monday in October ADDOMIT SCANFROM -28 MSG Labour Day
 OMIT 25 December MSG Christmas Day
 OMIT 26 December MSG Boxing Day
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
diff --git a/include/holidays/nz/south_canterbury.rem b/include/holidays/nz/south_canterbury.rem
index 2202441a..ac01daa1 100644
--- a/include/holidays/nz/south_canterbury.rem
+++ b/include/holidays/nz/south_canterbury.rem
@@ -9,4 +9,4 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/nz.rem
 
-REM Fourth Monday in September SCANFROM -28 ADDOMIT MSG South Canterbury Anniversary Day
+REM Fourth Monday in September ADDOMIT SCANFROM -28 MSG South Canterbury Anniversary Day
diff --git a/include/holidays/nz/tki.rem b/include/holidays/nz/tki.rem
index 668984f0..ca12a0df 100644
--- a/include/holidays/nz/tki.rem
+++ b/include/holidays/nz/tki.rem
@@ -9,4 +9,4 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/nz.rem
 
-REM Second Monday in March SCANFROM -28 ADDOMIT MSG Taranaki Anniversary Day
+REM Second Monday in March ADDOMIT SCANFROM -28 MSG Taranaki Anniversary Day
diff --git a/include/holidays/pa.rem b/include/holidays/pa.rem
index 8e3d189b..72c2662e 100644
--- a/include/holidays/pa.rem
+++ b/include/holidays/pa.rem
@@ -4,22 +4,22 @@
 # https://github.com/vacanza/holidays
 
 OMIT 1 January MSG New Year's Day
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
 OMIT 9 January MSG Martyrs' Day
-REM 10 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 9)) == 0] MSG Martyrs' Day (observed)
+REM 10 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 9)) == 0] MSG Martyrs' Day (observed)
 OMIT [easterdate($Uy)-47] MSG Carnival
 OMIT [easterdate($Uy)-2] MSG Good Friday
 OMIT 1 May MSG Labour Day
-REM 2 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Labour Day (observed)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Labour Day (observed)
 OMIT 3 November MSG Separation Day
 OMIT 4 November MSG National Symbols Day
 OMIT 5 November MSG Colon Day
 OMIT 10 November MSG Los Santos Uprising Day
 OMIT 28 November MSG Independence Day
-REM 29 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 28)) == 0] MSG Independence Day (observed)
+REM 29 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 28)) == 0] MSG Independence Day (observed)
 OMIT 8 December MSG Mother's Day
-REM 9 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 8)) == 0] MSG Mother's Day (observed)
+REM 9 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 8)) == 0] MSG Mother's Day (observed)
 OMIT 20 December MSG National Mourning Day
-REM 21 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 20)) == 0] MSG National Mourning Day (observed)
+REM 21 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 20)) == 0] MSG National Mourning Day (observed)
 OMIT 25 December MSG Christmas Day
-REM 26 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
diff --git a/include/holidays/pg.rem b/include/holidays/pg.rem
index f8432113..2b7b2276 100644
--- a/include/holidays/pg.rem
+++ b/include/holidays/pg.rem
@@ -4,19 +4,19 @@
 # https://github.com/vacanza/holidays
 
 OMIT 1 January MSG New Year's Day
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
 OMIT 26 February MSG Grand Chief Sir Michael Somare Remembrance Day
 OMIT [easterdate($Uy)-2] MSG Good Friday
 OMIT [easterdate($Uy)] MSG Easter Sunday
 OMIT [easterdate($Uy)+1] MSG Easter Monday
 OMIT 17 June MSG King's Birthday
 OMIT 23 July MSG Papua New Guinea Remembrance Day
-REM 24 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 23)) == 0] MSG Papua New Guinea Remembrance Day (observed)
+REM 24 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 23)) == 0] MSG Papua New Guinea Remembrance Day (observed)
 OMIT 26 August MSG National Repentance Day
-REM 27 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 26)) == 0] MSG National Repentance Day (observed)
+REM 27 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 26)) == 0] MSG National Repentance Day (observed)
 OMIT 16 September MSG Independence Day
-REM 17 September SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 9, 16)) == 0] MSG Independence Day (observed)
+REM 17 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 16)) == 0] MSG Independence Day (observed)
 OMIT 25 December MSG Christmas Day
 OMIT 26 December MSG Boxing Day
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
diff --git a/include/holidays/ph.rem b/include/holidays/ph.rem
index c385086c..181e19a1 100644
--- a/include/holidays/ph.rem
+++ b/include/holidays/ph.rem
@@ -8,7 +8,7 @@ OMIT [easterdate($Uy)-3] MSG Maundy Thursday
 OMIT [easterdate($Uy)-2] MSG Good Friday
 OMIT [easterdate($Uy)-1] MSG Black Saturday
 OMIT 1 May MSG Labor Day
-REM Last Monday in August SCANFROM -28 ADDOMIT MSG National Heroes Day
+REM Last Monday in August ADDOMIT SCANFROM -28 MSG National Heroes Day
 OMIT 1 November MSG All Saints' Day
 OMIT 8 December MSG Feast of the Immaculate Conception of Mary
 OMIT 25 December MSG Christmas Day
diff --git a/include/holidays/pr.rem b/include/holidays/pr.rem
index e82f0f9a..80ec5eb9 100644
--- a/include/holidays/pr.rem
+++ b/include/holidays/pr.rem
@@ -4,33 +4,33 @@
 # https://github.com/vacanza/holidays
 
 OMIT 1 January MSG New Year's Day
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
 OMIT 6 January MSG Epiphany
-REM Third Monday in January SCANFROM -28 ADDOMIT MSG Martin Luther King Jr. Day
-REM Third Monday in February SCANFROM -28 ADDOMIT MSG Presidents' Day
+REM Third Monday in January ADDOMIT SCANFROM -28 MSG Martin Luther King Jr. Day
+REM Third Monday in February ADDOMIT SCANFROM -28 MSG Presidents' Day
 OMIT 22 March MSG Emancipation Day
-REM 23 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 22)) == 0] MSG Emancipation Day (observed)
+REM 23 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 22)) == 0] MSG Emancipation Day (observed)
 OMIT [easterdate($Uy)-2] MSG Good Friday
-REM Last Monday in May SCANFROM -28 ADDOMIT MSG Memorial Day
-REM 18 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 19)) == 6] MSG Juneteenth National Independence Day (observed)
+REM Last Monday in May ADDOMIT SCANFROM -28 MSG Memorial Day
+REM 18 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 19)) == 6] MSG Juneteenth National Independence Day (observed)
 OMIT 19 June MSG Juneteenth National Independence Day
-REM 20 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 19)) == 0] MSG Juneteenth National Independence Day (observed)
-REM 3 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 4)) == 6] MSG Independence Day (observed)
+REM 20 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 19)) == 0] MSG Juneteenth National Independence Day (observed)
+REM 3 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 4)) == 6] MSG Independence Day (observed)
 OMIT 4 July MSG Independence Day
-REM 5 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 4)) == 0] MSG Independence Day (observed)
+REM 5 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 4)) == 0] MSG Independence Day (observed)
 OMIT 25 July MSG Constitution Day
-REM 26 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 25)) == 0] MSG Constitution Day (observed)
-REM First Monday in September SCANFROM -28 ADDOMIT MSG Labor Day
-REM 10 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 11)) == 6] MSG Veterans Day (observed)
+REM 26 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 25)) == 0] MSG Constitution Day (observed)
+REM First Monday in September ADDOMIT SCANFROM -28 MSG Labor Day
+REM 10 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 6] MSG Veterans Day (observed)
 OMIT 11 November MSG Veterans Day
-REM 12 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 11)) == 0] MSG Veterans Day (observed)
+REM 12 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 0] MSG Veterans Day (observed)
 OMIT 19 November MSG Discovery Day
-REM 20 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 19)) == 0] MSG Discovery Day (observed)
-REM Fourth Thursday in November SCANFROM -28 ADDOMIT MSG Thanksgiving
-REM 24 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
+REM 20 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 19)) == 0] MSG Discovery Day (observed)
+REM Fourth Thursday in November ADDOMIT SCANFROM -28 MSG Thanksgiving
+REM 24 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
 OMIT 25 December MSG Christmas Day
-REM 26 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 31 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 31 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
 
 # Optional holidays
 REM 14 February MSG Valentine's Day
diff --git a/include/holidays/pw.rem b/include/holidays/pw.rem
index 0e40ba14..73e46a32 100644
--- a/include/holidays/pw.rem
+++ b/include/holidays/pw.rem
@@ -4,29 +4,29 @@
 # https://github.com/vacanza/holidays
 
 OMIT 1 January MSG New Year's Day
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 14 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 15)) == 6] MSG Youth Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 14 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 15)) == 6] MSG Youth Day (observed)
 OMIT 15 March MSG Youth Day
-REM 16 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 15)) == 0] MSG Youth Day (observed)
-REM 4 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 5)) == 6] MSG Senior Citizens Day (observed)
+REM 16 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 15)) == 0] MSG Youth Day (observed)
+REM 4 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 5)) == 6] MSG Senior Citizens Day (observed)
 OMIT 5 May MSG Senior Citizens Day
-REM 6 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 5)) == 0] MSG Senior Citizens Day (observed)
-REM 31 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 1)) == 6] MSG President's Day (observed)
+REM 6 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 5)) == 0] MSG Senior Citizens Day (observed)
+REM 31 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 1)) == 6] MSG President's Day (observed)
 OMIT 1 June MSG President's Day
-REM 2 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 1)) == 0] MSG President's Day (observed)
-REM 8 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 9)) == 6] MSG Constitution Day (observed)
+REM 2 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 1)) == 0] MSG President's Day (observed)
+REM 8 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 9)) == 6] MSG Constitution Day (observed)
 OMIT 9 July MSG Constitution Day
-REM 10 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 9)) == 0] MSG Constitution Day (observed)
-REM First Monday in September SCANFROM -28 ADDOMIT MSG Labor Day
-REM 30 September SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 1)) == 6] MSG Independence Day (observed)
+REM 10 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 9)) == 0] MSG Constitution Day (observed)
+REM First Monday in September ADDOMIT SCANFROM -28 MSG Labor Day
+REM 30 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 1)) == 6] MSG Independence Day (observed)
 OMIT 1 October MSG Independence Day
-REM 2 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 1)) == 0] MSG Independence Day (observed)
-REM 23 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 24)) == 6] MSG United Nations Day (observed)
+REM 2 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 1)) == 0] MSG Independence Day (observed)
+REM 23 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 24)) == 6] MSG United Nations Day (observed)
 OMIT 24 October MSG United Nations Day
-REM 25 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 24)) == 0] MSG United Nations Day (observed)
-REM Fourth Friday in November SCANFROM -28 ADDOMIT MSG Family Day
-REM Fourth Thursday in November SCANFROM -28 ADDOMIT MSG Thanksgiving Day
-REM 24 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
+REM 25 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 24)) == 0] MSG United Nations Day (observed)
+REM Fourth Friday in November ADDOMIT SCANFROM -28 MSG Family Day
+REM Fourth Thursday in November ADDOMIT SCANFROM -28 MSG Thanksgiving Day
+REM 24 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
 OMIT 25 December MSG Christmas Day
-REM 26 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 31 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 31 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
diff --git a/include/holidays/rs.rem b/include/holidays/rs.rem
index 5262453c..05e0080d 100644
--- a/include/holidays/rs.rem
+++ b/include/holidays/rs.rem
@@ -5,20 +5,20 @@
 
 OMIT 1 January MSG Нова година
 OMIT 2 January MSG Нова година
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG Нова година (слободан дан)
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 2)) == 0] MSG Нова година (слободан дан)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG Нова година (слободан дан)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 2)) == 0] MSG Нова година (слободан дан)
 OMIT 15 February MSG Дан државности Србије
 OMIT 16 February MSG Дан државности Србије
-REM 17 February SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 2, 15)) == 0] MSG Дан државности Србије (слободан дан)
-REM 17 February SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 2, 16)) == 0] MSG Дан државности Србије (слободан дан)
+REM 17 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 15)) == 0] MSG Дан државности Србије (слободан дан)
+REM 17 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 16)) == 0] MSG Дан државности Србије (слободан дан)
 OMIT [easterdate($Uy)-2] MSG Велики петак
 OMIT [easterdate($Uy)-1] MSG Велика субота
 OMIT [easterdate($Uy)] MSG Васкрс
 OMIT [easterdate($Uy)+1] MSG Други дан Васкрса
 OMIT 1 May MSG Празник рада
 OMIT 2 May MSG Празник рада
-REM 3 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Празник рада (слободан дан)
-REM 3 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 2)) == 0] MSG Празник рада (слободан дан)
+REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Празник рада (слободан дан)
+REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 2)) == 0] MSG Празник рада (слободан дан)
 OMIT 11 November MSG Дан примирја у Првом светском рату
-REM 12 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 11)) == 0] MSG Дан примирја у Првом светском рату (слободан дан)
+REM 12 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 0] MSG Дан примирја у Првом светском рату (слободан дан)
 OMIT 25 December MSG Божић
diff --git a/include/holidays/sa.rem b/include/holidays/sa.rem
index 92e109c6..2e99cd61 100644
--- a/include/holidays/sa.rem
+++ b/include/holidays/sa.rem
@@ -3,7 +3,7 @@
 # Derived from the Python holidays project at
 # https://github.com/vacanza/holidays
 
-REM 21 February SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 2, 22)) == 5] MSG (ملاحظة) يوم التأسيسي
-REM 23 February SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 2, 22)) == 6] MSG (ملاحظة) يوم التأسيسي
-REM 22 September SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 9, 23)) == 5] MSG (ملاحظة) اليوم الوطني
-REM 24 September SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 9, 23)) == 6] MSG (ملاحظة) اليوم الوطني
+REM 21 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 22)) == 5] MSG (ملاحظة) يوم التأسيسي
+REM 23 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 22)) == 6] MSG (ملاحظة) يوم التأسيسي
+REM 22 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 23)) == 5] MSG (ملاحظة) اليوم الوطني
+REM 24 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 23)) == 6] MSG (ملاحظة) اليوم الوطني
diff --git a/include/holidays/sc.rem b/include/holidays/sc.rem
index 0f99a41d..9983b428 100644
--- a/include/holidays/sc.rem
+++ b/include/holidays/sc.rem
@@ -5,22 +5,22 @@
 
 OMIT 1 January MSG New Year's Day
 OMIT 2 January MSG New Year Holiday
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 2)) == 0] MSG New Year Holiday (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 2)) == 0] MSG New Year Holiday (observed)
 OMIT [easterdate($Uy)-2] MSG Good Friday
 OMIT [easterdate($Uy)-1] MSG Easter Saturday
 OMIT [easterdate($Uy)+1] MSG Easter Monday
 OMIT 1 May MSG Labour Day
-REM 2 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Labour Day (observed)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Labour Day (observed)
 OMIT [easterdate($Uy)+60] MSG The Fete Dieu
 OMIT 18 June MSG Constitution Day
-REM 19 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 18)) == 0] MSG Constitution Day (observed)
+REM 19 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 18)) == 0] MSG Constitution Day (observed)
 OMIT 29 June MSG Independence (National) Day
-REM 30 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 29)) == 0] MSG Independence (National) Day (observed)
+REM 30 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 29)) == 0] MSG Independence (National) Day (observed)
 OMIT 15 August MSG Assumption Day
-REM 16 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 15)) == 0] MSG Assumption Day (observed)
+REM 16 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 15)) == 0] MSG Assumption Day (observed)
 OMIT 1 November MSG All Saints Day
-REM 2 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 1)) == 0] MSG All Saints Day (observed)
+REM 2 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 1)) == 0] MSG All Saints Day (observed)
 OMIT 8 December MSG The Feast of the Immaculate Conception
-REM 9 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 8)) == 0] MSG The Feast of the Immaculate Conception (observed)
+REM 9 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 8)) == 0] MSG The Feast of the Immaculate Conception (observed)
 OMIT 25 December MSG Christmas Day
-REM 26 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
diff --git a/include/holidays/sz.rem b/include/holidays/sz.rem
index 2cdd21a8..d584e584 100644
--- a/include/holidays/sz.rem
+++ b/include/holidays/sz.rem
@@ -4,21 +4,21 @@
 # https://github.com/vacanza/holidays
 
 OMIT 1 January MSG New Year's Day
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
 OMIT [easterdate($Uy)-2] MSG Good Friday
 OMIT [easterdate($Uy)+1] MSG Easter Monday
 OMIT 19 April MSG King's Birthday
-REM 20 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 19)) == 0] MSG King's Birthday (observed)
+REM 20 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 19)) == 0] MSG King's Birthday (observed)
 OMIT 25 April MSG National Flag Day
-REM 26 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 25)) == 0] MSG National Flag Day (observed)
+REM 26 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 25)) == 0] MSG National Flag Day (observed)
 OMIT 1 May MSG Worker's Day
-REM 2 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Worker's Day (observed)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Worker's Day (observed)
 OMIT [easterdate($Uy)+39] MSG Ascension Day
 OMIT 22 July MSG Birthday of Late King Sobhuza
-REM 23 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 22)) == 0] MSG Birthday of Late King Sobhuza (observed)
+REM 23 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 22)) == 0] MSG Birthday of Late King Sobhuza (observed)
 OMIT 6 September MSG Independence Day
-REM 7 September SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 9, 6)) == 0] MSG Independence Day (observed)
+REM 7 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 6)) == 0] MSG Independence Day (observed)
 OMIT 25 December MSG Christmas Day
 OMIT 26 December MSG Boxing Day
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
diff --git a/include/holidays/td.rem b/include/holidays/td.rem
index 135a5031..08700a6d 100644
--- a/include/holidays/td.rem
+++ b/include/holidays/td.rem
@@ -4,17 +4,17 @@
 # https://github.com/vacanza/holidays
 
 OMIT 1 January MSG New Year's Day
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
 OMIT 8 March MSG International Women's Day
-REM 9 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 8)) == 0] MSG International Women's Day (observed)
+REM 9 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 8)) == 0] MSG International Women's Day (observed)
 OMIT [easterdate($Uy)+1] MSG Easter Monday
 OMIT 1 May MSG Labour Day
-REM 2 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Labour Day (observed)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Labour Day (observed)
 OMIT 11 August MSG Independence Day
-REM 12 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 11)) == 0] MSG Independence Day (observed)
+REM 12 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 11)) == 0] MSG Independence Day (observed)
 OMIT 1 November MSG All Saints' Day
 OMIT 28 November MSG Republic Day
-REM 29 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 28)) == 0] MSG Republic Day (observed)
+REM 29 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 28)) == 0] MSG Republic Day (observed)
 OMIT 1 December MSG Freedom and Democracy Day
-REM 2 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 1)) == 0] MSG Freedom and Democracy Day (observed)
+REM 2 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 1)) == 0] MSG Freedom and Democracy Day (observed)
 OMIT 25 December MSG Christmas Day
diff --git a/include/holidays/th.rem b/include/holidays/th.rem
index 7f983890..1d5d272a 100644
--- a/include/holidays/th.rem
+++ b/include/holidays/th.rem
@@ -4,57 +4,57 @@
 # https://github.com/vacanza/holidays
 
 OMIT 1 January MSG วันขึ้นปีใหม่
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG ชดเชยวันขึ้นปีใหม่
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG ชดเชยวันขึ้นปีใหม่
-REM Second Saturday in January SCANFROM -28 ADDOMIT MSG วันเด็กแห่งชาติ
-REM 25 February SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 2, 24)) == 0] MSG ชดเชยวันมาฆบูชา
-REM 26 February SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 2, 24)) == 6] MSG ชดเชยวันมาฆบูชา
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG ชดเชยวันขึ้นปีใหม่
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG ชดเชยวันขึ้นปีใหม่
+REM Second Saturday in January ADDOMIT SCANFROM -28 MSG วันเด็กแห่งชาติ
+REM 25 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 24)) == 0] MSG ชดเชยวันมาฆบูชา
+REM 26 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 24)) == 6] MSG ชดเชยวันมาฆบูชา
 OMIT 6 April MSG วันจักรี
-REM 7 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 6)) == 0] MSG ชดเชยวันจักรี
-REM 8 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 6)) == 6] MSG ชดเชยวันจักรี
+REM 7 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 6)) == 0] MSG ชดเชยวันจักรี
+REM 8 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 6)) == 6] MSG ชดเชยวันจักรี
 OMIT 13 April MSG วันสงกรานต์
 REM 13 April OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 13))==0 || wkdaynum(date($Ty, 4, 13))==6] MSG ชดเชยวันสงกรานต์
 OMIT 14 April MSG วันสงกรานต์
 OMIT 15 April MSG วันสงกรานต์
 OMIT 1 May MSG วันแรงงานแห่งชาติ
-REM 2 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG ชดเชยวันแรงงานแห่งชาติ
-REM 3 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 6] MSG ชดเชยวันแรงงานแห่งชาติ
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG ชดเชยวันแรงงานแห่งชาติ
+REM 3 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 6] MSG ชดเชยวันแรงงานแห่งชาติ
 OMIT 4 May MSG วันฉัตรมงคล
-REM 5 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 4)) == 0] MSG ชดเชยวันฉัตรมงคล
-REM 6 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 4)) == 6] MSG ชดเชยวันฉัตรมงคล
-REM 11 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 10)) == 0] MSG ชดเชยวันพืชมงคล
-REM 12 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 10)) == 6] MSG ชดเชยวันพืชมงคล
-REM 23 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 22)) == 0] MSG ชดเชยวันวิสาขบูชา
-REM 24 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 22)) == 6] MSG ชดเชยวันวิสาขบูชา
+REM 5 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 4)) == 0] MSG ชดเชยวันฉัตรมงคล
+REM 6 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 4)) == 6] MSG ชดเชยวันฉัตรมงคล
+REM 11 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 10)) == 0] MSG ชดเชยวันพืชมงคล
+REM 12 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 10)) == 6] MSG ชดเชยวันพืชมงคล
+REM 23 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 22)) == 0] MSG ชดเชยวันวิสาขบูชา
+REM 24 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 22)) == 6] MSG ชดเชยวันวิสาขบูชา
 OMIT 3 June MSG วันเฉลิมพระชนมพรรษาสมเด็จพระนางเจ้าสุทิดา พัชรสุธาพิมลลักษณ พระบรมราชินี
-REM 4 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 3)) == 0] MSG ชดเชยวันเฉลิมพระชนมพรรษาสมเด็จพระนางเจ้าสุทิดา พัชรสุธาพิมลลักษณ พระบรมราชินี
-REM 5 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 3)) == 6] MSG ชดเชยวันเฉลิมพระชนมพรรษาสมเด็จพระนางเจ้าสุทิดา พัชรสุธาพิมลลักษณ พระบรมราชินี
-REM 22 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 20)) == 0] MSG ชดเชยวันอาสาฬหบูชา
-REM 22 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 20)) == 6] MSG ชดเชยวันอาสาฬหบูชา
-REM 23 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 21)) == 6] MSG ชดเชยวันเข้าพรรษา
+REM 4 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 3)) == 0] MSG ชดเชยวันเฉลิมพระชนมพรรษาสมเด็จพระนางเจ้าสุทิดา พัชรสุธาพิมลลักษณ พระบรมราชินี
+REM 5 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 3)) == 6] MSG ชดเชยวันเฉลิมพระชนมพรรษาสมเด็จพระนางเจ้าสุทิดา พัชรสุธาพิมลลักษณ พระบรมราชินี
+REM 22 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 20)) == 0] MSG ชดเชยวันอาสาฬหบูชา
+REM 22 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 20)) == 6] MSG ชดเชยวันอาสาฬหบูชา
+REM 23 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 21)) == 6] MSG ชดเชยวันเข้าพรรษา
 OMIT 28 July MSG วันเฉลิมพระชนมพรรษาพระบาทสมเด็จพระปรเมนทรรามาธิบดีศรีสินทรมหาวชิราลงกรณ พระวชิรเกล้าเจ้าอยู่หัว
-REM 29 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 28)) == 0] MSG ชดเชยวันเฉลิมพระชนมพรรษาพระบาทสมเด็จพระปรเมนทรรามาธิบดีศรีสินทรมหาวชิราลงกรณ พระวชิรเกล้าเจ้าอยู่หัว
-REM 30 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 28)) == 6] MSG ชดเชยวันเฉลิมพระชนมพรรษาพระบาทสมเด็จพระปรเมนทรรามาธิบดีศรีสินทรมหาวชิราลงกรณ พระวชิรเกล้าเจ้าอยู่หัว
+REM 29 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 28)) == 0] MSG ชดเชยวันเฉลิมพระชนมพรรษาพระบาทสมเด็จพระปรเมนทรรามาธิบดีศรีสินทรมหาวชิราลงกรณ พระวชิรเกล้าเจ้าอยู่หัว
+REM 30 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 28)) == 6] MSG ชดเชยวันเฉลิมพระชนมพรรษาพระบาทสมเด็จพระปรเมนทรรามาธิบดีศรีสินทรมหาวชิราลงกรณ พระวชิรเกล้าเจ้าอยู่หัว
 OMIT 12 August MSG วันเฉลิมพระชนมพรรษาสมเด็จพระบรมราชชนนีพันปีหลวง
 OMIT 12 August MSG วันแม่แห่งชาติ
-REM 13 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 12)) == 0] MSG ชดเชยวันเฉลิมพระชนมพรรษาสมเด็จพระบรมราชชนนีพันปีหลวง
-REM 14 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 12)) == 6] MSG ชดเชยวันเฉลิมพระชนมพรรษาสมเด็จพระบรมราชชนนีพันปีหลวง
+REM 13 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 12)) == 0] MSG ชดเชยวันเฉลิมพระชนมพรรษาสมเด็จพระบรมราชชนนีพันปีหลวง
+REM 14 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 12)) == 6] MSG ชดเชยวันเฉลิมพระชนมพรรษาสมเด็จพระบรมราชชนนีพันปีหลวง
 OMIT 13 October MSG วันนวมินทรมหาราช
-REM 14 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 13)) == 0] MSG ชดเชยวันนวมินทรมหาราช
-REM 15 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 13)) == 6] MSG ชดเชยวันนวมินทรมหาราช
+REM 14 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 13)) == 0] MSG ชดเชยวันนวมินทรมหาราช
+REM 15 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 13)) == 6] MSG ชดเชยวันนวมินทรมหาราช
 OMIT 23 October MSG วันปิยมหาราช
-REM 24 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 23)) == 0] MSG ชดเชยวันปิยมหาราช
-REM 25 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 23)) == 6] MSG ชดเชยวันปิยมหาราช
+REM 24 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 23)) == 0] MSG ชดเชยวันปิยมหาราช
+REM 25 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 23)) == 6] MSG ชดเชยวันปิยมหาราช
 OMIT 5 December MSG วันคล้ายวันเฉลิมพระชนมพรรษาพระบาทสมเด็จพระบรมชนกาธิเบศร มหาภูมิพลอดุลยเดชมหาราช บรมนาถบพิตร
 OMIT 5 December MSG วันชาติ
 OMIT 5 December MSG วันพ่อแห่งชาติ
-REM 6 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 5)) == 0] MSG ชดเชยวันคล้ายวันเฉลิมพระชนมพรรษาพระบาทสมเด็จพระบรมชนกาธิเบศร มหาภูมิพลอดุลยเดชมหาราช บรมนาถบพิตร
-REM 6 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 5)) == 0] MSG ชดเชยวันชาติ
-REM 7 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 5)) == 6] MSG ชดเชยวันคล้ายวันเฉลิมพระชนมพรรษาพระบาทสมเด็จพระบรมชนกาธิเบศร มหาภูมิพลอดุลยเดชมหาราช บรมนาถบพิตร
-REM 7 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 5)) == 6] MSG ชดเชยวันชาติ
+REM 6 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 5)) == 0] MSG ชดเชยวันคล้ายวันเฉลิมพระชนมพรรษาพระบาทสมเด็จพระบรมชนกาธิเบศร มหาภูมิพลอดุลยเดชมหาราช บรมนาถบพิตร
+REM 6 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 5)) == 0] MSG ชดเชยวันชาติ
+REM 7 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 5)) == 6] MSG ชดเชยวันคล้ายวันเฉลิมพระชนมพรรษาพระบาทสมเด็จพระบรมชนกาธิเบศร มหาภูมิพลอดุลยเดชมหาราช บรมนาถบพิตร
+REM 7 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 5)) == 6] MSG ชดเชยวันชาติ
 OMIT 10 December MSG วันรัฐธรรมนูญ
-REM 11 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 10)) == 0] MSG ชดเชยวันรัฐธรรมนูญ
-REM 12 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 10)) == 6] MSG ชดเชยวันรัฐธรรมนูญ
+REM 11 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 10)) == 0] MSG ชดเชยวันรัฐธรรมนูญ
+REM 12 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 10)) == 6] MSG ชดเชยวันรัฐธรรมนูญ
 OMIT 31 December MSG วันสิ้นปี
 
 # Optional holidays
diff --git a/include/holidays/to.rem b/include/holidays/to.rem
index e22c2f8d..9b3eefc9 100644
--- a/include/holidays/to.rem
+++ b/include/holidays/to.rem
@@ -7,30 +7,30 @@ OMIT 1 January MSG 'Uluaki 'Aho 'o e Ta'u Fo'ou
 OMIT [easterdate($Uy)-2] MSG Falaite Lelei
 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)
-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)
-REM 8 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 4)) == 4] MSG 'Aho Tau'ataina (fakatokanga'i)
+REM 2 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 4)) == 3] MSG 'Aho Tau'ataina (fakatokanga'i)
+REM 3 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 4)) == 2] MSG 'Aho Tau'ataina (fakatokanga'i)
+REM 4 June ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG 'Aho Tau'ataina (fakatokanga'i)
+REM 5 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 4)) == 0] MSG 'Aho Tau'ataina (fakatokanga'i)
+REM 6 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 4)) == 6] MSG 'Aho Tau'ataina (fakatokanga'i)
+REM 7 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 4)) == 5] MSG 'Aho Tau'ataina (fakatokanga'i)
+REM 8 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 4)) == 4] MSG 'Aho Tau'ataina (fakatokanga'i)
 OMIT 4 July MSG 'Aho 'Alo'i 'o 'Ene 'Afio ko e Tu'i 'o Tonga 'oku lolotonga Pule
-REM 5 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 4)) == 0] MSG 'Aho 'Alo'i 'o 'Ene 'Afio ko e Tu'i 'o Tonga 'oku lolotonga Pule (fakatokanga'i)
+REM 5 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 4)) == 0] MSG 'Aho 'Alo'i 'o 'Ene 'Afio ko e Tu'i 'o Tonga 'oku lolotonga Pule (fakatokanga'i)
 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)
-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)
-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)
-REM 8 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 4)) == 4] MSG 'Aho Fakamanatu 'o e Hilifaki Kalauni 'o 'Ene 'Afio ko Siaosi Tupou I (fakatokanga'i)
+REM 18 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 17)) == 0] MSG 'Aho 'Alo'i 'o e 'Ea ki he Kalauni 'o Tonga (fakatokanga'i)
+REM 2 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 4)) == 3] MSG 'Aho Konisitutone (fakatokanga'i)
+REM 3 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 4)) == 2] MSG 'Aho Konisitutone (fakatokanga'i)
+REM 4 November ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG 'Aho Konisitutone (fakatokanga'i)
+REM 5 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 4)) == 0] MSG 'Aho Konisitutone (fakatokanga'i)
+REM 6 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 4)) == 6] MSG 'Aho Konisitutone (fakatokanga'i)
+REM 7 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 4)) == 5] MSG 'Aho Konisitutone (fakatokanga'i)
+REM 8 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 4)) == 4] MSG 'Aho Konisitutone (fakatokanga'i)
+REM 2 December ADDOMIT SCANFROM -28 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 ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 4)) == 2] MSG 'Aho Fakamanatu 'o e Hilifaki Kalauni 'o 'Ene 'Afio ko Siaosi Tupou I (fakatokanga'i)
+REM 4 December ADDOMIT SCANFROM -28 SATISFY [$Tw != 0] MSG 'Aho Fakamanatu 'o e Hilifaki Kalauni 'o 'Ene 'Afio ko Siaosi Tupou I (fakatokanga'i)
+REM 5 December ADDOMIT SCANFROM -28 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 ADDOMIT SCANFROM -28 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 ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 4)) == 5] MSG 'Aho Fakamanatu 'o e Hilifaki Kalauni 'o 'Ene 'Afio ko Siaosi Tupou I (fakatokanga'i)
+REM 8 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 4)) == 4] MSG 'Aho Fakamanatu 'o e Hilifaki Kalauni 'o 'Ene 'Afio ko Siaosi Tupou I (fakatokanga'i)
 OMIT 25 December MSG 'Aho Kilisimasi
 OMIT 26 December MSG 'Aho 2 'o e Kilisimasi
diff --git a/include/holidays/tw.rem b/include/holidays/tw.rem
index 53170f4c..0e57458e 100644
--- a/include/holidays/tw.rem
+++ b/include/holidays/tw.rem
@@ -9,16 +9,16 @@ REM 1 January OMIT SAT SUN BEFORE ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($T
 OMIT 28 February MSG 和平紀念日
 REM 28 February OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 28))==0 || wkdaynum(date($Ty, 2, 28))==6] MSG 和平紀念日（慶祝）
 REM 28 February OMIT SAT SUN BEFORE ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 28))==0 || wkdaynum(date($Ty, 2, 28))==6] MSG 和平紀念日（慶祝）
-REM 2 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 4)) == 0] MSG 兒童節（慶祝）
-REM 3 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 4)) == 2] MSG 兒童節（慶祝）
-REM 3 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 4)) == 3] MSG 兒童節（慶祝）
-REM 3 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 4)) == 5] MSG 兒童節（慶祝）
-REM 3 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 4)) == 6] MSG 兒童節（慶祝）
+REM 2 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 4)) == 0] MSG 兒童節（慶祝）
+REM 3 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 4)) == 2] MSG 兒童節（慶祝）
+REM 3 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 4)) == 3] MSG 兒童節（慶祝）
+REM 3 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 4)) == 5] MSG 兒童節（慶祝）
+REM 3 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 4)) == 6] MSG 兒童節（慶祝）
 OMIT 4 April MSG 兒童節
 REM 4 April OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 4))==0 || wkdaynum(date($Ty, 4, 4))==6] MSG 清明節（慶祝）
 REM 4 April OMIT SAT SUN BEFORE ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 4))==0 || wkdaynum(date($Ty, 4, 4))==6] MSG 清明節（慶祝）
-REM 5 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 4)) == 1] MSG 兒童節（慶祝）
-REM 5 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 4)) == 4] MSG 兒童節（慶祝）
+REM 5 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 4)) == 1] MSG 兒童節（慶祝）
+REM 5 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 4)) == 4] MSG 兒童節（慶祝）
 OMIT 10 October MSG 中華民國國慶日
 REM 10 October OMIT SAT SUN AFTER ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 10))==0 || wkdaynum(date($Ty, 10, 10))==6] MSG 中華民國國慶日（慶祝）
 REM 10 October OMIT SAT SUN BEFORE ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 10))==0 || wkdaynum(date($Ty, 10, 10))==6] MSG 中華民國國慶日（慶祝）
diff --git a/include/holidays/uk.rem b/include/holidays/uk.rem
index fb4c334c..b39727fd 100644
--- a/include/holidays/uk.rem
+++ b/include/holidays/uk.rem
@@ -11,14 +11,14 @@
 # [$SysInclude]/uk/
 
 OMIT 1 January MSG New Year's Day
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
 OMIT [easterdate($Uy)-2] MSG Good Friday
-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 Monday in May ADDOMIT SCANFROM -28 MSG May Day
+REM Last Monday in May ADDOMIT SCANFROM -28 MSG Spring Bank Holiday
 OMIT 25 December MSG Christmas Day
 OMIT 26 December MSG Boxing Day
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Boxing Day (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Boxing Day (observed)
diff --git a/include/holidays/uk/eng.rem b/include/holidays/uk/eng.rem
index b0fcc9dd..2d867676 100644
--- a/include/holidays/uk/eng.rem
+++ b/include/holidays/uk/eng.rem
@@ -10,4 +10,4 @@
 # also include [$SysInclude]/uk.rem
 
 OMIT [easterdate($Uy)+1] MSG Easter Monday
-REM Last Monday in August SCANFROM -28 ADDOMIT MSG Late Summer Bank Holiday
+REM Last Monday in August ADDOMIT SCANFROM -28 MSG Late Summer Bank Holiday
diff --git a/include/holidays/uk/nir.rem b/include/holidays/uk/nir.rem
index 37183467..c1b2ff31 100644
--- a/include/holidays/uk/nir.rem
+++ b/include/holidays/uk/nir.rem
@@ -10,10 +10,10 @@
 # also include [$SysInclude]/uk.rem
 
 OMIT 17 March MSG Saint Patrick's Day
-REM 18 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 17)) == 0] MSG Saint Patrick's Day (observed)
-REM 19 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 17)) == 6] MSG Saint Patrick's Day (observed)
+REM 18 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 17)) == 0] MSG Saint Patrick's Day (observed)
+REM 19 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 17)) == 6] MSG Saint Patrick's Day (observed)
 OMIT [easterdate($Uy)+1] MSG Easter Monday
 OMIT 12 July MSG Battle of the Boyne
-REM 13 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 12)) == 0] MSG Battle of the Boyne (observed)
-REM 14 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 12)) == 6] MSG Battle of the Boyne (observed)
-REM Last Monday in August SCANFROM -28 ADDOMIT MSG Late Summer Bank Holiday
+REM 13 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 12)) == 0] MSG Battle of the Boyne (observed)
+REM 14 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 12)) == 6] MSG Battle of the Boyne (observed)
+REM Last Monday in August ADDOMIT SCANFROM -28 MSG Late Summer Bank Holiday
diff --git a/include/holidays/uk/sct.rem b/include/holidays/uk/sct.rem
index 415bafe9..bd36cac0 100644
--- a/include/holidays/uk/sct.rem
+++ b/include/holidays/uk/sct.rem
@@ -10,10 +10,10 @@
 # also include [$SysInclude]/uk.rem
 
 OMIT 2 January MSG New Year Holiday
-REM 3 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 2)) == 1] MSG New Year Holiday (observed)
-REM 4 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 2)) == 0] MSG New Year Holiday (observed)
-REM 4 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 2)) == 6] MSG New Year Holiday (observed)
-REM First Monday in August SCANFROM -28 ADDOMIT MSG Summer Bank Holiday
+REM 3 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 2)) == 1] MSG New Year Holiday (observed)
+REM 4 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 2)) == 0] MSG New Year Holiday (observed)
+REM 4 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 2)) == 6] MSG New Year Holiday (observed)
+REM First Monday in August ADDOMIT SCANFROM -28 MSG Summer Bank Holiday
 OMIT 30 November MSG Saint Andrew's Day
-REM 1 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 30)) == 0] MSG Saint Andrew's Day (observed)
-REM 2 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 30)) == 6] MSG Saint Andrew's Day (observed)
+REM 1 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 30)) == 0] MSG Saint Andrew's Day (observed)
+REM 2 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 30)) == 6] MSG Saint Andrew's Day (observed)
diff --git a/include/holidays/uk/wls.rem b/include/holidays/uk/wls.rem
index e41f0fb1..70c4b2fa 100644
--- a/include/holidays/uk/wls.rem
+++ b/include/holidays/uk/wls.rem
@@ -10,4 +10,4 @@
 # also include [$SysInclude]/uk.rem
 
 OMIT [easterdate($Uy)+1] MSG Easter Monday
-REM Last Monday in August SCANFROM -28 ADDOMIT MSG Late Summer Bank Holiday
+REM Last Monday in August ADDOMIT SCANFROM -28 MSG Late Summer Bank Holiday
diff --git a/include/holidays/um.rem b/include/holidays/um.rem
index ad62faae..168bb24e 100644
--- a/include/holidays/um.rem
+++ b/include/holidays/um.rem
@@ -4,25 +4,25 @@
 # https://github.com/vacanza/holidays
 
 OMIT 1 January MSG New Year's Day
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM Third Monday in January SCANFROM -28 ADDOMIT MSG Martin Luther King Jr. Day
-REM Third Monday in February SCANFROM -28 ADDOMIT MSG Washington's Birthday
-REM Last Monday in May SCANFROM -28 ADDOMIT MSG Memorial Day
-REM 18 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 19)) == 6] MSG Juneteenth National Independence Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM Third Monday in January ADDOMIT SCANFROM -28 MSG Martin Luther King Jr. Day
+REM Third Monday in February ADDOMIT SCANFROM -28 MSG Washington's Birthday
+REM Last Monday in May ADDOMIT SCANFROM -28 MSG Memorial Day
+REM 18 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 19)) == 6] MSG Juneteenth National Independence Day (observed)
 OMIT 19 June MSG Juneteenth National Independence Day
-REM 20 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 19)) == 0] MSG Juneteenth National Independence Day (observed)
-REM 3 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 4)) == 6] MSG Independence Day (observed)
+REM 20 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 19)) == 0] MSG Juneteenth National Independence Day (observed)
+REM 3 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 4)) == 6] MSG Independence Day (observed)
 OMIT 4 July MSG Independence Day
-REM 5 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 4)) == 0] MSG Independence Day (observed)
-REM First Monday in September SCANFROM -28 ADDOMIT MSG Labor Day
-REM 10 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 11)) == 6] MSG Veterans Day (observed)
+REM 5 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 4)) == 0] MSG Independence Day (observed)
+REM First Monday in September ADDOMIT SCANFROM -28 MSG Labor Day
+REM 10 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 6] MSG Veterans Day (observed)
 OMIT 11 November MSG Veterans Day
-REM 12 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 11)) == 0] MSG Veterans Day (observed)
-REM Fourth Thursday in November SCANFROM -28 ADDOMIT MSG Thanksgiving
-REM 24 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
+REM 12 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 0] MSG Veterans Day (observed)
+REM Fourth Thursday in November ADDOMIT SCANFROM -28 MSG Thanksgiving
+REM 24 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
 OMIT 25 December MSG Christmas Day
-REM 26 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 31 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 31 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
 
 # Optional holidays
 REM 14 February MSG Valentine's Day
diff --git a/include/holidays/us.rem b/include/holidays/us.rem
index ed99e9e8..c66e41d6 100644
--- a/include/holidays/us.rem
+++ b/include/holidays/us.rem
@@ -11,26 +11,26 @@
 # [$SysInclude]/us/
 
 OMIT 1 January MSG New Year's Day
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
-REM Third Monday in January SCANFROM -28 ADDOMIT MSG Martin Luther King Jr. Day
-REM Third Monday in February SCANFROM -28 ADDOMIT MSG Washington's Birthday
-REM Last Monday in May SCANFROM -28 ADDOMIT MSG Memorial Day
-REM 18 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 19)) == 6] MSG Juneteenth National Independence Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM Third Monday in January ADDOMIT SCANFROM -28 MSG Martin Luther King Jr. Day
+REM Third Monday in February ADDOMIT SCANFROM -28 MSG Washington's Birthday
+REM Last Monday in May ADDOMIT SCANFROM -28 MSG Memorial Day
+REM 18 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 19)) == 6] MSG Juneteenth National Independence Day (observed)
 OMIT 19 June MSG Juneteenth National Independence Day
-REM 20 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 19)) == 0] MSG Juneteenth National Independence Day (observed)
-REM 3 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 4)) == 6] MSG Independence Day (observed)
+REM 20 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 19)) == 0] MSG Juneteenth National Independence Day (observed)
+REM 3 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 4)) == 6] MSG Independence Day (observed)
 OMIT 4 July MSG Independence Day
-REM 5 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 4)) == 0] MSG Independence Day (observed)
-REM First Monday in September SCANFROM -28 ADDOMIT MSG Labor Day
-REM Second Monday in October SCANFROM -28 ADDOMIT MSG Columbus Day
-REM 10 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 11)) == 6] MSG Veterans Day (observed)
+REM 5 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 4)) == 0] MSG Independence Day (observed)
+REM First Monday in September ADDOMIT SCANFROM -28 MSG Labor Day
+REM Second Monday in October ADDOMIT SCANFROM -28 MSG Columbus Day
+REM 10 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 6] MSG Veterans Day (observed)
 OMIT 11 November MSG Veterans Day
-REM 12 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 11)) == 0] MSG Veterans Day (observed)
-REM Fourth Thursday in November SCANFROM -28 ADDOMIT MSG Thanksgiving
-REM 24 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
+REM 12 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 0] MSG Veterans Day (observed)
+REM Fourth Thursday in November ADDOMIT SCANFROM -28 MSG Thanksgiving
+REM 24 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
 OMIT 25 December MSG Christmas Day
-REM 26 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 31 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 31 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
 
 # Optional holidays
 REM 2 February MSG Groundhog Day
diff --git a/include/holidays/us/ak.rem b/include/holidays/us/ak.rem
index 663e80ce..d24875f7 100644
--- a/include/holidays/us/ak.rem
+++ b/include/holidays/us/ak.rem
@@ -9,8 +9,8 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/us.rem
 
-REM Last Monday in March SCANFROM -28 ADDOMIT MSG Seward's Day
-REM Second Monday in October SCANFROM -28 ADDOMIT MSG Indigenous Peoples' Day
-REM 17 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 18)) == 6] MSG Alaska Day (observed)
+REM Last Monday in March ADDOMIT SCANFROM -28 MSG Seward's Day
+REM Second Monday in October ADDOMIT SCANFROM -28 MSG Indigenous Peoples' Day
+REM 17 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 18)) == 6] MSG Alaska Day (observed)
 OMIT 18 October MSG Alaska Day
-REM 19 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 18)) == 0] MSG Alaska Day (observed)
+REM 19 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 18)) == 0] MSG Alaska Day (observed)
diff --git a/include/holidays/us/al.rem b/include/holidays/us/al.rem
index fc89ab6b..a1708322 100644
--- a/include/holidays/us/al.rem
+++ b/include/holidays/us/al.rem
@@ -9,8 +9,8 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/us.rem
 
-REM Third Monday in January SCANFROM -28 ADDOMIT MSG Martin Luther King, Jr & Robert E. Lee's Birthday
-REM Third Monday in February SCANFROM -28 ADDOMIT MSG George Washington & Thomas Jefferson's Birthday
-REM Fourth Monday in April SCANFROM -28 ADDOMIT MSG Confederate Memorial Day
-REM First Monday in June SCANFROM -28 ADDOMIT MSG Jefferson Davis Birthday
-REM Second Monday in October SCANFROM -28 ADDOMIT MSG Columbus Day / American Indian Heritage Day / Fraternal Day
+REM Third Monday in January ADDOMIT SCANFROM -28 MSG Martin Luther King, Jr & Robert E. Lee's Birthday
+REM Third Monday in February ADDOMIT SCANFROM -28 MSG George Washington & Thomas Jefferson's Birthday
+REM Fourth Monday in April ADDOMIT SCANFROM -28 MSG Confederate Memorial Day
+REM First Monday in June ADDOMIT SCANFROM -28 MSG Jefferson Davis Birthday
+REM Second Monday in October ADDOMIT SCANFROM -28 MSG Columbus Day / American Indian Heritage Day / Fraternal Day
diff --git a/include/holidays/us/ar.rem b/include/holidays/us/ar.rem
index aa27f43b..aea718d2 100644
--- a/include/holidays/us/ar.rem
+++ b/include/holidays/us/ar.rem
@@ -9,4 +9,4 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/us.rem
 
-REM Third Monday in February SCANFROM -28 ADDOMIT MSG George Washington's Birthday and Daisy Gatson Bates Day
+REM Third Monday in February ADDOMIT SCANFROM -28 MSG George Washington's Birthday and Daisy Gatson Bates Day
diff --git a/include/holidays/us/as.rem b/include/holidays/us/as.rem
index 0e2a1026..0d29f768 100644
--- a/include/holidays/us/as.rem
+++ b/include/holidays/us/as.rem
@@ -9,10 +9,10 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/us.rem
 
-REM 16 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 17)) == 6] MSG American Samoa Flag Day (observed)
+REM 16 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 17)) == 6] MSG American Samoa Flag Day (observed)
 OMIT 17 April MSG American Samoa Flag Day
-REM 18 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 17)) == 0] MSG American Samoa Flag Day (observed)
-REM 15 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 16)) == 6] MSG Manu'a Islands Cession Day (observed)
+REM 18 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 17)) == 0] MSG American Samoa Flag Day (observed)
+REM 15 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 16)) == 6] MSG Manu'a Islands Cession Day (observed)
 OMIT 16 July MSG Manu'a Islands Cession Day
-REM 17 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 16)) == 0] MSG Manu'a Islands Cession Day (observed)
-REM Second Sunday in October SCANFROM -28 ADDOMIT MSG White Sunday
+REM 17 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 16)) == 0] MSG Manu'a Islands Cession Day (observed)
+REM Second Sunday in October ADDOMIT SCANFROM -28 MSG White Sunday
diff --git a/include/holidays/us/az.rem b/include/holidays/us/az.rem
index 4c14b856..9ec6c9c4 100644
--- a/include/holidays/us/az.rem
+++ b/include/holidays/us/az.rem
@@ -9,4 +9,4 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/us.rem
 
-REM Third Monday in January SCANFROM -28 ADDOMIT MSG Dr. Martin Luther King Jr. / Civil Rights Day
+REM Third Monday in January ADDOMIT SCANFROM -28 MSG Dr. Martin Luther King Jr. / Civil Rights Day
diff --git a/include/holidays/us/ca.rem b/include/holidays/us/ca.rem
index 30e5c4bc..dec58061 100644
--- a/include/holidays/us/ca.rem
+++ b/include/holidays/us/ca.rem
@@ -11,5 +11,5 @@
 
 OMIT 15 February MSG Susan B. Anthony Day
 OMIT 31 March MSG Cesar Chavez Day
-REM 1 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 31)) == 0] MSG Cesar Chavez Day (observed)
+REM 1 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 31)) == 0] MSG Cesar Chavez Day (observed)
 REM Friday 23 November ADDOMIT SCANFROM -28 MSG Day After Thanksgiving
diff --git a/include/holidays/us/co.rem b/include/holidays/us/co.rem
index 1031871a..cba2757f 100644
--- a/include/holidays/us/co.rem
+++ b/include/holidays/us/co.rem
@@ -10,4 +10,4 @@
 # also include [$SysInclude]/us.rem
 
 OMIT 31 March MSG Cesar Chavez Day
-REM First Monday in October SCANFROM -28 ADDOMIT MSG Frances Xavier Cabrini Day
+REM First Monday in October ADDOMIT SCANFROM -28 MSG Frances Xavier Cabrini Day
diff --git a/include/holidays/us/ct.rem b/include/holidays/us/ct.rem
index de6dcacd..f02e5c32 100644
--- a/include/holidays/us/ct.rem
+++ b/include/holidays/us/ct.rem
@@ -9,7 +9,7 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/us.rem
 
-REM 11 February SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 2, 12)) == 6] MSG Lincoln's Birthday (observed)
+REM 11 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 12)) == 6] MSG Lincoln's Birthday (observed)
 OMIT 12 February MSG Lincoln's Birthday
-REM 13 February SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 2, 12)) == 0] MSG Lincoln's Birthday (observed)
+REM 13 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 12)) == 0] MSG Lincoln's Birthday (observed)
 OMIT [easterdate($Uy)-2] MSG Good Friday
diff --git a/include/holidays/us/dc.rem b/include/holidays/us/dc.rem
index 81f77f04..75bf3f9b 100644
--- a/include/holidays/us/dc.rem
+++ b/include/holidays/us/dc.rem
@@ -9,7 +9,7 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/us.rem
 
-REM 15 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 16)) == 6] MSG Emancipation Day (observed)
+REM 15 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 16)) == 6] MSG Emancipation Day (observed)
 OMIT 16 April MSG Emancipation Day
-REM 17 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 16)) == 0] MSG Emancipation Day (observed)
-REM Second Monday in October SCANFROM -28 ADDOMIT MSG Indigenous Peoples' Day
+REM 17 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 16)) == 0] MSG Emancipation Day (observed)
+REM Second Monday in October ADDOMIT SCANFROM -28 MSG Indigenous Peoples' Day
diff --git a/include/holidays/us/ga.rem b/include/holidays/us/ga.rem
index 49f9a253..7e58b2b3 100644
--- a/include/holidays/us/ga.rem
+++ b/include/holidays/us/ga.rem
@@ -9,5 +9,5 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/us.rem
 
-REM Fourth Monday in April SCANFROM -28 ADDOMIT MSG State Holiday
+REM Fourth Monday in April ADDOMIT SCANFROM -28 MSG State Holiday
 REM Friday 23 November ADDOMIT SCANFROM -28 MSG State Holiday
diff --git a/include/holidays/us/gu.rem b/include/holidays/us/gu.rem
index b497dd3a..fba13e1a 100644
--- a/include/holidays/us/gu.rem
+++ b/include/holidays/us/gu.rem
@@ -9,7 +9,7 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/us.rem
 
-REM First Monday in March SCANFROM -28 ADDOMIT MSG Guam Discovery Day
+REM First Monday in March ADDOMIT SCANFROM -28 MSG Guam Discovery Day
 OMIT [easterdate($Uy)-2] MSG Good Friday
 OMIT 21 July MSG Liberation Day (Guam)
 OMIT 2 November MSG All Souls' Day
diff --git a/include/holidays/us/hi.rem b/include/holidays/us/hi.rem
index eb826cbf..617dd44b 100644
--- a/include/holidays/us/hi.rem
+++ b/include/holidays/us/hi.rem
@@ -9,10 +9,10 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/us.rem
 
-REM 25 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 26)) == 6] MSG Prince Jonah Kuhio Kalanianaole Day (observed)
+REM 25 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 26)) == 6] MSG Prince Jonah Kuhio Kalanianaole Day (observed)
 OMIT 26 March MSG Prince Jonah Kuhio Kalanianaole Day
-REM 27 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 26)) == 0] MSG Prince Jonah Kuhio Kalanianaole Day (observed)
-REM 10 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 11)) == 6] MSG Kamehameha Day (observed)
+REM 27 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 26)) == 0] MSG Prince Jonah Kuhio Kalanianaole Day (observed)
+REM 10 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 11)) == 6] MSG Kamehameha Day (observed)
 OMIT 11 June MSG Kamehameha Day
-REM 12 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 11)) == 0] MSG Kamehameha Day (observed)
-REM Third Friday in August SCANFROM -28 ADDOMIT MSG Statehood Day
+REM 12 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 11)) == 0] MSG Kamehameha Day (observed)
+REM Third Friday in August ADDOMIT SCANFROM -28 MSG Statehood Day
diff --git a/include/holidays/us/ia.rem b/include/holidays/us/ia.rem
index 15705d2d..4e47638b 100644
--- a/include/holidays/us/ia.rem
+++ b/include/holidays/us/ia.rem
@@ -9,6 +9,6 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/us.rem
 
-REM 11 February SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 2, 12)) == 6] MSG Lincoln's Birthday (observed)
+REM 11 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 12)) == 6] MSG Lincoln's Birthday (observed)
 OMIT 12 February MSG Lincoln's Birthday
-REM 13 February SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 2, 12)) == 0] MSG Lincoln's Birthday (observed)
+REM 13 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 12)) == 0] MSG Lincoln's Birthday (observed)
diff --git a/include/holidays/us/id.rem b/include/holidays/us/id.rem
index 813454e5..157ff9e5 100644
--- a/include/holidays/us/id.rem
+++ b/include/holidays/us/id.rem
@@ -9,4 +9,4 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/us.rem
 
-REM Third Monday in January SCANFROM -28 ADDOMIT MSG Martin Luther King Jr. / Idaho Human Rights Day
+REM Third Monday in January ADDOMIT SCANFROM -28 MSG Martin Luther King Jr. / Idaho Human Rights Day
diff --git a/include/holidays/us/il.rem b/include/holidays/us/il.rem
index c5863eb6..c70548e2 100644
--- a/include/holidays/us/il.rem
+++ b/include/holidays/us/il.rem
@@ -9,7 +9,7 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/us.rem
 
-REM 11 February SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 2, 12)) == 6] MSG Lincoln's Birthday (observed)
+REM 11 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 12)) == 6] MSG Lincoln's Birthday (observed)
 OMIT 12 February MSG Lincoln's Birthday
-REM 13 February SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 2, 12)) == 0] MSG Lincoln's Birthday (observed)
-REM First Monday in March SCANFROM -28 ADDOMIT MSG Casimir Pulaski Day
+REM 13 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 12)) == 0] MSG Lincoln's Birthday (observed)
+REM First Monday in March ADDOMIT SCANFROM -28 MSG Casimir Pulaski Day
diff --git a/include/holidays/us/ks.rem b/include/holidays/us/ks.rem
index f9535867..c93ee18a 100644
--- a/include/holidays/us/ks.rem
+++ b/include/holidays/us/ks.rem
@@ -9,7 +9,7 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/us.rem
 
-REM 22 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 24)) == 0] MSG Christmas Eve (observed)
-REM 23 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 24)) == 5] MSG Christmas Eve (observed)
-REM 23 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 24)) == 6] MSG Christmas Eve (observed)
+REM 22 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 24)) == 0] MSG Christmas Eve (observed)
+REM 23 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 24)) == 5] MSG Christmas Eve (observed)
+REM 23 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 24)) == 6] MSG Christmas Eve (observed)
 OMIT 24 December MSG Christmas Eve
diff --git a/include/holidays/us/ky.rem b/include/holidays/us/ky.rem
index 46096db8..91b1d7ec 100644
--- a/include/holidays/us/ky.rem
+++ b/include/holidays/us/ky.rem
@@ -9,7 +9,7 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/us.rem
 
-REM 1 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 31)) == 0] MSG New Year's Eve (observed)
+REM 1 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 31)) == 0] MSG New Year's Eve (observed)
 OMIT [easterdate($Uy)-2] MSG Good Friday
-REM 30 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 31)) == 6] MSG New Year's Eve (observed)
+REM 30 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 31)) == 6] MSG New Year's Eve (observed)
 OMIT 31 December MSG New Year's Eve
diff --git a/include/holidays/us/ma.rem b/include/holidays/us/ma.rem
index 03589d4f..60ade817 100644
--- a/include/holidays/us/ma.rem
+++ b/include/holidays/us/ma.rem
@@ -10,6 +10,6 @@
 # also include [$SysInclude]/us.rem
 
 OMIT 17 March MSG Evacuation Day
-REM 18 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 17)) == 0] MSG Evacuation Day (observed)
-REM 19 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 17)) == 6] MSG Evacuation Day (observed)
-REM Third Monday in April SCANFROM -28 ADDOMIT MSG Patriots' Day
+REM 18 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 17)) == 0] MSG Evacuation Day (observed)
+REM 19 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 17)) == 6] MSG Evacuation Day (observed)
+REM Third Monday in April ADDOMIT SCANFROM -28 MSG Patriots' Day
diff --git a/include/holidays/us/me.rem b/include/holidays/us/me.rem
index 0b4def74..9cfabd1e 100644
--- a/include/holidays/us/me.rem
+++ b/include/holidays/us/me.rem
@@ -9,5 +9,5 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/us.rem
 
-REM Third Monday in April SCANFROM -28 ADDOMIT MSG Patriots' Day
-REM Second Monday in October SCANFROM -28 ADDOMIT MSG Indigenous Peoples' Day
+REM Third Monday in April ADDOMIT SCANFROM -28 MSG Patriots' Day
+REM Second Monday in October ADDOMIT SCANFROM -28 MSG Indigenous Peoples' Day
diff --git a/include/holidays/us/mi.rem b/include/holidays/us/mi.rem
index e8b33ce1..6c9d942f 100644
--- a/include/holidays/us/mi.rem
+++ b/include/holidays/us/mi.rem
@@ -9,10 +9,10 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/us.rem
 
-REM 1 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 31)) == 0] MSG New Year's Eve (observed)
-REM 22 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 24)) == 0] MSG Christmas Eve (observed)
-REM 23 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 24)) == 5] MSG Christmas Eve (observed)
-REM 23 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 24)) == 6] MSG Christmas Eve (observed)
+REM 1 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 31)) == 0] MSG New Year's Eve (observed)
+REM 22 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 24)) == 0] MSG Christmas Eve (observed)
+REM 23 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 24)) == 5] MSG Christmas Eve (observed)
+REM 23 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 24)) == 6] MSG Christmas Eve (observed)
 OMIT 24 December MSG Christmas Eve
-REM 30 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 31)) == 6] MSG New Year's Eve (observed)
+REM 30 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 31)) == 6] MSG New Year's Eve (observed)
 OMIT 31 December MSG New Year's Eve
diff --git a/include/holidays/us/mo.rem b/include/holidays/us/mo.rem
index 10e90a09..aaa1eb7e 100644
--- a/include/holidays/us/mo.rem
+++ b/include/holidays/us/mo.rem
@@ -9,6 +9,6 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/us.rem
 
-REM 7 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 8)) == 6] MSG Truman Day (observed)
+REM 7 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 8)) == 6] MSG Truman Day (observed)
 OMIT 8 May MSG Truman Day
-REM 9 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 8)) == 0] MSG Truman Day (observed)
+REM 9 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 8)) == 0] MSG Truman Day (observed)
diff --git a/include/holidays/us/mp.rem b/include/holidays/us/mp.rem
index 8c3f3f7b..8006b1ed 100644
--- a/include/holidays/us/mp.rem
+++ b/include/holidays/us/mp.rem
@@ -9,14 +9,14 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/us.rem
 
-REM 23 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 24)) == 6] MSG Commonwealth Covenant Day (observed)
+REM 23 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 24)) == 6] MSG Commonwealth Covenant Day (observed)
 OMIT 24 March MSG Commonwealth Covenant Day
-REM 25 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 24)) == 0] MSG Commonwealth Covenant Day (observed)
+REM 25 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 24)) == 0] MSG Commonwealth Covenant Day (observed)
 OMIT [easterdate($Uy)-2] MSG Good Friday
-REM Second Monday in October SCANFROM -28 ADDOMIT MSG Commonwealth Cultural Day
-REM 3 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 4)) == 6] MSG Citizenship Day (observed)
+REM Second Monday in October ADDOMIT SCANFROM -28 MSG Commonwealth Cultural Day
+REM 3 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 4)) == 6] MSG Citizenship Day (observed)
 OMIT 4 November MSG Citizenship Day
-REM 5 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 4)) == 0] MSG Citizenship Day (observed)
-REM 7 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 8)) == 6] MSG Constitution Day (observed)
+REM 5 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 4)) == 0] MSG Citizenship Day (observed)
+REM 7 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 8)) == 6] MSG Constitution Day (observed)
 OMIT 8 December MSG Constitution Day
-REM 9 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 8)) == 0] MSG Constitution Day (observed)
+REM 9 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 8)) == 0] MSG Constitution Day (observed)
diff --git a/include/holidays/us/ms.rem b/include/holidays/us/ms.rem
index 0016cab9..d1244dac 100644
--- a/include/holidays/us/ms.rem
+++ b/include/holidays/us/ms.rem
@@ -9,5 +9,5 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/us.rem
 
-REM Third Monday in January SCANFROM -28 ADDOMIT MSG Dr. Martin Luther King Jr. and Robert E. Lee's Birthdays
-REM Last Monday in April SCANFROM -28 ADDOMIT MSG Confederate Memorial Day
+REM Third Monday in January ADDOMIT SCANFROM -28 MSG Dr. Martin Luther King Jr. and Robert E. Lee's Birthdays
+REM Last Monday in April ADDOMIT SCANFROM -28 MSG Confederate Memorial Day
diff --git a/include/holidays/us/nc.rem b/include/holidays/us/nc.rem
index 20584452..d7890492 100644
--- a/include/holidays/us/nc.rem
+++ b/include/holidays/us/nc.rem
@@ -11,11 +11,11 @@
 
 OMIT [easterdate($Uy)-2] MSG Good Friday
 REM Friday 23 November ADDOMIT SCANFROM -28 MSG Day After Thanksgiving
-REM 22 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 24)) == 0] MSG Christmas Eve (observed)
-REM 23 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 24)) == 5] MSG Christmas Eve (observed)
-REM 23 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 24)) == 6] MSG Christmas Eve (observed)
+REM 22 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 24)) == 0] MSG Christmas Eve (observed)
+REM 23 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 24)) == 5] MSG Christmas Eve (observed)
+REM 23 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 24)) == 6] MSG Christmas Eve (observed)
 OMIT 24 December MSG Christmas Eve
 OMIT 26 December MSG Day After Christmas
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Day After Christmas (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 1] MSG Day After Christmas (observed)
-REM 28 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Day After Christmas (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Day After Christmas (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 1] MSG Day After Christmas (observed)
+REM 28 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 6] MSG Day After Christmas (observed)
diff --git a/include/holidays/us/ne.rem b/include/holidays/us/ne.rem
index e5c6b110..aa17b2ea 100644
--- a/include/holidays/us/ne.rem
+++ b/include/holidays/us/ne.rem
@@ -9,5 +9,5 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/us.rem
 
-REM Last Friday in April SCANFROM -28 ADDOMIT MSG Arbor Day
-REM Second Monday in October SCANFROM -28 ADDOMIT MSG Indigenous Peoples' Day
+REM Last Friday in April ADDOMIT SCANFROM -28 MSG Arbor Day
+REM Second Monday in October ADDOMIT SCANFROM -28 MSG Indigenous Peoples' Day
diff --git a/include/holidays/us/nh.rem b/include/holidays/us/nh.rem
index 14381265..b08a0c49 100644
--- a/include/holidays/us/nh.rem
+++ b/include/holidays/us/nh.rem
@@ -9,5 +9,5 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/us.rem
 
-REM Third Monday in January SCANFROM -28 ADDOMIT MSG Dr. Martin Luther King Jr. / Civil Rights Day
+REM Third Monday in January ADDOMIT SCANFROM -28 MSG Dr. Martin Luther King Jr. / Civil Rights Day
 REM Friday 23 November ADDOMIT SCANFROM -28 MSG Day After Thanksgiving
diff --git a/include/holidays/us/nj.rem b/include/holidays/us/nj.rem
index 1f544e3a..6dafdab9 100644
--- a/include/holidays/us/nj.rem
+++ b/include/holidays/us/nj.rem
@@ -9,7 +9,7 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/us.rem
 
-REM 11 February SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 2, 12)) == 6] MSG Lincoln's Birthday (observed)
+REM 11 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 12)) == 6] MSG Lincoln's Birthday (observed)
 OMIT 12 February MSG Lincoln's Birthday
-REM 13 February SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 2, 12)) == 0] MSG Lincoln's Birthday (observed)
+REM 13 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 12)) == 0] MSG Lincoln's Birthday (observed)
 OMIT [easterdate($Uy)-2] MSG Good Friday
diff --git a/include/holidays/us/nm.rem b/include/holidays/us/nm.rem
index 6556a189..eb0bc68b 100644
--- a/include/holidays/us/nm.rem
+++ b/include/holidays/us/nm.rem
@@ -9,5 +9,5 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/us.rem
 
-REM Second Monday in October SCANFROM -28 ADDOMIT MSG Indigenous Peoples' Day
+REM Second Monday in October ADDOMIT SCANFROM -28 MSG Indigenous Peoples' Day
 REM Friday 23 November ADDOMIT SCANFROM -28 MSG Presidents' Day
diff --git a/include/holidays/us/nv.rem b/include/holidays/us/nv.rem
index 43f9c76d..ad3cf9dc 100644
--- a/include/holidays/us/nv.rem
+++ b/include/holidays/us/nv.rem
@@ -9,7 +9,7 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/us.rem
 
-REM 24 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 25)) == 6] MSG Nevada Day (observed)
-REM 26 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 25)) == 0] MSG Nevada Day (observed)
-REM Last Friday in October SCANFROM -28 ADDOMIT MSG Nevada Day
+REM 24 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 25)) == 6] MSG Nevada Day (observed)
+REM 26 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 25)) == 0] MSG Nevada Day (observed)
+REM Last Friday in October ADDOMIT SCANFROM -28 MSG Nevada Day
 REM Friday 23 November ADDOMIT SCANFROM -28 MSG Family Day
diff --git a/include/holidays/us/ny.rem b/include/holidays/us/ny.rem
index ac180b4a..c1e9140b 100644
--- a/include/holidays/us/ny.rem
+++ b/include/holidays/us/ny.rem
@@ -9,7 +9,7 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/us.rem
 
-REM 11 February SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 2, 12)) == 6] MSG Lincoln's Birthday (observed)
+REM 11 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 12)) == 6] MSG Lincoln's Birthday (observed)
 OMIT 12 February MSG Lincoln's Birthday
-REM 13 February SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 2, 12)) == 0] MSG Lincoln's Birthday (observed)
+REM 13 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 12)) == 0] MSG Lincoln's Birthday (observed)
 OMIT 15 February MSG Susan B. Anthony Day
diff --git a/include/holidays/us/pr.rem b/include/holidays/us/pr.rem
index 32c99fad..0adab6f6 100644
--- a/include/holidays/us/pr.rem
+++ b/include/holidays/us/pr.rem
@@ -10,11 +10,11 @@
 # also include [$SysInclude]/us.rem
 
 OMIT 6 January MSG Epiphany
-REM Third Monday in February SCANFROM -28 ADDOMIT MSG Presidents' Day
+REM Third Monday in February ADDOMIT SCANFROM -28 MSG Presidents' Day
 OMIT 22 March MSG Emancipation Day
-REM 23 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 22)) == 0] MSG Emancipation Day (observed)
+REM 23 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 22)) == 0] MSG Emancipation Day (observed)
 OMIT [easterdate($Uy)-2] MSG Good Friday
 OMIT 25 July MSG Constitution Day
-REM 26 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 25)) == 0] MSG Constitution Day (observed)
+REM 26 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 25)) == 0] MSG Constitution Day (observed)
 OMIT 19 November MSG Discovery Day
-REM 20 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 19)) == 0] MSG Discovery Day (observed)
+REM 20 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 19)) == 0] MSG Discovery Day (observed)
diff --git a/include/holidays/us/ri.rem b/include/holidays/us/ri.rem
index 47cba5ac..335f43bc 100644
--- a/include/holidays/us/ri.rem
+++ b/include/holidays/us/ri.rem
@@ -9,5 +9,5 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/us.rem
 
-REM Second Monday in August SCANFROM -28 ADDOMIT MSG Victory Day
-REM Second Monday in October SCANFROM -28 ADDOMIT MSG Indigenous Peoples' Day / Columbus Day
+REM Second Monday in August ADDOMIT SCANFROM -28 MSG Victory Day
+REM Second Monday in October ADDOMIT SCANFROM -28 MSG Indigenous Peoples' Day / Columbus Day
diff --git a/include/holidays/us/sc.rem b/include/holidays/us/sc.rem
index 5bd1921a..a7c7e3f6 100644
--- a/include/holidays/us/sc.rem
+++ b/include/holidays/us/sc.rem
@@ -9,4 +9,4 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/us.rem
 
-REM Fourth Monday in April SCANFROM -28 ADDOMIT MSG Confederate Memorial Day
+REM Fourth Monday in April ADDOMIT SCANFROM -28 MSG Confederate Memorial Day
diff --git a/include/holidays/us/sd.rem b/include/holidays/us/sd.rem
index c0ebbe0f..955af3d5 100644
--- a/include/holidays/us/sd.rem
+++ b/include/holidays/us/sd.rem
@@ -9,4 +9,4 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/us.rem
 
-REM Second Monday in October SCANFROM -28 ADDOMIT MSG Native Americans' Day
+REM Second Monday in October ADDOMIT SCANFROM -28 MSG Native Americans' Day
diff --git a/include/holidays/us/tx.rem b/include/holidays/us/tx.rem
index b8cc9068..11bcc631 100644
--- a/include/holidays/us/tx.rem
+++ b/include/holidays/us/tx.rem
@@ -17,8 +17,8 @@ OMIT 21 April MSG San Jacinto Day
 OMIT 19 June MSG Emancipation Day In Texas
 OMIT 27 August MSG Lyndon Baines Johnson Day
 REM Friday 23 November ADDOMIT SCANFROM -28 MSG Friday After Thanksgiving
-REM 22 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 24)) == 0] MSG Christmas Eve (observed)
-REM 23 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 24)) == 5] MSG Christmas Eve (observed)
-REM 23 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 24)) == 6] MSG Christmas Eve (observed)
+REM 22 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 24)) == 0] MSG Christmas Eve (observed)
+REM 23 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 24)) == 5] MSG Christmas Eve (observed)
+REM 23 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 24)) == 6] MSG Christmas Eve (observed)
 OMIT 24 December MSG Christmas Eve
 OMIT 26 December MSG Day After Christmas
diff --git a/include/holidays/us/ut.rem b/include/holidays/us/ut.rem
index d8477d55..490033b5 100644
--- a/include/holidays/us/ut.rem
+++ b/include/holidays/us/ut.rem
@@ -9,6 +9,6 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/us.rem
 
-REM 23 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 24)) == 6] MSG Pioneer Day (observed)
+REM 23 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 24)) == 6] MSG Pioneer Day (observed)
 OMIT 24 July MSG Pioneer Day
-REM 25 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 24)) == 0] MSG Pioneer Day (observed)
+REM 25 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 24)) == 0] MSG Pioneer Day (observed)
diff --git a/include/holidays/us/va.rem b/include/holidays/us/va.rem
index e116bd61..21e4eb8e 100644
--- a/include/holidays/us/va.rem
+++ b/include/holidays/us/va.rem
@@ -9,4 +9,4 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/us.rem
 
-REM Second Monday in October SCANFROM -28 ADDOMIT MSG Indigenous Peoples' Day
+REM Second Monday in October ADDOMIT SCANFROM -28 MSG Indigenous Peoples' Day
diff --git a/include/holidays/us/vi.rem b/include/holidays/us/vi.rem
index 0a0b3661..b1f0762d 100644
--- a/include/holidays/us/vi.rem
+++ b/include/holidays/us/vi.rem
@@ -10,12 +10,12 @@
 # also include [$SysInclude]/us.rem
 
 OMIT 6 January MSG Three Kings Day
-REM Third Monday in February SCANFROM -28 ADDOMIT MSG Presidents' Day
+REM Third Monday in February ADDOMIT SCANFROM -28 MSG Presidents' Day
 OMIT 31 March MSG Transfer Day
 OMIT [easterdate($Uy)-3] MSG Holy Thursday
 OMIT [easterdate($Uy)-2] MSG Good Friday
 OMIT [easterdate($Uy)+1] MSG Easter Monday
 OMIT 3 July MSG Emancipation Day
-REM Second Monday in October SCANFROM -28 ADDOMIT MSG Columbus Day and Puerto Rico Friendship Day
+REM Second Monday in October ADDOMIT SCANFROM -28 MSG Columbus Day and Puerto Rico Friendship Day
 OMIT 1 November MSG Liberty Day
 OMIT 26 December MSG Christmas Second Day
diff --git a/include/holidays/us/vt.rem b/include/holidays/us/vt.rem
index bd2a891e..cbc57a44 100644
--- a/include/holidays/us/vt.rem
+++ b/include/holidays/us/vt.rem
@@ -9,7 +9,7 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/us.rem
 
-REM First Tuesday in March SCANFROM -28 ADDOMIT MSG Town Meeting Day
-REM 15 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 16)) == 6] MSG Bennington Battle Day (observed)
+REM First Tuesday in March ADDOMIT SCANFROM -28 MSG Town Meeting Day
+REM 15 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 16)) == 6] MSG Bennington Battle Day (observed)
 OMIT 16 August MSG Bennington Battle Day
-REM 17 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 16)) == 0] MSG Bennington Battle Day (observed)
+REM 17 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 16)) == 0] MSG Bennington Battle Day (observed)
diff --git a/include/holidays/us/wi.rem b/include/holidays/us/wi.rem
index 4f4cf751..bbd9b716 100644
--- a/include/holidays/us/wi.rem
+++ b/include/holidays/us/wi.rem
@@ -9,11 +9,11 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/us.rem
 
-REM 1 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 31)) == 0] MSG New Year's Eve (observed)
+REM 1 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 31)) == 0] MSG New Year's Eve (observed)
 OMIT 15 February MSG Susan B. Anthony Day
-REM 22 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 24)) == 0] MSG Christmas Eve (observed)
-REM 23 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 24)) == 5] MSG Christmas Eve (observed)
-REM 23 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 24)) == 6] MSG Christmas Eve (observed)
+REM 22 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 24)) == 0] MSG Christmas Eve (observed)
+REM 23 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 24)) == 5] MSG Christmas Eve (observed)
+REM 23 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 24)) == 6] MSG Christmas Eve (observed)
 OMIT 24 December MSG Christmas Eve
-REM 30 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 31)) == 6] MSG New Year's Eve (observed)
+REM 30 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 31)) == 6] MSG New Year's Eve (observed)
 OMIT 31 December MSG New Year's Eve
diff --git a/include/holidays/us/wv.rem b/include/holidays/us/wv.rem
index 14e580e2..ff1cb94f 100644
--- a/include/holidays/us/wv.rem
+++ b/include/holidays/us/wv.rem
@@ -9,7 +9,7 @@
 # If you want the national holidays as well, you must
 # also include [$SysInclude]/us.rem
 
-REM 19 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 20)) == 6] MSG West Virginia Day (observed)
+REM 19 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 20)) == 6] MSG West Virginia Day (observed)
 OMIT 20 June MSG West Virginia Day
-REM 21 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 20)) == 0] MSG West Virginia Day (observed)
+REM 21 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 20)) == 0] MSG West Virginia Day (observed)
 REM Friday 23 November ADDOMIT SCANFROM -28 MSG Day After Thanksgiving
diff --git a/include/holidays/vi.rem b/include/holidays/vi.rem
index d92e3fb4..527b226d 100644
--- a/include/holidays/vi.rem
+++ b/include/holidays/vi.rem
@@ -4,34 +4,34 @@
 # https://github.com/vacanza/holidays
 
 OMIT 1 January MSG New Year's Day
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
 OMIT 6 January MSG Three Kings Day
-REM Third Monday in January SCANFROM -28 ADDOMIT MSG Martin Luther King Jr. Day
-REM Third Monday in February SCANFROM -28 ADDOMIT MSG Presidents' Day
+REM Third Monday in January ADDOMIT SCANFROM -28 MSG Martin Luther King Jr. Day
+REM Third Monday in February ADDOMIT SCANFROM -28 MSG Presidents' Day
 OMIT 31 March MSG Transfer Day
 OMIT [easterdate($Uy)-3] MSG Holy Thursday
 OMIT [easterdate($Uy)-2] MSG Good Friday
 OMIT [easterdate($Uy)+1] MSG Easter Monday
-REM Last Monday in May SCANFROM -28 ADDOMIT MSG Memorial Day
-REM 18 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 19)) == 6] MSG Juneteenth National Independence Day (observed)
+REM Last Monday in May ADDOMIT SCANFROM -28 MSG Memorial Day
+REM 18 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 19)) == 6] MSG Juneteenth National Independence Day (observed)
 OMIT 19 June MSG Juneteenth National Independence Day
-REM 20 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 19)) == 0] MSG Juneteenth National Independence Day (observed)
+REM 20 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 19)) == 0] MSG Juneteenth National Independence Day (observed)
 OMIT 3 July MSG Emancipation Day
-REM 3 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 4)) == 6] MSG Independence Day (observed)
+REM 3 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 4)) == 6] MSG Independence Day (observed)
 OMIT 4 July MSG Independence Day
-REM 5 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 4)) == 0] MSG Independence Day (observed)
-REM First Monday in September SCANFROM -28 ADDOMIT MSG Labor Day
-REM Second Monday in October SCANFROM -28 ADDOMIT MSG Columbus Day and Puerto Rico Friendship Day
+REM 5 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 4)) == 0] MSG Independence Day (observed)
+REM First Monday in September ADDOMIT SCANFROM -28 MSG Labor Day
+REM Second Monday in October ADDOMIT SCANFROM -28 MSG Columbus Day and Puerto Rico Friendship Day
 OMIT 1 November MSG Liberty Day
-REM 10 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 11)) == 6] MSG Veterans Day (observed)
+REM 10 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 6] MSG Veterans Day (observed)
 OMIT 11 November MSG Veterans Day
-REM 12 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 11)) == 0] MSG Veterans Day (observed)
-REM Fourth Thursday in November SCANFROM -28 ADDOMIT MSG Thanksgiving
-REM 24 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
+REM 12 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 11)) == 0] MSG Veterans Day (observed)
+REM Fourth Thursday in November ADDOMIT SCANFROM -28 MSG Thanksgiving
+REM 24 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 6] MSG Christmas Day (observed)
 OMIT 25 December MSG Christmas Day
 OMIT 26 December MSG Christmas Second Day
-REM 26 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
-REM 31 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 31 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 6] MSG New Year's Day (observed)
 
 # Optional holidays
 REM 14 February MSG Valentine's Day
diff --git a/include/holidays/vu.rem b/include/holidays/vu.rem
index 157a432c..073274bf 100644
--- a/include/holidays/vu.rem
+++ b/include/holidays/vu.rem
@@ -4,27 +4,27 @@
 # https://github.com/vacanza/holidays
 
 OMIT 1 January MSG New Year's Day
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
 OMIT 21 February MSG Father Lini Day
-REM 22 February SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 2, 21)) == 0] MSG Father Lini Day (observed)
+REM 22 February ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 2, 21)) == 0] MSG Father Lini Day (observed)
 OMIT 5 March MSG Custom Chief's Day
-REM 6 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 5)) == 0] MSG Custom Chief's Day (observed)
+REM 6 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 5)) == 0] MSG Custom Chief's Day (observed)
 OMIT [easterdate($Uy)-2] MSG Good Friday
 OMIT [easterdate($Uy)+1] MSG Easter Monday
 OMIT 1 May MSG Labour Day
-REM 2 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Labour Day (observed)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Labour Day (observed)
 OMIT [easterdate($Uy)+39] MSG Ascension Day
 OMIT 24 July MSG Children's Day
-REM 25 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 24)) == 0] MSG Children's Day (observed)
+REM 25 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 24)) == 0] MSG Children's Day (observed)
 OMIT 30 July MSG Independence Day
-REM 31 July SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 7, 30)) == 0] MSG Independence Day (observed)
+REM 31 July ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 7, 30)) == 0] MSG Independence Day (observed)
 OMIT 15 August MSG Assumption Day
-REM 16 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 15)) == 0] MSG Assumption Day (observed)
+REM 16 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 15)) == 0] MSG Assumption Day (observed)
 OMIT 5 October MSG Constitution Day
-REM 6 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 5)) == 0] MSG Constitution Day (observed)
+REM 6 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 5)) == 0] MSG Constitution Day (observed)
 OMIT 29 November MSG Unity Day
-REM 30 November SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 11, 29)) == 0] MSG Unity Day (observed)
+REM 30 November ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 11, 29)) == 0] MSG Unity Day (observed)
 OMIT 25 December MSG Christmas Day
 OMIT 26 December MSG Family Day
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Family Day (observed)
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 1] MSG Family Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Family Day (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 1] MSG Family Day (observed)
diff --git a/include/holidays/za.rem b/include/holidays/za.rem
index e1129d9d..3c056aed 100644
--- a/include/holidays/za.rem
+++ b/include/holidays/za.rem
@@ -4,23 +4,23 @@
 # https://github.com/vacanza/holidays
 
 OMIT 1 January MSG New Year's Day
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
 OMIT 21 March MSG Human Rights Day
-REM 22 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 21)) == 0] MSG Human Rights Day (observed)
+REM 22 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 21)) == 0] MSG Human Rights Day (observed)
 OMIT [easterdate($Uy)-2] MSG Good Friday
 OMIT [easterdate($Uy)+1] MSG Family Day
 OMIT 27 April MSG Freedom Day
-REM 28 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 27)) == 0] MSG Freedom Day (observed)
+REM 28 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 27)) == 0] MSG Freedom Day (observed)
 OMIT 1 May MSG Workers' Day
-REM 2 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Workers' Day (observed)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Workers' Day (observed)
 OMIT 16 June MSG Youth Day
-REM 17 June SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 6, 16)) == 0] MSG Youth Day (observed)
+REM 17 June ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 6, 16)) == 0] MSG Youth Day (observed)
 OMIT 9 August MSG National Women's Day
-REM 10 August SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 8, 9)) == 0] MSG National Women's Day (observed)
+REM 10 August ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 8, 9)) == 0] MSG National Women's Day (observed)
 OMIT 24 September MSG Heritage Day
-REM 25 September SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 9, 24)) == 0] MSG Heritage Day (observed)
+REM 25 September ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 9, 24)) == 0] MSG Heritage Day (observed)
 OMIT 16 December MSG Day of Reconciliation
-REM 17 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 16)) == 0] MSG Day of Reconciliation (observed)
+REM 17 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 16)) == 0] MSG Day of Reconciliation (observed)
 OMIT 25 December MSG Christmas Day
 OMIT 26 December MSG Day of Goodwill
-REM 27 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Day of Goodwill (observed)
+REM 27 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 26)) == 0] MSG Day of Goodwill (observed)
diff --git a/include/holidays/zm.rem b/include/holidays/zm.rem
index 3bff1f51..fbaaf336 100644
--- a/include/holidays/zm.rem
+++ b/include/holidays/zm.rem
@@ -4,26 +4,26 @@
 # https://github.com/vacanza/holidays
 
 OMIT 1 January MSG New Year's Day
-REM 2 January SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
+REM 2 January ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 1, 1)) == 0] MSG New Year's Day (observed)
 OMIT 8 March MSG International Women's Day
-REM 9 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 8)) == 0] MSG International Women's Day (observed)
+REM 9 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 8)) == 0] MSG International Women's Day (observed)
 OMIT 12 March MSG Youth Day
-REM 13 March SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 3, 12)) == 0] MSG Youth Day (observed)
+REM 13 March ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 3, 12)) == 0] MSG Youth Day (observed)
 OMIT [easterdate($Uy)-2] MSG Good Friday
 OMIT [easterdate($Uy)-1] MSG Holy Saturday
 OMIT [easterdate($Uy)+1] MSG Easter Monday
 OMIT 28 April MSG Kenneth Kaunda Day
-REM 29 April SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 4, 28)) == 0] MSG Kenneth Kaunda Day (observed)
+REM 29 April ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 4, 28)) == 0] MSG Kenneth Kaunda Day (observed)
 OMIT 1 May MSG Labour Day
-REM 2 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Labour Day (observed)
+REM 2 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 1)) == 0] MSG Labour Day (observed)
 OMIT 25 May MSG Africa Freedom Day
-REM 26 May SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 5, 25)) == 0] MSG Africa Freedom Day (observed)
-REM First Monday in July SCANFROM -28 ADDOMIT MSG Heroes' Day
+REM 26 May ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 5, 25)) == 0] MSG Africa Freedom Day (observed)
+REM First Monday in July ADDOMIT SCANFROM -28 MSG Heroes' Day
 REM Tuesday 2 July ADDOMIT SCANFROM -28 MSG Unity Day
-REM First Monday in August SCANFROM -28 ADDOMIT MSG Farmers' Day
+REM First Monday in August ADDOMIT SCANFROM -28 MSG Farmers' Day
 OMIT 18 October MSG National Prayer Day
-REM 19 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 18)) == 0] MSG National Prayer Day (observed)
+REM 19 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 18)) == 0] MSG National Prayer Day (observed)
 OMIT 24 October MSG Independence Day
-REM 25 October SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 10, 24)) == 0] MSG Independence Day (observed)
+REM 25 October ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 10, 24)) == 0] MSG Independence Day (observed)
 OMIT 25 December MSG Christmas Day
-REM 26 December SCANFROM -28 ADDOMIT SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)
+REM 26 December ADDOMIT SCANFROM -28 SATISFY [wkdaynum(date($Ty, 12, 25)) == 0] MSG Christmas Day (observed)