diff --git a/config/json_data/flag_days.json b/config/json_data/flag_days.json
index 05972e3d..b8a20507 100755
--- a/config/json_data/flag_days.json
+++ b/config/json_data/flag_days.json
@@ -2,76 +2,60 @@
     "Flag_Days_US": {
         "static": {
             "2/12": "Lincoln's Birthday",
+            "3/3": "Florida State Day",
+            "3/29": "National Vietnam War Veterans Day",
+            "4/9": "National Former Prisoner of War Recognition Day",
+            "5/1": "Loyalty Day",
+            "5/8": "Victory in Europe Day",
             "5/15": "Peace Officers Memorial Day",
             "6/14": "Flag Day",
             "7/4": "Independence Day",
             "7/27": "National Korean War Veterans Armistice Day",
+            "8/4": "Coast Guard Day",
             "9/11": "Patriot Day",
             "9/17": "Constitution Day",
             "10/27": "Navy Day",
+            "11/10": "Marine Corps Birthday",
             "11/11": "Veterans Day",
             "12/7": "Pearl Harbor Remembrance Day"
+        }
         },
         "dynamic": {
-            "01/20/2025": "Inauguration Day",
-            "01/16/2023": "Martin Luther King Jr. Day",
-            "01/15/2024": "Martin Luther King Jr. Day",
-            "01/19/2026": "Martin Luther King Jr. Day",
             "01/18/2027": "Martin Luther King Jr. Day",
             "01/17/2028": "Martin Luther King Jr. Day",
             "01/15/2029": "Martin Luther King Jr. Day",
             "01/21/2030": "Martin Luther King Jr. Day",
-            "02/20/2023": "Washington's Birthday (Presidents Day)",
-            "02/19/2024": "Washington's Birthday (Presidents Day)",
-            "02/17/2025": "Washington's Birthday (Presidents Day)",
-            "02/16/2026": "Washington's Birthday (Presidents Day)",
+            "01/20/2029": "Inauguration Day",
+            "01/20/2033": "Inauguration Day",
             "02/15/2027": "Washington's Birthday (Presidents Day)",
             "02/21/2028": "Washington's Birthday (Presidents Day)",
             "02/19/2029": "Washington's Birthday (Presidents Day)",
             "02/18/2030": "Washington's Birthday (Presidents Day)",
-            "05/20/2023": "Armed Forces Day",
-            "05/18/2024": "Armed Forces Day",
-            "05/17/2025": "Armed Forces Day",
             "05/16/2026": "Armed Forces Day",
             "05/15/2027": "Armed Forces Day",
             "05/20/2028": "Armed Forces Day",
             "05/19/2029": "Armed Forces Day",
             "05/18/2030": "Armed Forces Day",
-            "05/29/2023": "Memorial Day",
-            "05/27/2024": "Memorial Day",
-            "05/26/2025": "Memorial Day",
             "05/25/2026": "Memorial Day",
             "05/31/2027": "Memorial Day",
             "05/29/2028": "Memorial Day",
             "05/28/2029": "Memorial Day",
             "05/27/2030": "Memorial Day",
-            "09/04/2023": "Labor Day",
-            "09/02/2024": "Labor Day",
-            "09/01/2025": "Labor Day",
             "09/07/2026": "Labor Day",
             "09/06/2027": "Labor Day",
             "09/04/2028": "Labor Day",
             "09/03/2029": "Labor Day",
             "09/02/2030": "Labor Day",
-            "09/15/2023": "National POW/MIA Recognition Day",
-            "09/20/2024": "National POW/MIA Recognition Day",
-            "09/19/2025": "National POW/MIA Recognition Day",
             "09/18/2026": "National POW/MIA Recognition Day",
             "09/17/2027": "National POW/MIA Recognition Day",
             "09/15/2028": "National POW/MIA Recognition Day",
             "09/21/2029": "National POW/MIA Recognition Day",
             "09/20/2030": "National POW/MIA Recognition Day",
-            "10/09/2023": "Columbus Day",
-            "10/14/2024": "Columbus Day",
-            "10/13/2025": "Columbus Day",
             "10/12/2026": "Columbus Day",
             "10/11/2027": "Columbus Day",
             "10/09/2028": "Columbus Day",
             "10/08/2029": "Columbus Day",
             "10/14/2030": "Columbus Day",
-            "11/07/2023": "Election Day",
-            "11/05/2024": "Election Day",
-            "11/04/2025": "Election Day",
             "11/03/2026": "Election Day",
             "11/02/2027": "Election Day",
             "11/07/2028": "Election Day",
@@ -79,4 +63,3 @@
             "11/05/2030": "Election Day"
         }
     }
-}
diff --git a/config/json_data/holidays.json b/config/json_data/holidays.json
index 6a3992c8..3712054e 100755
--- a/config/json_data/holidays.json
+++ b/config/json_data/holidays.json
@@ -14,6 +14,7 @@
             "5/5": "Cinco de Mayo",
             "6/14": "Flag Day",
             "7/4": "Independence Day",
+            "8/1": "Joanna the Smart Homes Birthday",
             "8/30": "Paiges Birthday",
             "9/10": "Mom and Dads Wedding Anniversary",
             "9/11": "Patriot Day",
@@ -26,34 +27,6 @@
             "12/31": "New Years Eve"
         },
         "dynamic": {
-            "11/23/2023": "Thanksgiving Day",
-            "01/15/2024": "MLK Day",
-            "02/14/2024": "Ash Wednesday",
-            "02/19/2024": "Presidents Day",
-            "03/24/2024": "Palm Sunday",
-            "03/29/2024": "Good Friday",
-            "03/31/2024": "Easter Sunday",
-            "04/22/2024": "Memorial Day",
-            "05/12/2024": "Mothers Day",
-            "06/16/2024": "Fathers Day",
-            "09/02/2024": "Labor Day",
-            "10/14/2024": "Columbus Day",
-            "11/28/2024": "Thanksgiving Day",
-            "01/20/2025": "MLK Day",
-            "02/17/2025": "Presidents Day",
-            "03/05/2025": "Ash Wednesday",
-            "04/13/2025": "Palm Sunday",
-            "04/18/2025": "Good Friday",
-            "04/20/2025": "Easter Sunday",
-            "04/21/2025": "Memorial Day",
-            "05/11/2025": "Mothers Day",
-            "06/15/2025": "Fathers Day",
-            "09/01/2025": "Labor Day",
-            "10/13/2025": "Columbus Day",
-            "11/27/2025": "Thanksgiving Day",
-            "01/19/2026": "MLK Day",
-            "02/16/2026": "Presidents Day",
-            "02/18/2026": "Ash Wednesday",
             "03/29/2026": "Palm Sunday",
             "04/03/2026": "Good Friday",
             "04/05/2026": "Easter Sunday",