diff --git a/groups.yaml b/groups.yaml
index 14adc2b..fdd3778 100644
--- a/groups.yaml
+++ b/groups.yaml
@@ -90,10 +90,10 @@ Internet:
 #  - device_tracker.gateway2f3bca
 
 Entertainment:
-  - sensor.samsungtv
-  - sensor.appletv
+  - media_player.pn60e550_pn60e550
+  - media_player.apple_tv
   - sensor.xboxone
-  - sensor.chromecast
+  - media_player.chromecast_lr
 
 Home Automation:
   - sensor.smartthings
diff --git a/sensors/devices.yaml b/sensors/devices.yaml
index cc6b109..68c167d 100644
--- a/sensors/devices.yaml
+++ b/sensors/devices.yaml
@@ -22,14 +22,7 @@
 
       appletv:
         friendly_name: 'Apple Tv'
-        value_template: >-
-            {%- if is_state('media_player.apple_tv', 'on') %}
-                On
-            {%  elif states.media_player.apple_tv.attributes.media_title) %}
-                {{ states.media_player.apple_tv.attributes.media_title }}
-            {% else %}
-                Off
-            {%- endif %}
+        value_template: "{{ 'On' if is_state('media_player.apple_tv', 'on') else 'Off' }}"
 
       xboxone:
         friendly_name: 'xboxone'