diff --git a/esphome/nilan300.yaml b/esphome/nilan300.yaml
index 5d759c6..43973bc 100644
--- a/esphome/nilan300.yaml
+++ b/esphome/nilan300.yaml
@@ -25,8 +25,6 @@
     ssid: "Nilan300 Fallback Hotspot"
     password: !secret wifi_password
 
-captive_portal:
-
 uart:
   rx_pin: GPIO16
   tx_pin: GPIO17
diff --git a/lights.yaml b/lights.yaml
index d578741..4261ccd 100644
--- a/lights.yaml
+++ b/lights.yaml
@@ -39,7 +39,7 @@
     - light.niels_gruppe
     - light.jens_gruppe
     - light.seng
-    
+
 - platform: group
   name: All Lights On
   entities:
@@ -54,19 +54,37 @@
     - light.niels_gruppe
     - light.jens_gruppe
     - light.seng
-    
+
 - platform: group
   name: Niels Gruppe
   entities:
     - light.niels_loft
     - light.niels_seng
-    
+
 - platform: group
   name: Jens Gruppe
   entities:
     - light.gaestevaerelse
-    
+
 - platform: group
   name: Bryggers Gruppe
   entities:
-    - light.bryggers_indhak
\ No newline at end of file
+    - light.bryggers_indhak
+
+- platform: group
+  name: Alle
+  entities:
+    - light.gang_gruppe
+    - light.kokken_gruppe
+    - light.kokken_o_gruppe
+    - light.spisebord_gruppe
+    - light.kontor
+    - light.sofabord
+    - light.vetrineskab
+    - light.flowerpot
+    - light.bryggers_gruppe
+    - light.gaestevaerelse
+    - light.niels_gruppe
+    - light.jens_gruppe
+    - light.seng
+    - light.bryggers
diff --git a/mqtt/igrill.yaml b/mqtt/igrill.yaml
deleted file mode 100644
index 87578d7..0000000
--- a/mqtt/igrill.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-- state_topic: "bbq/grill/grill/probe1"
-  name: "iGrill_Temperature"
-  qos: 0
-  unit_of_measurement: "°C"
-
-- state_topic: "bbq/grill/grill/battery"
-  name: "iGrill_Battery"
-  qos: 0
-  unit_of_measurement: '%'
-  device_class: battery   
\ No newline at end of file
diff --git a/sensors/igrill.yaml b/sensors/igrill.yaml
index 55e8cd2..0628a45 100644
--- a/sensors/igrill.yaml
+++ b/sensors/igrill.yaml
@@ -1,11 +1,11 @@
 - platform: template
   sensors:
     target_alert_temp_probe_1:
-      availability_template: "{{(states.sensor.igrill_temperature.state | int(0)) > 0}}"
+      availability_template: "{{(states.sensor.igrill_mini_probe_1.state | default(0) | int(0)) > 0}}"
       value_template:
-        "{% if (states.sensor.igrill_temperature.state | int(0)) >= (states.input_number.grill_probe_1_target.state | int) %}
+        "{% if (states.sensor.igrill_mini_probe_1.state | int(0)) >= (states.input_number.grill_probe_1_target.state | int) %}
         Alert
-        {% elif (states.sensor.igrill_temperature.state | int(0)) >= (states.input_number.grill_probe_1_target.state | int) - 4 %}
+        {% elif (states.sensor.igrill_mini_probe_1.state | int(0)) >= (states.input_number.grill_probe_1_target.state | int) - 4 %}
         Ready
         {% else %}
         Cooking
diff --git a/themes/metro/metro.yaml b/themes/metro/metro.yaml
index de8ab19..9e72d4a 100644
--- a/themes/metro/metro.yaml
+++ b/themes/metro/metro.yaml
@@ -56,6 +56,10 @@
   mdc-theme-primary: var(--accent-color)
   mdc-theme-on-primary: var(--accent-text-color)
 
+  # Borders
+  ha-card-border-width: 0px
+  ha-card-border-color: transparent
+
   # Typography
   font-stack: &font-stack "Segoe UI Variable Static Text, Segoe UI, SegoeUI, -apple-system,BlinkMacSystemFont, system-ui, sans-serif"
   display-font-stack: &display-font-stack "Segoe UI Variable Static Display, Segoe UI, SegoeUI, -apple-system,BlinkMacSystemFont, system-ui, sans-serif"
@@ -75,7 +79,7 @@
   body-font-weight: normal
   body-line-height: normal
   card-title-font-size: 1.5rem
-  card-title-font-weight: 500
+  card-title-font-weight: 600
   card-title-line-height: normal
   title-font-size: 3.5rem
   subtitle-font-size: 1rem
@@ -91,7 +95,7 @@
   h1-font-weight: 100
   h2-font-weight: 100
   h3-font-weight: 100
-  h4-font-weight: 500
+  h4-font-weight: 600
   h5-font-weight: 400
   h6-font-weight: 400
 
@@ -105,7 +109,7 @@
   h6-font: "var(--h6-font-weight) var(--h6-font-size) var(--font-stack)"
 
   paper-font-headline_-_font-size: 3.5rem
-  paper-font-headline_-_font-weight: 500
+  paper-font-headline_-_font-weight: 600
   paper-font-headline_-_letter-spacing: 0
   paper-font-headline_-_line-height: 5rem
 
@@ -114,13 +118,13 @@
   material-button-font-size: 1rem
 
   mush-title-font-size: var(--title-font-size)
-  mush-title-font-weight: 500
+  mush-title-font-weight: 600
   mush-title-padding: 24px 16px 16px
   mush-subtitle-font-size: var(--subtitle-font-size)
-  mush-subtitle-font-weight: 500
+  mush-subtitle-font-weight: 600
   mush-card-primary-font-size: var(--body-font-size)
   mush-card-secondary-font-size: var(--small-font-size)
-  mush-card-primary-font-weight: 500
+  mush-card-primary-font-weight: 600
   mush-card-secondary-font-weight: normal
   mush-chip-font-size: var(--body-font-size)
   mush-chip-font-weight: normal
@@ -266,6 +270,9 @@
   # Swiper
   swiper-theme-color: var(--primary-color)
 
+  # Video
+  video-max-height: none
+
 
 ________________________________________Common Base 2 (Do Not Use):
 
@@ -446,7 +453,7 @@
       .mdc-top-app-bar__title, .main-title {
         text-transform: uppercase;
         font-size: var(--body-font-size);
-        font-weight: 500;
+        font-weight: 600;
         line-height: 1.1;
         overflow: inherit;
         white-space: normal;
@@ -537,7 +544,7 @@
 
   card-mod-sidebar: &card-mod-sidebar |
     .menu .title {
-      font-weight: 500;
+      font-weight: 600;
     }
     :host([expanded]) paper-icon-item {
       width: 100%;
@@ -557,13 +564,13 @@
   card-mod-view: &card-mod-view |
     .main-title {
       font-size: 10pt;
-      font-weight: 500;
+      font-weight: 600;
       text-transform: uppercase;
     }
     #tabbar {
       font-size: 10pt;
       text-transform: uppercase;
-      font-weight: 500;
+      font-weight: 600;
     }
     #tabbar:not(.bottom-bar) {
       justify-content: left;