diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml
index 24498d4..cdd5bc4 100644
--- a/nspanel_blueprint.yaml
+++ b/nspanel_blueprint.yaml
@@ -296,7 +296,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
     ##### BUTTONS #####
     entity01:
       name: Button 01 (Optional)
-      description: '* *Displayed on **"Button Page 1"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script)*'
+      description: '* *Displayed on **"Button Page 1"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
       default: []
       selector:
         entity:
@@ -311,6 +311,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - scene
             - person
             - script
+            - binary_sensor
     entity01_name:
       name: Name "Button 01" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -319,7 +320,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         text: {}
     entity02:
       name: Button 02 (Optional)
-      description: '* *Displayed on **"Button Page 1"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script)*'
+      description: '* *Displayed on **"Button Page 1"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
       default: []
       selector:
         entity:
@@ -334,6 +335,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - scene
             - person
             - script
+            - binary_sensor
     entity02_name:
       name: Name "Button 02" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -342,7 +344,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         text: {}
     entity03:
       name: Button 03 (Optional)
-      description: '* *Displayed on **"Button Page 1"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script)*'
+      description: '* *Displayed on **"Button Page 1"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
       default: []
       selector:
         entity:
@@ -357,6 +359,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - scene
             - person
             - script
+            - binary_sensor
     entity03_name:
       name: Name "Button 03" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -365,7 +368,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         text: {}
     entity04:
       name: Button 04 (Optional)
-      description: '* *Displayed on **"Button Page 1"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script)*'
+      description: '* *Displayed on **"Button Page 1"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
       default: []
       selector:
         entity:
@@ -380,6 +383,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - scene
             - person
             - script
+            - binary_sensor
     entity04_name:
       name: Name "Button 04" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -388,7 +392,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         text: {}
     entity05:
       name: Button 05 (Optional)
-      description: '* *Displayed on **"Button Page 1"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script)*'
+      description: '* *Displayed on **"Button Page 1"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
       default: []
       selector:
         entity:
@@ -403,6 +407,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - scene
             - person
             - script
+            - binary_sensor
     entity05_name:
       name: Name "Button 05" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -411,7 +416,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         text: {}
     entity06:
       name: Button 06 (Optional)
-      description: '* *Displayed on **"Button Page 1"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script)*'
+      description: '* *Displayed on **"Button Page 1"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
       default: []
       selector:
         entity:
@@ -426,6 +431,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - scene
             - person
             - script
+            - binary_sensor
     entity06_name:
       name: Name "Button 06" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -434,7 +440,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         text: {}
     entity07:
       name: Button 07 (Optional)
-      description: '* *Displayed on **"Button Page 1"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script)*'
+      description: '* *Displayed on **"Button Page 1"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
       default: []
       selector:
         entity:
@@ -449,6 +455,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - scene
             - person
             - script
+            - binary_sensor
     entity07_name:
       name: Name "Button 07" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -457,7 +464,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         text: {}
     entity08:
       name: Button 08 (Optional)
-      description: '* *Displayed on **"Button Page 1"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script)*'
+      description: '* *Displayed on **"Button Page 1"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
       default: []
       selector:
         entity:
@@ -472,6 +479,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - scene
             - person
             - script
+            - binary_sensor
     entity08_name:
       name: Name "Button 08" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -480,7 +488,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         text: {}
     entity09:
       name: Button 09 (Optional)
-      description: '* *Displayed on **"Button Page 2"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script)*'
+      description: '* *Displayed on **"Button Page 2"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
       default: []
       selector:
         entity:
@@ -495,6 +503,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - scene
             - person
             - script
+            - binary_sensor
     entity09_name:
       name: Name "Button 09" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -503,7 +512,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         text: {}
     entity10:
       name: Button 10 (Optional)
-      description: '* *Displayed on **"Button Page 2"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script)*'
+      description: '* *Displayed on **"Button Page 2"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
       default: []
       selector:
         entity:
@@ -518,6 +527,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - scene
             - person
             - script
+            - binary_sensor
     entity10_name:
       name: Name "Button 10" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -526,7 +536,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         text: {}
     entity11:
       name: Button 11 (Optional)
-      description: '* *Displayed on **"Button Page 2"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script)*'
+      description: '* *Displayed on **"Button Page 2"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
       default: []
       selector:
         entity:
@@ -541,6 +551,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - scene
             - person
             - script
+            - binary_sensor
     entity11_name:
       name: Name "Button 11" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -549,7 +560,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         text: {}
     entity12:
       name: Button 12 (Optional)
-      description: '* *Displayed on **"Button Page 2"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script)*'
+      description: '* *Displayed on **"Button Page 2"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
       default: []
       selector:
         entity:
@@ -564,6 +575,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - scene
             - person
             - script
+            - binary_sensor
     entity12_name:
       name: Name "Button 12" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -572,7 +584,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         text: {}
     entity13:
       name: Button 13 (Optional)
-      description: '* *Displayed on **"Button Page 2"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script)*'
+      description: '* *Displayed on **"Button Page 2"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
       default: []
       selector:
         entity:
@@ -587,6 +599,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - scene
             - person
             - script
+            - binary_sensor
     entity13_name:
       name: Name "Button 13" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -595,7 +608,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         text: {}
     entity14:
       name: Button 14 (Optional)
-      description: '* *Displayed on **"Button Page 2"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script)*'
+      description: '* *Displayed on **"Button Page 2"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
       default: []
       selector:
         entity:
@@ -610,6 +623,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - scene
             - person
             - script
+            - binary_sensor
     entity14_name:
       name: Name "Button 14" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -618,7 +632,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         text: {}
     entity15:
       name: Button 15 (Optional)
-      description: '* *Displayed on **"Button Page 2"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script)*'
+      description: '* *Displayed on **"Button Page 2"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
       default: []
       selector:
         entity:
@@ -633,6 +647,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - scene
             - person
             - script
+            - binary_sensor
     entity15_name:
       name: Name "Button 15" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -641,7 +656,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         text: {}
     entity16:
       name: Button 16 (Optional)
-      description: '* *Displayed on **"Button Page 2"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script)*'
+      description: '* *Displayed on **"Button Page 2"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
       default: []
       selector:
         entity:
@@ -656,6 +671,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - scene
             - person
             - script
+            - binary_sensor
     entity16_name:
       name: Name "Button 16" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -664,7 +680,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         text: {}
     entity17:
       name: Button 17 (Optional)
-      description: '* *Displayed on **"Button Page 3"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script)*'
+      description: '* *Displayed on **"Button Page 3"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
       default: []
       selector:
         entity:
@@ -679,6 +695,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - scene
             - person
             - script
+            - binary_sensor
     entity17_name:
       name: Name "Button 17" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -687,7 +704,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         text: {}
     entity18:
       name: Button 18 (Optional)
-      description: '* *Displayed on **"Button Page 3"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script)*'
+      description: '* *Displayed on **"Button Page 3"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
       default: []
       selector:
         entity:
@@ -702,6 +719,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - scene
             - person
             - script
+            - binary_sensor
     entity18_name:
       name: Name "Button 18" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -710,7 +728,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         text: {}
     entity19:
       name: Button 19 (Optional)
-      description: '* *Displayed on **"Button Page 3"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script)*'
+      description: '* *Displayed on **"Button Page 3"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
       default: []
       selector:
         entity:
@@ -725,6 +743,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - scene
             - person
             - script
+            - binary_sensor
     entity19_name:
       name: Name "Button 19" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -733,7 +752,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         text: {}
     entity20:
       name: Button 20 (Optional)
-      description: '* *Displayed on **"Button Page 3"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script)*'
+      description: '* *Displayed on **"Button Page 3"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
       default: []
       selector:
         entity:
@@ -748,6 +767,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - scene
             - person
             - script
+            - binary_sensor
     entity20_name:
       name: Name "Button 20" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -756,7 +776,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         text: {}
     entity21:
       name: Button 21 (Optional)
-      description: '* *Displayed on **"Button Page 3"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script)*'
+      description: '* *Displayed on **"Button Page 3"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
       default: []
       selector:
         entity:
@@ -771,6 +791,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - scene
             - person
             - script
+            - binary_sensor
     entity21_name:
       name: Name "Button 21" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -779,7 +800,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         text: {}
     entity22:
       name: Button 22 (Optional)
-      description: '* *Displayed on **"Button Page 3"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script)*'
+      description: '* *Displayed on **"Button Page 3"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
       default: []
       selector:
         entity:
@@ -794,6 +815,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - scene
             - person
             - script
+            - binary_sensor
     entity22_name:
       name: Name "Button 22" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -802,7 +824,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         text: {}
     entity23:
       name: Button 23 (Optional)
-      description: '* *Displayed on **"Button Page 3"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script)*'
+      description: '* *Displayed on **"Button Page 3"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
       default: []
       selector:
         entity:
@@ -817,6 +839,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - scene
             - person
             - script
+            - binary_sensor
     entity23_name:
       name: Name "Button 23" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -825,7 +848,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         text: {}
     entity24:
       name: Button 24 (Optional)
-      description: '* *Displayed on **"Button Page 3"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script)*'
+      description: '* *Displayed on **"Button Page 3"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
       default: []
       selector:
         entity:
@@ -840,6 +863,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - scene
             - person
             - script
+            - binary_sensor
     entity24_name:
       name: Name "Button 24" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -848,7 +872,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         text: {}
     entity25:
       name: Button 25 (Optional)
-      description: '* *Displayed on **"Button Page 4"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script)*'
+      description: '* *Displayed on **"Button Page 4"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
       default: []
       selector:
         entity:
@@ -863,6 +887,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - scene
             - person
             - script
+            - binary_sensor
     entity25_name:
       name: Name "Button 25" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -871,7 +896,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         text: {}
     entity26:
       name: Button 26 (Optional)
-      description: '* *Displayed on **"Button Page 4"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script)*'
+      description: '* *Displayed on **"Button Page 4"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
       default: []
       selector:
         entity:
@@ -886,6 +911,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - scene
             - person
             - script
+            - binary_sensor
     entity26_name:
       name: Name "Button 26" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -894,7 +920,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         text: {}
     entity27:
       name: Button 27 (Optional)
-      description: '* *Displayed on **"Button Page 4"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script)*'
+      description: '* *Displayed on **"Button Page 4"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
       default: []
       selector:
         entity:
@@ -909,6 +935,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - scene
             - person
             - script
+            - binary_sensor
     entity27_name:
       name: Name "Button 27" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -917,7 +944,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         text: {}
     entity28:
       name: Button 28 (Optional)
-      description: '* *Displayed on **"Button Page 4"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script)*'
+      description: '* *Displayed on **"Button Page 4"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
       default: []
       selector:
         entity:
@@ -932,6 +959,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - scene
             - person
             - script
+            - binary_sensor
     entity28_name:
       name: Name "Button 28" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -940,7 +968,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         text: {}
     entity29:
       name: Button 29 (Optional)
-      description: '* *Displayed on **"Button Page 4"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script)*'
+      description: '* *Displayed on **"Button Page 4"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
       default: []
       selector:
         entity:
@@ -955,6 +983,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - scene
             - person
             - script
+            - binary_sensor
     entity29_name:
       name: Name "Button 29" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -963,7 +992,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         text: {}
     entity30:
       name: Button 30 (Optional)
-      description: '* *Displayed on **"Button Page 4"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script)*'
+      description: '* *Displayed on **"Button Page 4"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
       default: []
       selector:
         entity:
@@ -978,6 +1007,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - scene
             - person
             - script
+            - binary_sensor
     entity30_name:
       name: Name "Button 30" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -986,7 +1016,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         text: {}
     entity31:
       name: Button 31 (Optional)
-      description: '* *Displayed on **"Button Page 4"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script)*'
+      description: '* *Displayed on **"Button Page 4"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
       default: []
       selector:
         entity:
@@ -1001,6 +1031,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - scene
             - person
             - script
+            - binary_sensor
     entity31_name:
       name: Name "Button 31" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -1009,7 +1040,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         text: {}
     entity32:
       name: Button 32 (Optional)
-      description: '* *Displayed on **"Button Page 4"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script)*'
+      description: '* *Displayed on **"Button Page 4"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
       default: []
       selector:
         entity:
@@ -1024,6 +1055,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - scene
             - person
             - script
+            - binary_sensor
     entity32_name:
       name: Name "Button 32" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -1125,7 +1157,9 @@ variables:
   button_person_off: "111"
   button_person_on: "112"
   button_script_off: "107"
-  button_script_on: "108" 
+  button_script_on: "108"
+  button_binary_sensor_off: '107'
+  button_binary_sensor_on: '108'
 
   hardware_button_pic_off: "98"
   hardware_button_pic_on: "99"
@@ -2289,6 +2323,8 @@ action:
                           {%- elif repeat.item.entity is match "script." and states[repeat.item.entity].state == 'off' -%} {{ button_script_off }}
                           {%- elif repeat.item.entity is match "person." and states[repeat.item.entity].state == 'home' -%} {{ button_person_on }}
                           {%- elif repeat.item.entity is match "person." and states[repeat.item.entity].state != 'home' -%} {{ button_person_off }}
+                          {%- elif repeat.item.entity is match "binary_sensor." and states[repeat.item.entity].state == 'on' -%} {{ button_binary_sensor_on }}
+                          {%- elif repeat.item.entity is match "binary_sensor." and states[repeat.item.entity].state == 'off' -%} {{ button_binary_sensor_off }}
                           {%- endif -%}
                         # TEXT and BRIGHTNESS Background
                         btn_bg: >-
@@ -2678,6 +2714,8 @@ action:
                 {%- elif trigger.to_state.entity_id is match "script." and trigger.to_state.state == 'off' -%} {{ button_script_off }}
                 {%- elif trigger.to_state.entity_id is match "person." and trigger.to_state.state == 'home' -%} {{ button_person_on }}
                 {%- elif trigger.to_state.entity_id is match "person." and trigger.to_state.state != 'home' -%} {{ button_person_off }}
+                {%- elif trigger.to_state.entity_id is match "binary_sensor." and trigger.to_state.state == 'on' -%} {{ button_binary_sensor_on }}
+                {%- elif trigger.to_state.entity_id is match "binary_sensor." and trigger.to_state.state == 'off' -%} {{ button_binary_sensor_off }}
                 {%- endif -%}
               # TEXT and BRIGHTNESS Background
               btn_bg: >-
@@ -3091,7 +3129,7 @@ action:
                 {%- elif states(last_click) == "releasebuttonpage04button08" -%} {{ entity32 }}
                 {%- endif -%}
           - condition: template
-            value_template: '{{ entity_short is not match "person." }}'  
+            value_template: '{{ entity_short is not match "person." and entity_short is not match "binary_sensor." }}'  
           - service: >-
               {% if entity_short is match 'light.' %}
                 light.toggle