diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml
index 991c480..2167b50 100644
--- a/nspanel_blueprint.yaml
+++ b/nspanel_blueprint.yaml
@@ -33,7 +33,7 @@ blueprint:
     🎉 Roadmap can be found here: [Roadmap](https://github.com/Blackymas/NSPanel_HA_Blueprint/labels/roadmap)
 
 
-    ℹ️ Version: v4.0dev
+    ℹ️ Version: v4.0b2
 
   source_url: https://github.com/Blackymas/NSPanel_HA_Blueprint/blob/main/nspanel_blueprint.yaml
   domain: automation
@@ -3583,7 +3583,7 @@ trigger_variables:
 
 variables:
   ##### GENERAL #####
-  blueprint_version: '4.0dev'
+  blueprint_version: '4.0b2'
   date_format_temp: !input 'date_format'
   #Avoid breaking change for existing users with legacy type format
   date_format: >
@@ -8985,12 +8985,10 @@ action:
                         continue_on_error: true
                     else:
                       - if:
-                          - '{{ nspanel_event.blueprint == nspanel_event.esphome }}'
-                          - '{{ nspanel_event.blueprint == nspanel_event.tft }}'
-                          #- '{{ nspanel_event.blueprint.split(".")[0] == nspanel_event.esphome.split(".")[0] }}'
-                          #- '{{ nspanel_event.blueprint.split(".")[1] == nspanel_event.esphome.split(".")[1] }}'
-                          #- '{{ nspanel_event.blueprint.split(".")[0] == nspanel_event.tft.split(".")[0] }}'
-                          #- '{{ nspanel_event.blueprint.split(".")[1] == nspanel_event.tft.split(".")[1] }}'
+                          - '{{ nspanel_event.blueprint.split(".")[0] == nspanel_event.esphome.split(".")[0] }}'
+                          - '{{ nspanel_event.blueprint.split(".")[1] == nspanel_event.esphome.split(".")[1] }}'
+                          - '{{ nspanel_event.blueprint.split(".")[0] == nspanel_event.tft.split(".")[0] }}'
+                          - '{{ nspanel_event.blueprint.split(".")[1] == nspanel_event.tft.split(".")[1] }}'
                         then:
                           - service: persistent_notification.dismiss
                             data:
diff --git a/nspanel_esphome.yaml b/nspanel_esphome.yaml
index ec9d09e..74786e4 100644
--- a/nspanel_esphome.yaml
+++ b/nspanel_esphome.yaml
@@ -8,7 +8,7 @@
 substitutions:
 
   ##### DON'T CHANGE THIS #####
-  version: "4.0dev"
+  version: "4.0b2"
   #############################
 
 ##### WIFI SETUP #####
diff --git a/nspanel_eu.HMI b/nspanel_eu.HMI
index 7188ebd..2a8a46b 100644
Binary files a/nspanel_eu.HMI and b/nspanel_eu.HMI differ
diff --git a/nspanel_eu.tft b/nspanel_eu.tft
index b120105..c7d0fcc 100644
Binary files a/nspanel_eu.tft and b/nspanel_eu.tft differ
diff --git a/nspanel_eu_code/boot.txt b/nspanel_eu_code/boot.txt
index 01402b3..efb7e3b 100644
--- a/nspanel_eu_code/boot.txt
+++ b/nspanel_eu_code/boot.txt
@@ -134,7 +134,7 @@ Text tft_version
         Dragging           : 0
         Send Component ID  : disabled
         Associated Keyboard: none
-        Text               : 4.0dev
+        Text               : 4.0b2
         Max. Text Size     : 8
     
 Text esph_version
diff --git a/nspanel_us.HMI b/nspanel_us.HMI
index d123068..78e78cd 100644
Binary files a/nspanel_us.HMI and b/nspanel_us.HMI differ
diff --git a/nspanel_us.tft b/nspanel_us.tft
index 7b0fe8c..df5cd4e 100644
Binary files a/nspanel_us.tft and b/nspanel_us.tft differ
diff --git a/nspanel_us_code/boot.txt b/nspanel_us_code/boot.txt
index 01402b3..efb7e3b 100644
--- a/nspanel_us_code/boot.txt
+++ b/nspanel_us_code/boot.txt
@@ -134,7 +134,7 @@ Text tft_version
         Dragging           : 0
         Send Component ID  : disabled
         Associated Keyboard: none
-        Text               : 4.0dev
+        Text               : 4.0b2
         Max. Text Size     : 8
     
 Text esph_version
diff --git a/nspanel_us_land.HMI b/nspanel_us_land.HMI
index 80303ad..c8e2c17 100644
Binary files a/nspanel_us_land.HMI and b/nspanel_us_land.HMI differ
diff --git a/nspanel_us_land.tft b/nspanel_us_land.tft
index a9a71dd..ac1f9f8 100644
Binary files a/nspanel_us_land.tft and b/nspanel_us_land.tft differ
diff --git a/nspanel_us_land_code/boot.txt b/nspanel_us_land_code/boot.txt
index 01402b3..efb7e3b 100644
--- a/nspanel_us_land_code/boot.txt
+++ b/nspanel_us_land_code/boot.txt
@@ -134,7 +134,7 @@ Text tft_version
         Dragging           : 0
         Send Component ID  : disabled
         Associated Keyboard: none
-        Text               : 4.0dev
+        Text               : 4.0b2
         Max. Text Size     : 8
     
 Text esph_version