diff --git a/config/lovelace/decluttering_templates/cards/hdmi_switch_remote_card.yaml b/config/lovelace/decluttering_templates/cards/hdmi_switch_remote_card.yaml
new file mode 100644
index 0000000..f7f0bbf
--- /dev/null
+++ b/config/lovelace/decluttering_templates/cards/hdmi_switch_remote_card.yaml
@@ -0,0 +1,107 @@
+hdmi_switch_remote_card:
+  card:
+    type: picture-elements
+    image: /local/images/remotes/hdmi_switch_new.png
+    elements:
+      - type: image
+        image: /local/images/floorplan/transparent.png
+        entity: script.hdmi_switch_on
+        tap_action:
+          action: toggle
+        style:
+          width: 23.6%
+          height: 11.8%
+          top: 11.4%
+          left: 82%
+          border-radius: 50%
+
+      - type: image
+        image: /local/images/floorplan/transparent.png
+        entity: script.hdmi_switch_off
+        tap_action:
+          action: toggle
+        style:
+          width: 23.6%
+          height: 11.8%
+          top: 11%
+          left: 14.1%
+          border-radius: 50%
+
+      - type: image
+        image: /local/images/floorplan/transparent.png
+        entity: script.hdmi_switch_1
+        tap_action:
+          action: toggle
+        style:
+          width: 23.6%
+          height: 11.8%
+          top: 23.6%
+          left: 13.5%
+          border-radius: 50%
+      - type: image
+        image: /local/images/floorplan/transparent.png
+        entity: script.hdmi_switch_2
+        tap_action:
+          action: toggle
+        style:
+          width: 23.6%
+          height: 11.8%
+          top: 23.6%
+          left: 83%
+          border-radius: 50%
+      - type: image
+        image: /local/images/floorplan/transparent.png
+        entity: script.hdmi_switch_3
+        tap_action:
+          action: toggle
+        style:
+          width: 23.6%
+          height: 11.8%
+          top: 36%
+          left: 49%
+          border-radius: 50%
+      - type: image
+        image: /local/images/floorplan/transparent.png
+        entity: script.hdmi_switch_4
+        tap_action:
+          action: toggle
+        style:
+          width: 23.6%
+          height: 11.8%
+          top: 48.5%
+          left: 13.5%
+          border-radius: 50%
+      - type: image
+        image: /local/images/floorplan/transparent.png
+        entity: script.hdmi_switch_5
+        tap_action:
+          action: toggle
+        style:
+          width: 23.6%
+          height: 11.8%
+          top: 48.5%
+          left: 83%
+          border-radius: 50%
+
+      - type: image
+        image: /local/images/floorplan/transparent.png
+        entity: script.hdmi_switch_next
+        tap_action:
+          action: toggle
+        style:
+          width: 23.6%
+          height: 11.8%
+          top: 61.5%
+          left: 50%
+          border-radius: 50%
+      - type: image
+        image: /local/images/floorplan/transparent.png
+        entity: script.hdmi_switch_prev
+        tap_action:
+          action: toggle
+        style:
+          width: 23.6%
+          height: 11.8%
+          top: 74%
+          left: 50%
+          border-radius: 50%
diff --git a/config/lovelace/decluttering_templates/cards/hdmi_swtich_remote_card.yaml b/config/lovelace/decluttering_templates/cards/old_hdmi_swtich_remote_card.yaml
similarity index 98%
rename from config/lovelace/decluttering_templates/cards/hdmi_swtich_remote_card.yaml
rename to config/lovelace/decluttering_templates/cards/old_hdmi_swtich_remote_card.yaml
index a9d7db6..fc867f3 100644
--- a/config/lovelace/decluttering_templates/cards/hdmi_swtich_remote_card.yaml
+++ b/config/lovelace/decluttering_templates/cards/old_hdmi_swtich_remote_card.yaml
@@ -1,4 +1,4 @@
-hdmi_switch_remote_card:
+old_hdmi_switch_remote_card:
   card:
     type: picture-elements
     image: /local/images/remotes/hdmi_switcher.png
diff --git a/config/packages/devices/living_room/hdmi_switch.yaml b/config/packages/devices/living_room/hdmi_switch.yaml
index eff3b5b..d9522cb 100644
--- a/config/packages/devices/living_room/hdmi_switch.yaml
+++ b/config/packages/devices/living_room/hdmi_switch.yaml
@@ -5,7 +5,7 @@ script:
       - service: mqtt.publish
         data:
           topic: cmnd/ir_blaster_1/IRSend
-          payload: '{ "Protocol": "NEC", "Bits": 32, "Data": "0x01FE48B7" }'
+          payload: '{ "Protocol": "NEC", "Bits": 32, "Data": "0x807FD827" }'
 
   hdmi_switch_2:
     alias: HDMI Swtich · Set to 2
@@ -13,7 +13,7 @@ script:
       - service: mqtt.publish
         data:
           topic: cmnd/ir_blaster_1/IRSend
-          payload: '{ "Protocol": "NEC", "Bits": 32, "Data": "0x01FE58A7" }'
+          payload: '{ "Protocol": "NEC", "Bits": 32, "Data": "0x807F7887" }'
 
   hdmi_switch_3:
     alias: HDMI Swtich · Set to 3
@@ -21,7 +21,7 @@ script:
       - service: mqtt.publish
         data:
           topic: cmnd/ir_blaster_1/IRSend
-          payload: '{ "Protocol": "NEC", "Bits": 32, "Data": "0x01FE7887" }'
+          payload: '{ "Protocol": "NEC", "Bits": 32, "Data": "0x807FB04F" }'
 
   hdmi_switch_4:
     alias: HDMI Swtich · Set to 4
@@ -29,7 +29,15 @@ script:
       - service: mqtt.publish
         data:
           topic: cmnd/ir_blaster_1/IRSend
-          payload: '{ "Protocol": "NEC", "Bits": 32, "Data": "0x01FE807F" }'
+          payload: '{ "Protocol": "NEC", "Bits": 32, "Data": "0x807F48B7" }'
+
+  hdmi_switch_5:
+    alias: HDMI Swtich · Set to 5
+    sequence:
+      - service: mqtt.publish
+        data:
+          topic: cmnd/ir_blaster_1/IRSend
+          payload: '{ "Protocol": "NEC", "Bits": 32, "Data": "0x807F08F7" }'
 
   hdmi_switch_next:
     alias: HDMI Swtich · Next
@@ -37,28 +45,28 @@ script:
       - service: mqtt.publish
         data:
           topic: cmnd/ir_blaster_1/IRSend
-          payload: '{ "Protocol": "NEC", "Bits": 32, "Data": "0x01FEC03F" }'
+          payload: '{ "Protocol": "NEC", "Bits": 32, "Data": "0x807F30CF" }'
 
-  hdmi_switch_pip:
-    alias: HDMI Swtich · PIP
+  hdmi_switch_prev:
+    alias: HDMI Swtich · Prev
     sequence:
       - service: mqtt.publish
         data:
           topic: cmnd/ir_blaster_1/IRSend
-          payload: '{ "Protocol": "NEC", "Bits": 32, "Data": "0x01FE50AF" }'
+          payload: '{ "Protocol": "NEC", "Bits": 32, "Data": "0x807FA05F" }'
 
-  hdmi_switch_sel:
-    alias: HDMI Swtich · SEL
+  hdmi_switch_on:
+    alias: HDMI Swtich · On
     sequence:
       - service: mqtt.publish
         data:
           topic: cmnd/ir_blaster_1/IRSend
-          payload: '{ "Protocol": "NEC", "Bits": 32, "Data": "0x01FED827" }'
+          payload: '{ "Protocol": "NEC", "Bits": 32, "Data": "0x807F3AC5" }'
 
-  hdmi_switch_enter:
-    alias: HDMI Swtich · Enter
+  hdmi_switch_off:
+    alias: HDMI Swtich · Off
     sequence:
       - service: mqtt.publish
         data:
           topic: cmnd/ir_blaster_1/IRSend
-          payload: '{ "Protocol": "NEC", "Bits": 32, "Data": "0x01FEF807" }'
+          payload: '{ "Protocol": "NEC", "Bits": 32, "Data": "0x807FF807" }'
diff --git a/config/packages/devices/living_room/hdmi_switch_old.yaml b/config/packages/devices/living_room/hdmi_switch_old.yaml
new file mode 100644
index 0000000..e883100
--- /dev/null
+++ b/config/packages/devices/living_room/hdmi_switch_old.yaml
@@ -0,0 +1,64 @@
+script:
+  old_hdmi_switch_1:
+    alias: Old HDMI Swtich · Set to 1
+    sequence:
+      - service: mqtt.publish
+        data:
+          topic: cmnd/ir_blaster_1/IRSend
+          payload: '{ "Protocol": "NEC", "Bits": 32, "Data": "0x01FE48B7" }'
+
+  old_hdmi_switch_2:
+    alias: Old HDMI Swtich · Set to 2
+    sequence:
+      - service: mqtt.publish
+        data:
+          topic: cmnd/ir_blaster_1/IRSend
+          payload: '{ "Protocol": "NEC", "Bits": 32, "Data": "0x01FE58A7" }'
+
+  old_hdmi_switch_3:
+    alias: Old HDMI Swtich · Set to 3
+    sequence:
+      - service: mqtt.publish
+        data:
+          topic: cmnd/ir_blaster_1/IRSend
+          payload: '{ "Protocol": "NEC", "Bits": 32, "Data": "0x01FE7887" }'
+
+  old_hdmi_switch_4:
+    alias: Old HDMI Swtich · Set to 4
+    sequence:
+      - service: mqtt.publish
+        data:
+          topic: cmnd/ir_blaster_1/IRSend
+          payload: '{ "Protocol": "NEC", "Bits": 32, "Data": "0x01FE807F" }'
+
+  old_hdmi_switch_next:
+    alias: Old HDMI Swtich · Next
+    sequence:
+      - service: mqtt.publish
+        data:
+          topic: cmnd/ir_blaster_1/IRSend
+          payload: '{ "Protocol": "NEC", "Bits": 32, "Data": "0x01FEC03F" }'
+
+  old_hdmi_switch_pip:
+    alias: Old HDMI Swtich · PIP
+    sequence:
+      - service: mqtt.publish
+        data:
+          topic: cmnd/ir_blaster_1/IRSend
+          payload: '{ "Protocol": "NEC", "Bits": 32, "Data": "0x01FE50AF" }'
+
+  old_hdmi_switch_sel:
+    alias: Old HDMI Swtich · SEL
+    sequence:
+      - service: mqtt.publish
+        data:
+          topic: cmnd/ir_blaster_1/IRSend
+          payload: '{ "Protocol": "NEC", "Bits": 32, "Data": "0x01FED827" }'
+
+  old_hdmi_switch_enter:
+    alias: Old HDMI Swtich · Enter
+    sequence:
+      - service: mqtt.publish
+        data:
+          topic: cmnd/ir_blaster_1/IRSend
+          payload: '{ "Protocol": "NEC", "Bits": 32, "Data": "0x01FEF807" }'