diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index a04b218..0000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "files.associations": {
-        "*.yaml": "home-assistant"
-    }
-}
\ No newline at end of file
diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml
index 981fb9d..9c7061a 100644
--- a/nspanel_blueprint.yaml
+++ b/nspanel_blueprint.yaml
@@ -248,6 +248,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - input_button
             - scene
             - script
+            - fan
     left_button_name:
       name: Name "Left Button" (Optional)
       description: '* *Left Button label - 10 characters are supported*'
@@ -270,6 +271,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - input_button
             - scene
             - script
+            - fan
     right_button_name:
       name: Name "Right Button" (Optional)
       description: '* *Right Button label - 10 characters are supported*'
@@ -309,7 +311,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 | binary_sensor)*'
+      description: '* *Displayed on **"Button Page 1"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor | fan)*'
       default: []
       selector:
         entity:
@@ -325,6 +327,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - person
             - script
             - binary_sensor
+            - fan
     entity01_name:
       name: Name "Button 01" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -339,7 +342,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         boolean:
     entity02:
       name: Button 02 (Optional)
-      description: '* *Displayed on **"Button Page 1"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
+      description: '* *Displayed on **"Button Page 1"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor | fan)*'
       default: []
       selector:
         entity:
@@ -355,6 +358,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - person
             - script
             - binary_sensor
+            - fan
     entity02_name:
       name: Name "Button 02" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -369,7 +373,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         boolean:
     entity03:
       name: Button 03 (Optional)
-      description: '* *Displayed on **"Button Page 1"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
+      description: '* *Displayed on **"Button Page 1"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor | fan)*'
       default: []
       selector:
         entity:
@@ -385,6 +389,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - person
             - script
             - binary_sensor
+            - fan
     entity03_name:
       name: Name "Button 03" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -399,7 +404,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         boolean:
     entity04:
       name: Button 04 (Optional)
-      description: '* *Displayed on **"Button Page 1"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
+      description: '* *Displayed on **"Button Page 1"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor | fan)*'
       default: []
       selector:
         entity:
@@ -415,6 +420,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - person
             - script
             - binary_sensor
+            - fan
     entity04_name:
       name: Name "Button 04" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -429,7 +435,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         boolean:
     entity05:
       name: Button 05 (Optional)
-      description: '* *Displayed on **"Button Page 1"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
+      description: '* *Displayed on **"Button Page 1"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor | fan)*'
       default: []
       selector:
         entity:
@@ -445,6 +451,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - person
             - script
             - binary_sensor
+            - fan
     entity05_name:
       name: Name "Button 05" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -459,7 +466,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         boolean:
     entity06:
       name: Button 06 (Optional)
-      description: '* *Displayed on **"Button Page 1"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
+      description: '* *Displayed on **"Button Page 1"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor | fan)*'
       default: []
       selector:
         entity:
@@ -475,6 +482,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - person
             - script
             - binary_sensor
+            - fan
     entity06_name:
       name: Name "Button 06" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -489,7 +497,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         boolean:
     entity07:
       name: Button 07 (Optional)
-      description: '* *Displayed on **"Button Page 1"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
+      description: '* *Displayed on **"Button Page 1"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor | fan)*'
       default: []
       selector:
         entity:
@@ -505,6 +513,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - person
             - script
             - binary_sensor
+            - fan
     entity07_name:
       name: Name "Button 07" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -519,7 +528,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         boolean:
     entity08:
       name: Button 08 (Optional)
-      description: '* *Displayed on **"Button Page 1"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
+      description: '* *Displayed on **"Button Page 1"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor | fan)*'
       default: []
       selector:
         entity:
@@ -535,6 +544,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - person
             - script
             - binary_sensor
+            - fan
     entity08_name:
       name: Name "Button 08" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -549,7 +559,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         boolean:
     entity09:
       name: Button 09 (Optional)
-      description: '* *Displayed on **"Button Page 2"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
+      description: '* *Displayed on **"Button Page 2"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor | fan)*'
       default: []
       selector:
         entity:
@@ -565,6 +575,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - person
             - script
             - binary_sensor
+            - fan
     entity09_name:
       name: Name "Button 09" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -579,7 +590,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         boolean:
     entity10:
       name: Button 10 (Optional)
-      description: '* *Displayed on **"Button Page 2"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
+      description: '* *Displayed on **"Button Page 2"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor | fan)*'
       default: []
       selector:
         entity:
@@ -595,6 +606,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - person
             - script
             - binary_sensor
+            - fan
     entity10_name:
       name: Name "Button 10" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -609,7 +621,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         boolean:
     entity11:
       name: Button 11 (Optional)
-      description: '* *Displayed on **"Button Page 2"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
+      description: '* *Displayed on **"Button Page 2"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor | fan)*'
       default: []
       selector:
         entity:
@@ -625,6 +637,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - person
             - script
             - binary_sensor
+            - fan
     entity11_name:
       name: Name "Button 11" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -639,7 +652,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         boolean:
     entity12:
       name: Button 12 (Optional)
-      description: '* *Displayed on **"Button Page 2"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
+      description: '* *Displayed on **"Button Page 2"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor | fan)*'
       default: []
       selector:
         entity:
@@ -655,6 +668,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - person
             - script
             - binary_sensor
+            - fan
     entity12_name:
       name: Name "Button 12" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -669,7 +683,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         boolean:
     entity13:
       name: Button 13 (Optional)
-      description: '* *Displayed on **"Button Page 2"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
+      description: '* *Displayed on **"Button Page 2"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor | fan)*'
       default: []
       selector:
         entity:
@@ -685,6 +699,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - person
             - script
             - binary_sensor
+            - fan
     entity13_name:
       name: Name "Button 13" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -699,7 +714,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         boolean:
     entity14:
       name: Button 14 (Optional)
-      description: '* *Displayed on **"Button Page 2"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
+      description: '* *Displayed on **"Button Page 2"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor | fan)*'
       default: []
       selector:
         entity:
@@ -715,6 +730,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - person
             - script
             - binary_sensor
+            - fan
     entity14_name:
       name: Name "Button 14" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -729,7 +745,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         boolean:
     entity15:
       name: Button 15 (Optional)
-      description: '* *Displayed on **"Button Page 2"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
+      description: '* *Displayed on **"Button Page 2"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor | fan)*'
       default: []
       selector:
         entity:
@@ -745,6 +761,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - person
             - script
             - binary_sensor
+            - fan
     entity15_name:
       name: Name "Button 15" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -759,7 +776,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         boolean:
     entity16:
       name: Button 16 (Optional)
-      description: '* *Displayed on **"Button Page 2"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
+      description: '* *Displayed on **"Button Page 2"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor | fan)*'
       default: []
       selector:
         entity:
@@ -775,6 +792,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - person
             - script
             - binary_sensor
+            - fan
     entity16_name:
       name: Name "Button 16" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -789,7 +807,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         boolean:
     entity17:
       name: Button 17 (Optional)
-      description: '* *Displayed on **"Button Page 3"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
+      description: '* *Displayed on **"Button Page 3"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor | fan)*'
       default: []
       selector:
         entity:
@@ -805,6 +823,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - person
             - script
             - binary_sensor
+            - fan
     entity17_name:
       name: Name "Button 17" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -819,7 +838,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         boolean:
     entity18:
       name: Button 18 (Optional)
-      description: '* *Displayed on **"Button Page 3"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
+      description: '* *Displayed on **"Button Page 3"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor | fan)*'
       default: []
       selector:
         entity:
@@ -835,6 +854,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - person
             - script
             - binary_sensor
+            - fan
     entity18_name:
       name: Name "Button 18" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -849,7 +869,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         boolean:
     entity19:
       name: Button 19 (Optional)
-      description: '* *Displayed on **"Button Page 3"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
+      description: '* *Displayed on **"Button Page 3"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor | fan)*'
       default: []
       selector:
         entity:
@@ -865,6 +885,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - person
             - script
             - binary_sensor
+            - fan
     entity19_name:
       name: Name "Button 19" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -879,7 +900,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         boolean:
     entity20:
       name: Button 20 (Optional)
-      description: '* *Displayed on **"Button Page 3"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
+      description: '* *Displayed on **"Button Page 3"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor | fan)*'
       default: []
       selector:
         entity:
@@ -895,6 +916,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - person
             - script
             - binary_sensor
+            - fan
     entity20_name:
       name: Name "Button 20" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -909,7 +931,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         boolean:
     entity21:
       name: Button 21 (Optional)
-      description: '* *Displayed on **"Button Page 3"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
+      description: '* *Displayed on **"Button Page 3"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor | fan)*'
       default: []
       selector:
         entity:
@@ -925,6 +947,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - person
             - script
             - binary_sensor
+            - fan
     entity21_name:
       name: Name "Button 21" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -939,7 +962,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         boolean:
     entity22:
       name: Button 22 (Optional)
-      description: '* *Displayed on **"Button Page 3"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
+      description: '* *Displayed on **"Button Page 3"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor | fan)*'
       default: []
       selector:
         entity:
@@ -955,6 +978,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - person
             - script
             - binary_sensor
+            - fan
     entity22_name:
       name: Name "Button 22" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -969,7 +993,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         boolean:
     entity23:
       name: Button 23 (Optional)
-      description: '* *Displayed on **"Button Page 3"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
+      description: '* *Displayed on **"Button Page 3"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor | fan)*'
       default: []
       selector:
         entity:
@@ -985,6 +1009,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - person
             - script
             - binary_sensor
+            - fan
     entity23_name:
       name: Name "Button 23" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -999,7 +1024,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         boolean:
     entity24:
       name: Button 24 (Optional)
-      description: '* *Displayed on **"Button Page 3"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
+      description: '* *Displayed on **"Button Page 3"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor | fan)*'
       default: []
       selector:
         entity:
@@ -1015,6 +1040,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - person
             - script
             - binary_sensor
+            - fan
     entity24_name:
       name: Name "Button 24" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -1029,7 +1055,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         boolean:
     entity25:
       name: Button 25 (Optional)
-      description: '* *Displayed on **"Button Page 4"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
+      description: '* *Displayed on **"Button Page 4"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor | fan)*'
       default: []
       selector:
         entity:
@@ -1045,6 +1071,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - person
             - script
             - binary_sensor
+            - fan
     entity25_name:
       name: Name "Button 25" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -1059,7 +1086,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         boolean:
     entity26:
       name: Button 26 (Optional)
-      description: '* *Displayed on **"Button Page 4"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
+      description: '* *Displayed on **"Button Page 4"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor | fan)*'
       default: []
       selector:
         entity:
@@ -1075,6 +1102,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - person
             - script
             - binary_sensor
+            - fan
     entity26_name:
       name: Name "Button 26" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -1089,7 +1117,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         boolean:
     entity27:
       name: Button 27 (Optional)
-      description: '* *Displayed on **"Button Page 4"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
+      description: '* *Displayed on **"Button Page 4"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor | fan)*'
       default: []
       selector:
         entity:
@@ -1105,6 +1133,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - person
             - script
             - binary_sensor
+            - fan
     entity27_name:
       name: Name "Button 27" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -1119,7 +1148,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         boolean:
     entity28:
       name: Button 28 (Optional)
-      description: '* *Displayed on **"Button Page 4"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
+      description: '* *Displayed on **"Button Page 4"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor | fan)*'
       default: []
       selector:
         entity:
@@ -1135,6 +1164,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - person
             - script
             - binary_sensor
+            - fan
     entity28_name:
       name: Name "Button 28" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -1149,7 +1179,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         boolean:
     entity29:
       name: Button 29 (Optional)
-      description: '* *Displayed on **"Button Page 4"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
+      description: '* *Displayed on **"Button Page 4"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor | fan)*'
       default: []
       selector:
         entity:
@@ -1165,6 +1195,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - person
             - script
             - binary_sensor
+            - fan
     entity29_name:
       name: Name "Button 29" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -1179,7 +1210,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         boolean:
     entity30:
       name: Button 30 (Optional)
-      description: '* *Displayed on **"Button Page 4"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
+      description: '* *Displayed on **"Button Page 4"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor | fan)*'
       default: []
       selector:
         entity:
@@ -1195,6 +1226,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - person
             - script
             - binary_sensor
+            - fan
     entity30_name:
       name: Name "Button 30" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -1209,7 +1241,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         boolean:
     entity31:
       name: Button 31 (Optional)
-      description: '* *Displayed on **"Button Page 4"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
+      description: '* *Displayed on **"Button Page 4"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor | fan)*'
       default: []
       selector:
         entity:
@@ -1225,6 +1257,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - person
             - script
             - binary_sensor
+            - fan
     entity31_name:
       name: Name "Button 31" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -1239,7 +1272,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
         boolean:
     entity32:
       name: Button 32 (Optional)
-      description: '* *Displayed on **"Button Page 4"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor)*'
+      description: '* *Displayed on **"Button Page 4"** - (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | person | script | binary_sensor | fan)*'
       default: []
       selector:
         entity:
@@ -1255,6 +1288,7 @@ The goal was to create a version that allows everyone to use the NSpanel fully l
             - person
             - script
             - binary_sensor
+            - fan
     entity32_name:
       name: Name "Button 32" (Optional)
       description: '* *Button label - 10 characters are supported*'
@@ -1375,6 +1409,8 @@ variables:
   button_script_on: "108"
   button_binary_sensor_off: '107'
   button_binary_sensor_on: '108'
+  button_fan_off: "107" #TODO replace icon
+  button_fan_on: "108" #TODO replace icon
 
   hardware_button_pic_off: "98"
   hardware_button_pic_on: "99"
@@ -2657,6 +2693,8 @@ action:
                           {%- 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 }}
+                          {%- elif repeat.item.entity is match "fan." and states[repeat.item.entity].state == 'on' -%} {{ button_fan_on }}
+                          {%- elif repeat.item.entity is match "fan." and states[repeat.item.entity].state == 'off' -%} {{ button_fan_off }}
                           {%- endif -%}
                         # TEXT and BRIGHTNESS Background
                         btn_bg: >-
@@ -2975,6 +3013,8 @@ action:
                 {%- 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 }}
+                {%- elif trigger.to_state.entity_id is match "fan." and trigger.to_state.state == 'on' -%} {{ button_fan_on }}
+                {%- elif trigger.to_state.entity_id is match "fan." and trigger.to_state.state == 'off' -%} {{ button_fan_off }}
                 {%- endif -%}
               # TEXT and BRIGHTNESS Background
               btn_bg: >-
@@ -3482,6 +3522,8 @@ action:
                           scene.turn_on
                         {% elif entity_short is match 'script.' %}
                           script.turn_on
+                        {% elif entity_short is match 'fan.' %}
+                          fan.toggle
                         {% endif %}
                       data:
                         entity_id: "{{ entity_short }}"
@@ -3528,7 +3570,9 @@ action:
                   {% elif entity_short is match 'scene.' %}
                     scene.turn_on
                   {% elif entity_short is match 'script.' %}
-                    script.turn_on
+                    script.turn_on                    
+                  {% elif entity_short is match 'fan.' %}
+                    fan.toggle
                   {% endif %}
                 data:
                   entity_id: "{{ entity_short }}"
@@ -4019,6 +4063,8 @@ action:
                 scene.turn_on
               {% elif left_button_entity is match 'script.' %}
                 script.turn_on
+              {% elif left_button_entity is match 'fan.' %}
+                fan.toggle
               {% endif %}
             data:
               entity_id: "{{ left_button_entity }}"
@@ -4068,6 +4114,8 @@ action:
                 scene.turn_on
               {% elif right_button_entity is match 'script.' %}
                 script.turn_on
+              {% elif right_button_entity is match 'fan.' %}
+                fan.toggle
               {% endif %}
             data:
               entity_id: "{{ right_button_entity }}"
@@ -5974,4 +6022,4 @@ action:
 
 #############################################################
 ##### CLOSE - Action #####
-#############################################################
\ No newline at end of file
+#############################################################