diff --git a/homeassistant/config/lovelace_minimalist/templates/EN.yaml b/homeassistant/config/lovelace_minimalist/templates/EN.yaml
index 851c6553..595835cb 100644
--- a/homeassistant/config/lovelace_minimalist/templates/EN.yaml
+++ b/homeassistant/config/lovelace_minimalist/templates/EN.yaml
@@ -71,6 +71,7 @@ ulm_language_variables_EN:
     ulm_floor_2: "Floor 2"
     ulm_1_light: "1 light"
     ulm_lights: " lights"
+    ulm_bedroom_makeup: "Makeup"
     
     ulm_boiler: "Boiler"
     ulm_kfir: "Kfir"
diff --git a/homeassistant/config/lovelace_minimalist/templates/HE.yaml b/homeassistant/config/lovelace_minimalist/templates/HE.yaml
index 991c8d42..a3b55dcb 100644
--- a/homeassistant/config/lovelace_minimalist/templates/HE.yaml
+++ b/homeassistant/config/lovelace_minimalist/templates/HE.yaml
@@ -71,6 +71,7 @@ ulm_language_variables:
     ulm_floor_2: "קומה 2"
     ulm_1_light: "אור 1"
     ulm_lights: " אורות"
+    ulm_bedroom_makeup: "הורים איפור"
 
     ulm_boiler: "דוד שמש"
     ulm_kfir: "כפיר"
diff --git a/homeassistant/config/lovelace_minimalist/views/view_bedroom.yaml b/homeassistant/config/lovelace_minimalist/views/view_bedroom.yaml
index e984647f..d4a20e21 100644
--- a/homeassistant/config/lovelace_minimalist/views/view_bedroom.yaml
+++ b/homeassistant/config/lovelace_minimalist/views/view_bedroom.yaml
@@ -108,6 +108,15 @@ cards:
                         variables:
                           ulm_chip_icon_state_entity: sensor.number_of_lights_on_bedroom
 
+                      # Covers Chip
+                      - type: 'custom:button-card'
+                        template:
+                          - 'chip_icon_label_state'
+                          - 'chip_blue'
+                        icon: 'mdi:window-shutter'
+                        variables:
+                          ulm_chip_icon_state_entity: sensor.number_of_covers_open_bedroom
+
                       # Motion Chip
                       - type: 'custom:button-card'
                         template:
@@ -195,6 +204,15 @@ cards:
                         view_layout:
                           grid-row-start: span 2
 
+                      # Bedroom Makup Cover
+                      - type: 'custom:button-card'
+                        template: card_cover_buttons
+                        variables:
+                          x_ulm_card_cover_buttons_name: "[[[ return variables.ulm_bedroom_makeup; ]]]"
+                          ulm_card_cover_buttons_entity: cover.parents_makeup
+                        view_layout:
+                          grid-row-start: span 2
+
                       # Bedroom Radiator
                       # - type: 'custom:button-card'
                       #   template: card_power_outlet
diff --git a/homeassistant/config/lovelace_minimalist/views/view_covers.yaml b/homeassistant/config/lovelace_minimalist/views/view_covers.yaml
index 245ab90a..7eda3d77 100644
--- a/homeassistant/config/lovelace_minimalist/views/view_covers.yaml
+++ b/homeassistant/config/lovelace_minimalist/views/view_covers.yaml
@@ -270,6 +270,15 @@ cards:
                           grid-template-columns: 1fr 1fr            
                     cards:
 
+                      # Bedroom Makup Cover
+                      - type: 'custom:button-card'
+                        template: card_cover_buttons
+                        variables:
+                          x_ulm_card_cover_buttons_name: "[[[ return variables.ulm_bedroom_makeup; ]]]"
+                          ulm_card_cover_buttons_entity: cover.parents_makeup
+                        view_layout:
+                          grid-row-start: span 2
+
                       # Ronen Room Cover
                       - type: 'custom:button-card'
                         template: card_cover_buttons
@@ -278,7 +287,7 @@ cards:
                           ulm_card_cover_buttons_entity: cover.ronen_room
                         view_layout:
                           grid-row-start: span 2
-                          
+
                       # Kfir Room Cover
                       - type: 'custom:button-card'
                         template: card_cover_buttons
diff --git a/homeassistant/config/lovelace_minimalist/views/view_kfir_room.yaml b/homeassistant/config/lovelace_minimalist/views/view_kfir_room.yaml
index 80e11e63..da0b7860 100644
--- a/homeassistant/config/lovelace_minimalist/views/view_kfir_room.yaml
+++ b/homeassistant/config/lovelace_minimalist/views/view_kfir_room.yaml
@@ -108,6 +108,15 @@ cards:
                         variables:
                           ulm_chip_icon_state_entity: sensor.number_of_lights_on_kfir_room
 
+                      # Covers Chip
+                      - type: 'custom:button-card'
+                        template:
+                          - 'chip_icon_label_state'
+                          - 'chip_blue'
+                        icon: 'mdi:window-shutter'
+                        variables:
+                          ulm_chip_icon_state_entity: sensor.number_of_covers_open_kfir_room
+
 
 
           ############################################################################
diff --git a/homeassistant/config/lovelace_minimalist/views/view_ronen_room.yaml b/homeassistant/config/lovelace_minimalist/views/view_ronen_room.yaml
index 65a671d4..52543c68 100644
--- a/homeassistant/config/lovelace_minimalist/views/view_ronen_room.yaml
+++ b/homeassistant/config/lovelace_minimalist/views/view_ronen_room.yaml
@@ -108,6 +108,15 @@ cards:
                         variables:
                           ulm_chip_icon_state_entity: sensor.number_of_lights_on_ronen_room
 
+                      # Covers Chip
+                      - type: 'custom:button-card'
+                        template:
+                          - 'chip_icon_label_state'
+                          - 'chip_blue'
+                        icon: 'mdi:window-shutter'
+                        variables:
+                          ulm_chip_icon_state_entity: sensor.number_of_covers_open_ronen_room
+
 
 
           ############################################################################
diff --git a/homeassistant/config/lovelace_minimalist/views_wallpanel/view_covers.yaml b/homeassistant/config/lovelace_minimalist/views_wallpanel/view_covers.yaml
index 54ef26eb..904630ee 100644
--- a/homeassistant/config/lovelace_minimalist/views_wallpanel/view_covers.yaml
+++ b/homeassistant/config/lovelace_minimalist/views_wallpanel/view_covers.yaml
@@ -217,6 +217,15 @@ cards:
                       grid-template-columns: 1fr 1fr 1fr 1fr
                 cards:
 
+                    # Bedroom Makup Cover
+                    - type: 'custom:button-card'
+                      template: card_cover_buttons
+                      variables:
+                        x_ulm_card_cover_buttons_name: "[[[ return variables.ulm_bedroom_makeup; ]]]"
+                        ulm_card_cover_buttons_entity: cover.parents_makeup
+                      view_layout:
+                        grid-row-start: span 2
+
                     # Ronen Room Cover
                     - type: 'custom:button-card'
                       template: card_cover_buttons
diff --git a/homeassistant/config/lovelace_minimalist/views_wallpanel/view_floor_2.yaml b/homeassistant/config/lovelace_minimalist/views_wallpanel/view_floor_2.yaml
index 92be2d79..b3275a9f 100644
--- a/homeassistant/config/lovelace_minimalist/views_wallpanel/view_floor_2.yaml
+++ b/homeassistant/config/lovelace_minimalist/views_wallpanel/view_floor_2.yaml
@@ -119,6 +119,15 @@ cards:
                       grid-template-columns: 1fr 1fr
                 cards:
 
+                  # Bedroom Makup Cover
+                  - type: 'custom:button-card'
+                    template: card_cover_buttons
+                    variables:
+                      x_ulm_card_cover_buttons_name: "[[[ return variables.ulm_bedroom_makeup; ]]]"
+                      ulm_card_cover_buttons_entity: cover.parents_makeup
+                    view_layout:
+                      grid-row-start: span 2
+
                   # Ronen Room Cover
                   - type: 'custom:button-card'
                     template: card_cover_buttons
@@ -139,69 +148,6 @@ cards:
 
 
 
-              ############################################################################
-              #                                                                          #
-              #   Heating                                                                #
-              #                                                                          #
-              ############################################################################
-
-              # Title
-              - type: horizontal-stack
-                cards:
-
-                  - type: custom:button-card
-                    template: title
-                    name: "[[[ return variables.ulm_heating; ]]]"
-
-              - type: custom:layout-card
-                layout_type: grid
-                layout_options:
-                  grid-template-columns: 1fr 1fr
-                  grid-template-rows: auto
-                  grid-gap: 0px 4px
-                  mediaquery:
-                    "(max-width: 450px)":
-                      grid-template-columns: 1fr 1fr
-                cards:
-
-                  # Bathroom Heater
-                  - type: 'custom:button-card'
-                    template: 
-                      - "card_power_outlet"
-                      - "red_on"
-                    variables:
-                      ulm_card_power_outlet_consumption_sensor: sensor.bathroom_heater_power
-                    entity: switch.bathroom_heater
-                    name: "[[[ return variables.ulm_bathroom; ]]]"
-                    icon: mdi:heat-wave
-
-                  # Parents Bathroom Heater
-                  - type: 'custom:button-card'
-                    template: 
-                      - "card_power_outlet"
-                      - "red_on"
-                    variables:
-                      ulm_card_power_outlet_consumption_sensor: sensor.parents_bathroom_heater_power
-                    entity: switch.parents_bathroom_heater
-                    name: "[[[ return variables.ulm_parents_bathroom; ]]]"
-                    icon: mdi:heat-wave
-
-                  # Switcher
-                  - type: 'custom:button-card'
-                    template: 
-                      - card_switcher
-                    variables:
-                      x_ulm_card_switcher_name: "[[[ return variables.ulm_boiler; ]]]"
-                      ulm_card_switcher_icon: "mdi:waves"
-                      ulm_card_switcher_entity: switch.switcher_boiler
-                      ulm_card_switcher_timer_script: script.switcher_boiler_turn_on_timer_script
-                      ulm_card_switcher_time_left: sensor.switcher_boiler_time_left_short
-                      ulm_card_switcher_timer_minutes: input_select.switcher_boiler_timer_minutes_input_select
-                      ulm_card_switcher_electric_current: sensor.switcher_boiler_electric_current
-                      ulm_card_switcher_auto_off: sensor.switcher_boiler_auto_off_time
-                    view_layout:
-                      grid-row-start: span 2
-
           ############################################################################
           #                                                                          #
           #   Right Column                                                           #
@@ -211,6 +157,13 @@ cards:
           - type: vertical-stack
             cards:
 
+
+              ############################################################################
+              #                                                                          #
+              #   Lights                                                                 #
+              #                                                                          #
+              ############################################################################
+
               # Lights
               - type: horizontal-stack
                 cards:
@@ -333,3 +286,65 @@ cards:
                     name: "[[[ return variables.ulm_laundry; ]]]"
 
 
+              ############################################################################
+              #                                                                          #
+              #   Heating                                                                #
+              #                                                                          #
+              ############################################################################
+
+              # Title
+              - type: horizontal-stack
+                cards:
+
+                  - type: custom:button-card
+                    template: title
+                    name: "[[[ return variables.ulm_heating; ]]]"
+
+              - type: custom:layout-card
+                layout_type: grid
+                layout_options:
+                  grid-template-columns: 1fr 1fr
+                  grid-template-rows: auto
+                  grid-gap: 0px 4px
+                  mediaquery:
+                    "(max-width: 450px)":
+                      grid-template-columns: 1fr 1fr
+                cards:
+
+                  # Bathroom Heater
+                  - type: 'custom:button-card'
+                    template: 
+                      - "card_power_outlet"
+                      - "red_on"
+                    variables:
+                      ulm_card_power_outlet_consumption_sensor: sensor.bathroom_heater_power
+                    entity: switch.bathroom_heater
+                    name: "[[[ return variables.ulm_bathroom; ]]]"
+                    icon: mdi:heat-wave
+
+                  # Parents Bathroom Heater
+                  - type: 'custom:button-card'
+                    template: 
+                      - "card_power_outlet"
+                      - "red_on"
+                    variables:
+                      ulm_card_power_outlet_consumption_sensor: sensor.parents_bathroom_heater_power
+                    entity: switch.parents_bathroom_heater
+                    name: "[[[ return variables.ulm_parents_bathroom; ]]]"
+                    icon: mdi:heat-wave
+
+                  # Switcher
+                  - type: 'custom:button-card'
+                    template: 
+                      - card_switcher
+                    variables:
+                      x_ulm_card_switcher_name: "[[[ return variables.ulm_boiler; ]]]"
+                      ulm_card_switcher_icon: "mdi:waves"
+                      ulm_card_switcher_entity: switch.switcher_boiler
+                      ulm_card_switcher_timer_script: script.switcher_boiler_turn_on_timer_script
+                      ulm_card_switcher_time_left: sensor.switcher_boiler_time_left_short
+                      ulm_card_switcher_timer_minutes: input_select.switcher_boiler_timer_minutes_input_select
+                      ulm_card_switcher_electric_current: sensor.switcher_boiler_electric_current
+                      ulm_card_switcher_auto_off: sensor.switcher_boiler_auto_off_time
+                    view_layout:
+                      grid-row-start: span 2
\ No newline at end of file
diff --git a/homeassistant/config/packages/covers/sensors_covers.yaml b/homeassistant/config/packages/covers/sensors_covers.yaml
index 0add4cff..7189b363 100644
--- a/homeassistant/config/packages/covers/sensors_covers.yaml
+++ b/homeassistant/config/packages/covers/sensors_covers.yaml
@@ -56,3 +56,54 @@ template:
           {% endfor %}
           {{ count.value }}
 
+      ############################################################################
+      #                                                                          #
+      #   Number of Covers Open - Bedroom                                        #
+      #                                                                          #
+      ############################################################################
+
+      - name: "Number Of Covers Open Bedroom"
+        unique_id: number_of_covers_open_bedroom
+        state: >
+          {% set count = namespace(value=0) %}
+          {% for entity_id in state_attr('cover.bedroom_covers','entity_id') %}
+            {% if (states(entity_id) == 'open' or states(entity_id) == 'opening' or states(entity_id) == 'closing') %}
+              {% set count.value = count.value + 1 %}
+            {% endif %}
+          {% endfor %}
+          {{ count.value }}
+
+      ############################################################################
+      #                                                                          #
+      #   Number of Covers Open - Ronen Room                                     #
+      #                                                                          #
+      ############################################################################
+
+      - name: "Number Of Covers Open Ronen Room"
+        unique_id: number_of_covers_open_ronen_room
+        state: >
+          {% set count = namespace(value=0) %}
+          {% for entity_id in state_attr('cover.ronen_room_covers','entity_id') %}
+            {% if (states(entity_id) == 'open' or states(entity_id) == 'opening' or states(entity_id) == 'closing') %}
+              {% set count.value = count.value + 1 %}
+            {% endif %}
+          {% endfor %}
+          {{ count.value }}
+
+      ############################################################################
+      #                                                                          #
+      #   Number of Covers Open - Kfir Room                                      #
+      #                                                                          #
+      ############################################################################
+
+      - name: "Number Of Covers Open Kfir Room"
+        unique_id: number_of_covers_open_kfir_room
+        state: >
+          {% set count = namespace(value=0) %}
+          {% for entity_id in state_attr('cover.kfir_room_covers','entity_id') %}
+            {% if (states(entity_id) == 'open' or states(entity_id) == 'opening' or states(entity_id) == 'closing') %}
+              {% set count.value = count.value + 1 %}
+            {% endif %}
+          {% endfor %}
+          {{ count.value }}
+