diff --git a/.storage/lovelace.lovelace b/.storage/lovelace.lovelace
index 848c837..4959e47 100644
--- a/.storage/lovelace.lovelace
+++ b/.storage/lovelace.lovelace
@@ -222,6 +222,642 @@
             }
           ]
         },
+        {
+          "title": "Räume",
+          "path": "raume",
+          "icon": "mdi:floor-plan",
+          "type": "sections",
+          "max_columns": 2,
+          "sections": [
+            {
+              "type": "grid",
+              "title": "Wohnzimmer",
+              "cards": [
+                {
+                  "type": "custom:mushroom-chips-card",
+                  "alignment": "justify",
+                  "chips": [
+                    {
+                      "type": "entity",
+                      "entity": "sensor.wohnzimmer_rauchmelder_temperature",
+                      "icon": "mdi:thermometer",
+                      "content_info": "state"
+                    },
+                    {
+                      "type": "entity",
+                      "entity": "sensor.wohnzimmer_rauchmelder_humidity",
+                      "icon": "mdi:water-percent",
+                      "content_info": "state"
+                    },
+                    {
+                      "type": "entity",
+                      "entity": "binary_sensor.wohnzimmer_rauchmelder_smoke",
+                      "icon": "mdi:smoke-detector",
+                      "content_info": "name"
+                    }
+                  ]
+                },
+                {
+                  "type": "custom:auto-entities",
+                  "card": {
+                    "type": "grid",
+                    "columns": 2,
+                    "square": false
+                  },
+                  "card_param": "cards",
+                  "filter": {
+                    "include": [
+                      {
+                        "domain": "light",
+                        "area": "wohnzimmer"
+                      }
+                    ]
+                  },
+                  "sort": {
+                    "method": "friendly_name"
+                  }
+                },
+                {
+                  "type": "custom:mushroom-cover-card",
+                  "entity": "cover.wohnzimmer_rolladen",
+                  "show_buttons_control": true,
+                  "show_position_control": true
+                }
+              ]
+            },
+            {
+              "type": "grid",
+              "title": "Küche",
+              "cards": [
+                {
+                  "type": "custom:auto-entities",
+                  "card": {
+                    "type": "grid",
+                    "columns": 2,
+                    "square": false
+                  },
+                  "card_param": "cards",
+                  "filter": {
+                    "include": [
+                      {
+                        "domain": "light",
+                        "area": "kuche"
+                      }
+                    ]
+                  },
+                  "sort": {
+                    "method": "friendly_name"
+                  }
+                },
+                {
+                  "type": "custom:mushroom-cover-card",
+                  "entity": "cover.kuche_rolladen",
+                  "show_buttons_control": true,
+                  "show_position_control": true
+                }
+              ]
+            },
+            {
+              "type": "grid",
+              "title": "Esszimmer",
+              "cards": [
+                {
+                  "type": "custom:auto-entities",
+                  "card": {
+                    "type": "grid",
+                    "columns": 2,
+                    "square": false
+                  },
+                  "card_param": "cards",
+                  "filter": {
+                    "include": [
+                      {
+                        "domain": "light",
+                        "area": "esszimmer"
+                      }
+                    ]
+                  },
+                  "sort": {
+                    "method": "friendly_name"
+                  }
+                },
+                {
+                  "type": "horizontal-stack",
+                  "cards": [
+                    {
+                      "type": "custom:mushroom-cover-card",
+                      "entity": "cover.esszimmer_rolladen_terrasse",
+                      "show_buttons_control": true,
+                      "fill_container": true
+                    },
+                    {
+                      "type": "custom:mushroom-cover-card",
+                      "entity": "cover.esszimmer_rollladen_fenster",
+                      "show_buttons_control": true,
+                      "fill_container": true
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "type": "grid",
+              "title": "Schlafzimmer",
+              "cards": [
+                {
+                  "type": "custom:mushroom-chips-card",
+                  "alignment": "justify",
+                  "chips": [
+                    {
+                      "type": "entity",
+                      "entity": "sensor.schlafzimmer_rauchmelder_temperature",
+                      "icon": "mdi:thermometer"
+                    },
+                    {
+                      "type": "entity",
+                      "entity": "sensor.schlafzimmer_rauchmelder_humidity",
+                      "icon": "mdi:water-percent"
+                    }
+                  ]
+                },
+                {
+                  "type": "custom:auto-entities",
+                  "card": {
+                    "type": "grid",
+                    "columns": 2,
+                    "square": false
+                  },
+                  "card_param": "cards",
+                  "filter": {
+                    "include": [
+                      {
+                        "domain": "light",
+                        "area": "schlafzimmer"
+                      }
+                    ]
+                  },
+                  "sort": {
+                    "method": "friendly_name"
+                  }
+                },
+                {
+                  "type": "custom:mushroom-cover-card",
+                  "entity": "cover.schlafzimmer_rolladen",
+                  "show_buttons_control": true,
+                  "show_position_control": true
+                }
+              ]
+            },
+            {
+              "type": "grid",
+              "title": "Kinderzimmer",
+              "cards": [
+                {
+                  "type": "custom:mushroom-chips-card",
+                  "alignment": "justify",
+                  "chips": [
+                    {
+                      "type": "entity",
+                      "entity": "sensor.kinderzimmer_rauchmelder_temperature",
+                      "icon": "mdi:thermometer"
+                    },
+                    {
+                      "type": "entity",
+                      "entity": "sensor.kinderzimmer_rauchmelder_humidity",
+                      "icon": "mdi:water-percent"
+                    },
+                    {
+                      "type": "entity",
+                      "entity": "binary_sensor.kinderzimmer_bewegungsmelder_occupancy",
+                      "icon": "mdi:motion-sensor"
+                    }
+                  ]
+                },
+                {
+                  "type": "custom:auto-entities",
+                  "card": {
+                    "type": "grid",
+                    "columns": 2,
+                    "square": false
+                  },
+                  "card_param": "cards",
+                  "filter": {
+                    "include": [
+                      {
+                        "domain": "light",
+                        "area": "kinderzimmer"
+                      }
+                    ]
+                  },
+                  "sort": {
+                    "method": "friendly_name"
+                  }
+                },
+                {
+                  "type": "custom:mushroom-cover-card",
+                  "entity": "cover.kinderzimmer_rollladen",
+                  "show_buttons_control": true,
+                  "show_position_control": true
+                }
+              ]
+            },
+            {
+              "type": "grid",
+              "title": "Badezimmer",
+              "cards": [
+                {
+                  "type": "custom:mushroom-chips-card",
+                  "alignment": "justify",
+                  "chips": [
+                    {
+                      "type": "entity",
+                      "entity": "sensor.badezimmer_feuchtemesser_temperature",
+                      "icon": "mdi:thermometer"
+                    },
+                    {
+                      "type": "entity",
+                      "entity": "sensor.badezimmer_feuchtemesser_humidity",
+                      "icon": "mdi:water-percent"
+                    },
+                    {
+                      "type": "entity",
+                      "entity": "binary_sensor.badezimmer_bewegungsmelder_occupancy",
+                      "icon": "mdi:motion-sensor"
+                    }
+                  ]
+                },
+                {
+                  "type": "custom:auto-entities",
+                  "card": {
+                    "type": "grid",
+                    "columns": 2,
+                    "square": false
+                  },
+                  "card_param": "cards",
+                  "filter": {
+                    "include": [
+                      {
+                        "domain": "light",
+                        "area": "badezimmer"
+                      }
+                    ]
+                  },
+                  "sort": {
+                    "method": "friendly_name"
+                  }
+                },
+                {
+                  "type": "custom:mushroom-entity-card",
+                  "entity": "switch.badezimmer_handtuchheizung",
+                  "name": "Handtuchheizung",
+                  "icon": "mdi:radiator",
+                  "icon_color": "{% if is_state('switch.badezimmer_handtuchheizung','on') %}red{% else %}grey{% endif %}",
+                  "tap_action": {
+                    "action": "toggle"
+                  }
+                }
+              ]
+            },
+            {
+              "type": "grid",
+              "title": "WC",
+              "cards": [
+                {
+                  "type": "custom:mushroom-chips-card",
+                  "alignment": "justify",
+                  "chips": [
+                    {
+                      "type": "entity",
+                      "entity": "binary_sensor.wc_wassermelder_water_leak",
+                      "icon": "mdi:water-alert"
+                    },
+                    {
+                      "type": "entity",
+                      "entity": "binary_sensor.wc_bewegungsmelder_occupancy",
+                      "icon": "mdi:motion-sensor"
+                    }
+                  ]
+                },
+                {
+                  "type": "custom:auto-entities",
+                  "card": {
+                    "type": "grid",
+                    "columns": 2,
+                    "square": false
+                  },
+                  "card_param": "cards",
+                  "filter": {
+                    "include": [
+                      {
+                        "domain": "light",
+                        "area": "wc"
+                      }
+                    ]
+                  },
+                  "sort": {
+                    "method": "friendly_name"
+                  }
+                }
+              ]
+            },
+            {
+              "type": "grid",
+              "title": "Büro",
+              "cards": [
+                {
+                  "type": "custom:mushroom-chips-card",
+                  "alignment": "justify",
+                  "chips": [
+                    {
+                      "type": "entity",
+                      "entity": "sensor.buro_rauchmelder_temperature",
+                      "icon": "mdi:thermometer"
+                    },
+                    {
+                      "type": "entity",
+                      "entity": "sensor.buro_rauchmelder_humidity",
+                      "icon": "mdi:water-percent"
+                    },
+                    {
+                      "type": "entity",
+                      "entity": "binary_sensor.buro_anwesenheitssensor_raum",
+                      "icon": "mdi:motion-sensor"
+                    }
+                  ]
+                },
+                {
+                  "type": "custom:auto-entities",
+                  "card": {
+                    "type": "grid",
+                    "columns": 2,
+                    "square": false
+                  },
+                  "card_param": "cards",
+                  "filter": {
+                    "include": [
+                      {
+                        "domain": "light",
+                        "area": "buro"
+                      }
+                    ]
+                  },
+                  "sort": {
+                    "method": "friendly_name"
+                  }
+                },
+                {
+                  "type": "custom:mushroom-cover-card",
+                  "entity": "cover.buro_rollladen",
+                  "show_buttons_control": true,
+                  "show_position_control": true
+                }
+              ]
+            },
+            {
+              "type": "grid",
+              "title": "Gästezimmer",
+              "cards": [
+                {
+                  "type": "custom:mushroom-chips-card",
+                  "alignment": "justify",
+                  "chips": [
+                    {
+                      "type": "entity",
+                      "entity": "sensor.gastezimmer_rauchmelder_temperature",
+                      "icon": "mdi:thermometer"
+                    },
+                    {
+                      "type": "entity",
+                      "entity": "sensor.gastezimmer_rauchmelder_humidity",
+                      "icon": "mdi:water-percent"
+                    }
+                  ]
+                },
+                {
+                  "type": "custom:auto-entities",
+                  "card": {
+                    "type": "grid",
+                    "columns": 2,
+                    "square": false
+                  },
+                  "card_param": "cards",
+                  "filter": {
+                    "include": [
+                      {
+                        "domain": "light",
+                        "area": "gastezimmer"
+                      }
+                    ]
+                  },
+                  "sort": {
+                    "method": "friendly_name"
+                  }
+                },
+                {
+                  "type": "custom:mushroom-cover-card",
+                  "entity": "cover.gastezimmer_rollladen",
+                  "show_buttons_control": true,
+                  "show_position_control": true
+                }
+              ]
+            },
+            {
+              "type": "grid",
+              "title": "Garderobe",
+              "cards": [
+                {
+                  "type": "custom:auto-entities",
+                  "card": {
+                    "type": "grid",
+                    "columns": 2,
+                    "square": false
+                  },
+                  "card_param": "cards",
+                  "filter": {
+                    "include": [
+                      {
+                        "domain": "light",
+                        "area": "gaderobe"
+                      }
+                    ]
+                  },
+                  "sort": {
+                    "method": "friendly_name"
+                  }
+                },
+                {
+                  "type": "custom:mushroom-entity-card",
+                  "entity": "input_boolean.garderobe_helper",
+                  "name": "Garderobe-Helper",
+                  "tap_action": {
+                    "action": "toggle"
+                  }
+                }
+              ]
+            },
+            {
+              "type": "grid",
+              "title": "Speis",
+              "cards": [
+                {
+                  "type": "custom:mushroom-chips-card",
+                  "alignment": "justify",
+                  "chips": [
+                    {
+                      "type": "entity",
+                      "entity": "binary_sensor.speis_bewegungsmelder_occupancy",
+                      "icon": "mdi:motion-sensor"
+                    }
+                  ]
+                },
+                {
+                  "type": "custom:auto-entities",
+                  "card": {
+                    "type": "grid",
+                    "columns": 2,
+                    "square": false
+                  },
+                  "card_param": "cards",
+                  "filter": {
+                    "include": [
+                      {
+                        "domain": "light",
+                        "area": "speis"
+                      }
+                    ]
+                  },
+                  "sort": {
+                    "method": "friendly_name"
+                  }
+                }
+              ]
+            },
+            {
+              "type": "grid",
+              "title": "Technikraum",
+              "cards": [
+                {
+                  "type": "custom:mushroom-chips-card",
+                  "alignment": "justify",
+                  "chips": [
+                    {
+                      "type": "entity",
+                      "entity": "sensor.technikraum_rauchmelder_temperature",
+                      "icon": "mdi:thermometer"
+                    },
+                    {
+                      "type": "entity",
+                      "entity": "sensor.technikraum_rauchmelder_humidity",
+                      "icon": "mdi:water-percent"
+                    },
+                    {
+                      "type": "entity",
+                      "entity": "binary_sensor.technikraum_wassermelder_water_leak",
+                      "icon": "mdi:water-alert"
+                    },
+                    {
+                      "type": "entity",
+                      "entity": "binary_sensor.technikraum_bewegungsmelder_occupancy",
+                      "icon": "mdi:motion-sensor"
+                    }
+                  ]
+                },
+                {
+                  "type": "custom:auto-entities",
+                  "card": {
+                    "type": "grid",
+                    "columns": 2,
+                    "square": false
+                  },
+                  "card_param": "cards",
+                  "filter": {
+                    "include": [
+                      {
+                        "domain": "light",
+                        "area": "technikraum"
+                      }
+                    ]
+                  },
+                  "sort": {
+                    "method": "friendly_name"
+                  }
+                }
+              ]
+            },
+            {
+              "type": "grid",
+              "title": "Gang",
+              "cards": [
+                {
+                  "type": "custom:auto-entities",
+                  "card": {
+                    "type": "grid",
+                    "columns": 2,
+                    "square": false
+                  },
+                  "card_param": "cards",
+                  "filter": {
+                    "include": [
+                      {
+                        "domain": "light",
+                        "area": "gang"
+                      }
+                    ]
+                  },
+                  "sort": {
+                    "method": "friendly_name"
+                  }
+                }
+              ]
+            },
+            {
+              "type": "grid",
+              "title": "Außenbereiche",
+              "cards": [
+                {
+                  "type": "custom:mushroom-title-card",
+                  "subtitle": "Lichter aller Außenbereiche"
+                },
+                {
+                  "type": "custom:auto-entities",
+                  "card": {
+                    "type": "grid",
+                    "columns": 2,
+                    "square": false
+                  },
+                  "card_param": "cards",
+                  "filter": {
+                    "include": [
+                      {
+                        "domain": "light",
+                        "area": "terrasse"
+                      },
+                      {
+                        "domain": "light",
+                        "area": "garage"
+                      },
+                      {
+                        "domain": "light",
+                        "area": "eingang"
+                      },
+                      {
+                        "domain": "light",
+                        "area": "grillplatz"
+                      },
+                      {
+                        "domain": "light",
+                        "area": "ruheplatz"
+                      }
+                    ]
+                  },
+                  "sort": {
+                    "method": "friendly_name"
+                  }
+                }
+              ]
+            }
+          ]
+        },
         {
           "title": "Home",
           "type": "sections",