diff --git a/.vs/NSPanel_HA_Blueprint/FileContentIndex/4a36059d-0d01-4a92-9922-a7a244697e7f.vsidx b/.vs/NSPanel_HA_Blueprint/FileContentIndex/4a36059d-0d01-4a92-9922-a7a244697e7f.vsidx
new file mode 100644
index 0000000..403b2c9
Binary files /dev/null and b/.vs/NSPanel_HA_Blueprint/FileContentIndex/4a36059d-0d01-4a92-9922-a7a244697e7f.vsidx differ
diff --git a/.vs/NSPanel_HA_Blueprint/FileContentIndex/read.lock b/.vs/NSPanel_HA_Blueprint/FileContentIndex/read.lock
new file mode 100644
index 0000000..e69de29
diff --git a/.vs/NSPanel_HA_Blueprint/v17/.wsuo b/.vs/NSPanel_HA_Blueprint/v17/.wsuo
new file mode 100644
index 0000000..9773456
Binary files /dev/null and b/.vs/NSPanel_HA_Blueprint/v17/.wsuo differ
diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json
new file mode 100644
index 0000000..8894c12
--- /dev/null
+++ b/.vs/VSWorkspaceState.json
@@ -0,0 +1,7 @@
+{
+  "ExpandedNodes": [
+    ""
+  ],
+  "SelectedNode": "\\C:\\Users\\tiki\\Source\\Repos\\NSPanel_HA_Blueprint",
+  "PreviewInSolutionExplorer": false
+}
\ No newline at end of file
diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite
new file mode 100644
index 0000000..5195a87
Binary files /dev/null and b/.vs/slnx.sqlite differ
diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml
index 980be71..6a7df62 100644
--- a/nspanel_blueprint.yaml
+++ b/nspanel_blueprint.yaml
@@ -235,6 +235,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*'
@@ -257,6 +258,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*'
@@ -296,7 +298,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 | fan)*'
       default: []
       selector:
         entity:
@@ -312,6 +314,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*'
@@ -326,7 +329,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 | fan)*'
       default: []
       selector:
         entity:
@@ -342,6 +345,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*'
@@ -356,7 +360,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 | fan)*'
       default: []
       selector:
         entity:
@@ -372,6 +376,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*'
@@ -386,7 +391,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 | fan)*'
       default: []
       selector:
         entity:
@@ -402,6 +407,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*'
@@ -416,7 +422,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 | fan)*'
       default: []
       selector:
         entity:
@@ -432,6 +438,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*'
@@ -446,7 +453,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:
@@ -462,6 +469,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*'
@@ -476,7 +484,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:
@@ -492,6 +500,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*'
@@ -506,7 +515,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:
@@ -522,6 +531,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*'
@@ -536,7 +546,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:
@@ -552,6 +562,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*'
@@ -566,7 +577,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:
@@ -582,6 +593,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*'
@@ -596,7 +608,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:
@@ -612,6 +624,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*'
@@ -626,7 +639,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:
@@ -642,6 +655,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*'
@@ -656,7 +670,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:
@@ -672,6 +686,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*'
@@ -686,7 +701,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:
@@ -702,6 +717,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*'
@@ -716,7 +732,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:
@@ -732,6 +748,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*'
@@ -746,7 +763,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:
@@ -762,6 +779,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*'
@@ -776,7 +794,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:
@@ -792,6 +810,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*'
@@ -806,7 +825,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:
@@ -822,6 +841,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*'
@@ -836,7 +856,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:
@@ -852,6 +872,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*'
@@ -866,7 +887,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:
@@ -882,6 +903,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*'
@@ -896,7 +918,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:
@@ -912,6 +934,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*'
@@ -926,7 +949,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:
@@ -942,6 +965,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*'
@@ -956,7 +980,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:
@@ -972,6 +996,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*'
@@ -986,7 +1011,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:
@@ -1002,6 +1027,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*'
@@ -1016,7 +1042,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:
@@ -1032,6 +1058,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*'
@@ -1046,7 +1073,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:
@@ -1062,6 +1089,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*'
@@ -1076,7 +1104,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:
@@ -1092,6 +1120,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*'
@@ -1106,7 +1135,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:
@@ -1122,6 +1151,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*'
@@ -1136,7 +1166,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:
@@ -1152,6 +1182,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*'
@@ -1166,7 +1197,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:
@@ -1182,6 +1213,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*'
@@ -1196,7 +1228,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:
@@ -1212,6 +1244,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*'
@@ -1226,7 +1259,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 | fan)*'
       default: []
       selector:
         entity:
@@ -1242,6 +1275,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*'
@@ -1362,6 +1396,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"
@@ -2628,6 +2664,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: >-
@@ -3099,6 +3137,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 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: >-
@@ -3608,6 +3648,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 }}"
@@ -3654,7 +3696,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 }}"
@@ -4150,6 +4194,8 @@ action:
                 scene.turn_on
               {% elif left_button_entity is match 'script.' %}
                 script.turn_on
+              {% elif entity_short is match 'fan.' %}
+                fan.toggle
               {% endif %}
             data:
               entity_id: "{{ left_button_entity }}"
@@ -4201,6 +4247,8 @@ action:
                 scene.turn_on
               {% elif right_button_entity is match 'script.' %}
                 script.turn_on
+              {% elif entity_short is match 'fan.' %}
+                fan.toggle
               {% endif %}
             data:
               entity_id: "{{ right_button_entity }}"