diff --git a/lovelace/popup_cards.yaml b/lovelace/popup_cards.yaml
index 31e831d..85ba63d 100644
--- a/lovelace/popup_cards.yaml
+++ b/lovelace/popup_cards.yaml
@@ -171,9 +171,70 @@ cards:
             - type: custom:decluttering-card
               template: bulsatcom_remote_card
 
-  # - type: custom:popup-card
-  #   entity: media_player.living_room_tv: *nvidia_shiel
+  - type: custom:popup-card
+    entity: media_player.living_room_tv
+    title: TV
+    card:
+      type: vertical-stack
+      cards:
+        - type: horizontal-stack
+          cards:
+            - type: custom:button-card
+              template: [v3_button, v3_popup_button]
+              icon: mdi:set-top-box
+              name: Set to Shield
+              show_state: false
+              tap_action:
+                action: call-service
+                service: media_player.select_source
+                service_data:
+                  entity_id: media_player.living_room_tv
+                  source: Shield
+              styles:
+                card:
+                  - margin-left: 8px
 
+            - type: custom:button-card
+              template: [v3_button, v3_popup_button]
+              name: Set to Switch
+              icon: mdi:video-input-hdmi
+              show_state: false
+              tap_action:
+                action: call-service
+                service: media_player.select_source
+                service_data:
+                  entity_id: media_player.living_room_tv
+                  source: Switch
+
+            - type: custom:button-card
+              template: [v3_button, v3_popup_button]
+              name: Bulsatcom
+              icon: mdi:remote-tv
+              show_state: false
+              tap_action:
+                action: call-service
+                service: script.tv_bulsatcom_toggle
+
+        - type: custom:mini-media-player
+          entity: media_player.nvidia_shield
+
+        - type: custom:mini-media-player
+          entity: media_player.living_room_tv
+
+        - type: custom:decluttering-card
+          template: sonos_media_player
+          variables:
+            - player: media_player.living_room
+            - name: Sonos
+            - sync_volume: false
+
+        - type: horizontal-stack
+          title: Remotes
+          cards:
+            - type: custom:decluttering-card
+              template: hdmi_switch_remote_card
+            - type: custom:decluttering-card
+              template: bulsatcom_remote_card
 
   - type: custom:popup-card
     entity: group.all_motion_sensors
@@ -559,6 +620,8 @@ cards:
       entities:
         - sensor.printer_black_toner_remaining
         - sensor.printer_drum_remaining_life
+        - sensor.printer_drum_remaining_pages
+        - sensor.printer_drum_counter
         - sensor.printer_duplex_unit_pages_counter
         - sensor.printer_page_counter
         - sensor.printer_uptime