diff --git a/packages/fire_tablet.yaml b/packages/fire_tablet.yaml
index a1d7546b..8f981026 100755
--- a/packages/fire_tablet.yaml
+++ b/packages/fire_tablet.yaml
@@ -2,13 +2,14 @@
 #  Fire Tablet Alarm Panel - http://www.vmwareinfo.com/2017/07/visualizing-smart-home-using-home.html
 #-------------------------------------------
 #
-# homeassistant:
-#   customize:
-#     binary_sensor.office_motion:
-#       icon: mdi:sensor
-#       friendly_name: Office Motion Sensor
-#       emulated_hue: False
-#       hidden: False
+homeassistant:
+  customize_glob:
+    "sensor.alarm_panel_*":
+      emulated_hue: False
+      hidden: True
+  customize:
+    group.fire_tablet:
+      emulated_hue: True
 
 #---Sensor for Fire Tablet-----------------------------
 sensor:
@@ -23,7 +24,6 @@ sensor:
     state_topic: "wallpanel/alarm 1/sensor/battery"
     name: "Alarm Panel 1 Plugged In"
     value_template: '{{ value_json.acPlugged }}'
-    unit_of_measurement: '%'
     device_class: power
 
   - platform: mqtt
@@ -32,7 +32,10 @@ sensor:
     value_template: '{{ value_json.value }}'
     device_class: motion
 
-  - platform: mqtt
-    state_topic: "wallpanel/alarm 1/state"
-    name: "Alarm Panel 1 Screen"
-    value_template: '{{ value_json.screenOn }}'
+
+group:
+  fire_tablet:
+    entities:
+      - sensor.alarm_panel_1_battery_level
+      - sensor.alarm_panel_1_motion
+      - sensor.alarm_panel_1_plugged_in