Bunches of fixes nd changes

lovelace/phone/home.yaml

@@ -292,7 +292,7 @@ cards:
   - type: vertical-stack
     cards:
       - type: custom:mushroom-title-card
-        title: Upstairs
+        title: Private
       - type: horizontal-stack
         cards:
           - type: custom:mushroom-template-card
@@ -310,6 +310,21 @@ cards:
             icon_color: "{{iif(is_state('light.nursery_hue','on'),'yellow')}}"
             multiline_secondary: true
             layout: vertical
+          - type: custom:mushroom-template-card
+            primary: Boy's Room
+            icon: mdi:earth
+            entity: light.boys_room_hue
+            tap_action:
+              action: navigate
+              navigation_path: boys-room
+            hold_action:
+              action: toggle
+            secondary: |-
+              {{states('sensor.boys_room_multisensor_air_temperature')}}°F
+              {{states('sensor.boys_room_multisensor_humidity')}}%
+            icon_color: "{{iif(is_state('light.boys_room_hue','on'),'yellow')}}"
+            multiline_secondary: true
+            layout: vertical
           - type: custom:mushroom-template-card
             primary: Master Bedroom
             icon: mdi:bed-king
@@ -319,15 +334,16 @@ cards:
               navigation_path: master-bedroom
             hold_action:
               action: toggle
-            secondary: >-
+            secondary: |-
               {{states('sensor.master_bedroom_multisensor_air_temperature')}}°F
-
               {{states('sensor.master_bedroom_multisensor_humidity')}}%
             icon_color: "{{iif(is_state('light.master_bedroom_hue','on'),'yellow')}}"
             multiline_secondary: true
             layout: vertical
+      - type: horizontal-stack
+        cards:
           - type: custom:mushroom-template-card
-            primary: Master Bathroom
+            primary: Bathroom
             icon: mdi:shower
             entity: light.master_bathroom_hue
             tap_action:
@@ -338,9 +354,43 @@ cards:
             secondary: |-
               {{states('sensor.master_bathroom_thermostat_temperature')}}°F
               {{states('sensor.master_bathroom_thermostat_humidity')}}%
-            icon_color: "{{iif(is_state('light.master_bathroom_hue','on'),'yellow')}}"
+            icon_color: "{{iif(is_state('light.master_bathroom','on'),'yellow')}}"
             multiline_secondary: true
             layout: vertical
+          - type: custom:mushroom-template-card
+            primary: Utility Room
+            icon: mdi:washing-machine
+            entity: light.utility_room_vanity
+            tap_action:
+              action: navigate
+              navigation_path: utility-room
+            hold_action:
+              action: toggle
+            secondary: |-
+              {{states('sensor.utility_room_thermostat_temperature')}}°F
+              {{states('sensor.utility_room_thermostat_humidity')}}%
+            icon_color: "{{iif(is_state('light.utility_room_vanity','on'),'yellow')}}"
+            multiline_secondary: true
+            layout: vertical
+          - type: custom:mushroom-template-card
+            primary: Furnace Room
+            icon: mdi:hvac
+            entity: light.furnace_room
+            tap_action:
+              action: navigate
+              navigation_path: furnace-room
+            hold_action:
+              action: toggle
+            secondary: |-
+              {{states('sensor.furnace_room_thermostat_temperature')}}°F
+              {{states('sensor.furnace_room_thermostat_humidity')}}%
+            icon_color: "{{iif(is_state('light.furnace_room','on'),'yellow')}}"
+            multiline_secondary: true
+            layout: vertical
+  - type: vertical-stack
+    cards:
+      - type: custom:mushroom-title-card
+        title: Public
       - type: horizontal-stack
         cards:
           - type: custom:mushroom-template-card
@@ -388,6 +438,53 @@ cards:
             icon_color: "{{iif(is_state('light.dining_room_switch','on'),'yellow')}}"
             multiline_secondary: true
             layout: vertical
+      - type: horizontal-stack
+        cards:
+          - type: custom:mushroom-template-card
+            primary: Computer Area
+            icon: mdi:desktop-classic
+            entity: light.computer_area_hue
+            tap_action:
+              action: navigate
+              navigation_path: computer-area
+            hold_action:
+              action: toggle
+            secondary: >-
+              {{states('sensor.computer_area_multisensor_air_temperature')}}°F
+              {{states('sensor.computer_area_multisensor_humidity')}}%
+            icon_color: "{{iif(is_state('light.computer_area_hue','on'),'yellow')}}"
+            multiline_secondary: true
+            layout: vertical
+          - type: custom:mushroom-template-card
+            primary: Great Room
+            icon: mdi:microsoft-xbox-controller
+            entity: light.great_room_hue
+            tap_action:
+              action: navigate
+              navigation_path: great-room
+            hold_action:
+              action: toggle
+            secondary: |-
+              {{states('sensor.great_room_multisensor_air_temperature')}}°F
+              {{states('sensor.great_room_multisensor_humidity')}}%
+            icon_color: "{{iif(is_state('light.great_room_hue','on'),'yellow')}}"
+            multiline_secondary: true
+            layout: vertical
+          - type: custom:mushroom-template-card
+            primary: Mancave
+            icon: mdi:human-male
+            entity: light.mancave
+            tap_action:
+              action: navigate
+              navigation_path: mancave
+            hold_action:
+              action: toggle
+            secondary: |-
+              {{states('sensor.mancave_thermostat_temperature')}}°F
+              {{states('sensor.mancave_thermostat_humidity')}}%
+            icon_color: "{{iif(is_state('light.mancave','on'),'yellow')}}"
+            multiline_secondary: true
+            layout: vertical
   - type: vertical-stack
     cards:
       - type: custom:mushroom-title-card
@@ -486,102 +583,3 @@ cards:
             icon_color: "{{iif(is_state('light.deck','on'),'yellow')}}"
             multiline_secondary: true
             layout: vertical
-  - type: vertical-stack
-    cards:
-      - type: custom:mushroom-title-card
-        subtitle: Downstairs
-      - type: horizontal-stack
-        cards:
-          - type: custom:mushroom-template-card
-            primary: Computer Area
-            icon: mdi:desktop-classic
-            entity: light.computer_area_hue
-            tap_action:
-              action: navigate
-              navigation_path: computer-area
-            hold_action:
-              action: toggle
-            secondary: >-
-              {{states('sensor.computer_area_multisensor_air_temperature')}}°F
-
-              {{states('sensor.computer_area_multisensor_humidity')}}%
-            icon_color: "{{iif(is_state('light.computer_area_hue','on'),'yellow')}}"
-            multiline_secondary: true
-            layout: vertical
-          - type: custom:mushroom-template-card
-            primary: Great Room
-            icon: mdi:microsoft-xbox-controller
-            entity: light.great_room_hue
-            tap_action:
-              action: navigate
-              navigation_path: great-room
-            hold_action:
-              action: toggle
-            secondary: |-
-              {{states('sensor.great_room_multisensor_air_temperature')}}°F
-              {{states('sensor.great_room_multisensor_humidity')}}%
-            icon_color: "{{iif(is_state('light.great_room_hue','on'),'yellow')}}"
-            multiline_secondary: true
-            layout: vertical
-          - type: custom:mushroom-template-card
-            primary: Utility Room
-            icon: mdi:washing-machine
-            entity: light.utility_room_vanity
-            tap_action:
-              action: navigate
-              navigation_path: utility-room
-            hold_action:
-              action: toggle
-            secondary: |-
-              {{states('sensor.utility_room_thermostat_temperature')}}°F
-              {{states('sensor.utility_room_thermostat_humidity')}}%
-            icon_color: "{{iif(is_state('light.utility_room_vanity','on'),'yellow')}}"
-            multiline_secondary: true
-            layout: vertical
-      - type: horizontal-stack
-        cards:
-          - type: custom:mushroom-template-card
-            primary: Boy's Room
-            icon: mdi:earth
-            entity: light.boys_room_hue
-            tap_action:
-              action: navigate
-              navigation_path: boys-room
-            hold_action:
-              action: toggle
-            secondary: |-
-              {{states('sensor.boys_room_multisensor_air_temperature')}}°F
-              {{states('sensor.boys_room_multisensor_humidity')}}%
-            icon_color: "{{iif(is_state('light.boys_room_hue','on'),'yellow')}}"
-            multiline_secondary: true
-            layout: vertical
-          - type: custom:mushroom-template-card
-            primary: Mancave
-            icon: mdi:human-male
-            entity: light.mancave
-            tap_action:
-              action: navigate
-              navigation_path: mancave
-            hold_action:
-              action: toggle
-            secondary: |-
-              {{states('sensor.mancave_thermostat_temperature')}}°F
-              {{states('sensor.mancave_thermostat_humidity')}}%
-            icon_color: "{{iif(is_state('light.mancave','on'),'yellow')}}"
-            multiline_secondary: true
-            layout: vertical
-          - type: custom:mushroom-template-card
-            primary: Furnace Room
-            icon: mdi:hvac
-            entity: light.furnace_room
-            tap_action:
-              action: navigate
-              navigation_path: furnace-room
-            hold_action:
-              action: toggle
-            secondary: |-
-              {{states('sensor.furnace_room_thermostat_temperature')}}°F
-              {{states('sensor.furnace_room_thermostat_humidity')}}%
-            icon_color: "{{iif(is_state('light.furnace_room','on'),'yellow')}}"
-            multiline_secondary: true
-            layout: vertical