diff --git a/ui-lovelace.yaml b/ui-lovelace.yaml
index ae545fd..24f999c 100644
--- a/ui-lovelace.yaml
+++ b/ui-lovelace.yaml
@@ -232,25 +232,25 @@ views:
                   - entity: switch.general_persianas
                     icon: 'mdi:plus-circle-multiple-outline'
                     name: Persianas
-                  - entity: switch.sonoffuv1
+                  - entity: switch.varios_1
                     icon: 'mdi:power-socket-eu'
                     name: Varios1
-                  - entity: switch.sonoffuv2
+                  - entity: switch.varios_2
                     icon: 'mdi:power-socket-eu'
                     name: Varios2
-                  - entity: switch.sonoffhumedos
+                  - entity: switch.humedos
                     icon: 'mdi:power-socket-eu'
                     name: Húmedos
-                  - entity: switch.sonoffhorno
+                  - entity: switch.horno
                     icon: 'mdi:stove'
                     name: Horno
                   - entity: switch.general_caldera
                     icon: 'mdi:radiator'
                     name: Caldera
-                  - entity: switch.sonofflavavajillas
+                  - entity: switch.lavavajillas
                     icon: 'mdi:amplifier'
                     name: Lavavajillas
-                  - entity: switch.sonofflavadora
+                  - entity: switch.lavadora
                     icon: 'mdi:amplifier'
                     name: Lavavadora
                   - entity: switch.coche_electrico
@@ -861,17 +861,17 @@ views:
         title: General Electricidad
         type: entities
       - entities:
-          - entity: sensor.sonoffhorno_energy_power
+          - entity: sensor.horno_kw_actuales
             name: Horno
-          - entity: sensor.sonoffuv1_energy_power
+          - entity: sensor.varios_1_kw_actuales
             name: UV1
-          - entity: sensor.sonoffuv2_energy_power
+          - entity: sensor.varios_2_kw_actuales
             name: UV2
-          - entity: sensor.sonoffhumedos_energy_power
+          - entity: sensor.humedos_kw_actuales
             name: Húmedos
-          - entity: sensor.sonofflavavajillas_energy_power
+          - entity: sensor.lavavajillas_kw_actuales
             name: Lavavajillas
-          - entity: sensor.sonofflavadora_energy_power
+          - entity: sensor.lavadora_kw_actuales
             name: Lavadora
           - entity: sensor.consumo_general_calefaccion
             name: Calefacción
@@ -884,58 +884,20 @@ views:
         title: Energía Consumida Actual
         type: glance
       - entities:
-          - entity: sensor.sonoffhorno_energy_today
+          - entity: sensor.horno_consumo_diario
             name: Horno Hoy
-          - entity: sensor.sonoffhumedos_energy_today
+          - entity: sensor.humedos_consumo_diario
             name: Humedos Hoy
-          - entity: sensor.sonofflavavajillas_energy_today
+          - entity: sensor.lavavajillas_consumo_diario
             name: Lavavajillas Hoy
-          - entity: sensor.sonofflavadora_energy_today
+          - entity: sensor.lavadora_consumo_diario
             name: Lavadora Hoy
-          - entity: sensor.sonoffuv1_energy_today
+          - entity: sensor.varios_1_consumo_diario
             name: UV1 Hoy
-          - entity: sensor.sonoffuv2_energy_today
+          - entity: sensor.varios_2_consumo_diario
             name: UV2 Hoy
-          - entity: sensor.sonoffhorno_energy_yesterday
-            name: Horno Ayer
-          - entity: sensor.sonoffhumedos_energy_yesterday
-            name: Humedos Ayer
-          - entity: sensor.sonofflavavajillas_energy_yester
-            name: Lavavajillas Ayer
-          - entity: sensor.sonofflavadora_energy_yesterday
-            name: Lavadora Ayer
-          - entity: sensor.sonoffuv1_energy_yesterday
-            name: UV1 Ayer
-          - entity: sensor.sonoffuv2_energy_yesterday
-            name: UV2 Ayer
         title: Energía Consumida Fecha
         type: glance
-      - columns: 5
-        entities:
-          - entity: sensor.sonoffhorno_energy_total
-            name: Horno
-          - entity: sensor.sonofflavavajillas_energy_total
-            name: Lavavajillas
-          - entity: sensor.sonofflavadora_energy_total
-            name: Lavadora
-          - entity: sensor.sonoffuv2_energy_total
-            name: Varios2
-          - entity: sensor.sonoffhumedos_energy_total
-            name: Humedos
-          - entity: sensor.sonoffuv1_energy_total
-            name: Varios1
-          - entity: sensor.energia_general_persianas
-            name: Persianas
-          - entity: sensor.energia_general_luces
-            name: Luces
-          - entity: sensor.energia_general_calefaccion
-            name: Calefacción
-          - entity: sensor.energia_general_coche_electrico
-            name: Coche
-        show_name: true
-        show_state: true
-        title: Energia Consumida Total
-        type: glance
       - entities:
           - entity: sensor.consumo_general_calefaccion
             name: Calefacción
@@ -945,17 +907,17 @@ views:
             name: Luces
           - entity: sensor.consumo_general_persianas
             name: Persianas
-          - entity: sensor.sonoffhorno_energy_power
+          - entity: sensor.horno_kw_actuales
             name: Horno
-          - entity: sensor.sonoffhumedos_energy_power
+          - entity: sensor.humedos_kw_actuales
             name: Humedos
-          - entity: sensor.sonofflavavajillas_energy_power
+          - entity: sensor.lavavajillas_kw_actuales
             name: Lavavajillas
-          - entity: sensor.sonofflavadora_energy_power
+          - entity: sensor.lavadora_kw_actuales
             name: Lavadora
-          - entity: sensor.sonoffuv1_energy_power
+          - entity: sensor.varios_1_kw_actuales
             name: UV1
-          - entity: sensor.sonoffuv2_energy_power
+          - entity: sensor.varios_2_kw_actuales
             name: UV2
         hours_to_show: 12
         refresh_interval: 60